Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29160

Modified Files:
        python27.info python27.patch 
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8


Index: python27.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages/python27.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- python27.patch      31 Jan 2013 17:32:35 -0000      1.4
+++ python27.patch      30 May 2013 01:41:31 -0000      1.5
@@ -1,6 +1,6 @@
-diff -ru Python-2.7.2.orig/Lib/ctypes/macholib/dyld.py 
Python-2.7.2/Lib/ctypes/macholib/dyld.py
---- Python-2.7.2.orig/Lib/ctypes/macholib/dyld.py      2011-06-11 
11:46:24.000000000 -0400
-+++ Python-2.7.2/Lib/ctypes/macholib/dyld.py   2011-12-29 18:30:21.000000000 
-0500
+diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py
+--- a/Lib/ctypes/macholib/dyld.py
++++ b/Lib/ctypes/macholib/dyld.py
 @@ -26,6 +26,7 @@
  
  DEFAULT_LIBRARY_FALLBACK = [
@@ -9,10 +9,29 @@
      "/usr/local/lib",
      "/lib",
      "/usr/lib",
-diff -ru Python-2.7.2.orig/Lib/platform.py Python-2.7.2/Lib/platform.py
---- Python-2.7.2.orig/Lib/platform.py  2011-06-11 11:46:25.000000000 -0400
-+++ Python-2.7.2/Lib/platform.py       2011-12-29 18:28:04.000000000 -0500
-@@ -810,6 +810,15 @@
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -177,7 +177,14 @@
+ 
+         newcc = None
+         if 'CC' in os.environ:
+-            cc = os.environ['CC']
++            newcc = os.environ['CC']
++            # On OS X, if CC is overridden, use that as the default
++            #       command for LDSHARED as well
++            if (sys.platform == 'darwin'
++                    and 'LDSHARED' not in os.environ
++                    and ldshared.startswith(cc)):
++                ldshared = newcc + ldshared[len(cc):]
++            cc = newcc
+         if 'CXX' in os.environ:
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+diff --git a/Lib/platform.py b/Lib/platform.py
+--- a/Lib/platform.py
++++ b/Lib/platform.py
+@@ -816,6 +816,15 @@
      if info is not None:
          return info
  
@@ -28,20 +47,35 @@
      # If that also doesn't work return the default values
      return release,versioninfo,machine
  
-diff -ru Python-2.7.2.orig/Makefile.pre.in Python-2.7.2/Makefile.pre.in
---- Python-2.7.2.orig/Makefile.pre.in  2011-06-11 11:46:26.000000000 -0400
-+++ Python-2.7.2/Makefile.pre.in       2011-12-29 18:28:04.000000000 -0500
-@@ -432,8 +432,7 @@
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -303,12 +303,6 @@
+             msg = msg + " (%s)" % e.strerror
+         raise IOError(msg)
+ 
+-    # On AIX, there are wrong paths to the linker scripts in the Makefile
+-    # -- these paths are relative to the Python source, but when installed
+-    # the scripts are in another directory.
+-    if _PYTHON_BUILD:
+-        vars['LDSHARED'] = vars['BLDSHARED']
+-
+     # There's a chicken-and-egg situation on OS X with regards to the
+     # _sysconfigdata module after the changes introduced by #15298:
+     # get_config_vars() is called by get_platform() as part of the
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -479,7 +479,7 @@
        fi
  
  libpython$(VERSION).dylib: $(LIBRARY_OBJS)
 -       $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) -undefined 
dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(VERSION).dylib 
-Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ 
$(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
--               
-+       $(CC) -dynamiclib -Wl,-single_module @LIBTOOL_CRUFT@ -o $@ 
$(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LDLAST)
++       $(CC) -dynamiclib -Wl,-single_module $(LDFLAGS) @LIBTOOL_CRUFT@ -o $@ 
$(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LDLAST)
+ 
  
  libpython$(VERSION).sl: $(LIBRARY_OBJS)
-       $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) 
$(LDLAST)
-@@ -802,7 +801,7 @@
+@@ -866,7 +866,7 @@
  # Install the interpreter with $(VERSION) affixed
  # This goes into $(exec_prefix)
  altbininstall:        $(BUILDPYTHON)
