[96747] trunk/dports/python/py27-svn

blair at macports.org blair at macports.org
Fri Aug 17 20:28:54 PDT 2012 

Revision: 96747
          https://trac.macports.org/changeset/96747
Author:   blair at macports.org
Date:     2012-08-17 20:28:53 -0700 (Fri, 17 Aug 2012)
Log Message:
-----------
py27-svn: update to 1.7.6.

The patch has been complete redone since the build system has been
complete changed:
  - Delete the code that removed -Wno-long-double for #21749; the new
    build system doesn't use it.
  - Always set self.is_mac_os_x_darwin_ports to False even though it
    doesn't appear to be used, just to make sure it's not used.
  - Add -O2 to CFLAGS.
  - Remove -no-long-double, I don't know why one would need to specify
    this.

Modified Paths:
--------------
    trunk/dports/python/py27-svn/Portfile
    trunk/dports/python/py27-svn/files/patch-Source_setup_configure.py.diff

Modified: trunk/dports/python/py27-svn/Portfile
===================================================================
--- trunk/dports/python/py27-svn/Portfile	2012-08-18 03:14:46 UTC (rev 96746)
+++ trunk/dports/python/py27-svn/Portfile	2012-08-18 03:28:53 UTC (rev 96747)
@@ -4,7 +4,7 @@
 PortGroup python27 1.0
 
 name			py27-svn
-version			1.7.0
+version			1.7.6
 categories		python devel
 maintainers		blair gmail.com:yunzheng.hu openmaintainer
 platforms		darwin
@@ -18,9 +18,9 @@
 
 master_sites		http://pysvn.barrys-emacs.org/source_kits/
 distname		pysvn-${version}
-checksums		md5     77614676d24bca45749034ea6ec449d8 \
-			sha1    96f5217e7d74dbb2eee52e490e79d97b3959b0f0 \
-			rmd160  e343fd373559d138e7b8414034527a3721566594
+checksums		md5     010a80f0058713209d62e96b20afbde9 \
+			sha1    720399815278a0b29a2ea87a09a0d2807d4614e4 \
+			rmd160  f6b44e293ec4a94cd610cb8e1f2b711c1aad5aee
 
 depends_lib-append	port:subversion
 
@@ -30,7 +30,12 @@
 
 use_configure		yes
 configure.cmd		${python.bin} setup.py configure
-configure.args		--svn-root-dir=${prefix}
+configure.pre_args
+configure.args		--apr-inc-dir=${prefix}/include/apr-1 \
+			--apu-inc-dir=${prefix}/include/apr-1 \
+			--apr-lib-dir=${prefix}/lib \
+			--svn-root-dir=${prefix}
+
 pre-configure {
 	system "cd ${worksrcpath} && ${python.bin} setup.py backport"
 }

Modified: trunk/dports/python/py27-svn/files/patch-Source_setup_configure.py.diff
===================================================================
--- trunk/dports/python/py27-svn/files/patch-Source_setup_configure.py.diff	2012-08-18 03:14:46 UTC (rev 96746)
+++ trunk/dports/python/py27-svn/files/patch-Source_setup_configure.py.diff	2012-08-18 03:28:53 UTC (rev 96747)
@@ -1,60 +1,32 @@
---- setup_configure.py.orig	2009-04-04 03:20:59.000000000 -0600
-+++ setup_configure.py	2009-10-01 18:01:53.000000000 -0600
-@@ -258,9 +258,6 @@
-             if self.is_mac_os_x_fink:
-                 makefile.write( self.makefile_template_macosx_fink % template_values )
+diff -ru ../../pysvn-1.7.6.orig/Source/setup_configure.py ./setup_configure.py
+--- ../../pysvn-1.7.6.orig/Source/setup_configure.py	2012-02-28 10:53:48.000000000 -0800
++++ ./setup_configure.py	2012-08-17 20:25:49.000000000 -0700
+@@ -515,7 +515,7 @@
+                     self.get_lib_name_for_platform( 'libsvn_client-1' ) )
+         # if we are using the Fink SVN then remember this
+         self.is_mac_os_x_fink = folder.startswith( '/sw/' )
+-        self.is_mac_os_x_darwin_ports = folder.startswith( '/opt/local/' )
++        self.is_mac_os_x_darwin_ports = False
+         return folder
  
