11 files changed, 67 insertions, 50 deletions

diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index e894b6ebc801..a86b21332ffb 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -3,29 +3,34 @@
 
 PORTNAME=	bsddb
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases python
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${PYTHON_DISTFILE}
 
-MAINTAINER?=	python@FreeBSD.org
-COMMENT=	Python bindings to the Berkeley DB library
+MAINTAINER=	python@FreeBSD.org
+COMMENT=	Standard Python bindings to the Berkeley DB library
 
 USE_BDB=	yes
-USE_PYTHON?=	yes
+USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_XZ=		yes
-PYDISTUTILS_PKGNAME=	_bsddb
-PYDISTUTILS_PKGVERSION=	0.0.0
+
 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}/Modules
 DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
+WRKSRC=		${PYTHON_WRKSRC}/Modules
+
+PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
+PYDISTUTILS_NOEGGINFO=	yes
+PYDISTUTILS_PKGNAME=	_bsddb
+
 MAKE_ENV=	BSDDB_VERSION=${BDB_LIB_NAME}
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_bsddb.so
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-py${PYTHON_SUFFIX}-_bsddb.c
 
+PLIST_FILES=	%%PYTHON_LIBDIR%%/lib-dynload/_bsddb.so
+
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} >= 300
diff --git a/databases/py-bsddb/files/setup.py b/databases/py-bsddb/files/setup.py
index 6878938bb2d7..3f2f606dca31 100644
--- a/databases/py-bsddb/files/setup.py
+++ b/databases/py-bsddb/files/setup.py
@@ -14,6 +14,9 @@ try:
 except:
     raise SystemExit, "Distutils problem"
 
+install.sub_commands = filter(lambda (cmd, avl): 'egg' not in cmd,
+                              install.sub_commands)
+
 prefix = sysconfig.PREFIX
 inc_dirs = [prefix + "/include"]
 lib_dirs = [prefix + "/lib"]