@@ -50,7 +84,7 @@
        do \
                if test ! -d $(DESTDIR)$$i; then \
                        echo "Creating directory $$i"; \
-@@ -815,9 +814,9 @@
+@@ -879,9 +879,9 @@
                if test -n "$(DLLLIBRARY)" ; then \
                        $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
                else \
@@ -62,10 +96,10 @@
                        fi \
                fi; \
        else    true; \
-diff -ru Python-2.7.2.orig/Misc/python-config.in 
Python-2.7.2/Misc/python-config.in
---- Python-2.7.2.orig/Misc/python-config.in    2011-06-11 11:46:26.000000000 
-0400
-+++ Python-2.7.2/Misc/python-config.in 2011-12-29 18:28:04.000000000 -0500
-@@ -46,11 +46,10 @@
+diff --git a/Misc/python-config.in b/Misc/python-config.in
+--- a/Misc/python-config.in
++++ b/Misc/python-config.in
+@@ -46,12 +46,10 @@
      elif opt in ('--libs', '--ldflags'):
          libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
          libs.append('-lpython'+pyver)
@@ -76,13 +110,15 @@
          if opt == '--ldflags':
 -            if not getvar('Py_ENABLE_SHARED'):
 -                libs.insert(0, '-L' + getvar('LIBPL'))
+-            if not getvar('PYTHONFRAMEWORK'):
+-                libs.extend(getvar('LINKFORSHARED').split())
 +            libs.insert(0, '-L' + getvar('LIBPL'))
-             libs.extend(getvar('LINKFORSHARED').split())
++            libs.extend(getvar('LINKFORSHARED').split())
          print ' '.join(libs)
  
-diff -ru Python-2.7.2.orig/Misc/python.pc.in Python-2.7.2/Misc/python.pc.in
---- Python-2.7.2.orig/Misc/python.pc.in        2011-06-11 11:46:26.000000000 
-0400
-+++ Python-2.7.2/Misc/python.pc.in     2011-12-29 18:28:04.000000000 -0500
+diff --git a/Misc/python.pc.in b/Misc/python.pc.in
+--- a/Misc/python.pc.in
++++ b/Misc/python.pc.in
 @@ -1,6 +1,6 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -91,26 +127,9 @@
  includedir=@includedir@
  
  Name: Python
-diff -ru Python-2.7.2.orig/Modules/_bsddb.c Python-2.7.2/Modules/_bsddb.c
---- Python-2.7.2.orig/Modules/_bsddb.c 2011-06-11 11:46:26.000000000 -0400
-+++ Python-2.7.2/Modules/_bsddb.c      2011-12-29 18:28:04.000000000 -0500
-@@ -9766,7 +9766,13 @@
-     ADD_INT(d, DB_REP_PERMANENT);
- 
- #if (DBVER >= 44)
-+#if (DBVER >= 50)
-+    ADD_INT(d, DB_REP_CONF_AUTOINIT);
-+#else
-     ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
-+#endif /* 5.0 */
-+#endif /* 4.4 */
-+#if (DBVER >= 44)
-     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.2.orig/Modules/dbmmodule.c Python-2.7.2/Modules/dbmmodule.c
---- Python-2.7.2.orig/Modules/dbmmodule.c      2011-06-11 11:46:27.000000000 
-0400
-+++ Python-2.7.2/Modules/dbmmodule.c   2011-12-29 18:28:04.000000000 -0500
+diff --git a/Modules/dbmmodule.c b/Modules/dbmmodule.c
+--- a/Modules/dbmmodule.c
++++ b/Modules/dbmmodule.c
 @@ -19,7 +19,7 @@
  static char *which_dbm = "GNU gdbm";  /* EMX port of GDBM */
  #endif
