Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages In directory vz-cvs-3.sog:/tmp/cvs-serv9480
Modified Files: python27.info python27.patch Log Message: New upstream python27 2.7.2. Index: python27.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python27.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- python27.patch 29 Nov 2010 14:31:25 -0000 1.3 +++ python27.patch 11 Jun 2011 23:46:05 -0000 1.4 @@ -1,6 +1,6 @@ -diff -ru Python-2.7.1.orig/Lib/platform.py Python-2.7.1/Lib/platform.py ---- Python-2.7.1.orig/Lib/platform.py 2010-08-03 03:44:35.000000000 -0400 -+++ Python-2.7.1/Lib/platform.py 2010-11-29 08:14:10.000000000 -0500 +diff -ru Python-2.7.2rc1.orig/Lib/platform.py Python-2.7.2rc1/Lib/platform.py +--- Python-2.7.2rc1.orig/Lib/platform.py 2011-05-29 17:54:42.000000000 -0400 ++++ Python-2.7.2rc1/Lib/platform.py 2011-06-10 16:17:00.000000000 -0400 @@ -810,6 +810,15 @@ if info is not None: return info @@ -17,10 +17,10 @@ # If that also doesn't work return the default values return release,versioninfo,machine -diff -ru Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in ---- Python-2.7.1.orig/Makefile.pre.in 2010-10-14 07:37:30.000000000 -0400 -+++ Python-2.7.1/Makefile.pre.in 2010-11-29 08:14:10.000000000 -0500 -@@ -429,8 +429,7 @@ +diff -ru Python-2.7.2rc1.orig/Makefile.pre.in Python-2.7.2rc1/Makefile.pre.in +--- Python-2.7.2rc1.orig/Makefile.pre.in 2011-05-29 17:54:47.000000000 -0400 ++++ Python-2.7.2rc1/Makefile.pre.in 2011-06-10 16:17:00.000000000 -0400 +@@ -432,8 +432,7 @@ fi libpython$(VERSION).dylib: $(LIBRARY_OBJS) @@ -30,7 +30,7 @@ libpython$(VERSION).sl: $(LIBRARY_OBJS) $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) -@@ -787,7 +786,7 @@ +@@ -792,7 +791,7 @@ then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ else true; \ fi @@ -39,7 +39,7 @@ -rm -f $(DESTDIR)$(BINDIR)/python-config (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) -@@ -797,7 +796,7 @@ +@@ -802,7 +801,7 @@ # Install the interpreter with $(VERSION) affixed # This goes into $(exec_prefix) altbininstall: $(BUILDPYTHON) @@ -48,7 +48,7 @@ do \ if test ! -d $(DESTDIR)$$i; then \ echo "Creating directory $$i"; \ -@@ -810,9 +809,9 @@ +@@ -815,9 +814,9 @@ if test -n "$(DLLLIBRARY)" ; then \ $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ else \ @@ -60,9 +60,9 @@ fi \ fi; \ else true; \ -diff -ru Python-2.7.1.orig/Misc/python-config.in Python-2.7.1/Misc/python-config.in ---- Python-2.7.1.orig/Misc/python-config.in 2010-03-18 20:08:44.000000000 -0400 -+++ Python-2.7.1/Misc/python-config.in 2010-11-29 08:14:10.000000000 -0500 +diff -ru Python-2.7.2rc1.orig/Misc/python-config.in Python-2.7.2rc1/Misc/python-config.in +--- Python-2.7.2rc1.orig/Misc/python-config.in 2011-05-29 17:54:47.000000000 -0400 ++++ Python-2.7.2rc1/Misc/python-config.in 2011-06-10 16:17:00.000000000 -0400 @@ -46,11 +46,10 @@ elif opt in ('--libs', '--ldflags'): libs = getvar('LIBS').split() + getvar('SYSLIBS').split() @@ -78,9 +78,9 @@ libs.extend(getvar('LINKFORSHARED').split()) print ' '.join(libs) -diff -ru Python-2.7.1.orig/Misc/python.pc.in Python-2.7.1/Misc/python.pc.in ---- Python-2.7.1.orig/Misc/python.pc.in 2009-05-24 16:23:57.000000000 -0400 -+++ Python-2.7.1/Misc/python.pc.in 2010-11-29 08:14:10.000000000 -0500 +diff -ru Python-2.7.2rc1.orig/Misc/python.pc.in Python-2.7.2rc1/Misc/python.pc.in +--- Python-2.7.2rc1.orig/Misc/python.pc.in 2011-05-29 17:54:47.000000000 -0400 ++++ Python-2.7.2rc1/Misc/python.pc.in 2011-06-10 16:17:00.000000000 -0400 @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -89,9 +89,9 @@ includedir=@includedir@ Name: Python -diff -ru Python-2.7.1.orig/Modules/_bsddb.c Python-2.7.1/Modules/_bsddb.c ---- Python-2.7.1.orig/Modules/_bsddb.c 2010-11-08 07:57:59.000000000 -0500 -+++ Python-2.7.1/Modules/_bsddb.c 2010-11-29 08:14:10.000000000 -0500 +diff -ru Python-2.7.2rc1.orig/Modules/_bsddb.c Python-2.7.2rc1/Modules/_bsddb.c +--- Python-2.7.2rc1.orig/Modules/_bsddb.c 2011-05-29 17:54:47.000000000 -0400 ++++ Python-2.7.2rc1/Modules/_bsddb.c 2011-06-10 16:17:00.000000000 -0400 @@ -9766,7 +9766,13 @@ ADD_INT(d, DB_REP_PERMANENT); @@ -106,9 +106,9 @@ ADD_INT(d, DB_REP_CONF_DELAYCLIENT); ADD_INT(d, DB_REP_CONF_BULK); ADD_INT(d, DB_REP_CONF_NOWAIT); -diff -ru Python-2.7.1.orig/Modules/dbmmodule.c Python-2.7.1/Modules/dbmmodule.c ---- Python-2.7.1.orig/Modules/dbmmodule.c 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7.1/Modules/dbmmodule.c 2010-11-29 08:15:20.000000000 -0500 +diff -ru Python-2.7.2rc1.orig/Modules/dbmmodule.c Python-2.7.2rc1/Modules/dbmmodule.c +--- Python-2.7.2rc1.orig/Modules/dbmmodule.c 2011-05-29 17:54:48.000000000 -0400 ++++ Python-2.7.2rc1/Modules/dbmmodule.c 2011-06-10 16:17:00.000000000 -0400 @@ -19,7 +19,7 @@ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */ #endif @@ -118,10 +118,10 @@ static char *which_dbm = "GNU gdbm"; #elif defined(HAVE_GDBM_DASH_NDBM_H) #include <gdbm-ndbm.h> -diff -ru Python-2.7.1.orig/Modules/posixmodule.c Python-2.7.1/Modules/posixmodule.c ---- Python-2.7.1.orig/Modules/posixmodule.c 2010-11-26 12:35:50.000000000 -0500 -+++ Python-2.7.1/Modules/posixmodule.c 2010-11-29 08:14:10.000000000 -0500 -@@ -455,7 +455,7 @@ +diff -ru Python-2.7.2rc1.orig/Modules/posixmodule.c Python-2.7.2rc1/Modules/posixmodule.c +--- Python-2.7.2rc1.orig/Modules/posixmodule.c 2011-05-29 17:54:50.000000000 -0400 ++++ Python-2.7.2rc1/Modules/posixmodule.c 2011-06-10 16:17:00.000000000 -0400 +@@ -457,7 +457,7 @@ #endif /* Return a dictionary corresponding to the POSIX environment table */ @@ -130,7 +130,7 @@ /* On Darwin/MacOSX a shared library or framework has no access to ** environ directly, we must obtain it with _NSGetEnviron(). */ -@@ -477,7 +477,7 @@ +@@ -479,7 +479,7 @@ d = PyDict_New(); if (d == NULL) return NULL; @@ -139,10 +139,10 @@ if (environ == NULL) environ = *_NSGetEnviron(); #endif -diff -ru Python-2.7.1.orig/configure Python-2.7.1/configure ---- Python-2.7.1.orig/configure 2010-10-31 21:47:19.000000000 -0400 -+++ Python-2.7.1/configure 2010-11-29 08:14:10.000000000 -0500 -@@ -4947,7 +4947,7 @@ +diff -ru Python-2.7.2rc1.orig/configure Python-2.7.2rc1/configure +--- Python-2.7.2rc1.orig/configure 2011-05-29 17:54:52.000000000 -0400 ++++ Python-2.7.2rc1/configure 2011-06-10 16:36:18.000000000 -0400 +@@ -4962,7 +4962,7 @@ ;; Darwin*) LDLIBRARY='libpython$(VERSION).dylib' @@ -151,7 +151,7 @@ RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}' ;; AIX*) -@@ -7443,8 +7443,8 @@ +@@ -7505,8 +7505,8 @@ #ARCH_RUN_32BIT="true" fi @@ -162,7 +162,7 @@ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; esac -@@ -7591,18 +7591,6 @@ +@@ -7653,20 +7653,8 @@ LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)' fi ;; Darwin/*) @@ -174,14 +174,18 @@ - if test "${enable_universalsdk}"; then - LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}" - fi -- LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup' -- LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup' +- LDSHARED='$(CC) -bundle -undefined dynamic_lookup' +- LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup' - BLDSHARED="$LDSHARED" - else - LDSHARED='$(CC) $(LDFLAGS) -bundle' - LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle' +- LDSHARED='$(CC) -bundle' +- LDCXXSHARED='$(CXX) -bundle' ++ LDSHARED='$(CC) $(LDFLAGS) -bundle' ++ LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle' if test "$enable_framework" ; then -@@ -7612,11 +7600,10 @@ + # Link against the framework. All externals should be defined. + BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' +@@ -7674,11 +7662,10 @@ LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' else # No framework, use the Python app as bundle-loader @@ -196,7 +200,7 @@ ;; Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared' -@@ -13658,7 +13645,7 @@ +@@ -13734,7 +13721,7 @@ if test $ac_sys_system = Darwin then @@ -205,9 +209,9 @@ fi -diff -ru Python-2.7.1.orig/setup.py Python-2.7.1/setup.py ---- Python-2.7.1.orig/setup.py 2010-10-31 12:40:21.000000000 -0400 -+++ Python-2.7.1/setup.py 2010-11-29 08:16:11.000000000 -0500 +diff -ru Python-2.7.2rc1.orig/setup.py Python-2.7.2rc1/setup.py +--- Python-2.7.2rc1.orig/setup.py 2011-05-29 17:54:52.000000000 -0400 ++++ Python-2.7.2rc1/setup.py 2011-06-10 16:29:20.000000000 -0400 @@ -250,13 +250,17 @@ longest, g) @@ -234,19 +238,19 @@ def build_extension(self, ext): -@@ -346,9 +351,8 @@ - return sys.platform +@@ -369,9 +374,8 @@ def detect_modules(self): -- # Ensure that /usr/local is always used + # 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. -@@ -680,10 +684,9 @@ +@@ -703,10 +707,9 @@ depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) search_for_ssl_incs_in = [ @@ -259,7 +263,7 @@ search_for_ssl_incs_in ) if ssl_incs is not None: -@@ -691,9 +694,8 @@ +@@ -714,9 +717,8 @@ ['/usr/kerberos/include']) if krb5_h: ssl_incs += krb5_h @@ -271,7 +275,7 @@ ] ) if (ssl_incs is not None and -@@ -713,7 +715,7 @@ +@@ -736,7 +738,7 @@ # look for the openssl version header on the compiler search path. opensslv_h = find_file('openssl/opensslv.h', [], @@ -280,7 +284,7 @@ if opensslv_h: name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') if sys.platform == 'darwin' and is_macosx_sdk_path(name): -@@ -776,7 +778,7 @@ +@@ -799,7 +801,7 @@ # a release. Most open source OSes come with one or more # versions of BerkeleyDB already installed. @@ -289,7 +293,7 @@ min_db_ver = (4, 1) db_setup_debug = False # verbose debug prints from this script? -@@ -812,50 +814,8 @@ +@@ -835,50 +837,8 @@ # construct a list of paths to look for the header file in on # top of the normal inc_dirs. db_inc_paths = [ @@ -341,7 +345,7 @@ db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)] db_ver_inc_map = {} -@@ -981,12 +941,7 @@ +@@ -1004,12 +964,7 @@ # We hunt for #define SQLITE_VERSION "n.n.n" # We need to find >= sqlite version 3.0.8 sqlite_incdir = sqlite_libdir = None @@ -355,7 +359,7 @@ ] MIN_SQLITE_VERSION_NUMBER = (3, 0, 8) MIN_SQLITE_VERSION = ".".join([str(x) -@@ -998,7 +953,7 @@ +@@ -1021,7 +976,7 @@ if sys.platform == 'darwin': sysroot = macosx_sdk_root() @@ -364,7 +368,7 @@ f = os.path.join(d, "sqlite3.h") if sys.platform == 'darwin' and is_macosx_sdk_path(d): -@@ -1030,11 +985,9 @@ +@@ -1053,11 +1008,9 @@ sqlite_dirs_to_check = [ os.path.join(sqlite_incdir, '..', 'lib64'), os.path.join(sqlite_incdir, '..', 'lib'), @@ -377,7 +381,7 @@ if sqlite_libfile: sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))] -@@ -1151,7 +1104,7 @@ +@@ -1174,7 +1127,7 @@ if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): gdbm_libs.append('gdbm_compat') @@ -386,7 +390,7 @@ print "building dbm using gdbm" dbmext = Extension( 'dbm', ['dbmmodule.c'], -@@ -1229,6 +1182,7 @@ +@@ -1252,6 +1205,7 @@ panel_library = 'panelw' curses_libs = [curses_library] exts.append( Extension('_curses', ['_cursesmodule.c'], @@ -394,7 +398,7 @@ libraries = curses_libs) ) elif curses_library == 'curses' and platform != 'darwin': # OSX has an old Berkeley curses, not good enough for -@@ -1249,6 +1203,7 @@ +@@ -1272,6 +1226,7 @@ if (module_enabled(exts, '_curses') and self.compiler.find_library_file(lib_dirs, panel_library)): exts.append( Extension('_curses_panel', ['_curses_panel.c'], @@ -402,7 +406,7 @@ libraries = [panel_library] + curses_libs) ) else: missing.append('_curses_panel') -@@ -1679,16 +1634,12 @@ +@@ -1702,16 +1657,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() Index: python27.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python27.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- python27.info 14 Mar 2011 23:46:37 -0000 1.7 +++ python27.info 11 Jun 2011 23:46:05 -0000 1.8 @@ -1,6 +1,6 @@ Info2: << Package: python%type_pkg[python] -Version: 2.7.1 +Version: 2.7.2 Revision: 1 Epoch: 1 Type: python 2.7 @@ -37,11 +37,11 @@ << Provides: argparse-py%type_pkg[python] Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2 -Source-MD5: aa27bc25725137ba155910bd8e5ddc4f +Source-MD5: ba7b2f11ffdbf195ee0d111b9455a5bd Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2 -Source2-MD5: 312d4da0c1d8adbfb27f4f0e09f2cffe +Source2-MD5: 40f0bd51b221662cae14fb0c6b6f622b PatchFile: %n.patch -PatchFile-MD5: 0330209992930fd92fd17a651ed95be2 +PatchFile-MD5: ba06c354a2ffe1d94ab41f386add2898 PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 SetLDFLAGS: -L%p/lib/system-openssl/lib ConfigureParams: --enable-shared --with-dbmliborder=gdbm ------------------------------------------------------------------------------ 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