- 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.
- Reactivate curses/ncurses support.
- Use buildbottest in the regression-test: target.

Phabric:	D410
Exp-run:	192242, 192244
Reviewed by:	koobs, bapt
With hat:	python@

2 files changed, 40 insertions, 65 deletions

diff --git a/lang/python33/files/patch-Makefile.pre.in b/lang/python33/files/patch-Makefile.pre.in
index 71d2e5fcc63b..b904dbaaa3f6 100644
--- a/lang/python33/files/patch-Makefile.pre.in
+++ b/lang/python33/files/patch-Makefile.pre.in
@@ -1,17 +1,19 @@
+# Patch based on lang/python34/files/patch-Makefile.pre.in
+
 # 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	2014-03-09 19:40:23.000000000 +1100
-+++ ./Makefile.pre.in	2014-04-20 23:28:30.086226530 +1000
+# Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc
+# Submitted by: antoine@ (r358029)
+# TODO: Upstream
+
+--- Makefile.pre.in.orig	2014-03-09 09:40:23.000000000 +0100
++++ Makefile.pre.in	2014-07-15 08:23:56.000000000 +0200
 @@ -70,18 +70,18 @@
  OPT=		@OPT@
  BASECFLAGS=	@BASECFLAGS@
@@ -81,7 +83,20 @@
  
  ############################################################################
  # Header files
-@@ -1205,8 +1205,8 @@
+@@ -972,12 +972,6 @@
+ 	else true; \
+ 	fi
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(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
+@@ -1205,8 +1199,8 @@
  			if test "$(SHLIB_SUFFIX)" = .dll; then \
  				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
  			else \
@@ -91,3 +106,16 @@
  			fi; \
  		else \
  			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
+@@ -1223,6 +1217,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 \
diff --git a/lang/python33/files/patch-setup.py b/lang/python33/files/patch-setup.py
index 55d6d3fd1fa3..ff985a2efd08 100644
--- a/lang/python33/files/patch-setup.py
+++ b/lang/python33/files/patch-setup.py
@@ -1,5 +1,5 @@
---- ./setup.py.orig	2012-09-29 18:00:50.000000000 +1000
-+++ ./setup.py	2012-10-04 20:21:15.000000000 +1000
+--- setup.py.orig	2014-03-09 09:40:35.000000000 +0100
++++ setup.py	2014-07-15 08:17:17.000000000 +0200
 @@ -31,7 +31,7 @@
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
  
@@ -7,52 +7,9 @@
 -disabled_module_list = []
 +disabled_module_list = ["_sqlite3", "_tkinter", "_gdbm"]
  
- # File which contains the directory for shared mods (for sys.path fixup
- # when running from the build dir, see Modules/getpath.c)
-@@ -694,7 +694,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, 'XXXXncursesw'):
-             curses_library = 'ncursesw'
-         elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
-             curses_library = 'ncurses'
-@@ -733,7 +733,7 @@
-                                                      'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-+                                   library_dirs=['/usr/lib','/usr/lib/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
-         else:
-@@ -1261,7 +1261,7 @@
-         curses_defines = []
-         curses_includes = []
-         panel_library = 'panel'
--        if curses_library == 'ncursesw':
-+        if curses_library == 'XXXXncursesw':
-             curses_defines.append(('HAVE_NCURSESW', '1'))
-             curses_includes.append('/usr/include/ncursesw')
-             # Bug 1464056: If _curses.so links with ncursesw,
-@@ -1285,6 +1285,7 @@
-             exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                    include_dirs=curses_includes,
-                                    define_macros=curses_defines,
-+                                   library_dirs = ['/usr/lib'],
-                                    libraries = curses_libs) )
-         elif curses_library == 'curses' and host_platform != 'darwin':
-                 # OSX has an old Berkeley curses, not good enough for
-@@ -1298,6 +1299,7 @@
- 
-             exts.append( Extension('_curses', ['_cursesmodule.c'],
-                                    define_macros=curses_defines,
-+                                   library_dirs = ['/usr/lib'],
-                                    libraries = curses_libs) )
-         else:
-             missing.append('_curses')
-@@ -1462,7 +1464,7 @@
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (after any relative
+@@ -1463,7 +1463,7 @@
              macros = dict()
              libraries = []
  
@@ -61,13 +18,3 @@
              # FreeBSD's P1003.1b semaphore support is very experimental
              # and has many known problems. (as of June 2008)
              macros = dict()
-@@ -2143,8 +2145,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", "Tools/scripts/pyvenv"]
-+          scripts = []
-         )
- 
- # --install-platlib