@@ -120,40 +139,19 @@
  static char *which_dbm = "GNU gdbm";
  #elif defined(HAVE_GDBM_DASH_NDBM_H)
  #include <gdbm-ndbm.h>
-diff -ru Python-2.7.2.orig/Modules/posixmodule.c 
Python-2.7.2/Modules/posixmodule.c
---- Python-2.7.2.orig/Modules/posixmodule.c    2011-06-11 11:46:27.000000000 
-0400
-+++ Python-2.7.2/Modules/posixmodule.c 2011-12-29 18:28:04.000000000 -0500
-@@ -457,7 +457,7 @@
- #endif
- 
- /* Return a dictionary corresponding to the POSIX environment table */
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- /* On Darwin/MacOSX a shared library or framework has no access to
- ** environ directly, we must obtain it with _NSGetEnviron().
- */
-@@ -479,7 +479,7 @@
-     d = PyDict_New();
-     if (d == NULL)
-         return NULL;
--#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
-     if (environ == NULL)
-         environ = *_NSGetEnviron();
- #endif
-diff -ru Python-2.7.2.orig/configure Python-2.7.2/configure
---- Python-2.7.2.orig/configure        2011-06-11 11:46:28.000000000 -0400
-+++ Python-2.7.2/configure     2011-12-29 18:28:04.000000000 -0500
-@@ -4962,7 +4962,7 @@
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -5377,7 +5377,7 @@
          ;;
      Darwin*)
        LDLIBRARY='libpython$(VERSION).dylib'
 -      BLDLIBRARY='-L. -lpython$(VERSION)'
-+      BLDLIBRARY="$LDLIBRARY"
++      BLDLIBRARY="`pwd`/$LDLIBRARY"
        RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
        ;;
      AIX*)
-@@ -7505,8 +7505,8 @@
+@@ -8071,8 +8071,8 @@
        #ARCH_RUN_32BIT="true"
      fi
  
@@ -164,7 +162,7 @@
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) 
-current_version $(VERSION)';;
  esac
  
-@@ -7653,20 +7653,8 @@
+@@ -8219,20 +8219,8 @@
                        LDCXXSHARED="$LDCXXSHARED "'-bundle_loader 
