[58144] trunk/dports/lang/python31
erickt at macports.org
erickt at macports.org
Tue Sep 22 16:49:19 PDT 2009
Revision: 58144
http://trac.macports.org/changeset/58144
Author: erickt at macports.org
Date: 2009-09-22 16:49:18 -0700 (Tue, 22 Sep 2009)
Log Message:
-----------
python 3.1.1 version bump.
Modified Paths:
--------------
trunk/dports/lang/python31/Portfile
Added Paths:
-----------
trunk/dports/lang/python31/files/locale_fix.patch
trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff
Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile 2009-09-22 23:28:02 UTC (rev 58143)
+++ trunk/dports/lang/python31/Portfile 2009-09-22 23:49:18 UTC (rev 58144)
@@ -5,7 +5,7 @@
name python31
epoch 1
-version 3.1
+version 3.1.1
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -25,9 +25,9 @@
distname Python-${version}
use_bzip2 yes
-checksums md5 f64437a24d39f1917aa1878cc70621f6 \
- sha1 f8c610f47e6c9420314e48871b9c697a93ed2e42 \
- rmd160 e41d8fd9c24d567f05835a1f9de6ba679ce2fd38
+checksums md5 d1ddd9f16e3c6a51c7208f33518cd674 \
+ sha1 42eb37bf75fae5731f6df1b195902960ae1789e0 \
+ rmd160 d60b64e1346b2ff15d65b032ea35fb3ad8b0dc66
patchfiles patch-Makefile.pre.in.diff \
patch-setup.py.diff \
@@ -154,6 +154,11 @@
configure.args-append --with-wide-unicode
}
+variant no_tkinter description {Disable Tkinter support, which will break IDLE} {
+ patchfiles-append patch-setup_no_tkinter.py.diff
+ depends_lib-delete port:tk
+}
+
livecheck.type regex
livecheck.url ${homepage}download/releases/
livecheck.regex Python (${branch}(?:\\.\\d+)*)
Added: trunk/dports/lang/python31/files/locale_fix.patch
===================================================================
--- trunk/dports/lang/python31/files/locale_fix.patch (rev 0)
+++ trunk/dports/lang/python31/files/locale_fix.patch 2009-09-22 23:49:18 UTC (rev 58144)
@@ -0,0 +1,131 @@
+Index: configure
+===================================================================
+--- configure (revision 73052)
++++ configure (working copy)
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 72899 .
++# From configure.in Revision: 73021 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.61 for python 3.1.
+ #
+@@ -13501,6 +13501,74 @@
+ fi
+ { echo "$as_me:$LINENO: result: $CCSHARED" >&5
+ echo "${ECHO_T}$CCSHARED" >&6; }
++
++# check if we need libintl for locale functions
++{ echo "$as_me:$LINENO: checking for textdomain in -lintl" >&5
++echo $ECHO_N "checking for textdomain in -lintl... $ECHO_C" >&6; }
++if test "${ac_cv_lib_intl_textdomain+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char textdomain ();
++int
++main ()
++{
++return textdomain ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_intl_textdomain=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_lib_intl_textdomain=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_textdomain" >&5
++echo "${ECHO_T}$ac_cv_lib_intl_textdomain" >&6; }
++if test $ac_cv_lib_intl_textdomain = yes; then
++ have_intl=yes
++fi
++
++
+ # LINKFORSHARED are the flags passed to the $(CC) command that links
+ # the python executable -- this is only needed for a few systems
+ { echo "$as_me:$LINENO: checking LINKFORSHARED" >&5
+@@ -13516,7 +13584,12 @@
+ Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ # -u libsys_s pulls in all symbols in libsys
+ Darwin/*)
+- LINKFORSHARED="$extra_undefs -framework CoreFoundation"
++ if test $have_intl
++ then
++ LINKFORSHARED="$extra_undefs -lintl"
++ else
++ LINKFORSHARED="$extra_undefs -framework CoreFoundation"
++ fi
+ if test "$enable_framework"
+ then
+ LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+Index: configure.in
+===================================================================
+--- configure.in (revision 73052)
++++ configure.in (working copy)
+@@ -1722,6 +1722,10 @@
+ esac
+ fi
+ AC_MSG_RESULT($CCSHARED)
++
++# check if we need libintl for locale functions
++AC_CHECK_LIB(intl, textdomain, have_intl=yes)
++
+ # LINKFORSHARED are the flags passed to the $(CC) command that links
+ # the python executable -- this is only needed for a few systems
+ AC_MSG_CHECKING(LINKFORSHARED)
+@@ -1735,8 +1739,13 @@
+ BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ # -u libsys_s pulls in all symbols in libsys
+- Darwin/*)
+- LINKFORSHARED="$extra_undefs -framework CoreFoundation"
++ Darwin/*)
++ if test $have_intl
++ then
++ LINKFORSHARED="$extra_undefs -lintl"
++ else
++ LINKFORSHARED="$extra_undefs -framework CoreFoundation"
++ fi
+ if test "$enable_framework"
+ then
+ LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
Added: trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff
===================================================================
--- trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff (rev 0)
+++ trunk/dports/lang/python31/files/patch-setup_no_tkinter.py.diff 2009-09-22 23:49:18 UTC (rev 58144)
@@ -0,0 +1,11 @@
+--- setup.py.orig 2009-03-31 12:20:48.000000000 -0600
++++ setup.py 2009-09-17 00:33:12.000000000 -0600
+@@ -17,7 +17,7 @@
+ from distutils.command.install_lib import install_lib
+
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_tkinter"]
+
+ def add_dir_to_list(dirlist, dir):
+ """Add the directory 'dir' to the list 'dirlist' (at the front) if
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090922/04d0a2aa/attachment.html>
More information about the macports-changes
mailing list