[93307] trunk/dports/python/py-glewpy

jmr at macports.org jmr at macports.org
Sat May 19 07:42:46 PDT 2012


Revision: 93307
          https://trac.macports.org/changeset/93307
Author:   jmr at macports.org
Date:     2012-05-19 07:42:46 -0700 (Sat, 19 May 2012)
Log Message:
-----------
py-glewpy: fix hardcoded prefix in patch (#30792), remove unused patch

Modified Paths:
--------------
    trunk/dports/python/py-glewpy/Portfile
    trunk/dports/python/py-glewpy/files/patch-setup.py

Removed Paths:
-------------
    trunk/dports/python/py-glewpy/files/patch-setup-osx.py

Modified: trunk/dports/python/py-glewpy/Portfile
===================================================================
--- trunk/dports/python/py-glewpy/Portfile	2012-05-19 14:30:14 UTC (rev 93306)
+++ trunk/dports/python/py-glewpy/Portfile	2012-05-19 14:42:46 UTC (rev 93307)
@@ -24,6 +24,9 @@
 depends_lib-append      port:glew \
                         port:py-pyrex
 
+post-patch {
+    reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/setup.py
+}
 post-destroot {
         xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
 }

Deleted: trunk/dports/python/py-glewpy/files/patch-setup-osx.py
===================================================================
--- trunk/dports/python/py-glewpy/files/patch-setup-osx.py	2012-05-19 14:30:14 UTC (rev 93306)
+++ trunk/dports/python/py-glewpy/files/patch-setup-osx.py	2012-05-19 14:42:46 UTC (rev 93307)
@@ -1,69 +0,0 @@
---- setup-osx.py	2006-04-25 00:34:28.000000000 +0200
-+++ setup-osx.py.new	2007-04-15 21:49:20.000000000 +0200
-@@ -1,6 +1,9 @@
- from distutils.core import setup
- from distutils.extension import Extension
- from Pyrex.Distutils import build_ext
-+
-+glew_include_dirs=['/opt/local/include']
-+
- setup(
-   name = "glewpy",
-   version = '0.7.4',
-@@ -16,31 +19,31 @@
-                             'examples/oneshot.py',
-                             'examples/logo2.jpg']},
-   ext_modules=[
--    Extension('glew', ['src/glew.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.threedfx', ['src/gl/threedfx.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.apple', ['src/gl/apple.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.arb', ['src/gl/arb.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.ati', ['src/gl/ati.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.atix', ['src/gl/atix.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.ext', ['src/gl/ext.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.gl', ['src/gl/gl.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.hp', ['src/gl/hp.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.ibm', ['src/gl/ibm.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.ingr', ['src/gl/ingr.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.intel', ['src/gl/intel.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.ktx', ['src/gl/ktx.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.mesa', ['src/gl/mesa.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.nv', ['src/gl/nv.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.oml', ['src/gl/oml.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.pgi', ['src/gl/pgi.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.rend', ['src/gl/rend.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.s3', ['src/gl/s3.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.sgis', ['src/gl/sgis.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.sgix', ['src/gl/sgix.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.sgi', ['src/gl/sgi.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.sunx', ['src/gl/sunx.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.sun', ['src/gl/sun.pyx'], extra_link_args = ['-framework', 'OpenGL']),
--    Extension('gl.win', ['src/gl/win.pyx'], extra_link_args = ['-framework', 'OpenGL'])
-+    Extension('glew', ['src/glew.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.threedfx', ['src/gl/threedfx.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.apple', ['src/gl/apple.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.arb', ['src/gl/arb.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.ati', ['src/gl/ati.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.atix', ['src/gl/atix.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.ext', ['src/gl/ext.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.gl', ['src/gl/gl.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.hp', ['src/gl/hp.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.ibm', ['src/gl/ibm.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.ingr', ['src/gl/ingr.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.intel', ['src/gl/intel.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.ktx', ['src/gl/ktx.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.mesa', ['src/gl/mesa.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.nv', ['src/gl/nv.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.oml', ['src/gl/oml.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.pgi', ['src/gl/pgi.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.rend', ['src/gl/rend.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.s3', ['src/gl/s3.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.sgis', ['src/gl/sgis.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.sgix', ['src/gl/sgix.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.sgi', ['src/gl/sgi.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.sunx', ['src/gl/sunx.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.sun', ['src/gl/sun.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL']),
-+    Extension('gl.win', ['src/gl/win.pyx'], include_dirs=glew_include_dirs, extra_link_args = ['-framework', 'OpenGL'])
-     ],
-   cmdclass = {'build_ext': build_ext}
- )

Modified: trunk/dports/python/py-glewpy/files/patch-setup.py
===================================================================
--- trunk/dports/python/py-glewpy/files/patch-setup.py	2012-05-19 14:30:14 UTC (rev 93306)
+++ trunk/dports/python/py-glewpy/files/patch-setup.py	2012-05-19 14:42:46 UTC (rev 93307)
@@ -6,11 +6,11 @@
  
 -glew_extensions = [Extension('glew', ['src/glew.pyx'], libraries=libs)]
 +glew_extensions = [Extension('glew', ['src/glew.pyx'], 
-+                             include_dirs=['/opt/local/include'], 
++                             include_dirs=['__PREFIX__/include'], 
 +                             libraries=libs)]
  gl_extensions = [Extension('gl.%s' % g,
                             ['src/gl/%s.pyx' % g],
-+                           include_dirs=['/opt/local/include'],
++                           include_dirs=['__PREFIX__/include'],
                             libraries=libs) for g in gl_modules]
  
  all_extensions = []
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120519/5565e992/attachment.html>


More information about the macports-changes mailing list