$(BINDIR)/python$(VERSION)$(EXE)'
                fi ;;
        Darwin/*)
@@ -187,7 +185,7 @@
                        if test "$enable_framework" ; then
                                # Link against the framework. All externals 
should be defined.
                                BLDSHARED="$LDSHARED 
"'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
-@@ -7674,11 +7662,10 @@
+@@ -8240,11 +8228,10 @@
                                LDCXXSHARED="$LDCXXSHARED 
"'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        else
                                # No framework, use the Python app as 
bundle-loader
@@ -202,7 +200,16 @@
                ;;
        Linux*|GNU*|QNX*)
                LDSHARED='$(CC) -shared'
-@@ -13734,7 +13721,7 @@
+@@ -8634,7 +8621,7 @@
+ if test "x$ac_cv_lib_intl_textdomain" = xyes; then :
+ 
+ $as_echo "#define WITH_LIBINTL 1" >>confdefs.h
+-
++LIBS="-lintl $LIBS"
+ fi
+ 
+ 
+@@ -14394,7 +14381,7 @@
  
  if test $ac_sys_system = Darwin
  then
@@ -211,10 +218,10 @@
  fi
  
  
-diff -ru Python-2.7.2.orig/setup.py Python-2.7.2/setup.py
---- Python-2.7.2.orig/setup.py 2011-06-11 11:46:28.000000000 -0400
-+++ Python-2.7.2/setup.py      2011-12-29 18:28:04.000000000 -0500
-@@ -250,13 +250,17 @@
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -264,13 +264,17 @@
                                                longest, g)
  
          if missing:
@@ -232,7 +239,7 @@
  
          if self.failed:
              failed = self.failed[:]
-@@ -264,6 +268,7 @@
+@@ -278,6 +282,7 @@
              print "Failed to build these modules:"
              print_three_column(failed)
              print
@@ -240,28 +247,20 @@
  
      def build_extension(self, ext):
  
-@@ -369,9 +374,8 @@
+@@ -437,10 +442,8 @@
  
      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_gcc_paths()
 -        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.
-@@ -799,7 +801,7 @@
-         # a release.  Most open source OSes come with one or more
-         # versions of BerkeleyDB already installed.
- 
--        max_db_ver = (4, 8)
-+        max_db_ver = (5, 1)
-         min_db_ver = (4, 1)
-         db_setup_debug = False   # verbose debug prints from this script?
- 
-@@ -835,50 +837,8 @@
+@@ -919,53 +922,8 @@
          # construct a list of paths to look for the header file in on
          # top of the normal inc_dirs.
          db_inc_paths = [
@@ -294,6 +293,9 @@
 -            db_inc_paths.append('/pkg/db-3.%d/include' % x)
 -            db_inc_paths.append('/opt/db-3.%d/include' % x)
 -
+-        if cross_compiling:
+-            db_inc_paths = []
+-
 -        # Add some common subdirectories for Sleepycat DB to the list,
 -        # based on the standard include directories. This way DB3/4 gets
 -        # picked up when it is installed in a non-standard prefix and
@@ -313,7 +315,7 @@
          db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
  
          db_ver_inc_map = {}
-@@ -1004,12 +964,7 @@
+@@ -1091,12 +1049,7 @@
          # We hunt for #define SQLITE_VERSION "n.n.n"
          # We need to find >= sqlite version 3.0.8
          sqlite_incdir = sqlite_libdir = None
@@ -325,18 +327,18 @@
 -                             '/usr/local/include/sqlite3',
 +        sqlite_inc_paths = [ '@PREFIX@/include'
                             ]
-         MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
-         MIN_SQLITE_VERSION = ".".join([str(x)
-@@ -1021,7 +976,7 @@
-         if sys.platform == 'darwin':
+         if cross_compiling:
+             sqlite_inc_paths = []
+@@ -1110,7 +1063,7 @@
+         if host_platform == 'darwin':
              sysroot = macosx_sdk_root()
  
--        for d in inc_dirs + sqlite_inc_paths:
-+        for d in sqlite_inc_paths:
-             f = os.path.join(d, "sqlite3.h")
- 
-             if sys.platform == 'darwin' and is_macosx_sdk_path(d):
-@@ -1053,11 +1008,9 @@
+-        for d_ in inc_dirs + sqlite_inc_paths:
++        for d_ in sqlite_inc_paths:
+             d = d_
+             if host_platform == 'darwin' and is_macosx_sdk_path(d):
+                 d = os.path.join(sysroot, d[1:])
+@@ -1142,11 +1095,9 @@
              sqlite_dirs_to_check = [
                  os.path.join(sqlite_incdir, '..', 'lib64'),
                  os.path.join(sqlite_incdir, '..', 'lib'),
@@ -349,7 +351,7 @@
              if sqlite_libfile:
                  sqlite_libdir = 
[os.path.abspath(os.path.dirname(sqlite_libfile))]
  
-@@ -1174,7 +1127,7 @@
+@@ -1267,7 +1218,7 @@
                          if self.compiler.find_library_file(lib_dirs,
                                                                 'gdbm_compat'):
                              gdbm_libs.append('gdbm_compat')
@@ -358,15 +360,15 @@
                              print "building dbm using gdbm"
                              dbmext = Extension(
                                  'dbm', ['dbmmodule.c'],
-@@ -1252,6 +1205,7 @@
+@@ -1345,6 +1296,7 @@
                  panel_library = 'panelw'
              curses_libs = [curses_library]
              exts.append( Extension('_curses', ['_cursesmodule.c'],
 +                                   include_dirs=["@PREFIX@/include/ncursesw"],
                                     libraries = curses_libs) )
-         elif curses_library == 'curses' and platform != 'darwin':
+         elif curses_library == 'curses' and host_platform != 'darwin':
                  # OSX has an old Berkeley curses, not good enough for
-@@ -1272,6 +1226,7 @@
+@@ -1365,6 +1317,7 @@
          if (module_enabled(exts, '_curses') and
              self.compiler.find_library_file(lib_dirs, panel_library)):
              exts.append( Extension('_curses_panel', ['_curses_panel.c'],
@@ -374,14 +376,17 @@
                                     libraries = [panel_library] + curses_libs) 
)
          else:
              missing.append('_curses_panel')
-@@ -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()
--        if (platform == 'darwin' and
+@@ -1807,19 +1760,11 @@
+     def detect_tkinter(self, inc_dirs, lib_dirs):
+         # The _tkinter module.
+ 
+-        # Rather than complicate the code below, detecting and building
+-        # AquaTk is a separate method. Only one Tkinter will be built on
+-        # Darwin - either AquaTk, if it is found, or X11 based Tk.
+-        if (host_platform == 'darwin' and
 -            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
 -            return
- 
+-
          # Assume we haven't found any of the libraries or include files
          # The versions with dots are used on Unix, and the versions without
          # dots on Windows, for detection by cygwin.
@@ -392,7 +397,7 @@
              tklib = self.compiler.find_library_file(lib_dirs,
                                                          'tk' + version)
              tcllib = self.compiler.find_library_file(lib_dirs,
-@@ -1932,7 +1883,8 @@
+@@ -2043,7 +1988,8 @@
                          sources=sources,
                          depends=depends)
          ext_test = Extension('_ctypes_test',
@@ -402,57 +407,3 @@
          self.extensions.extend([ext, ext_test])
  
          if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
-diff --git a/Modules/_math.c b/Modules/_math.c
---- a/Modules/_math.c
-+++ b/Modules/_math.c
-@@ -189,6 +189,27 @@ double
-    significant loss of precision that arises from direct evaluation when x is
-    small. */
- 
-+#ifdef HAVE_LOG1P
-+
-+double
-+_Py_log1p(double x)
-+{
-+    /* Some platforms supply a log1p function but don't respect the sign of
-+       zero:  log1p(-0.0) gives 0.0 instead of the correct result of -0.0.
-+
-+       To save fiddling with configure tests and platform checks, we handle 
the
-+       special case of zero input directly on all platforms.
-+    */
-+    if (x == 0.0) {
-+        return x;
-+    }
-+    else {
-+        return log1p(x);
-+    }
-+}
-+
-+#else
-+
- double
- _Py_log1p(double x)
- {
-@@ -230,3 +251,5 @@ double
-         return log(1.+x);
-     }
- }
-+
-+#endif /* ifdef HAVE_LOG1P */
-diff --git a/Modules/_math.h b/Modules/_math.h
---- a/Modules/_math.h
-+++ b/Modules/_math.h
-@@ -36,10 +36,6 @@ double _Py_log1p(double x);
- #define m_expm1 _Py_expm1
- #endif
- 
--#ifdef HAVE_LOG1P
--#define m_log1p log1p
--#else
--/* if the system doesn't have log1p, use the substitute
--   function defined in Modules/_math.c. */
-+/* Use the substitute from _math.c on all platforms:
-+   it includes workarounds for buggy handling of zeros. */
- #define m_log1p _Py_log1p
--#endif
-

