Date: Fri, 1 Aug 2014 16:37:55 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363730 - in head/lang/python32: . files Message-ID: <201408011637.s71GbtgP082204@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Fri Aug 1 16:37:54 2014 New Revision: 363730 URL: http://svnweb.freebsd.org/changeset/ports/363730 QAT: https://qat.redports.org/buildarchive/r363730/ Log: - Remove everything related to USE_PYTHON and bsd.python.mk. This is a preparatory step to convert bsd.python.mk into a USES file. - Remove the shared/static build separation, which is the source of many problems and even more hacks. Instead build only the shared version, which greatly simplifies the build. - Use NLS_LIBS instead of NLS_LDFLAGS as done for lang/python27 (r357486) - Remove the FPECTL option to align the build with the clean "template" from lang/python34. - Remove PORTDATA and EXAMPLES. Those will be made available via separate ports. - Add a new DEBUG option to enable debug builds as for lang/python34. - Add a new TSC option for precise timestamp counter support as for lang/python34. - Add CPE support. - Reactivate curses/ncurses support. - Use buildbottest in the regression-test: target. Phabric: D448 Reviewed by: koobs, bapt With hat: python@ Added: head/lang/python32/files/patch-Lib_distutils_command_build_ext.py (contents, props changed) Modified: head/lang/python32/Makefile head/lang/python32/files/patch-Makefile.pre.in head/lang/python32/files/patch-setup.py head/lang/python32/pkg-plist Modified: head/lang/python32/Makefile ============================================================================== --- head/lang/python32/Makefile Fri Aug 1 16:23:35 2014 (r363729) +++ head/lang/python32/Makefile Fri Aug 1 16:37:54 2014 (r363730) @@ -2,11 +2,11 @@ PORTNAME= python32 PORTVERSION= 3.2.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON -MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} -DISTNAME= ${PYTHON_DISTNAME} +MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} +DISTNAME= Python-${PORTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org @@ -14,86 +14,71 @@ COMMENT= Interpreted object-oriented pro LICENSE= PSFL -GNU_CONFIGURE= yes -CONFIGURE_SCRIPT= ../configure # must be relative -CONFIGURE_ENV= OPT="" SVNVERSION="echo freebsd" -MAKE_ENV= VPATH="${PYTHON_WRKSRC}" - -INSTALL_TARGET= altinstall - -USES= readline tar:xz cpe +USES= cpe ncurses pkgconfig readline tar:xz USE_LDCONFIG= yes -USE_PYTHON= yes +GNU_CONFIGURE= yes CPE_VENDOR= python CPE_PRODUCT= ${CPE_VENDOR} CPE_VERSION= ${PORTVERSION} -PYTHON_VERSION= python3.2 -PYTHON_NO_DEPENDS= yes - -WRKSRC= ${PYTHON_WRKSRC}/portbld.static -SHARED_WRKSRC= ${PYTHON_WRKSRC}/portbld.shared -PATCH_WRKSRC= ${PYTHON_WRKSRC} - -PYABIVER= # default empty, for after appending - -PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ - PYMAJOR=${PYTHON_MAJOR_VER} \ - PYVER_WITHPAT=${PORTVERSION:S/.rc/rc/} \ - PYABIVER=${PYABIVER} -EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_VERSION} -DATADIR= ${PREFIX}/share/${PYTHON_VERSION} - -PLATFORMS= plat-freebsd4 plat-freebsd5 plat-freebsd6 \ - plat-freebsd7 plat-freebsd8 plat-freebsd9 \ - plat-freebsd10 plat-freebsd11 - -BIN_SCRIPTS= 2to3 idle3 pydoc3 -BIN_FILES= python python-shared python-config python-shared-config \ - ${BIN_SCRIPTS} -BINLINKS_SUB= -e 's,(2to3|idle3|pydoc3),\1-${PYTHON_VER},' \ - -e 's,(python-shared|python),\1${PYTHON_VER},' - -OPTIONS_DEFINE= THREADS UCS4 PYMALLOC IPV6 FPECTL EXAMPLES NLS -OPTIONS_DEFAULT= THREADS UCS4 PYMALLOC IPV6 +CONFIGURE_ARGS+= --enable-shared +CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations -NLS_DESC= Enable Gettext support for the locale module +INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files +SHAREMODE= 644 # Match upstream INSTALL_DATA=644, so we can STRIP shared libraries +MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Override read-only for libraries, so we can STRIP them +MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in + +PLIST_SUB= ABI=${ABIFLAGS} \ + OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 + +OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC THREADS TSC UCS4 +OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS UCS4 +OPTIONS_SUB= yes + +NLS_DESC= Enable gettext support for the locale module +PYMALLOC_DESC= Enable specialized mallocs +TSC_DESC= Enable processor timestamp counter profiling + +DEBUG_CONFIGURE_WITH= pydebug +IPV6_CONFIGURE_ENABLE= ipv6 + +# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat +# to break in Python 2.7, or preprocessor complaints in Python >= 3.3 +# Upstream Issue: http://bugs.python.org/issue6299 +NLS_USES= gettext +NLS_CPPFLAGS= -I${LOCALBASE}/include +NLS_LIBS= -L${LOCALBASE}/lib -lintl +NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no + +THREADS_CONFIGURE_WITH= threads +THREADS_CFLAGS= ${PTHREAD_CFLAGS} +THREADS_LDFLAGS= ${PTHREAD_LIBS} +TSC_CONFIGURE_WITH= tsc +UCS4_CONFIGURE_WITH= wide-unicode .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -LDFLAGS+= -L${LOCALBASE}/lib -# We use CPPFLAGS over CFLAGS here due to -I ordering causing things like -# elementtree and pyexpat to break with python27, or to silence preprocessor -# complaints with python33 -CPPFLAGS+= -I${LOCALBASE}/include -.else -CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no +.if ${PORT_OPTIONS:MUCS4} +ABIFLAGS:= u${ABIFLAGS} .endif -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MTHREADS} -PLIST_SUB+= THREADS="" -CONFIGURE_ARGS+= --with-threads -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +.if ${PORT_OPTIONS:MPYMALLOC} +ABIFLAGS:= m${ABIFLAGS} .else -PLIST_SUB+= THREADS="@comment " -CONFIGURE_ARGS+= --without-threads +# Can't use PYMALLOC_CONFIGURE_WITH here, since the configure script has a bug +CONFIGURE_ARGS+= --without-pymalloc .endif -.if ${PORT_OPTIONS:MUCS4} -CONFIGURE_ARGS+= --with-wide-unicode -PYABIVER:= ${PYABIVER}u +.if ${PORT_OPTIONS:MDEBUG} +ABIFLAGS:= d${ABIFLAGS} .endif -.if empty(PORT_OPTIONS:MPYMALLOC) -CONFIGURE_ARGS+= --without-pymalloc -.else -PYABIVER:= m${PYABIVER} +.if !empty(ABIFLAGS) +PLIST_FILES+= bin/python3.2%%ABI%% +PLIST_FILES+= bin/python3.2%%ABI%%-config +PLIST_FILES+= libdata/pkgconfig/python-3.2%%ABI%%.pc .endif .if ${ARCH} == sparc64 @@ -103,124 +88,41 @@ CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMI # See http://bugs.freebsd.org/115940 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS) # the world with NO_NIS PLIST_SUB+= NO_NIS="@comment " -WITHOUT_NIS?= detected .else PLIST_SUB+= NO_NIS="" .endif -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if ${PORT_OPTIONS:MFPECTL} -CONFIGURE_ARGS+= --with-fpectl -.endif - -pre-patch: - ${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \ - ${PATCH_WRKSRC}/Lib/plat-freebsd9 - ${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \ - ${PATCH_WRKSRC}/Lib/plat-freebsd10 - ${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \ - ${PATCH_WRKSRC}/Lib/plat-freebsd11 - ${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules -.for script in ${BIN_SCRIPTS} - ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ - ${PATCH_WRKSRC}/Tools/scripts/${script} \ - > ${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB}` -.endfor - ${REINPLACE_CMD} -e \ +post-patch: + @${REINPLACE_CMD} -e \ 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py - ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ - ${PATCH_WRKSRC}/Lib/site.py - ${REINPLACE_CMD} -e \ - 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g; \ - s|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g; \ - s|*\(..INSTALL_SCRIPT.*\)python-config$$|#port \1|' \ - ${PATCH_WRKSRC}/Makefile.pre.in - - ${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \ - ${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-config - ${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \ - ${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config - -.if defined(WITH_FPECTL) && ${ARCH} == i386 - ${MKDIR} ${WRKSRC}/Modules - ${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist -.endif - -post-patch: -.if defined(WITHOUT_NIS) - ${REINPLACE_CMD} -e \ - 's/disabled_module_list =[^]]*/&, "nis"/' \ - ${PATCH_WRKSRC}/setup.py -.endif # Fix for http://bugs.python.org/issue12852 (especially on 10.x+); # not needed for python33+ - ${REINPLACE_CMD} -e 's|_XOPEN_SOURCE 600|_XOPEN_SOURCE 700|' \ - ${PATCH_WRKSRC}/configure - -post-configure: - ${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf - - ${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib - ${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(LDVERSION).so,' \ - -e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(LDVERSION),' \ - -e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \ - -e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \ - -e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \ - -e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \ - ${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile - -pre-build: - cd ${SHARED_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}${PYABIVER}.so python; \ - ${LN} -f lib${PYTHON_VERSION}${PYABIVER}.so lib${PYTHON_VERSION}${PYABIVER}.so.1; \ - ${LN} -f python ${PYTHON_VERSION:S/thon/thon-shared/} - -pre-su-install: -.for platform in ${PLATFORMS} - ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform} -.for file in IN.py regen - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ - ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform}/ -.endfor -.endfor + @${REINPLACE_CMD} -e 's|_XOPEN_SOURCE 600|_XOPEN_SOURCE 700|' \ + ${WRKSRC}/configure +.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS) + @${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \ + ${WRKSRC}/setup.py +.endif +# Fix permissions for keyword.py and token.py - otherwise the cache files +# can't be properly recreated, since compileall fails with an IOError. +# This looks like an improper fix in http://bugs.python.org/issue6074 +# for Python3.2 +# Since side effects for other modules can't be foreseen, do not fix +# it on a source level yet. + @${CHMOD} a-x ${WRKSRC}/Lib/keyword.py ${WRKSRC}/Lib/token.py post-install: - @# install config providers - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config \ - ${STAGEDIR}${PREFIX}/bin - - @# shared version of executable and library - ${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}${PYABIVER}.so.1 \ - ${STAGEDIR}${PREFIX}/lib - (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so.1 \ - lib${PYTHON_VERSION}${PYABIVER}.so) - (cd ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/config-${PYTHON_VER}${PYABIVER}; \ - ${LN} -sf ../../lib${PYTHON_VERSION}${PYABIVER}.so) - ${INSTALL_PROGRAM} \ - ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ - ${STAGEDIR}${PREFIX}/bin - - @# additional files installing by ports -.for script in ${BIN_SCRIPTS} - ${INSTALL_SCRIPT} \ - ${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB}` \ - ${STAGEDIR}${PREFIX}/bin -.endfor - ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ - ${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1 - - @${MKDIR} ${STAGEDIR}${DATADIR} - @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ - (cd ${STAGEDIR}${DATADIR}; ${TAR} -xf -) +.if !${PORT_OPTIONS:MDEBUG} + # Upstream Issue: http://bugs.python.org/issue17975 + ${RM} -f ${STAGEDIR}${PREFIX}/lib/libpython3.so +.endif + # Strip shared extensions and shared library + for i in ${STAGEDIR}${PREFIX}/lib/python3.2/lib-dynload/*.so; do \ + ${STRIP_CMD} $$i; done + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpython3.2${ABIFLAGS}.so.1 - @${CAT} ${PKGMESSAGE} +regression-test: build + @cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/lang/python32/files/patch-Lib_distutils_command_build_ext.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python32/files/patch-Lib_distutils_command_build_ext.py Fri Aug 1 16:37:54 2014 (r363730) @@ -0,0 +1,17 @@ +--- Lib/distutils/command/build_ext.py.orig 2014-07-20 11:51:54.000000000 +0200 ++++ Lib/distutils/command/build_ext.py 2014-07-20 11:52:52.000000000 +0200 +@@ -236,12 +236,9 @@ + # building python standard extensions + self.library_dirs.append('.') + +- # for extensions under Linux or Solaris with a shared Python library, + # Python's library directory must be appended to library_dirs +- sysconfig.get_config_var('Py_ENABLE_SHARED') +- if ((sys.platform.startswith('linux') or sys.platform.startswith('gnu') +- or sys.platform.startswith('sunos')) +- and sysconfig.get_config_var('Py_ENABLE_SHARED')): ++ # See Issues: #1600860, #4366 ++ if (sysconfig.get_config_var('Py_ENABLE_SHARED')): + if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): + # building third party extensions + self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) Modified: head/lang/python32/files/patch-Makefile.pre.in ============================================================================== --- head/lang/python32/files/patch-Makefile.pre.in Fri Aug 1 16:23:35 2014 (r363729) +++ head/lang/python32/files/patch-Makefile.pre.in Fri Aug 1 16:37:54 2014 (r363730) @@ -1,17 +1,25 @@ +# Description: INSTALL_SHARED sometimes is not properly handled in the env +# Submitted by: mva + # Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* # Submitted by: koobs (r326729) # TODO: Upstream -# Description: Fix out-of-tree build as a result of upstream #15819 -# Submitted by: rm (r318353) -# Issue ID: http://bugs.python.org/issue15819#msg203348 - # Description: Run ranlib before installing the library read-only # Submitted by: antoine@ (r350207) # TODO: Upstream ---- ./Makefile.pre.in.orig 2013-05-16 02:33:51.000000000 +1000 -+++ ./Makefile.pre.in 2014-04-20 23:27:06.346079817 +1000 +--- Makefile.pre.in.orig 2013-05-15 18:33:51.000000000 +0200 ++++ Makefile.pre.in 2014-07-18 20:54:36.000000000 +0200 +@@ -60,7 +60,7 @@ + # Shared libraries must be installed with executable mode on some systems; + # rather than figuring out exactly which, we always give them executable mode. + # Also, making them read-only seems to be a good idea... +-INSTALL_SHARED= ${INSTALL} -m 555 ++INSTALL_SHARED?= ${INSTALL} -m 555 + + MKDIR_P= @MKDIR_P@ + @@ -70,18 +70,18 @@ OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ @@ -37,32 +45,6 @@ NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ -@@ -277,21 +277,21 @@ - - ########################################################################## - # AST --AST_H_DIR= Include -+AST_H_DIR= $(srcdir)/Include - AST_H= $(AST_H_DIR)/Python-ast.h --AST_C_DIR= Python -+AST_C_DIR= $(srcdir)/Python - AST_C= $(AST_C_DIR)/Python-ast.c - AST_ASDL= $(srcdir)/Parser/Python.asdl - - ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py - # XXX Note that a build now requires Python exist before the build starts --ASDLGEN= @ASDLGEN@ $(srcdir)/Parser/asdl_c.py -+ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py - - ########################################################################## - # Python - - OPCODETARGETS_H= \ -- Python/opcode_targets.h -+ $(srcdir)/Python/opcode_targets.h - - OPCODETARGETGEN= \ - $(srcdir)/Python/makeopcodetargets.py @@ -676,7 +676,7 @@ Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h @@ -81,7 +63,20 @@ ############################################################################ # Header files -@@ -1108,8 +1108,8 @@ +@@ -908,12 +908,6 @@ + else true; \ + fi + (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)3$(EXE)) +- -if test "$(VERSION)" != "$(LDVERSION)"; then \ +- rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ +- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ +- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ +- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ +- fi + -rm -f $(DESTDIR)$(BINDIR)/python3-config + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) + -rm -f $(DESTDIR)$(LIBPC)/python3.pc +@@ -1108,8 +1102,8 @@ if test "$(SHLIB_SUFFIX)" = .dll; then \ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ else \ @@ -91,3 +86,16 @@ fi; \ else \ echo Skip install of $(LIBRARY) - use make frameworkinstall; \ +@@ -1126,6 +1120,12 @@ + $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup + $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh + $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config ++ -if test "$(VERSION)" != "$(LDVERSION)"; then \ ++ rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ ++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ ++ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ ++ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ ++ fi + rm python-config + @if [ -s Modules/python.exp -a \ + "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ Modified: head/lang/python32/files/patch-setup.py ============================================================================== --- head/lang/python32/files/patch-setup.py Fri Aug 1 16:23:35 2014 (r363729) +++ head/lang/python32/files/patch-setup.py Fri Aug 1 16:37:54 2014 (r363730) @@ -1,5 +1,5 @@ ---- ./setup.py.orig 2013-05-16 02:33:58.000000000 +1000 -+++ ./setup.py 2013-12-01 21:08:17.425989640 +1100 +--- setup.py.orig 2013-05-15 18:33:58.000000000 +0200 ++++ setup.py 2014-07-27 11:00:57.000000000 +0200 @@ -21,7 +21,7 @@ COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount') @@ -20,15 +20,6 @@ self.compiler.set_executables(**args) # Not only do we write the builddir cookie, but we manually install -@@ -629,7 +629,7 @@ - # use the same library for the readline and curses modules. - if 'curses' in readline_termcap_library: - curses_library = readline_termcap_library -- elif self.compiler.find_library_file(lib_dirs, 'ncursesw'): -+ elif self.compiler.find_library_file(lib_dirs, 'XXXncursesw'): - curses_library = 'ncursesw' - elif self.compiler.find_library_file(lib_dirs, 'ncurses'): - curses_library = 'ncurses' @@ -668,7 +668,7 @@ 'termcap'): readline_libs.append('termcap') @@ -38,39 +29,16 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1187,12 +1187,13 @@ - # provided by the ncurses library. - panel_library = 'panel' - if curses_library.startswith('ncurses'): -- if curses_library == 'ncursesw': -+ if curses_library == 'XXXncursesw': - # Bug 1464056: If _curses.so links with ncursesw, - # _curses_panel.so must link with panelw. - panel_library = 'panelw' - curses_libs = [curses_library] - exts.append( Extension('_curses', ['_cursesmodule.c'], -+ library_dirs = ['/usr/lib'], - libraries = curses_libs) ) - elif curses_library == 'curses' and platform != 'darwin': - # OSX has an old Berkeley curses, not good enough for -@@ -1205,6 +1206,7 @@ - curses_libs = ['curses'] - - exts.append( Extension('_curses', ['_cursesmodule.c'], -+ library_dirs = ['/usr/lib'], - libraries = curses_libs) ) - else: - missing.append('_curses') -@@ -1373,7 +1375,7 @@ +@@ -1373,7 +1373,7 @@ macros = dict() libraries = [] - elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'): -+ elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'): ++ elif platform in ('freebsd7', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11'): # FreeBSD's P1003.1b semaphore support is very experimental # and has many known problems. (as of June 2008) macros = dict() -@@ -1416,9 +1418,12 @@ +@@ -1416,9 +1416,12 @@ # End multiprocessing # Platform-specific libraries @@ -86,13 +54,37 @@ exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) else: missing.append('ossaudiodev') -@@ -1935,8 +1940,7 @@ - # If you change the scripts installed here, you also need to - # check the PyBuildScripts command above, and change the links - # created by the bininstall target in Makefile.pre.in -- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", -- "Tools/scripts/2to3"] -+ scripts = [] - ) +@@ -1443,6 +1446,18 @@ + if '_tkinter' not in [e.name for e in self.extensions]: + missing.append('_tkinter') - # --install-platlib ++ ############################# ++ # Backport Commit: http://hg.python.org/cpython/rev/e5607874e8ff ++ # Backport Issue: http://bugs.python.org/issue18517 ++ ############################# ++## # Uncomment these lines if you want to play with xxmodule.c ++## ext = Extension('xx', ['xxmodule.c']) ++## self.extensions.append(ext) ++ if 'd' not in sys.abiflags: ++ ext = Extension('xxlimited', ['xxlimited.c'], ++ define_macros=[('Py_LIMITED_API', 1)]) ++ self.extensions.append(ext) ++ + return missing + + def detect_tkinter_darwin(self, inc_dirs, lib_dirs): +@@ -1641,14 +1656,6 @@ + ) + self.extensions.append(ext) + +-## # Uncomment these lines if you want to play with xxmodule.c +-## ext = Extension('xx', ['xxmodule.c']) +-## self.extensions.append(ext) +- if 'd' not in sys.abiflags: +- ext = Extension('xxlimited', ['xxlimited.c'], +- define_macros=[('Py_LIMITED_API', 1)]) +- self.extensions.append(ext) +- + # XXX handle these, but how to detect? + # *** Uncomment and edit for PIL (TkImaging) extension only: + # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ Modified: head/lang/python32/pkg-plist ============================================================================== --- head/lang/python32/pkg-plist Fri Aug 1 16:23:35 2014 (r363729) +++ head/lang/python32/pkg-plist Fri Aug 1 16:37:54 2014 (r363730) @@ -1,4631 +1,4378 @@ -bin/2to3-%%PYVER%% -bin/idle3-%%PYVER%% -bin/pydoc3-%%PYVER%% -bin/python%%PYVER%% -bin/python%%PYVER%%-config -bin/python-shared%%PYVER%% -bin/python-shared%%PYVER%%-config -bin/python%%PYVER%%%%PYABIVER%% -bin/python%%PYVER%%%%PYABIVER%%-config -lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.a -lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.so -lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.so.1 +bin/2to3-3.2 +bin/idle3.2 +bin/pydoc3.2 +bin/python3.2 +bin/python3.2-config +lib/libpython3.2%%ABI%%.so +lib/libpython3.2%%ABI%%.so.1 libdata/pkgconfig/python-3.2.pc man/man1/python3.2.1.gz -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/accu.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/Python-ast.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/Python.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/abstract.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/asdl.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/ast.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/bitset.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/bltinmodule.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/boolobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/bytearrayobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/bytes_methods.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/bytesobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/cellobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/ceval.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/classobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/code.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/codecs.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/compile.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/complexobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/datetime.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/descrobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/dictobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/dtoa.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/dynamic_annotations.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/enumobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/errcode.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/eval.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/fileobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/fileutils.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/floatobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/frameobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/funcobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/genobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/graminit.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/grammar.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/import.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/intrcheck.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/iterobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/listobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/longintrepr.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/longobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/marshal.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/memoryobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/metagrammar.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/methodobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/modsupport.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/moduleobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/node.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/object.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/objimpl.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/opcode.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/osdefs.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/parsetok.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/patchlevel.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pgen.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pgenheaders.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/py_curses.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pyarena.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pyatomic.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pycapsule.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pyconfig.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pyctype.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pydebug.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pyerrors.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pyexpat.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pyfpe.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pygetopt.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pymacconfig.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pymath.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pymem.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pyport.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pystate.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pystrcmp.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pystrtod.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pythonrun.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pythread.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/pytime.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/rangeobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/setobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/sliceobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/structmember.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/structseq.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/symtable.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/sysmodule.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/timefuncs.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/token.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/traceback.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/tupleobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/typeslots.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/ucnhash.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/unicodeobject.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/warnings.h -%%PYTHON_INCLUDEDIR%%%%PYABIVER%%/weakrefobject.h -%%PYTHON_LIBDIR%%/LICENSE.txt -%%PYTHON_LIBDIR%%/__future__.py -%%PYTHON_LIBDIR%%/__phello__.foo.py -%%PYTHON_LIBDIR%%/__pycache__/__future__.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/__future__.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/__phello__.foo.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/__phello__.foo.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_abcoll.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_abcoll.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_compat_pickle.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_compat_pickle.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_dummy_thread.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_dummy_thread.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_markupbase.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_markupbase.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_osx_support.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_osx_support.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_pyio.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_pyio.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_strptime.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_strptime.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_threading_local.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_threading_local.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/_weakrefset.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/_weakrefset.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/abc.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/abc.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/aifc.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/aifc.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/antigravity.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/antigravity.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/argparse.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/argparse.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/ast.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/ast.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/asynchat.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/asynchat.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/asyncore.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/asyncore.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/base64.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/base64.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/bdb.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/bdb.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/binhex.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/binhex.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/bisect.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/bisect.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/cProfile.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/cProfile.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/calendar.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/calendar.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/cgi.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/cgi.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/cgitb.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/cgitb.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/chunk.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/chunk.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/cmd.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/cmd.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/code.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/code.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/codecs.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/codecs.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/codeop.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/codeop.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/collections.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/collections.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/colorsys.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/colorsys.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/compileall.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/compileall.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/configparser.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/configparser.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/contextlib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/contextlib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/copy.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/copy.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/copyreg.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/copyreg.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/csv.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/csv.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/datetime.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/datetime.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/decimal.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/decimal.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/difflib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/difflib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/dis.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/dis.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/doctest.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/doctest.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/dummy_threading.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/dummy_threading.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/filecmp.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/filecmp.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/fileinput.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/fileinput.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/fnmatch.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/fnmatch.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/formatter.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/formatter.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/fractions.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/fractions.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/ftplib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/ftplib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/functools.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/functools.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/genericpath.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/genericpath.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/getopt.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/getopt.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/getpass.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/getpass.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/gettext.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/gettext.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/glob.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/glob.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/gzip.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/gzip.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/hashlib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/hashlib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/heapq.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/heapq.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/hmac.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/hmac.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/imaplib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/imaplib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/imghdr.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/imghdr.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/inspect.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/inspect.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/io.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/io.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/keyword.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/keyword.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/linecache.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/linecache.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/locale.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/locale.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/macpath.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/macpath.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/macurl2path.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/macurl2path.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/mailbox.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/mailbox.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/mailcap.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/mailcap.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/mimetypes.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/mimetypes.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/modulefinder.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/modulefinder.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/netrc.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/netrc.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/nntplib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/nntplib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/ntpath.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/ntpath.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/nturl2path.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/nturl2path.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/numbers.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/numbers.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/opcode.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/opcode.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/optparse.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/optparse.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/os.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/os.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/os2emxpath.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/os2emxpath.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pdb.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pdb.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pickle.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pickle.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pickletools.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pickletools.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pipes.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pipes.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pkgutil.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pkgutil.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/platform.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/platform.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/plistlib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/plistlib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/poplib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/poplib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/posixpath.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/posixpath.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pprint.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pprint.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/profile.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/profile.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pstats.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pstats.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pty.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pty.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/py_compile.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/py_compile.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pyclbr.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pyclbr.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/pydoc.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/pydoc.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/queue.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/queue.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/quopri.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/quopri.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/random.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/random.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/re.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/re.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/reprlib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/reprlib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/rlcompleter.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/rlcompleter.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/runpy.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/runpy.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/sched.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/sched.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/shelve.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/shelve.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/shlex.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/shlex.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/shutil.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/shutil.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/site.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/site.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/smtpd.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/smtpd.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/smtplib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/smtplib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/sndhdr.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/sndhdr.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/socket.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/socket.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/socketserver.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/socketserver.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/sre_compile.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/sre_compile.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/sre_constants.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/sre_constants.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/sre_parse.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/sre_parse.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/ssl.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/ssl.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/stat.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/stat.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/string.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/string.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/stringprep.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/stringprep.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/struct.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/struct.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/subprocess.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/subprocess.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/sunau.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/sunau.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/symbol.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/symbol.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/symtable.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/symtable.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/sysconfig.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/sysconfig.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/tabnanny.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/tabnanny.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/tarfile.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/tarfile.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/telnetlib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/telnetlib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/tempfile.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/tempfile.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/textwrap.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/textwrap.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/this.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/this.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/threading.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/threading.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/timeit.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/timeit.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/token.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/token.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/tokenize.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/tokenize.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/trace.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/trace.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/traceback.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/traceback.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/tty.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/tty.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/turtle.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/turtle.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/types.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/types.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/uu.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/uu.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/uuid.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/uuid.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/warnings.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/warnings.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/wave.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/wave.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/weakref.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/weakref.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/webbrowser.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/webbrowser.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/xdrlib.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/xdrlib.cpython-32.pyo -%%PYTHON_LIBDIR%%/__pycache__/zipfile.cpython-32.pyc -%%PYTHON_LIBDIR%%/__pycache__/zipfile.cpython-32.pyo -%%PYTHON_LIBDIR%%/_abcoll.py -%%PYTHON_LIBDIR%%/_compat_pickle.py -%%PYTHON_LIBDIR%%/_dummy_thread.py -%%PYTHON_LIBDIR%%/_markupbase.py -%%PYTHON_LIBDIR%%/_osx_support.py -%%PYTHON_LIBDIR%%/_pyio.py -%%PYTHON_LIBDIR%%/_strptime.py -%%PYTHON_LIBDIR%%/_threading_local.py -%%PYTHON_LIBDIR%%/_weakrefset.py -%%PYTHON_LIBDIR%%/abc.py -%%PYTHON_LIBDIR%%/aifc.py -%%PYTHON_LIBDIR%%/antigravity.py -%%PYTHON_LIBDIR%%/argparse.py -%%PYTHON_LIBDIR%%/ast.py -%%PYTHON_LIBDIR%%/asynchat.py -%%PYTHON_LIBDIR%%/asyncore.py -%%PYTHON_LIBDIR%%/base64.py -%%PYTHON_LIBDIR%%/bdb.py -%%PYTHON_LIBDIR%%/binhex.py -%%PYTHON_LIBDIR%%/bisect.py -%%PYTHON_LIBDIR%%/cProfile.py -%%PYTHON_LIBDIR%%/calendar.py -%%PYTHON_LIBDIR%%/cgi.py -%%PYTHON_LIBDIR%%/cgitb.py -%%PYTHON_LIBDIR%%/chunk.py -%%PYTHON_LIBDIR%%/cmd.py -%%PYTHON_LIBDIR%%/code.py -%%PYTHON_LIBDIR%%/codecs.py -%%PYTHON_LIBDIR%%/codeop.py -%%PYTHON_LIBDIR%%/collections.py -%%PYTHON_LIBDIR%%/colorsys.py *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408011637.s71GbtgP082204>