[90461] trunk/dports/lang

jwa at macports.org jwa at macports.org
Mon Mar 5 23:40:54 PST 2012


Revision: 90461
          http://trac.macports.org/changeset/90461
Author:   jwa at macports.org
Date:     2012-03-05 23:40:54 -0800 (Mon, 05 Mar 2012)
Log Message:
-----------
python33: new port for Python 3.3 line, now in the alpha cycle

Added Paths:
-----------
    trunk/dports/lang/python33/
    trunk/dports/lang/python33/Portfile
    trunk/dports/lang/python33/files/
    trunk/dports/lang/python33/files/patch-Lib-cgi.py.diff
    trunk/dports/lang/python33/files/patch-Lib-distutils-dist.py.diff
    trunk/dports/lang/python33/files/patch-configure.diff
    trunk/dports/lang/python33/files/patch-libedit.diff
    trunk/dports/lang/python33/files/patch-setup.py-disabled_modules.diff
    trunk/dports/lang/python33/files/patch-setup.py.diff
    trunk/dports/lang/python33/files/pyconfig.ed
    trunk/dports/lang/python33/files/pyconfig.h-universal.ed
    trunk/dports/lang/python33/files/python33

Added: trunk/dports/lang/python33/Portfile
===================================================================
--- trunk/dports/lang/python33/Portfile	                        (rev 0)
+++ trunk/dports/lang/python33/Portfile	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,156 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 88868 2012-01-14 00:55:49Z jmr at macports.org $
+
+PortSystem 1.0
+PortGroup select 1.0
+
+name                    python33
+
+# Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
+version                 3.3.0a1
+
+set major               [lindex [split $version .] 0]
+set branch              [join [lrange [split ${version} .] 0 1] .]
+categories              lang
+license                 PSF
+platforms               darwin
+maintainers             jwa openmaintainer
+
+description             An interpreted, object-oriented programming language
+long_description        Python is an interpreted, interactive, object-oriented \
+                        programming language.
+
+homepage                http://www.python.org/
+#master_sites            ${homepage}ftp/python/${version}/
+master_sites            ${homepage}ftp/python/3.3.0/
+
+distname                Python-${version}
+
+use_xz					yes
+
+checksums           rmd160  146e9ad8cf586b26dd9ddb4ef8413c57b5e7015b \
+                    sha256  932d039f97d107dbc05ede123a521ded4857f6dd8951d58d8fa664904324fe8a
+
+patchfiles              patch-setup.py.diff \
+                        patch-Lib-cgi.py.diff \
+                        patch-Lib-distutils-dist.py.diff \
+                        patch-configure.diff \
+                        patch-setup.py-disabled_modules.diff \
+                        patch-libedit.diff
+
+depends_lib             port:zlib port:openssl \
+                        port:sqlite3 port:ncurses \
+                        port:bzip2 port:libedit port:gettext
+depends_run             port:python_select
+
+configure.args          --enable-framework=${frameworks_dir} \
+                        --enable-ipv6 \
+                        --with-computed-gotos
+configure.ccache        no
+
+use_parallel_build      yes
+
+post-patch {
+   reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Lib/cgi.py
+
+   reinplace "s|/setup.py|/setup.py --no-user-cfg|" ${worksrcpath}/Makefile.pre.in
+
+   # replace /Applications with ${applications_dir}
+   reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
+      ${worksrcpath}/configure
+
+   # See http://trac.macports.org/changeset/37861
+   reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \
+      ${worksrcpath}/Mac/PythonLauncher/Makefile.in
+}
+
+build.target            all
+
+# test_cmd_line fails
+# see http://bugs.python.org/issue4388 and
+#     http://bugs.python.org/issue4474
+test.run                yes
+test.target             test
+
+destroot.target         frameworkinstall maninstall
+
+# ensure that correct compiler is used
+build.args-append       MAKE="${build.cmd} CC=${configure.cc}"
+destroot.args-append    MAKE="${destroot.cmd} CC=${configure.cc}"
+
+select.group            python
+select.file             ${filespath}/python[string map {. {}} ${branch}]
+set confdir config-${branch}m
+
+notes \
+"To make python ${branch} the default (i.e. the version you get when you run
+'python'), please run:
+    \tsudo port select --set ${select.group} [file tail ${select.file}]"
+
+post-destroot {
+   set framewpath ${frameworks_dir}/Python.framework
+   set framewdir  ${framewpath}/Versions/${branch}
+
+   foreach dir { Headers Resources Python Versions/Current } {
+      file delete ${destroot}${framewpath}/${dir}
+   }
+
+   ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
+
+   # Without this, LINKFORSHARED is set to
+   # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
+   # (this becomes Python.framework/Versions/3.2/Python) which doesn't
+   # quite work (see ticket #15099); instead specifically list the
+   # full path to the proper Python framework file (which becomes
+   # ${prefix}/Library/Frameworks/Python.framework/Versions/3.2/Python)
+    reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
+
+   # remove -arch flags from the config
+    reinplace -E {s|-arch [a-z0-9_]+||g} \
+       ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
+}
+
+platform darwin {
+   post-configure {
+      # See http://trac.macports.org/ticket/18376
+      system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.ed"
+   }
+}
+
+variant universal {
+   post-patch {
+      set universal_arch_flags {}
+      set arch_run_32bit {}
+      foreach arch ${universal_archs} {
+         lappend universal_arch_flags -arch ${arch}
+         if { ${arch}=="i386" || ${arch}=="ppc" } {
+            lappend arch_run_32bit -${arch}
+         }
+      }
+      reinplace \
+         "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \
+         ${worksrcpath}/configure
+      if { ${arch_run_32bit} != "" } {
+         reinplace \
+            "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
+            ${worksrcpath}/configure
+      }
+   }
+   if {${configure.sdkroot} != ""} {
+      configure.args-append   --enable-universalsdk=${configure.sdkroot}
+   } else {
+      configure.args-append   --enable-universalsdk=/
+   }
+   post-configure {
+      system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
+   }
+}
+
+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+)*)