Index: python27.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/languages/python27.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- python27.info       31 Jan 2013 17:32:35 -0000      1.5
+++ python27.info       30 May 2013 01:41:31 -0000      1.6
@@ -1,6 +1,6 @@
 Info2: <<
 Package: python%type_pkg[python]
-Version: 2.7.3
+Version: 2.7.5
 Revision: 2
 Epoch: 1
 Type: python 2.7
@@ -9,12 +9,12 @@
        %N-shlibs (= %e:%v-%r),
        blt-shlibs,
        bzip2-shlibs,
-       db51-aes-shlibs | db51-shlibs,
+       db53-aes-shlibs,
        gdbm3-shlibs,
        libgettext8-shlibs,
        libncursesw5-shlibs,
-       openssl100-shlibs (>= 1.0.1-1),
-       readline5-shlibs,
+       openssl100-shlibs (>= 1.0.1e-1),
+       readline6-shlibs,
        sqlite3-shlibs  (>= 3.7.2-2),
        tcltk (>= 8.4.1-1),
        x11
@@ -23,31 +23,32 @@
 BuildDepends: <<
        blt-dev (>= 2.4z-15),
        bzip2-dev,
-       db51-aes | db51,
+       db53-aes,
        fink (>= 0.28), 
        gdbm3,
        gettext-bin,
        gettext-tools,
        libgettext8-dev,
        libncursesw5,
