Update py-cxfreeze to 4.2.3.

While here,
* register egg-info.
* add patch to enable rpath, custom post-build should not be required anymore.

Changes from 4.2.2 to 4.2.3
 1) Added support for Python 3.2.
 2) Added hook for datetime module which implicitly imports the time module.
 3) Fixed hook for tkinter in Python 3.x.
 4) Always include the zlib module since the zipimport module requires it,
    even when compression is not taking place.
 5) Added sample for a tkinter application.

4 files changed, 41 insertions, 30 deletions

diff --git a/lang/py-cxfreeze/Makefile b/lang/py-cxfreeze/Makefile
index ce85856b85f..44a5cbefe2f 100644
--- a/lang/py-cxfreeze/Makefile
+++ b/lang/py-cxfreeze/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2011/12/03 00:02:15 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2012/05/22 08:28:46 obache Exp $
 #
 
-VERS=			4.2.2
+VERS=			4.2.3
 DISTNAME=		cx_Freeze-${VERS}
 PKGNAME=		${PYPKGPREFIX}-cxfreeze-${VERS}
 CATEGORIES=		devel
@@ -18,29 +18,11 @@ PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 USE_LANGUAGES=      	c c++
 
-PYDISTUTILSPKG=         yes
 PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-extract:
 	${MV} ${WRKSRC}/cxfreeze ${WRKSRC}/cxfreeze${PYVERSSUFFIX}
 
-# XXX this pkg abuses the distutils extension build mechanism to
-# build executables. The result isn't executable on NetBSD.
-# Relink to get valid executables.
-post-build:
-	cd ${WRKSRC} && ${CC} build/temp.*/source/bases/Console.o \
-	-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpython${PYVERSSUFFIX} \
-	-o ${WRKDIR}/Console && \
-	${CC} build/temp.*/source/bases/ConsoleKeepPath.o \
-	-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpython${PYVERSSUFFIX} \
-	-o ${WRKDIR}/ConsoleKeepPath
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/Console \
-		${DESTDIR}${PREFIX}/${PYSITELIB}/cx_Freeze/bases
-	${INSTALL_PROGRAM} ${WRKDIR}/ConsoleKeepPath \
-		${DESTDIR}${PREFIX}/${PYSITELIB}/cx_Freeze/bases
-
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-cxfreeze/PLIST b/lang/py-cxfreeze/PLIST
index a1aa5ae74fd..c0f37e0d045 100644
--- a/lang/py-cxfreeze/PLIST
+++ b/lang/py-cxfreeze/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2011/01/11 11:39:50 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/05/22 08:28:47 obache Exp $
 bin/cxfreeze${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/cx_Freeze/__init__.py
 ${PYSITELIB}/cx_Freeze/__init__.pyc
 ${PYSITELIB}/cx_Freeze/__init__.pyo
@@ -29,6 +30,8 @@ ${PYSITELIB}/cx_Freeze/main.pyc
 ${PYSITELIB}/cx_Freeze/main.pyo
 ${PYSITELIB}/cx_Freeze/samples/PyQt4/PyQt4app.py
 ${PYSITELIB}/cx_Freeze/samples/PyQt4/setup.py
+${PYSITELIB}/cx_Freeze/samples/Tkinter/SimpleTkApp.py
+${PYSITELIB}/cx_Freeze/samples/Tkinter/setup.py
 ${PYSITELIB}/cx_Freeze/samples/advanced/advanced_1.py
 ${PYSITELIB}/cx_Freeze/samples/advanced/advanced_2.py
 ${PYSITELIB}/cx_Freeze/samples/advanced/modules/testfreeze_1.py
diff --git a/lang/py-cxfreeze/distinfo b/lang/py-cxfreeze/distinfo
index 8baaf89c426..3ea9cd21e5b 100644
--- a/lang/py-cxfreeze/distinfo
+++ b/lang/py-cxfreeze/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2011/01/11 11:39:50 drochner Exp $
+$NetBSD: distinfo,v 1.3 2012/05/22 08:28:47 obache Exp $
 
-SHA1 (cx_Freeze-4.2.2.tar.gz) = bb5c63ab2b4ef20ba2b88517118f3bfb2493f1a0
-RMD160 (cx_Freeze-4.2.2.tar.gz) = 48396e18de29b65a441bd101337b63ed6c503d8d
-Size (cx_Freeze-4.2.2.tar.gz) = 61971 bytes
-SHA1 (patch-aa) = 8ae98e1ac3a0962bf6ed28c8c4c7d2a2de012172
+SHA1 (cx_Freeze-4.2.3.tar.gz) = 860de723365f2994f94f242f1147f89e09ed1ee9
+RMD160 (cx_Freeze-4.2.3.tar.gz) = 92dbdd14315bc4b02d98649b8c6b2982b06ad2e7
+Size (cx_Freeze-4.2.3.tar.gz) = 62436 bytes
+SHA1 (patch-aa) = fd0b9d5537fac3c9d881b55f5eb8173a05adf109
diff --git a/lang/py-cxfreeze/patches/patch-aa b/lang/py-cxfreeze/patches/patch-aa
index f9f4aec9f68..2d7805509bf 100644
--- a/lang/py-cxfreeze/patches/patch-aa
+++ b/lang/py-cxfreeze/patches/patch-aa
@@ -1,8 +1,34 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/08/15 10:45:57 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2012/05/22 08:28:47 obache Exp $
 
---- setup.py.orig	2010-07-19 19:00:21.000000000 +0000
+--- setup.py.orig	2011-03-19 17:27:27.000000000 +0000
 +++ setup.py
-@@ -238,7 +238,7 @@ setup(name = "cx_Freeze",
+@@ -61,6 +61,7 @@ class build_ext(distutils.command.build_
+         fileName = os.path.splitext(self.get_ext_filename(ext.name))[0]
+         fullName = os.path.join(self.build_lib, fileName)
+         libraryDirs = ext.library_dirs or []
++        runtimeLibraryDirs = ext.runtime_library_dirs or []
+         libraries = self.get_libraries(ext)
+         extraArgs = ext.extra_link_args or []
+         if sys.platform != "win32":
+@@ -78,6 +79,8 @@ class build_ext(distutils.command.build_
+                     extraArgs.extend(vars["BASEMODLIBS"].split())
+                 if vars["LOCALMODLIBS"]:
+                     extraArgs.extend(vars["LOCALMODLIBS"].split())
++            else:
++                runtimeLibraryDirs.append(sys.prefix + "/lib")
+             extraArgs.append("-s")
+         elif ext.name.find("Win32GUI") > 0 \
+                 and self.compiler.compiler_type == "mingw32":
+@@ -85,7 +88,7 @@ class build_ext(distutils.command.build_
+         self.compiler.link_executable(objects, fullName,
+                 libraries = libraries,
+                 library_dirs = libraryDirs,
+-                runtime_library_dirs = ext.runtime_library_dirs,
++                runtime_library_dirs = runtimeLibraryDirs,
+                 extra_postargs = extraArgs,
+                 debug = self.debug)
+ 
+@@ -238,7 +241,7 @@ setup(name = "cx_Freeze",
          maintainer="Anthony Tuininga",
          maintainer_email="anthony.tuininga@gmail.com",
          url = "http://cx-freeze.sourceforge.net",