[25391] trunk/dports/lang/python24

[source_changes at macosforge.org]

Revision: 25391
          http://trac.macosforge.org/projects/macports/changeset/25391
Author:   jann at macports.org
Date:     2007-05-20 15:31:52 -0700 (Sun, 20 May 2007)

Log Message:
-----------
Fixed bug with missing _locale

Modified Paths:
--------------
    trunk/dports/lang/python24/Portfile
    trunk/dports/lang/python24/files/patch-setup.py

Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile	2007-05-20 22:20:50 UTC (rev 25390)
+++ trunk/dports/lang/python24/Portfile	2007-05-20 22:31:52 UTC (rev 25391)
@@ -4,6 +4,7 @@
 
 name            python24
 version         2.4.4
+revision        1
 set major_version   2
 set minor_version   4
 categories      lang
@@ -29,6 +30,8 @@
 
 use_bzip2       yes
 
+depends-lib     port:gettext
+
 configure.args  --enable-shared \
                 --mandir=${prefix}/share/man \
                 --bindir=${prefix}/bin \
@@ -42,6 +45,7 @@
     cd ${worksrcpath}
     reinplace "s|__PREFIX__|${prefix}|g" Lib/site.py
     reinplace "s|__PREFIX__|${prefix}|g" Mac/OSX/Makefile.in
+    reinplace "s|__PREFIX__|${prefix}|g" setup.py
 }
 
 # Workaround for case-sensitive file systems
@@ -62,7 +66,6 @@
         xinstall -m 755 -d ${destroot}${framewdir}/Versions/2.4/include
         system "cd ${destroot}${framewdir} \
             && ln -s Versions/Current/lib Libraries"
-        system "ln -sf ${prefix}/include/python2.4 ${destroot}${framewdir}/Versions/2.4/include/python2.4"
         system "cd ${destroot}${prefix}/bin \
             && ln -sf ${framewdir}/Versions/2.4/bin/pydoc pydoc \
             && ln -sf ${framewdir}/Versions/2.4/bin/pydoc pydoc24"

Modified: trunk/dports/lang/python24/files/patch-setup.py
===================================================================
--- trunk/dports/lang/python24/files/patch-setup.py	2007-05-20 22:20:50 UTC (rev 25390)
+++ trunk/dports/lang/python24/files/patch-setup.py	2007-05-20 22:31:52 UTC (rev 25391)
@@ -1,6 +1,31 @@
---- setup.py	Wed Mar  9 23:27:24 2005
-+++ ../../setup.py	Thu Mar 31 18:34:35 2005
-@@ -905,7 +905,8 @@
+--- /Users/roederja/Desktop/setup.py.orig	2007-05-20 13:02:39.000000000 -0700
++++ setup.py	2007-05-20 14:49:50.000000000 -0700
+@@ -246,11 +246,11 @@
+         # Add paths to popular package managers on OS X/darwin
+         if sys.platform == "darwin":
+             # Fink installs into /sw by default
+-            add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
+-            add_dir_to_list(self.compiler.include_dirs, '/sw/include')
++            #add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
++            #add_dir_to_list(self.compiler.include_dirs, '/sw/include')
+             # DarwinPorts installs into /opt/local by default
+-            #add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')
+-            #add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')
++            add_dir_to_list(self.compiler.library_dirs, '__PREFIX__/lib')
++            add_dir_to_list(self.compiler.include_dirs, '__PREFIX__/include')
+ 
+         if os.path.normpath(sys.prefix) != '/usr':
+             add_dir_to_list(self.compiler.library_dirs,
+@@ -357,7 +357,7 @@
+             exts.append( Extension('unicodedata', ['unicodedata.c']) )
+         # access to ISO C locale support
+         data = open('pyconfig.h').read()
+-        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
++        m = re.search(r"#\s*define\s+(HAVE_LIBINTL_H|WITH_LIBINTL)\s+1\s*", data)
+         if m is not None:
+             locale_libs = ['intl']
+         else:
+@@ -954,7 +954,8 @@
          self.extensions.extend(exts)
  
          # Call the method for detecting whether _tkinter can be compiled

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070520/b61371f3/attachment.html