--            elif self.is_mac_os_x_darwin_ports:
--                makefile.write( self.makefile_template_macosx_darwin_ports % template_values )
--
-             elif self.mac_os_x_universal:
-                 template_values[ 'mac_os_x_sdk' ] = self.mac_os_x_sdk
-                 if sys.version_info[0] >= 3:
-@@ -542,9 +539,9 @@
- PYTHON=%(python_exe)s
- SVN_INCLUDE=%(svn_include)s
- CCC=g++
--CCCFLAGS=-Wall -Wno-long-double -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s
-+CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s
- CC=gcc
--CCFLAGS=-Wall -Wno-long-double -fPIC %(includes)s %(debug_cflags)s
-+CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s
- PYCXX=%(pycxx_dir)s
- PYCXXSRC=%(pycxx_src_dir)s
- LDSHARED=g++ -bundle %(debug_cflags)s -u _PyMac_Error %(frameworks)s
-@@ -567,9 +564,9 @@
- PYTHON=%(python_exe)s
- SVN_INCLUDE=%(svn_include)s
- CCC=g++
--CCCFLAGS=-Wall -Wno-long-double -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s
-+CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s
- CC=gcc
--CCFLAGS=-Wall -Wno-long-double -fPIC %(includes)s %(debug_cflags)s
-+CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s
- PYCXX=%(pycxx_dir)s
- PYCXXSRC=%(pycxx_src_dir)s
- LDSHARED=g++ -bundle %(debug_cflags)s %(frameworks)s
-@@ -592,9 +589,9 @@
- PYTHON=%(python_exe)s
- SVN_INCLUDE=%(svn_include)s
- CCC=g++
--CCCFLAGS=-Wall -Wno-long-double -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -isysroot %(mac_os_x_sdk)s -arch ppc -arch i386
-+CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -isysroot %(mac_os_x_sdk)s -arch ppc -arch i386
- CC=gcc
--CCFLAGS=-Wall -Wno-long-double -fPIC %(includes)s %(debug_cflags)s -isysroot %(mac_os_x_sdk)s -arch ppc -arch i386
-+CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s -isysroot %(mac_os_x_sdk)s -arch ppc -arch i386
- PYCXX=%(pycxx_dir)s
- PYCXXSRC=%(pycxx_src_dir)s
- LDSHARED=g++ -bundle -twolevel_namespace %(debug_cflags)s -u _PyMac_Error %(frameworks)s -Wl,-syslibroot,%(mac_os_x_sdk)s -arch ppc -arch i386
-@@ -617,9 +614,9 @@
- PYTHON=%(python_exe)s
- SVN_INCLUDE=%(svn_include)s
- CCC=g++
--CCCFLAGS=-Wall -Wno-long-double -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -isysroot %(mac_os_x_sdk)s -arch ppc -arch i386
-+CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -isysroot %(mac_os_x_sdk)s -arch ppc -arch i386
- CC=gcc
--CCFLAGS=-Wall -Wno-long-double -fPIC %(includes)s %(debug_cflags)s -isysroot %(mac_os_x_sdk)s -arch ppc -arch i386
-+CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s -isysroot %(mac_os_x_sdk)s -arch ppc -arch i386
- PYCXX=%(pycxx_dir)s
- PYCXXSRC=%(pycxx_src_dir)s
- LDSHARED=g++ -bundle -twolevel_namespace %(debug_cflags)s %(frameworks)s -Wl,-syslibroot,%(mac_os_x_sdk)s -arch ppc -arch i386
+     def find_apr_inc( self ):
+@@ -1014,8 +1014,7 @@
+ 
+     def setupUtilities( self ):
+         self._addVar( 'CCCFLAGS',
+-                                        '-g  '
+-                                        '-no-long-double '
++                                        '-g -O2 '
+                                         '-Wall -fPIC -fexceptions -frtti '
+                                         '-I. -I%(APR_INC)s -I%(SVN_INC)s '
+                                         '-D%(DEBUG)s' )
+@@ -1031,8 +1030,7 @@
+         self._addVar( 'PYTHON_INC',         distutils.sysconfig.get_python_inc() )
+ 
+         py_cflags_list = [
+-                    '-g',
+-                    '-no-long-double',
++                    '-g -O2',
+                     '-Wall -fPIC -fexceptions -frtti',
+                     '-I. -I%(APR_INC)s -I%(SVN_INC)s',
+                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120817/5d50c1a5/attachment.html>

More information about the macports-changes mailing list