[96528] trunk/dports/lang/python33
jwa at macports.org
jwa at macports.org
Mon Aug 13 07:42:32 PDT 2012
Revision: 96528
https://trac.macports.org/changeset/96528
Author: jwa at macports.org
Date: 2012-08-13 07:42:32 -0700 (Mon, 13 Aug 2012)
Log Message:
-----------
python33: version bump to 3.3.0b2, a bit late, add xz as dependency (liblzma was requested in #33872, that is replaced by xz, so this ticket will now be closed), remove an unnecessary variant, fix the patch files also a bit
Modified Paths:
--------------
trunk/dports/lang/python33/Portfile
trunk/dports/lang/python33/files/patch-configure.diff
trunk/dports/lang/python33/files/patch-libedit.diff
trunk/dports/lang/python33/files/patch-setup.py.diff
Modified: trunk/dports/lang/python33/Portfile
===================================================================
--- trunk/dports/lang/python33/Portfile 2012-08-13 14:37:41 UTC (rev 96527)
+++ trunk/dports/lang/python33/Portfile 2012-08-13 14:42:32 UTC (rev 96528)
@@ -7,7 +7,7 @@
name python33
# Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
-version 3.3.0b1
+version 3.3.0b2
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -28,8 +28,8 @@
use_xz yes
-checksums rmd160 1b498027ac6b483d1742e7357bf5346800c7400c \
- sha256 4c96d17a7578cd9d3557a7784b8dc2e1302225b0de2c363a3d99fdcb5d4ab432
+checksums rmd160 cc048b9763f24a8bc5b56291b8b103d363c3c3ab \
+ sha256 e971a5305a50f5a3e69b6573d0ad59cd1884a0dd4c8e1bc8d1db9fb70604ea83
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
@@ -40,7 +40,8 @@
depends_lib port:zlib port:openssl \
port:sqlite3 port:ncurses \
- port:bzip2 port:libedit port:gettext
+ port:bzip2 port:libedit port:gettext \
+ port:xz
depends_run port:python_select
configure.args --enable-framework=${frameworks_dir} \
@@ -148,11 +149,6 @@
}
}
-variant ucs4 description {Use 4-byte Unicode characters} {
- configure.args-append --with-wide-unicode
- set confdir config-${branch}mu
-}
-
livecheck.type regex
livecheck.url ${homepage}download/releases/
livecheck.regex Python (${branch}(?:\\.\\d+)*)
Modified: trunk/dports/lang/python33/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-configure.diff 2012-08-13 14:37:41 UTC (rev 96527)
+++ trunk/dports/lang/python33/files/patch-configure.diff 2012-08-13 14:42:32 UTC (rev 96528)
@@ -1,6 +1,6 @@
---- configure.orig 2011-02-19 19:58:23.000000000 +1100
-+++ configure 2011-05-14 02:29:23.000000000 +1000
-@@ -2920,6 +2920,8 @@
+--- configure.orig 2012-08-13 17:08:58.000000000 +0300
++++ configure 2012-08-13 17:11:07.000000000 +0300
+@@ -3145,6 +3145,8 @@
;;
esac
Modified: trunk/dports/lang/python33/files/patch-libedit.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-libedit.diff 2012-08-13 14:37:41 UTC (rev 96527)
+++ trunk/dports/lang/python33/files/patch-libedit.diff 2012-08-13 14:42:32 UTC (rev 96528)
@@ -1,8 +1,8 @@
---- configure.orig 2011-06-12 01:48:52.000000000 +1000
-+++ configure 2011-10-31 15:28:14.000000000 +1100
-@@ -12807,9 +12807,9 @@
+--- configure.orig 2012-08-13 17:14:16.000000000 +0300
++++ configure 2012-08-13 17:21:44.000000000 +0300
+@@ -13725,9 +13725,9 @@
$as_echo_n "checking how to link readline libs... " >&6; }
- for py_libtermcap in "" ncursesw ncurses curses termcap; do
+ for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
if test -z "$py_libtermcap"; then
- READLINE_LIBS="-lreadline"
+ READLINE_LIBS="-ledit"
@@ -12,7 +12,7 @@
fi
LIBS="$READLINE_LIBS $LIBS_no_readline"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12853,13 +12853,13 @@
+@@ -13771,13 +13771,13 @@
fi
# check for readline 2.1
@@ -29,7 +29,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -12899,7 +12899,7 @@
+@@ -13817,7 +13817,7 @@
# check for readline 2.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -38,7 +38,7 @@
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
-@@ -12912,7 +12912,7 @@
+@@ -13830,7 +13830,7 @@
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -47,7 +47,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -12925,7 +12925,7 @@
+@@ -13843,7 +13843,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -56,7 +56,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -12939,13 +12939,13 @@
+@@ -13857,13 +13857,13 @@
fi
# check for readline 4.0
@@ -73,7 +73,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -12983,13 +12983,13 @@
+@@ -13901,13 +13901,13 @@
# also in 4.0
@@ -90,7 +90,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13027,13 +13027,13 @@
+@@ -13945,13 +13945,13 @@
# check for readline 4.2
@@ -107,7 +107,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -13073,7 +13073,7 @@
+@@ -13991,7 +13991,7 @@
# also in readline 4.2
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -116,7 +116,7 @@
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
have_readline=yes
-@@ -13086,7 +13086,7 @@
+@@ -14004,7 +14004,7 @@
then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -125,9 +125,9 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
---- setup.py.orig 2011-10-31 15:26:25.000000000 +1100
-+++ setup.py 2011-10-31 15:29:39.000000000 +1100
-@@ -581,7 +581,7 @@
+--- setup.py.orig 2012-08-13 17:24:39.000000000 +0300
++++ setup.py 2012-08-13 17:25:59.000000000 +0300
+@@ -659,7 +659,7 @@
exts.append( Extension('audioop', ['audioop.c']) )
# readline
@@ -135,8 +135,8 @@
+ do_readline = self.compiler.find_library_file(lib_dirs, 'edit')
readline_termcap_library = ""
curses_library = ""
- # Determine if readline is already linked against curses or tinfo.
-@@ -637,7 +637,7 @@
+ # Cannot use os.popen here in py3k.
+@@ -723,7 +723,7 @@
else:
readline_extra_link_args = ()
@@ -145,8 +145,8 @@
if readline_termcap_library:
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
---- Modules/readline.c.orig 2011-09-04 02:16:46.000000000 +1000
-+++ Modules/readline.c 2011-10-31 16:02:33.000000000 +1100
+--- Modules/readline.c.orig 2012-08-13 17:27:11.000000000 +0300
++++ Modules/readline.c 2012-08-13 17:30:18.000000000 +0300
@@ -28,8 +28,7 @@
/* GNU readline definitions */
@@ -157,7 +157,7 @@
#ifdef HAVE_RL_COMPLETION_MATCHES
#define completion_matches(x, y) \
-@@ -573,14 +572,13 @@ get_history_item(PyObject *self, PyObjec
+@@ -574,14 +573,13 @@
* difference.
*/
int length = _py_get_history_length();
@@ -173,7 +173,7 @@
Py_RETURN_NONE;
}
}
-@@ -1000,7 +998,6 @@ readline_until_enter_or_signal(char *pro
+@@ -1002,7 +1000,6 @@
PyEval_SaveThread();
#endif
if (s < 0) {
@@ -181,7 +181,7 @@
rl_cleanup_after_signal();
rl_callback_handler_remove();
*signal = 1;
-@@ -1099,15 +1096,6 @@ call_readline(FILE *sys_stdin, FILE *sys
+@@ -1101,15 +1098,6 @@
const char *line;
int length = _py_get_history_length();
if (length > 0)
Modified: trunk/dports/lang/python33/files/patch-setup.py.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-setup.py.diff 2012-08-13 14:37:41 UTC (rev 96527)
+++ trunk/dports/lang/python33/files/patch-setup.py.diff 2012-08-13 14:42:32 UTC (rev 96528)
@@ -1,6 +1,6 @@
---- setup.py.orig 2009-05-24 03:13:14.000000000 +1000
-+++ setup.py 2009-09-03 13:51:47.000000000 +1000
-@@ -1265,7 +1265,7 @@
+--- setup.py.orig 2012-08-13 17:01:43.000000000 +0300
++++ setup.py 2012-08-13 17:06:17.000000000 +0300
+@@ -1576,7 +1576,7 @@
# For 8.4a2, the X11 headers are not included. Rather than include a
# complicated search, this is a hard-coded path. It could bail out
# if X11 libs are not found...
@@ -9,22 +9,22 @@
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1300,13 +1300,7 @@
+@@ -1621,13 +1621,6 @@
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.
- platform = self.get_platform()
-- if (platform == 'darwin' and
+- 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
-@@ -1354,17 +1348,17 @@
- if platform == 'sunos5':
+ # dots on Windows, for detection by cygwin.
+@@ -1676,17 +1669,17 @@
+ if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
- elif os.path.exists('/usr/X11R6/include'):
@@ -50,4 +50,4 @@
+ # added_lib_dirs.append('/usr/X11/lib')
# If Cygwin, then verify that X is installed before proceeding
- if platform == 'cygwin':
+ if host_platform == 'cygwin':
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120813/fed94f78/attachment-0001.html>
More information about the macports-changes
mailing list