[77792] trunk/dports/python/py-svn

[jmr at macports.org]

Revision: 77792
          http://trac.macports.org/changeset/77792
Author:   jmr at macports.org
Date:     2011-04-12 23:26:08 -0700 (Tue, 12 Apr 2011)
Log Message:
-----------
py-svn: update to 1.7.5 and fix build (#23778)

Modified Paths:
--------------
    trunk/dports/python/py-svn/Portfile

Added Paths:
-----------
    trunk/dports/python/py-svn/files/patch-setup_configure.py

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

Modified: trunk/dports/python/py-svn/Portfile
===================================================================
--- trunk/dports/python/py-svn/Portfile	2011-04-13 03:32:32 UTC (rev 77791)
+++ trunk/dports/python/py-svn/Portfile	2011-04-13 06:26:08 UTC (rev 77792)
@@ -4,7 +4,7 @@
 PortGroup python24 1.0
 
 name			py-svn
-version			1.5.1
+version			1.7.5
 categories		python devel
 maintainers		gmail.com:yunzheng.hu
 platforms		darwin
@@ -16,20 +16,23 @@
 
 homepage		http://pysvn.tigris.org/
 
-master_sites		http://pysvn.tigris.org/files/documents/1233/36248
+master_sites		http://pysvn.barrys-emacs.org/source_kits/
 distname		pysvn-${version}
-checksums		md5 692b33cb82e2446c051df358d61b349a \
-			sha1 1f24b5b18bf93fc978afca049a219128c372ca57
+checksums		md5 3334718248ec667b17d333aac73d5680 \
+			sha1 912d7081a8294a578f822e03d60747154cf8532d \
+			rmd160 d412aab74737d371a184a327ceadc971a00340ab
 
 depends_lib		port:python24 \
 			port:subversion
 
-patchfiles              patch-setup.py
+patchfiles              patch-setup_configure.py
 
-use_configure		yes
-configure.cmd		cd Source && ${python.bin} setup.py configure
+configure {
+    system "cd ${worksrcpath}/Source && ${python.bin} setup.py backport && ${python.bin} setup.py configure"
+}
 
-build.cmd		cd Source && make
+build.cmd		make
+build.dir       ${worksrcpath}/Source
 build.target		all
 
 destroot {

Deleted: trunk/dports/python/py-svn/files/patch-setup.py
===================================================================
--- trunk/dports/python/py-svn/files/patch-setup.py	2011-04-13 03:32:32 UTC (rev 77791)
+++ trunk/dports/python/py-svn/files/patch-setup.py	2011-04-13 06:26:08 UTC (rev 77792)
@@ -1,21 +0,0 @@
---- Source/setup.py.org	2007-03-31 15:05:46.000000000 +0200
-+++ Source/setup.py	2007-03-31 15:05:21.000000000 +0200
-@@ -198,7 +198,7 @@
- 
-                 # 10.4 needs the libintl.a but 10.3 does not
-                 template_values['extra_libs'] = '%(svn_lib_dir)s/libintl.a' % template_values
--                template_values['frameworks'] = '-framework System %s -framework CoreFoundation -framework Kerberos' % framework_lib
-+                template_values['frameworks'] = '-framework System %s -framework CoreFoundation -framework Kerberos -framework Security' % framework_lib
-             else:
-                 if self.verbose:
-                     print 'Info: Using Mac OS X 10.3 makefile template'
-@@ -209,9 +209,6 @@
-             if self.is_mac_os_x_fink:
-                 makefile.write( self.makefile_template_macosx_fink % template_values )
- 
--            elif self.is_mac_os_x_darwin_ports:
--                makefile.write( self.makefile_template_macosx_darwin_ports % template_values )
--
-             else:
-                 makefile.write( self.makefile_template_macosx % template_values )
-         elif sys.platform.startswith('aix'):

Copied: trunk/dports/python/py-svn/files/patch-setup_configure.py (from rev 77790, trunk/dports/python/py-svn/files/patch-setup.py)
===================================================================
--- trunk/dports/python/py-svn/files/patch-setup_configure.py	                        (rev 0)
+++ trunk/dports/python/py-svn/files/patch-setup_configure.py	2011-04-13 06:26:08 UTC (rev 77792)
@@ -0,0 +1,25 @@
+--- Source/setup_configure.py.orig	2011-01-01 00:19:01.000000000 +1100
++++ Source/setup_configure.py	2011-04-13 16:22:11.000000000 +1000
+@@ -337,7 +337,11 @@
+             # python framework will be used and not the one matching this python
+             var_prefix = distutils.sysconfig.get_config_var('prefix')
+             var_ldlibrary = distutils.sysconfig.get_config_var('LDLIBRARY')
+-            framework_lib = os.path.join( var_prefix, os.path.basename( var_ldlibrary ) )
++            if distutils.sysconfig.get_config_var('PYTHONFRAMEWORKDIR') != 'no-framework':
++                framework_lib = os.path.join( var_prefix, os.path.basename( var_ldlibrary ) )
++            else:
++                var_libpl = distutils.sysconfig.get_config_var('LIBPL')
++                framework_lib = os.path.join( var_libpl, os.path.basename( var_ldlibrary ) ) + ' -undefined dynamic_lookup'
+ 
+             if self.is_atleast_mac_os_x_version( (10,5) ) >= 0:
+                 if self.verbose:
+@@ -364,9 +368,6 @@
+             if self.is_mac_os_x_fink:
+                 makefile.write( self.makefile_template_macosx_fink % template_values )
+ 
+-            elif self.is_mac_os_x_darwin_ports:
+-                makefile.write( self.makefile_template_macosx_darwin_ports % template_values )
+-
+             else:
+                 if sys.version_info[0] >= 3:
+                     makefile.write( self.makefile_template_macosx_one_arch_py3 % template_values )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110412/0f8bb29e/attachment.html>