-       readline5,
+       readline6,
        sqlite3-dev (>= 3.7.2-2),
-       openssl100-dev (>= 1.0.1-1),
+       openssl100-dev (>= 1.0.1e-1),
        tcltk-dev (>= 8.4.1-1),
        x11-dev
 <<
 Provides: argparse-py%type_pkg[python]
 Source: http://python.org/ftp/python/%v/Python-%v.tar.bz2
-Source-MD5: c57477edd6d18bd9eeca2f21add73919
+Source-MD5: 6334b666b7ff2038c761d7b27ba699c1
 Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
-Source2-MD5: 101c13d39f76fd6706aac3a9196b2f01
+Source2-MD5: 77ae8fd6b456c6339a1a62d57425335b
 PatchFile: %n.patch
-PatchFile-MD5: fa848f2e65a867a3eda68c5fc308fe8e
+PatchFile-MD5: c80fb5c66dfc5af1843e50078b5ccfb0
 PatchScript: <<
        sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
 <<
 
 UseMaxBuildJobs: true
+
 ConfigureParams: --enable-shared --with-dbmliborder=gdbm
 CompileScript: <<
 #!/bin/sh -ex
@@ -69,14 +70,23 @@
 <<
 
 InfoTest: <<
-       TestConflicts: pyxml-py%type_pkg[python]
+       TestConflicts: pyxml-py%type_pkg[python], gnome-applets
        TestScript: LANG=en_US.UTF-8 make -k test EXTRATESTOPTS='-w -x 
test_distutils test_argparse test_httpservers test_pydoc' || exit 2
 <<
 
 InstallScript: <<
 #!/bin/sh -ex
+       # _sysconfigdata.py contains build-time variables that point to %b.
+       # This is harmless but upsets fink's validator.
+       # Change to %p/lib to make fink happy.
+       perl -pi -e 's,%b,%p/lib,' `ls -d %b/build/lib*`/_sysconfigdata.py
+       # Don't propagate -lintl to other packages.
+       perl -pi -e 's/-lintl //' `ls -d %b/build/lib*`/_sysconfigdata.py
        make install DESTDIR=%d
 
+       # we don't want -lintl to appear in LIBS otherwise python-config will 
propagate it
+       perl -pi -e 's/-lintl //' %i/lib/python%type_raw[python]/config/Makefile
+
        # fix all main things to be python-versioned filenames with
        # unversioned symlinks to them
        pushd %i/bin
@@ -85,7 +95,6 @@
                        ln -s ${f}%type_raw[python] %i/bin/${f}
                done
        popd
-       ln -s python%type_raw[python].1 %i/share/man/man1/python.1
        ln -s python%type_raw[python].1 
%i/share/man/man1/python%type_pkg[python].1
 
        # install some docs and other useful tidbits


------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to