[58694] trunk/dports/lang/python26
blb at macports.org
blb at macports.org
Fri Oct 2 15:17:59 PDT 2009
Revision: 58694
http://trac.macports.org/changeset/58694
Author: blb at macports.org
Date: 2009-10-02 15:17:58 -0700 (Fri, 02 Oct 2009)
Log Message:
-----------
lang/python26 - update to 2.6.3
Modified Paths:
--------------
trunk/dports/lang/python26/Portfile
Removed Paths:
-------------
trunk/dports/lang/python26/files/patch-64bit.diff
trunk/dports/lang/python26/files/version.plist
Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile 2009-10-02 21:48:31 UTC (rev 58693)
+++ trunk/dports/lang/python26/Portfile 2009-10-02 22:17:58 UTC (rev 58694)
@@ -4,8 +4,7 @@
PortGroup select 1.0
name python26
-version 2.6.2
-revision 6
+version 2.6.3
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -23,9 +22,9 @@
distname Python-${version}
use_bzip2 yes
-checksums md5 245db9f1e0f09ab7e0faaa0cf7301011 \
- sha1 125d4ed90f82de1d44f288150bbbda23a6cd27a4 \
- rmd160 85fa3540cbacf4d0547d2381eb3aa76bef35c2e1
+checksums md5 8755fc03075b1701ca3f13932e6ade9f \
+ sha1 8e598f7f9299da96899bd8c0afd0d1313221f00f \
+ rmd160 8af600f29c06d0a1bd7e5476750cdd7fac5d7529
# patch-Lib-distutils-dist.py.diff comes from
# <http://bugs.python.org/issue1180>
@@ -42,15 +41,12 @@
patch-Mac-Makefile.in.diff \
patch-Mac-PythonLauncher-Makefile.in.diff \
patch-Mac-Tools-Doc-setup.py.diff \
- patch-readlinefix.diff \
- patch-64bit.diff
+ patch-readlinefix.diff
depends_lib port:gettext port:zlib port:openssl port:tk \
port:sqlite3 port:db46 port:ncurses port:gdbm \
port:bzip2 port:readline
-use_autoconf yes
-
configure.args --enable-framework=${frameworks_dir} \
--enable-ipv6
@@ -111,12 +107,6 @@
# ${prefix}/Library/Frameworks/Python.framework/Versions/2.6/Python)
reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile
- # The framework version.plist isn't currently being installed so
- # we'll copy ours for now (see http://trac.macports.org/ticket/18773 and
- # http://bugs.python.org/issue4937)
- xinstall -m 644 ${filespath}/version.plist \
- ${destroot}${framewdir}/Resources/version.plist
-
foreach unversionedFile {idle pydoc python python-config pythonw smtpd.py} {
delete ${destroot}${prefix}/bin/${unversionedFile}
}
Deleted: trunk/dports/lang/python26/files/patch-64bit.diff
===================================================================
--- trunk/dports/lang/python26/files/patch-64bit.diff 2009-10-02 21:48:31 UTC (rev 58693)
+++ trunk/dports/lang/python26/files/patch-64bit.diff 2009-10-02 22:17:58 UTC (rev 58694)
@@ -1,290 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in (revision 74680)
-+++ configure.in (revision 74681)
-@@ -92,7 +92,6 @@
- ])
- AC_SUBST(UNIVERSALSDK)
-
--ARCH_RUN_32BIT=
- AC_SUBST(ARCH_RUN_32BIT)
-
- UNIVERSAL_ARCHS="32-bit"
-@@ -921,6 +920,7 @@
-
- elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
- UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
-+ ARCH_RUN_32BIT="true"
-
- elif test "$UNIVERSAL_ARCHS" = "all" ; then
- UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
-@@ -944,13 +944,23 @@
- cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
- if test ${cur_target} '>' 10.2; then
- cur_target=10.3
-+ if test ${enable_universalsdk}; then
-+ if test "${UNIVERSAL_ARCHS}" = "all"; then
-+ # Ensure that the default platform for a
-+ # 4-way universal build is OSX 10.5,
-+ # that's the first OS release where
-+ # 4-way builds make sense.
-+ cur_target='10.5'
-+ fi
-+ else
-+ if test `arch` = "i386"; then
-+ # On Intel macs default to a deployment
-+ # target of 10.4, that's the first OSX
-+ # release with Intel support.
-+ cur_target="10.4"
-+ fi
-+ fi
- fi
-- if test "${UNIVERSAL_ARCHS}" = "all"; then
-- # Ensure that the default platform for a 4-way
-- # universal build is OSX 10.5, that's the first
-- # OS release where 4-way builds make sense.
-- cur_target='10.5'
-- fi
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
-
- # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
-@@ -1519,6 +1529,8 @@
- ;;
- esac
-
-+
-+ARCH_RUN_32BIT=""
- AC_SUBST(LIBTOOL_CRUFT)
- case $ac_sys_system/$ac_sys_release in
- Darwin/@<:@01567@:>@\..*)
-@@ -1526,7 +1538,7 @@
- if test "${enable_universalsdk}"; then
- :
- else
-- LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
-+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
- fi
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-@@ -1538,7 +1550,49 @@
- else
- LIBTOOL_CRUFT=""
- fi
-- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
-+ AC_TRY_RUN([
-+ #include <unistd.h>
-+ int main(int argc, char*argv[])
-+ {
-+ if (sizeof(long) == 4) {
-+ return 0;
-+ } else {
-+ return 1;
-+ }
-+ }
-+ ], ac_osx_32bit=yes,
-+ ac_osx_32bit=no,
-+ ac_osx_32bit=no)
-+
-+ if test "${ac_osx_32bit}" = "yes"; then
-+ case `arch` in
-+ i386)
-+ MACOSX_DEFAULT_ARCH="i386"
-+ ;;
-+ ppc)
-+ MACOSX_DEFAULT_ARCH="ppc"
-+ ;;
-+ *)
-+ AC_MSG_ERROR([Unexpected output of 'arch' on OSX])
-+ ;;
-+ esac
-+ else
-+ case `arch` in
-+ i386)
-+ MACOSX_DEFAULT_ARCH="x86_64"
-+ ;;
-+ ppc)
-+ MACOSX_DEFAULT_ARCH="ppc64"
-+ ;;
-+ *)
-+ AC_MSG_ERROR([Unexpected output of 'arch' on OSX])
-+ ;;
-+ esac
-+
-+ #ARCH_RUN_32BIT="true"
-+ fi
-+
-+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}"
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
- esac
-Index: Mac/scripts/BuildApplet.py
-===================================================================
---- Mac/scripts/BuildApplet.py (revision 74680)
-+++ Mac/scripts/BuildApplet.py (revision 74681)
-@@ -12,7 +12,10 @@
-
- import os
- import MacOS
--import EasyDialogs
-+try:
-+ import EasyDialogs
-+except ImportError:
-+ EasyDialogs = None
- import buildtools
- import getopt
-
-@@ -32,7 +35,10 @@
- try:
- buildapplet()
- except buildtools.BuildError, detail:
-- EasyDialogs.Message(detail)
-+ if EasyDialogs is None:
-+ print detail
-+ else:
-+ EasyDialogs.Message(detail)
-
-
- def buildapplet():
-@@ -46,6 +52,10 @@
- # Ask for source text if not specified in sys.argv[1:]
-
- if not sys.argv[1:]:
-+ if EasyDialogs is None:
-+ usage()
-+ sys.exit(1)
-+
- filename = EasyDialogs.AskFileForOpen(message='Select Python source or applet:',
- typeList=('TEXT', 'APPL'))
- if not filename:
-Index: Lib/test/test_aepack.py
-===================================================================
---- Lib/test/test_aepack.py (revision 74680)
-+++ Lib/test/test_aepack.py (revision 74681)
-@@ -59,6 +59,9 @@
- import Carbon.File
- except:
- return
-+
-+ if not hasattr(Carbon.File, "FSSpec"):
-+ return
- o = Carbon.File.FSSpec(os.curdir)
- packed = aepack.pack(o)
- unpacked = aepack.unpack(packed)
-@@ -69,6 +72,8 @@
- import Carbon.File
- except:
- return
-+ if not hasattr(Carbon.File, "FSSpec"):
-+ return
- o = Carbon.File.FSSpec(os.curdir).NewAliasMinimal()
- packed = aepack.pack(o)
- unpacked = aepack.unpack(packed)
-Index: Lib/plat-mac/applesingle.py
-===================================================================
---- Lib/plat-mac/applesingle.py (revision 74680)
-+++ Lib/plat-mac/applesingle.py (revision 74681)
-@@ -119,8 +119,13 @@
- if not hasattr(infile, 'read'):
- if isinstance(infile, Carbon.File.Alias):
- infile = infile.ResolveAlias()[0]
-- if isinstance(infile, (Carbon.File.FSSpec, Carbon.File.FSRef)):
-- infile = infile.as_pathname()
-+
-+ if hasattr(Carbon.File, "FSSpec"):
-+ if isinstance(infile, (Carbon.File.FSSpec, Carbon.File.FSRef)):
-+ infile = infile.as_pathname()
-+ else:
-+ if isinstance(infile, Carbon.File.FSRef):
-+ infile = infile.as_pathname()
- infile = open(infile, 'rb')
-
- asfile = AppleSingle(infile, verbose=verbose)
-Index: Lib/plat-mac/macresource.py
-===================================================================
---- Lib/plat-mac/macresource.py (revision 74680)
-+++ Lib/plat-mac/macresource.py (revision 74681)
-@@ -79,8 +79,8 @@
- AppleSingle file"""
- try:
- refno = Res.FSpOpenResFile(pathname, 1)
-- except Res.Error, arg:
-- if arg[0] in (-37, -39):
-+ except (AttributeError, Res.Error), arg:
-+ if isinstance(arg, AttributeError) or arg[0] in (-37, -39):
- # No resource fork. We may be on OSX, and this may be either
- # a data-fork based resource file or a AppleSingle file
- # from the CVS repository.
-@@ -106,8 +106,8 @@
- try:
- refno = Res.FSpOpenResFile(pathname, 1)
- Res.CloseResFile(refno)
-- except Res.Error, arg:
-- if arg[0] in (-37, -39):
-+ except (AttributeError, Res.Error), arg:
-+ if isinstance(arg, AttributeError) or arg[0] in (-37, -39):
- # No resource fork. We may be on OSX, and this may be either
- # a data-fork based resource file or a AppleSingle file
- # from the CVS repository.
-Index: Lib/plat-mac/buildtools.py
-===================================================================
---- Lib/plat-mac/buildtools.py (revision 74680)
-+++ Lib/plat-mac/buildtools.py (revision 74681)
-@@ -15,7 +15,10 @@
- import MacOS
- import macostools
- import macresource
--import EasyDialogs
-+try:
-+ import EasyDialogs
-+except ImportError:
-+ EasyDialogs = None
- import shutil
-
-
-@@ -67,9 +70,13 @@
- rsrcname=None, others=[], raw=0, progress="default", destroot=""):
-
- if progress == "default":
-- progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120)
-- progress.label("Compiling...")
-- progress.inc(0)
-+ if EasyDialogs is None:
-+ print "Compiling %s"%(os.path.split(filename)[1],)
-+ process = None
-+ else:
-+ progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120)
-+ progress.label("Compiling...")
-+ progress.inc(0)
- # check for the script name being longer than 32 chars. This may trigger a bug
- # on OSX that can destroy your sourcefile.
- if '#' in os.path.split(filename)[1]:
-@@ -119,7 +126,11 @@
- if MacOS.runtimemodel == 'macho':
- raise BuildError, "No updating yet for MachO applets"
- if progress:
-- progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120)
-+ if EasyDialogs is None:
-+ print "Updating %s"%(os.path.split(filename)[1],)
-+ progress = None
-+ else:
-+ progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120)
- else:
- progress = None
- if not output:
-Index: Lib/plat-mac/aepack.py
-===================================================================
---- Lib/plat-mac/aepack.py (revision 74680)
-+++ Lib/plat-mac/aepack.py (revision 74681)
-@@ -58,7 +58,11 @@
- # Some python types we need in the packer:
- #
- AEDescType = AE.AEDescType
--FSSType = Carbon.File.FSSpecType
-+try:
-+ FSSType = Carbon.File.FSSpecType
-+except AttributeError:
-+ class FSSType:
-+ pass
- FSRefType = Carbon.File.FSRefType
- AliasType = Carbon.File.AliasType
-
Deleted: trunk/dports/lang/python26/files/version.plist
===================================================================
--- trunk/dports/lang/python26/files/version.plist 2009-10-02 21:48:31 UTC (rev 58693)
+++ trunk/dports/lang/python26/files/version.plist 2009-10-02 22:17:58 UTC (rev 58694)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>BuildVersion</key>
- <string>1</string>
- <key>CFBundleShortVersionString</key>
- <string>2.6.2</string>
- <key>CFBundleVersion</key>
- <string>2.6.2</string>
- <key>ProjectName</key>
- <string>Python</string>
- <key>SourceVersion</key>
- <string>2.6.2</string>
-</dict>
-</plist>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091002/bd4ef811/attachment-0001.html>
More information about the macports-changes
mailing list