Added: trunk/dports/lang/python33/files/patch-Lib-cgi.py.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-Lib-cgi.py.diff	                        (rev 0)
+++ trunk/dports/lang/python33/files/patch-Lib-cgi.py.diff	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,18 @@
+--- Lib/cgi.py.orig	2006-08-10 19:41:07.000000000 +0200
++++ Lib/cgi.py	2007-08-21 15:36:54.000000000 +0200
+@@ -1,13 +1,6 @@
+-#! /usr/local/bin/python
++#! @@PREFIX@@/bin/python3.2
+ 
+-# NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
+-# intentionally NOT "/usr/bin/env python".  On many systems
+-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
+-# scripts, and /usr/local/bin is the default directory where Python is
+-# installed, so /usr/bin/env would be unable to find python.  Granted,
+-# binary installations by Linux vendors often install Python in
+-# /usr/bin.  So let those vendors patch cgi.py to match their choice
+-# of installation.
++# NOTE: /usr/local/bin/python patched for MacPorts installation
+ 
+ """Support module for CGI (Common Gateway Interface) scripts.
+ 

Added: trunk/dports/lang/python33/files/patch-Lib-distutils-dist.py.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-Lib-distutils-dist.py.diff	                        (rev 0)
+++ trunk/dports/lang/python33/files/patch-Lib-distutils-dist.py.diff	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,51 @@
+--- Lib/distutils/dist.py.orig	2008-07-26 16:09:45.000000000 -0400
++++ Lib/distutils/dist.py	2009-01-31 11:37:17.000000000 -0500
+@@ -54,6 +54,7 @@
+                       ('quiet', 'q', "run quietly (turns verbosity off)"),
+                       ('dry-run', 'n', "don't actually do anything"),
+                       ('help', 'h', "show detailed help message"),
++                      ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'),
+                      ]
+ 
+     # 'common_usage' is a short (2-3 line) string describing the common
+@@ -260,6 +261,12 @@
+                     else:
+                         sys.stderr.write(msg + "\n")
+ 
++        # no-user-cfg is handled before other command line args
++        # because other args override the config files, and this
++        # one is needed before we can load the config files.
++        # If attrs['script_args'] wasn't passed, assume false.
++        self.want_user_cfg = '--no-user-cfg' not in (self.script_args or [])
++
+         self.finalize_options()
+ 
+     def get_option_dict(self, command):
+@@ -315,6 +322,9 @@
+         Distutils __inst__.py file lives), a file in the user's home
+         directory named .pydistutils.cfg on Unix and pydistutils.cfg
+         on Windows/Mac, and setup.cfg in the current directory.
++
++        The file in the user's home directory can be disabled with the
++        --no-user-cfg option.
+         """
+         files = []
+         check_environ()
+@@ -335,7 +345,7 @@
+ 
+         # And look for the user config file
+         user_file = os.path.join(os.path.expanduser('~'), user_filename)
+-        if os.path.isfile(user_file):
++        if self.want_user_cfg and os.path.isfile(user_file):
+             files.append(user_file)
+ 
+         # All platforms support local setup.cfg
+@@ -343,6 +353,8 @@
+         if os.path.isfile(local_file):
+             files.append(local_file)
+ 
++        if DEBUG:
++            print("using config files: %s" % ', '.join(files))
+         return files
+ 
+     def parse_config_files(self, filenames=None):

