pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/py-gtkglext fix installation without DESTDIR



details:   https://anonhg.NetBSD.org/pkgsrc/rev/346d6f3f11b9
branches:  trunk
changeset: 575734:346d6f3f11b9
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu May 20 11:09:51 2010 +0000

description:
fix installation without DESTDIR

diffstat:

 graphics/py-gtkglext/distinfo         |   4 ++--
 graphics/py-gtkglext/patches/patch-aa |  15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r 261160b6899d -r 346d6f3f11b9 graphics/py-gtkglext/distinfo
--- a/graphics/py-gtkglext/distinfo     Thu May 20 09:56:53 2010 +0000
+++ b/graphics/py-gtkglext/distinfo     Thu May 20 11:09:51 2010 +0000
@@ -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 -r 261160b6899d -r 346d6f3f11b9 graphics/py-gtkglext/patches/patch-aa
--- a/graphics/py-gtkglext/patches/patch-aa     Thu May 20 09:56:53 2010 +0000
+++ b/graphics/py-gtkglext/patches/patch-aa     Thu May 20 11:09:51 2010 +0000
@@ -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 @@
 -        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 @@
          
          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
  



Home | Main Index | Thread Index | Old Index