@@ -21,7 +24,7 @@ libs = [os.environ['BSDDB_VERSION']]
 
 setup(name = "_bsddb",
       description = "BSDDB Extension to Python",
-      
+
       ext_modules = [Extension('_bsddb', ['_bsddb.c'],
                                include_dirs = inc_dirs,
                                libraries = libs,
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 76feabe190db..1ed6c5afcec1 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:    py-gdbm
-# Date created:         03 October 2000
-# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gdbm
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -17,16 +13,20 @@ DISTFILES=	${PYTHON_DISTFILE}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python bindings to the GNU dbm library
 
-LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/gdbm.so
-DIST_SUBDIR=	python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_XZ=		yes
-PYDISTUTILS_PKGVERSION=	0.0.0
-WRKSRC=		${PYTHON_WRKSRC}/Modules
+
+DIST_SUBDIR=	python
 DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
+WRKSRC=		${PYTHON_WRKSRC}/Modules
+
+PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
+PYDISTUTILS_NOEGGINFO=	yes
+
+PLIST_FILES=	%%PYTHON_LIBDIR%%/lib-dynload/gdbm.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/py-gdbm/files/setup.py b/databases/py-gdbm/files/setup.py
index 2675fccfb954..0e51831223a5 100644
--- a/databases/py-gdbm/files/setup.py
+++ b/databases/py-gdbm/files/setup.py
@@ -13,6 +13,9 @@ try:
 except:
     raise SystemExit, "Distutils problem"
 
+install.sub_commands = filter(lambda (cmd, avl): 'egg' not in cmd,
+                              install.sub_commands)
+
 prefix = sysconfig.PREFIX
 inc_dirs = [prefix + "/include"]
 lib_dirs = [prefix + "/lib"]
@@ -20,7 +23,7 @@ libs = ["gdbm"]
 
 setup(name = "gdbm",
       description = "GDBM Extension to Python",
-      
+
       ext_modules = [Extension('gdbm', ['gdbmmodule.c'],
                                include_dirs = inc_dirs,
                                libraries = libs,
diff --git a/databases/py-gdbm/files/setup3.py b/databases/py-gdbm/files/setup3.py
index 382264277fc6..8c2cea5ff32c 100644
--- a/databases/py-gdbm/files/setup3.py
+++ b/databases/py-gdbm/files/setup3.py
@@ -13,6 +13,8 @@ try:
 except:
     raise SystemExit("Distutils problem")
 
+install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]]
+
 prefix = sysconfig.PREFIX
 inc_dirs = [prefix + "/include"]
 lib_dirs = [prefix + "/lib"]
@@ -20,7 +22,7 @@ libs = ["gdbm"]
 
 setup(name = "gdbm",
       description = "GDBM Extension to Python",
-      
+
       ext_modules = [Extension('gdbm', ['_gdbmmodule.c'],
                                include_dirs = inc_dirs,
                                libraries = libs,
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index 3c848451f4e3..17475cbed738 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:    py-sqlite3
-# Date created:         23 June 2006
-# Whom:                 Hye-Shik Chang
-#
+# Created by: Hye-Shik Chang
 # $FreeBSD$
-#
 
 PORTNAME=	sqlite3
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases python
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -17,18 +13,21 @@ DISTFILES=	${PYTHON_DISTFILE}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Standard Python binding to the SQLite3 library
 
-LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
 
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_sqlite3.so
-DIST_SUBDIR=	python
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_XZ=		yes
-WRKSRC=		${PYTHON_WRKSRC}/Modules
+
+DIST_SUBDIR=	python
 DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
+WRKSRC=		${PYTHON_WRKSRC}/Modules
 
+PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
 PYDISTUTILS_NOEGGINFO=	yes
 
+PLIST_FILES=	%%PYTHON_LIBDIR%%/lib-dynload/_sqlite3.so
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
diff --git a/databases/py-sqlite3/files/setup.py b/databases/py-sqlite3/files/setup.py
index d913319f1f12..0452af5aa9c4 100644
--- a/databases/py-sqlite3/files/setup.py
+++ b/databases/py-sqlite3/files/setup.py
@@ -40,7 +40,7 @@ except AttributeError:
 
 setup(name = "_sqlite3",
       description = "SQLite 3 extension to Python",
-      
+
       ext_modules = [Extension('_sqlite3', sqlite_srcs,
                                include_dirs = inc_dirs,
                                libraries = libs,
diff --git a/databases/py-sqlite3/files/setup3.py b/databases/py-sqlite3/files/setup3.py
index 549fd496ab37..b0d7a1770beb 100644
--- a/databases/py-sqlite3/files/setup3.py
+++ b/databases/py-sqlite3/files/setup3.py
@@ -39,7 +39,7 @@ except AttributeError:
 
 setup(name = "_sqlite3",
       description = "SQLite 3 extension to Python",
-      
+
       ext_modules = [Extension('_sqlite3', sqlite_srcs,
                                include_dirs = inc_dirs,
                                libraries = libs,
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index 93b9235edc81..f69a1c4aa88e 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -1,32 +1,32 @@
-# New ports collection makefile for:    py-Tkinter
-# Date created:         12 Jan 1999
-# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tkinter
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${PYTHON_DISTFILE}
 
-MAINTAINER?=	python@FreeBSD.org
+MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python bindings to the Tk widget set
 
-DIST_SUBDIR=	python
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_tkinter.so
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+USE_TK=		yes
 USE_XZ=		yes
-PYDISTUTILS_PKGNAME=	Tkinter
-PYDISTUTILS_PKGVERSION=	0.0.0
-USE_TK=	83+
-WRKSRC=		${PYTHON_WRKSRC}/Modules
+
+DIST_SUBDIR=	python
 DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
+WRKSRC=		${PYTHON_WRKSRC}/Modules
+
+PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
+PYDISTUTILS_NOEGGINFO=	yes
+PYDISTUTILS_PKGNAME=	Tkinter
+
+PLIST_FILES=	%%PYTHON_LIBDIR%%/lib-dynload/_tkinter.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-toolkits/py-tkinter/files/setup.py b/x11-toolkits/py-tkinter/files/setup.py
index 2d6100c2ff61..f94cefa943eb 100644
--- a/x11-toolkits/py-tkinter/files/setup.py
+++ b/x11-toolkits/py-tkinter/files/setup.py
@@ -15,6 +15,9 @@ try:
 except:
     raise SystemExit, "Distutils problem"
 
+install.sub_commands = filter(lambda (cmd, avl): 'egg' not in cmd,
+                              install.sub_commands)
+
 tkversion = "%%TK_VER%%"
 prefix = sysconfig.PREFIX
 # Python 1.5 doesn't have os.getenv()?
@@ -31,7 +34,7 @@ libs = ["tcl" + string.replace(tkversion, ".", ""),
 
 setup(name = "Tkinter",
       description = "Tk Extension to Python",
-      
+
       ext_modules = [Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
                                define_macros=[('WITH_APPINIT', 1)],
                                include_dirs = inc_dirs,
diff --git a/x11-toolkits/py-tkinter/files/setup3.py b/x11-toolkits/py-tkinter/files/setup3.py
index 25c3bbc672f2..7b672a053eb0 100644
--- a/x11-toolkits/py-tkinter/files/setup3.py
+++ b/x11-toolkits/py-tkinter/files/setup3.py
@@ -15,6 +15,8 @@ try:
 except:
     raise SystemExit("Distutils problem")
 
+install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]]
+
 tkversion = "%%TK_VER%%"
 prefix = sysconfig.PREFIX
 # Python 1.5 doesn't have os.getenv()?
@@ -31,7 +33,7 @@ libs = ["tcl" + tkversion.replace(".", ""),
 
 setup(name = "Tkinter",
       description = "Tk Extension to Python",
-      
+
       ext_modules = [Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
                                define_macros=[('WITH_APPINIT', 1)],
                                include_dirs = inc_dirs,