Added: trunk/dports/lang/python33/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/lang/python33/files/patch-configure.diff	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,11 @@
+--- configure.orig	2011-02-19 19:58:23.000000000 +1100
++++ configure	2011-05-14 02:29:23.000000000 +1000
+@@ -2920,6 +2920,8 @@
+ 			;;
+ 		esac
+ 
++		FRAMEWORKINSTALLAPPSPREFIX="@@APPLICATIONS_DIR@@"
++
+ 		prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
+ 
+ 		# Add files for Mac specific code to the list of output

Added: trunk/dports/lang/python33/files/patch-libedit.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-libedit.diff	                        (rev 0)
+++ trunk/dports/lang/python33/files/patch-libedit.diff	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,199 @@
+--- configure.orig	2011-06-12 01:48:52.000000000 +1000
++++ configure	2011-10-31 15:28:14.000000000 +1100
+@@ -12807,9 +12807,9 @@
+ $as_echo_n "checking how to link readline libs... " >&6; }
+ for py_libtermcap in "" ncursesw ncurses curses termcap; do
+   if test -z "$py_libtermcap"; then
+-    READLINE_LIBS="-lreadline"
++    READLINE_LIBS="-ledit"
+   else
+-    READLINE_LIBS="-lreadline -l$py_libtermcap"
++    READLINE_LIBS="-ledit -l$py_libtermcap"
+   fi
+   LIBS="$READLINE_LIBS $LIBS_no_readline"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12853,13 +12853,13 @@
+ fi
+ 
+ # check for readline 2.1
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
+-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -ledit" >&5
++$as_echo_n "checking for rl_callback_handler_install in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_rl_callback_handler_install+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $READLINE_LIBS $LIBS"
++LIBS="-ledit $READLINE_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -12899,7 +12899,7 @@
+ # check for readline 2.2
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <readline/readline.h>
++#include <editline/readline.h>
+ _ACEOF
+ if ac_fn_c_try_cpp "$LINENO"; then :
+   have_readline=yes
+@@ -12912,7 +12912,7 @@
+ then
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <readline/readline.h>
++#include <editline/readline.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -12925,7 +12925,7 @@
+ 
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <readline/readline.h>
++#include <editline/readline.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -12939,13 +12939,13 @@
+ fi
+ 
+ # check for readline 4.0
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -lreadline" >&5
+-$as_echo_n "checking for rl_pre_input_hook in -lreadline... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -ledit" >&5
++$as_echo_n "checking for rl_pre_input_hook in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_rl_pre_input_hook+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $READLINE_LIBS $LIBS"
++LIBS="-ledit $READLINE_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -12983,13 +12983,13 @@
+ 
+ 
+ # also in 4.0
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -lreadline" >&5
+-$as_echo_n "checking for rl_completion_display_matches_hook in -lreadline... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -ledit" >&5
++$as_echo_n "checking for rl_completion_display_matches_hook in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_rl_completion_display_matches_hook+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $READLINE_LIBS $LIBS"
++LIBS="-ledit $READLINE_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -13027,13 +13027,13 @@
+ 
+ 
+ # check for readline 4.2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
+-$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5
++$as_echo_n "checking for rl_completion_matches in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $READLINE_LIBS $LIBS"
++LIBS="-ledit $READLINE_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -13073,7 +13073,7 @@
+ # also in readline 4.2
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <readline/readline.h>
++#include <editline/readline.h>
+ _ACEOF
+ if ac_fn_c_try_cpp "$LINENO"; then :
+   have_readline=yes
+@@ -13086,7 +13086,7 @@
+ then
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <readline/readline.h>
++#include <editline/readline.h>
+ 
+ _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 @@
+         exts.append( Extension('audioop', ['audioop.c']) )
+ 
+         # readline
+-        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
++        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 @@
+             else:
+                 readline_extra_link_args = ()
+ 
+-            readline_libs = ['readline']
++            readline_libs = ['edit']
+             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
+@@ -28,8 +28,7 @@
+ 
+ /* GNU readline definitions */
+ #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
+-#include <readline/readline.h>
+-#include <readline/history.h>
++#include <editline/readline.h>
+ 
+ #ifdef HAVE_RL_COMPLETION_MATCHES
+ #define completion_matches(x, y) \
+@@ -573,14 +572,13 @@ get_history_item(PyObject *self, PyObjec
+          * difference.
+          */
+         int length = _py_get_history_length();
+-        idx --;
+ 
+         /*
+          * Apple's readline emulation crashes when
+          * the index is out of range, therefore
+          * test for that and fail gracefully.
+          */
+-        if (idx < 0 || idx >= length) {
++        if (idx < 1 || idx > length) {
+             Py_RETURN_NONE;
+         }
+     }
+@@ -1000,7 +998,6 @@ readline_until_enter_or_signal(char *pro
+             PyEval_SaveThread();
+ #endif
+             if (s < 0) {
+-                rl_free_line_state();
+                 rl_cleanup_after_signal();
+                 rl_callback_handler_remove();
+                 *signal = 1;
+@@ -1099,15 +1096,6 @@ call_readline(FILE *sys_stdin, FILE *sys
+         const char *line;
+         int length = _py_get_history_length();
+         if (length > 0)
+-#ifdef __APPLE__
+-            if (using_libedit_emulation) {
+-                /*
+-                 * Libedit's emulation uses 0-based indexes,
+-                 * the real readline uses 1-based indexes.
+-                 */
+-                line = (const char *)history_get(length - 1)->line;
+-            } else
+-#endif /* __APPLE__ */
+             line = (const char *)history_get(length)->line;
+         else
+             line = "";

Added: trunk/dports/lang/python33/files/patch-setup.py-disabled_modules.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-setup.py-disabled_modules.diff	                        (rev 0)
+++ trunk/dports/lang/python33/files/patch-setup.py-disabled_modules.diff	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,11 @@
+--- setup.py.orig	2011-07-09 16:58:56.000000000 +1000
++++ setup.py	2011-07-13 20:50:12.000000000 +1000
+@@ -21,7 +21,7 @@
+ COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+ 
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ["_tkinter", "_gdbm"]
+ 
+ # File which contains the directory for shared mods (for sys.path fixup
+ # when running from the build dir, see Modules/getpath.c)

Added: trunk/dports/lang/python33/files/patch-setup.py.diff
===================================================================
--- trunk/dports/lang/python33/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/lang/python33/files/patch-setup.py.diff	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,53 @@
+--- 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 @@
+         # 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...
+-        include_dirs.append('/usr/X11R6/include')
++        #include_dirs.append('/usr/X11R6/include')
+         frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
+ 
+         # All existing framework builds of Tcl/Tk don't support 64-bit
+@@ -1300,13 +1300,7 @@
+     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
+-            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':
+             include_dirs.append('/usr/openwin/include')
+             added_lib_dirs.append('/usr/openwin/lib')
+-        elif os.path.exists('/usr/X11R6/include'):
+-            include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib64')
+-            added_lib_dirs.append('/usr/X11R6/lib')
+-        elif os.path.exists('/usr/X11R5/include'):
+-            include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
+-        else:
++        #elif os.path.exists('/usr/X11R6/include'):
++        #    include_dirs.append('/usr/X11R6/include')
++        #    added_lib_dirs.append('/usr/X11R6/lib64')
++        #    added_lib_dirs.append('/usr/X11R6/lib')
++        #elif os.path.exists('/usr/X11R5/include'):
++        #    include_dirs.append('/usr/X11R5/include')
++        #    added_lib_dirs.append('/usr/X11R5/lib')
++        #else:
+             # Assume default location for X11
+-            include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
++        #    include_dirs.append('/usr/X11/include')
++        #    added_lib_dirs.append('/usr/X11/lib')
+ 
+         # If Cygwin, then verify that X is installed before proceeding
+         if platform == 'cygwin':

Added: trunk/dports/lang/python33/files/pyconfig.ed
===================================================================
--- trunk/dports/lang/python33/files/pyconfig.ed	                        (rev 0)
+++ trunk/dports/lang/python33/files/pyconfig.ed	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,2 @@
+g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */,
+w

Added: trunk/dports/lang/python33/files/pyconfig.h-universal.ed
===================================================================
--- trunk/dports/lang/python33/files/pyconfig.h-universal.ed	                        (rev 0)
+++ trunk/dports/lang/python33/files/pyconfig.h-universal.ed	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,78 @@
+/DOUBLE_IS_BIG_ENDIAN_IEEE754/c
+#ifdef __BIG_ENDIAN__
+#define DOUBLE_IS_BIG_ENDIAN_IEEE754 1
+#else
+/* #undef DOUBLE_IS_BIG_ENDIAN_IEEE754 */
+#endif
+.
+/DOUBLE_IS_LITTLE_ENDIAN_IEEE754/c
+#ifdef __LITTLE_ENDIAN__
+#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1
+#else
+/* #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 */
+#endif
+.
+/HAVE_LARGEFILE_SUPPORT/c
+#ifdef __LP64__
+/* #undef HAVE_LARGEFILE_SUPPORT */
+#else
+#define HAVE_LARGEFILE_SUPPORT 1
+#endif
+.
+/SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/SIZEOF_PTHREAD_T/c
+#ifdef __LP64__
+#define SIZEOF_PTHREAD_T 8
+#else
+#define SIZEOF_PTHREAD_T 4
+#endif
+.
+/SIZEOF_SIZE_T/c
+#ifdef __LP64__
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
+.
+/SIZEOF_TIME_T/c
+#ifdef __LP64__
+#define SIZEOF_TIME_T 8
+#else
+#define SIZEOF_TIME_T 4
+#endif
+.
+/SIZEOF_UINTPTR_T/c
+#ifdef __LP64__
+#define SIZEOF_UINTPTR_T 8
+#else
+#define SIZEOF_UINTPTR_T 4
+#endif
+.
+/SIZEOF_VOID_P/c
+#ifdef __LP64__
+#define SIZEOF_VOID_P 8
+#else
+#define SIZEOF_VOID_P 4
+#endif
+.
+/SIZEOF__BOOL/c
+#if defined(__LP64__) || !defined(__POWERPC__)
+#define SIZEOF__BOOL 1
+#else
+#define SIZEOF__BOOL 4
+#endif
+.
+/VA_LIST_IS_ARRAY/c
+#ifdef __LP64__
+#define VA_LIST_IS_ARRAY 1
+#else
+/* #undef VA_LIST_IS_ARRAY */
+#endif
+.
+w

Added: trunk/dports/lang/python33/files/python33
===================================================================
--- trunk/dports/lang/python33/files/python33	                        (rev 0)
+++ trunk/dports/lang/python33/files/python33	2012-03-06 07:40:54 UTC (rev 90461)
@@ -0,0 +1,13 @@
+bin/python3.3
+bin/pythonw3.3
+bin/python3.3-config
+bin/idle3.3
+bin/pydoc3.3
+-
+bin/2to3-3.3
+share/man/man1/python3.3.0
+-
+${frameworks_dir}/Python.framework/Versions/3.3
+${frameworks_dir}/Python.framework/Versions/3.3/Headers
+${frameworks_dir}/Python.framework/Versions/3.3/Resources
+${frameworks_dir}/Python.framework/Versions/3.3/Python
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120305/062c0f49/attachment-0001.html>


More information about the macports-changes mailing list