[72682] trunk/dports/python/py25-ssl

23 Oct 2010

Revision: 72682
          http://trac.macports.org/changeset/72682
Author:   and.damore@macports.org
Date:     2010-10-23 09:33:10 -0700 (Sat, 23 Oct 2010)
Log Message:
-----------
replacing prefix in post-patch

Modified Paths:
--------------
    trunk/dports/python/py25-ssl/Portfile
    trunk/dports/python/py25-ssl/files/patch-setup_py.diff

Removed Paths:
-------------
    trunk/dports/python/py25-ssl/patch-setup_py.diff

Modified: trunk/dports/python/py25-ssl/Portfile
===================================================================

--- trunk/dports/python/py25-ssl/Portfile	2010-10-23 14:21:53 UTC (rev 72681)
+++ trunk/dports/python/py25-ssl/Portfile	2010-10-23 16:33:10 UTC (rev 72682)
@@ -21,15 +21,8 @@
                     sha1    18035755a0ab75fe23191b5588d4572bfe675b5c \
                     rmd160  c4bf59d13ad7142d09cca7b9796a849275874e0a
 
-
 patchfiles          patch-setup_py.diff
 
-
-#patch   {
-#        reinplace "s|/sw/|${prefix}/|g" ${worksrcpath}/setup.py
-#}
-
-#post-destroot   {
-#        xinstall -m 644 -W ${worksrcpath} COPYING ChangeLog INSTALL README \
-#                TODO ${destroot}${prefix}/share/doc/${name}
-#}
+post-patch   {
+        reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/setup.py
+}

Modified: trunk/dports/python/py25-ssl/files/patch-setup_py.diff
===================================================================
--- trunk/dports/python/py25-ssl/files/patch-setup_py.diff	2010-10-23 14:21:53 UTC (rev 72681)
+++ trunk/dports/python/py25-ssl/files/patch-setup_py.diff	2010-10-23 16:33:10 UTC (rev 72682)
@@ -5,7 +5,7 @@
  
      compiler = new_compiler()
 -    inc_dirs = compiler.include_dirs + ['/usr/include']
-+    inc_dirs = compiler.include_dirs + ['/opt/local/include']
++    inc_dirs = compiler.include_dirs + ['@@PREFIX@@/include']
  
      search_for_ssl_incs_in = [
                            '/usr/local/ssl/include',
@@ -14,7 +14,7 @@
  
      ssl_libs = find_library_file(compiler, 'ssl',
 -                                 ['/usr/lib'],
-+                                 ['/opt/local/lib'],
++                                 ['@@PREFIX@@/lib'],
                                   ['/usr/local/lib',
                                    '/usr/local/ssl/lib',
                                    '/usr/contrib/ssl/lib/'

Deleted: trunk/dports/python/py25-ssl/patch-setup_py.diff
===================================================================
--- trunk/dports/python/py25-ssl/patch-setup_py.diff	2010-10-23 14:21:53 UTC (rev 72681)
+++ trunk/dports/python/py25-ssl/patch-setup_py.diff	2010-10-23 16:33:10 UTC (rev 72682)
@@ -1,20 +0,0 @@
---- setup.py.orig	2010-10-22 17:23:47.000000000 +0200
-+++ setup.py	2010-10-22 17:24:21.000000000 +0200
-@@ -114,7 +114,7 @@
-     from distutils.ccompiler import new_compiler
- 
-     compiler = new_compiler()
--    inc_dirs = compiler.include_dirs + ['/usr/include']
-+    inc_dirs = compiler.include_dirs + ['/opt/local/include']
- 
-     search_for_ssl_incs_in = [
-                           '/usr/local/ssl/include',
-@@ -130,7 +130,7 @@
-             ssl_incs += krb5_h
- 
-     ssl_libs = find_library_file(compiler, 'ssl',
--                                 ['/usr/lib'],
-+                                 ['/opt/local/lib'],
-                                  ['/usr/local/lib',
-                                   '/usr/local/ssl/lib',
-                                   '/usr/contrib/ssl/lib/'

    

and.damore＠macports.org

tags

participants (1)