From ded0069f8e90d0a0f742193a476e277ac4afa72b Mon Sep 17 00:00:00 2001 From: drochner Date: Thu, 20 May 2010 11:09:51 +0000 Subject: fix installation without DESTDIR --- graphics/py-gtkglext/distinfo | 4 ++-- graphics/py-gtkglext/patches/patch-aa | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'graphics/py-gtkglext') diff --git a/graphics/py-gtkglext/distinfo b/graphics/py-gtkglext/distinfo index 780f1dcd98c..20c10850eee 100644 --- a/graphics/py-gtkglext/distinfo +++ b/graphics/py-gtkglext/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2010/02/22 12:10:59 obache Exp $ +$NetBSD: distinfo,v 1.3 2010/05/20 11:09:51 drochner Exp $ SHA1 (pygtkglext-1.1.0.tar.bz2) = a22962982d12a43acac7601a8b370ec02834eb8f RMD160 (pygtkglext-1.1.0.tar.bz2) = a050519f520dc45254f485bdc2c41e2d51a2d26f Size (pygtkglext-1.1.0.tar.bz2) = 349067 bytes -SHA1 (patch-aa) = 07c33bed02cb4b756bb2bc6b324bf2ce051e9408 +SHA1 (patch-aa) = 00d5d9d229772a8e0ec9bc3e4717d3e1c71a3e32 diff --git a/graphics/py-gtkglext/patches/patch-aa b/graphics/py-gtkglext/patches/patch-aa index da0d4d7b0e6..98803f163ff 100644 --- a/graphics/py-gtkglext/patches/patch-aa +++ b/graphics/py-gtkglext/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2010/02/22 12:10:59 obache Exp $ +$NetBSD: patch-aa,v 1.3 2010/05/20 11:09:51 drochner Exp $ ---- setup.py.in.orig 2003-09-03 07:42:55.000000000 +0200 +--- setup.py.in.orig 2003-09-03 05:42:55.000000000 +0000 +++ setup.py.in -@@ -58,12 +58,9 @@ if version < [2, 2]: +@@ -58,12 +58,12 @@ if version < [2, 2]: class PyGtkGLExtInstallLib(InstallLib): def run(self): @@ -10,13 +10,16 @@ $NetBSD: patch-aa,v 1.2 2010/02/22 12:10:59 obache Exp $ - self.add_template_option('PYGTKGLEXT_API_VERSION', API_VERSION) - self.prepare() ++ dd = os.getenv('DESTDIR') ++ if not dd: ++ dd = "" self.install_template_as('pygtkglext.pc.in', - os.path.join(self.libdir, 'pkgconfig'), -+ os.path.join(os.getenv('DESTDIR') + os.getenv('PREFIX'), 'lib', 'pkgconfig'), ++ os.path.join(dd + os.getenv('PREFIX'), 'lib', 'pkgconfig'), 'pygtkglext-' + API_VERSION + '.pc') # Modify the base installation dir -@@ -76,8 +73,6 @@ class PyGtkGLExtInstallLib(InstallLib): +@@ -76,8 +76,6 @@ class PyGtkGLExtInstallLib(InstallLib): """Install template filename into target directory install_dir.""" template = open(filename).read() @@ -25,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2010/02/22 12:10:59 obache Exp $ output = os.path.join(install_dir, install_filename) self.mkpath(install_dir) -@@ -86,7 +81,7 @@ class PyGtkGLExtInstallLib(InstallLib): +@@ -86,7 +84,7 @@ class PyGtkGLExtInstallLib(InstallLib): self.local_outputs.append(output) return output -- cgit v1.2.3