Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages In directory vz-cvs-3.sog:/tmp/cvs-serv26004
Modified Files: python31.info python31.patch Log Message: New upstream python31 3.1.4. Index: python31.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python31.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- python31.info 7 Dec 2010 02:04:48 -0000 1.8 +++ python31.info 12 Jun 2011 22:24:12 -0000 1.9 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] -Version: 3.1.3 -Revision: 2 +Version: 3.1.4 +Revision: 1 Type: python 3.1 Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Depends: << @@ -33,20 +33,22 @@ x11-dev << Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2 -Source-MD5: ad5e5f1c07e829321e0a015f8cafe245 +Source-MD5: 09ed98eace4c403b475846702708675e Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2 -Source2-MD5: 2a662052eae95322919c1232cd308d05 +Source2-MD5: 0a4a56361005966cc38d1068dfd52a54 PatchFile: %n.patch -PatchFile-MD5: f031885cecf19521acc1be8422a95309 +PatchFile-MD5: 3a7a5e57983326d43ee476cf96b7f84b PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 SetLDFLAGS: -L%p/lib/system-openssl/lib ConfigureParams: --enable-shared --with-dbmliborder=gdbm CompileScript: << #!/bin/sh -ex if [ "%m" = "x86_64" ]; then - #perl -pi.bak -e 's|num_missing != 2:|num_missing != 2:|g' ./setup.py + #perl -pi -e 's|num_missing != 2:|num_missing != 2:|g' ./setup.py # Architecture:x86_64 has tcltk-8.5.x, other arch have 8.4.x - perl -pi.bak -e "s/8.4\'/8.5\'/" ./setup.py + perl -pi -e "s/8.4\'/8.5\'/" ./setup.py + # Test assumes that little endian Macs always return i386. + perl -pi -e "s/i386/x86_64/" Lib/test/test_platform.py fi %{default_script} << Index: python31.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python31.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- python31.patch 29 Nov 2010 14:31:25 -0000 1.4 +++ python31.patch 12 Jun 2011 22:24:12 -0000 1.5 @@ -1,7 +1,7 @@ -diff -ru Python-3.1.3.orig/Makefile.pre.in Python-3.1.3/Makefile.pre.in ---- Python-3.1.3.orig/Makefile.pre.in 2010-10-14 07:35:17.000000000 -0400 -+++ Python-3.1.3/Makefile.pre.in 2010-11-29 07:52:00.000000000 -0500 -@@ -442,8 +442,7 @@ +diff -ru Python-3.1.4.orig/Makefile.pre.in Python-3.1.4/Makefile.pre.in +--- Python-3.1.4.orig/Makefile.pre.in 2011-06-11 11:48:51.000000000 -0400 ++++ Python-3.1.4/Makefile.pre.in 2011-06-11 19:47:11.000000000 -0400 +@@ -445,8 +445,7 @@ fi libpython$(VERSION).dylib: $(LIBRARY_OBJS) @@ -11,7 +11,7 @@ libpython$(VERSION).sl: $(LIBRARY_OBJS) $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) -@@ -784,7 +783,7 @@ +@@ -789,7 +788,7 @@ # Install the interpreter with $(VERSION) affixed # This goes into $(exec_prefix) altbininstall: $(BUILDPYTHON) @@ -20,7 +20,7 @@ do \ if test ! -d $(DESTDIR)$$i; then \ echo "Creating directory $$i"; \ -@@ -797,9 +796,9 @@ +@@ -802,9 +801,9 @@ if test -n "$(DLLLIBRARY)" ; then \ $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ else \ @@ -32,7 +32,7 @@ fi \ fi; \ else true; \ -@@ -810,7 +809,7 @@ +@@ -815,7 +814,7 @@ then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON)3$(EXE); \ else true; \ fi @@ -41,9 +41,9 @@ -rm -f $(DESTDIR)$(BINDIR)/python3-config (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) -rm -f $(DESTDIR)$(LIBPC)/python3.pc -diff -ru Python-3.1.3.orig/Misc/python-config.in Python-3.1.3/Misc/python-config.in ---- Python-3.1.3.orig/Misc/python-config.in 2007-09-01 03:27:37.000000000 -0400 -+++ Python-3.1.3/Misc/python-config.in 2010-11-29 07:52:00.000000000 -0500 +diff -ru Python-3.1.4.orig/Misc/python-config.in Python-3.1.4/Misc/python-config.in +--- Python-3.1.4.orig/Misc/python-config.in 2011-06-11 11:48:51.000000000 -0400 ++++ Python-3.1.4/Misc/python-config.in 2011-06-11 19:47:11.000000000 -0400 @@ -45,9 +45,9 @@ elif opt in ('--libs', '--ldflags'): libs = getvar('LIBS').split() + getvar('SYSLIBS').split() @@ -57,9 +57,9 @@ libs.insert(0, '-L' + getvar('LIBPL')) print(' '.join(libs)) -diff -ru Python-3.1.3.orig/Misc/python.pc.in Python-3.1.3/Misc/python.pc.in ---- Python-3.1.3.orig/Misc/python.pc.in 2009-05-24 16:39:11.000000000 -0400 -+++ Python-3.1.3/Misc/python.pc.in 2010-11-29 07:52:00.000000000 -0500 +diff -ru Python-3.1.4.orig/Misc/python.pc.in Python-3.1.4/Misc/python.pc.in +--- Python-3.1.4.orig/Misc/python.pc.in 2011-06-11 11:48:51.000000000 -0400 ++++ Python-3.1.4/Misc/python.pc.in 2011-06-11 19:47:11.000000000 -0400 @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -68,9 +68,9 @@ includedir=@includedir@ Name: Python -diff -ru Python-3.1.3.orig/Modules/_dbmmodule.c Python-3.1.3/Modules/_dbmmodule.c ---- Python-3.1.3.orig/Modules/_dbmmodule.c 2010-05-09 12:14:21.000000000 -0400 -+++ Python-3.1.3/Modules/_dbmmodule.c 2010-11-29 07:53:30.000000000 -0500 +diff -ru Python-3.1.4.orig/Modules/_dbmmodule.c Python-3.1.4/Modules/_dbmmodule.c +--- Python-3.1.4.orig/Modules/_dbmmodule.c 2011-06-11 11:48:51.000000000 -0400 ++++ Python-3.1.4/Modules/_dbmmodule.c 2011-06-11 19:47:11.000000000 -0400 @@ -20,7 +20,7 @@ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */ #endif @@ -80,10 +80,10 @@ static char *which_dbm = "GNU gdbm"; #elif defined(HAVE_GDBM_DASH_NDBM_H) #include <gdbm-ndbm.h> -diff -ru Python-3.1.3.orig/Modules/posixmodule.c Python-3.1.3/Modules/posixmodule.c ---- Python-3.1.3.orig/Modules/posixmodule.c 2010-11-26 12:04:40.000000000 -0500 -+++ Python-3.1.3/Modules/posixmodule.c 2010-11-29 07:52:00.000000000 -0500 -@@ -443,7 +443,7 @@ +diff -ru Python-3.1.4.orig/Modules/posixmodule.c Python-3.1.4/Modules/posixmodule.c +--- Python-3.1.4.orig/Modules/posixmodule.c 2011-06-11 11:48:52.000000000 -0400 ++++ Python-3.1.4/Modules/posixmodule.c 2011-06-11 19:47:11.000000000 -0400 +@@ -445,7 +445,7 @@ #endif /* Return a dictionary corresponding to the POSIX environment table */ @@ -92,7 +92,7 @@ /* On Darwin/MacOSX a shared library or framework has no access to ** environ directly, we must obtain it with _NSGetEnviron(). */ -@@ -470,7 +470,7 @@ +@@ -472,7 +472,7 @@ d = PyDict_New(); if (d == NULL) return NULL; @@ -101,10 +101,10 @@ if (environ == NULL) environ = *_NSGetEnviron(); #endif -diff -ru Python-3.1.3.orig/configure Python-3.1.3/configure ---- Python-3.1.3.orig/configure 2010-11-25 12:05:57.000000000 -0500 -+++ Python-3.1.3/configure 2010-11-29 07:52:00.000000000 -0500 -@@ -4868,7 +4868,7 @@ +diff -ru Python-3.1.4.orig/configure Python-3.1.4/configure +--- Python-3.1.4.orig/configure 2011-06-11 11:48:52.000000000 -0400 ++++ Python-3.1.4/configure 2011-06-11 19:47:11.000000000 -0400 +@@ -4883,7 +4883,7 @@ ;; Darwin*) LDLIBRARY='libpython$(VERSION).dylib' @@ -113,7 +113,7 @@ RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}' ;; AIX*) -@@ -7386,8 +7386,8 @@ +@@ -7451,8 +7451,8 @@ #ARCH_RUN_32BIT="true" fi @@ -124,7 +124,7 @@ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; esac -@@ -7521,14 +7521,6 @@ +@@ -7586,14 +7586,6 @@ # Use -undefined dynamic_lookup whenever possible (10.3 and later). # This allows an extension to be used in any Python @@ -139,7 +139,7 @@ LDSHARED='$(CC) $(LDFLAGS) -bundle' if test "$enable_framework" ; then # Link against the framework. All externals should be defined. -@@ -7536,10 +7528,9 @@ +@@ -7601,10 +7593,9 @@ LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -152,7 +152,7 @@ ;; Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; BSD/OS*/4*) LDSHARED="gcc -shared";; -@@ -13363,7 +13354,7 @@ +@@ -13443,7 +13434,7 @@ if test $ac_sys_system = Darwin then @@ -161,10 +161,9 @@ fi -Only in Python-3.1.3: configure.orig -diff -ru Python-3.1.3.orig/setup.py Python-3.1.3/setup.py ---- Python-3.1.3.orig/setup.py 2010-11-26 06:56:26.000000000 -0500 -+++ Python-3.1.3/setup.py 2010-11-29 07:54:10.000000000 -0500 +diff -ru Python-3.1.4.orig/setup.py Python-3.1.4/setup.py +--- Python-3.1.4.orig/setup.py 2011-06-11 11:48:52.000000000 -0400 ++++ Python-3.1.4/setup.py 2011-06-11 19:50:41.000000000 -0400 @@ -238,13 +238,17 @@ longest, g)) @@ -191,19 +190,20 @@ def build_extension(self, ext): -@@ -340,9 +345,8 @@ - return sys.platform +@@ -362,10 +367,8 @@ + os.unlink(tmpfile) def detect_modules(self): - # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') +- self.add_multiarch_paths() + add_dir_to_list(self.compiler.library_dirs, '@PREFIX@/lib') + add_dir_to_list(self.compiler.include_dirs, '@PREFIX@/include') # Add paths specified in the environment variables LDFLAGS and # CPPFLAGS for header and library files. -@@ -639,10 +643,9 @@ +@@ -662,10 +665,9 @@ depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) search_for_ssl_incs_in = [ @@ -216,7 +216,7 @@ search_for_ssl_incs_in ) if ssl_incs is not None: -@@ -650,9 +653,8 @@ +@@ -673,9 +675,8 @@ ['/usr/kerberos/include']) if krb5_h: ssl_incs += krb5_h @@ -228,7 +228,7 @@ ] ) if (ssl_incs is not None and -@@ -672,7 +674,7 @@ +@@ -695,7 +696,7 @@ # look for the openssl version header on the compiler search path. opensslv_h = find_file('openssl/opensslv.h', [], @@ -237,7 +237,7 @@ if opensslv_h: name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') if sys.platform == 'darwin' and is_macosx_sdk_path(name): -@@ -915,12 +917,7 @@ +@@ -938,12 +939,7 @@ # We hunt for #define SQLITE_VERSION "n.n.n" # We need to find >= sqlite version 3.0.8 sqlite_incdir = sqlite_libdir = None @@ -251,7 +251,7 @@ ] MIN_SQLITE_VERSION_NUMBER = (3, 0, 8) MIN_SQLITE_VERSION = ".".join([str(x) -@@ -932,7 +929,7 @@ +@@ -955,7 +951,7 @@ if sys.platform == 'darwin': sysroot = macosx_sdk_root() @@ -260,7 +260,7 @@ f = os.path.join(d, "sqlite3.h") if sys.platform == 'darwin' and is_macosx_sdk_path(d): -@@ -964,11 +961,9 @@ +@@ -987,11 +983,9 @@ sqlite_dirs_to_check = [ os.path.join(sqlite_incdir, '..', 'lib64'), os.path.join(sqlite_incdir, '..', 'lib'), @@ -273,7 +273,7 @@ if sqlite_libfile: sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))] -@@ -1044,7 +1039,7 @@ +@@ -1067,7 +1061,7 @@ gdbm_libs = ['gdbm'] if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): gdbm_libs.append('gdbm_compat') @@ -282,7 +282,7 @@ print("building dbm using gdbm") dbmext = Extension( '_dbm', ['_dbmmodule.c'], -@@ -1122,6 +1117,7 @@ +@@ -1145,6 +1139,7 @@ panel_library = 'panelw' curses_libs = [curses_library] exts.append( Extension('_curses', ['_cursesmodule.c'], @@ -290,7 +290,7 @@ libraries = curses_libs) ) elif curses_library == 'curses' and platform != 'darwin': # OSX has an old Berkeley curses, not good enough for -@@ -1142,6 +1138,7 @@ +@@ -1165,6 +1160,7 @@ if (module_enabled(exts, '_curses') and self.compiler.find_library_file(lib_dirs, panel_library)): exts.append( Extension('_curses_panel', ['_curses_panel.c'], @@ -298,7 +298,7 @@ libraries = [panel_library] + curses_libs) ) else: missing.append('_curses_panel') -@@ -1447,16 +1444,12 @@ +@@ -1470,16 +1466,12 @@ # AquaTk is a separate method. Only one Tkinter will be built on # Darwin - either AquaTk, if it is found, or X11 based Tk. platform = self.get_platform() ------------------------------------------------------------------------------ EditLive Enterprise is the world's most technically advanced content authoring tool. Experience the power of Track Changes, Inline Image Editing and ensure content is compliant with Accessibility Checking. http://p.sf.net/sfu/ephox-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs