Index: x11-toolkits/py-tkinter/Makefile =================================================================== --- x11-toolkits/py-tkinter/Makefile (revision 312862) +++ x11-toolkits/py-tkinter/Makefile (working copy) @@ -1,33 +1,33 @@ -# New ports collection makefile for: py-Tkinter -# Date created: 12 Jan 1999 -# Whom: Thomas Gellekum -# +# Created by: Thomas Gellekum # $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+ + +DIST_SUBDIR= python +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${PYTHON_WRKSRC}/Modules -DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo +PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload +PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_PKGNAME= Tkinter + +PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/_tkinter.so + .include post-extract: Index: x11-toolkits/py-tkinter/files/setup.py =================================================================== --- x11-toolkits/py-tkinter/files/setup.py (revision 312862) +++ x11-toolkits/py-tkinter/files/setup.py (working copy) @@ -15,6 +15,9 @@ 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 @@ 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, Index: x11-toolkits/py-tkinter/files/setup3.py =================================================================== --- x11-toolkits/py-tkinter/files/setup3.py (revision 312862) +++ x11-toolkits/py-tkinter/files/setup3.py (working copy) @@ -15,6 +15,8 @@ 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 @@ 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, Index: databases/py-gdbm/Makefile =================================================================== --- databases/py-gdbm/Makefile (revision 312862) +++ databases/py-gdbm/Makefile (working copy) @@ -1,13 +1,9 @@ -# New ports collection makefile for: py-gdbm -# Date created: 03 October 2000 -# Whom: Thomas Gellekum -# +# Created by: Thomas Gellekum # $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,17 +13,21 @@ 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 + +DIST_SUBDIR= python +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${PYTHON_WRKSRC}/Modules -DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo +PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload +PYDISTUTILS_NOEGGINFO= yes + +PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/gdbm.so + .include post-extract: Index: databases/py-gdbm/files/setup.py =================================================================== --- databases/py-gdbm/files/setup.py (revision 312862) +++ databases/py-gdbm/files/setup.py (working copy) @@ -13,6 +13,9 @@ 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 @@ setup(name = "gdbm", description = "GDBM Extension to Python", - + ext_modules = [Extension('gdbm', ['gdbmmodule.c'], include_dirs = inc_dirs, libraries = libs, Index: databases/py-gdbm/files/setup3.py =================================================================== --- databases/py-gdbm/files/setup3.py (revision 312862) +++ databases/py-gdbm/files/setup3.py (working copy) @@ -13,6 +13,8 @@ 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 @@ setup(name = "gdbm", description = "GDBM Extension to Python", - + ext_modules = [Extension('gdbm', ['_gdbmmodule.c'], include_dirs = inc_dirs, libraries = libs, Index: databases/py-bsddb/Makefile =================================================================== --- databases/py-bsddb/Makefile (revision 312862) +++ databases/py-bsddb/Makefile (working copy) @@ -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 +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${PYTHON_WRKSRC}/Modules -DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo + +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 .if ${PYTHON_REL} >= 300 Index: databases/py-bsddb/files/setup.py =================================================================== --- databases/py-bsddb/files/setup.py (revision 312862) +++ databases/py-bsddb/files/setup.py (working copy) @@ -14,6 +14,9 @@ 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 @@ setup(name = "_bsddb", description = "BSDDB Extension to Python", - + ext_modules = [Extension('_bsddb', ['_bsddb.c'], include_dirs = inc_dirs, libraries = libs, Index: databases/py-sqlite3/Makefile =================================================================== --- databases/py-sqlite3/Makefile (revision 312862) +++ databases/py-sqlite3/Makefile (working copy) @@ -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 @@ 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 + +DIST_SUBDIR= python +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${PYTHON_WRKSRC}/Modules -DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo +PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload PYDISTUTILS_NOEGGINFO= yes +PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/_sqlite3.so + .include .if ${ARCH} == "arm" Index: databases/py-sqlite3/files/setup.py =================================================================== --- databases/py-sqlite3/files/setup.py (revision 312862) +++ databases/py-sqlite3/files/setup.py (working copy) @@ -40,7 +40,7 @@ setup(name = "_sqlite3", description = "SQLite 3 extension to Python", - + ext_modules = [Extension('_sqlite3', sqlite_srcs, include_dirs = inc_dirs, libraries = libs, Index: databases/py-sqlite3/files/setup3.py =================================================================== --- databases/py-sqlite3/files/setup3.py (revision 312862) +++ databases/py-sqlite3/files/setup3.py (working copy) @@ -39,7 +39,7 @@ setup(name = "_sqlite3", description = "SQLite 3 extension to Python", - + ext_modules = [Extension('_sqlite3', sqlite_srcs, include_dirs = inc_dirs, libraries = libs,