From owner-svn-ports-head@FreeBSD.ORG Fri Mar 1 20:12:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8548EB19; Fri, 1 Mar 2013 20:12:04 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 75AA8154F; Fri, 1 Mar 2013 20:12:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21KC4Vh075348; Fri, 1 Mar 2013 20:12:04 GMT (envelope-from lwhsu@svn.freebsd.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21KC2BB075329; Fri, 1 Mar 2013 20:12:02 GMT (envelope-from lwhsu@svn.freebsd.org) Message-Id: <201303012012.r21KC2BB075329@svn.freebsd.org> From: Li-Wen Hsu Date: Fri, 1 Mar 2013 20:12:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313167 - in head: databases/py-bsddb databases/py-bsddb/files databases/py-gdbm databases/py-gdbm/files databases/py-sqlite3 databases/py-sqlite3/files x11-toolkits/py-tkinter x11-tool... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Mar 2013 20:12:04 -0000 Author: lwhsu Date: Fri Mar 1 20:12:01 2013 New Revision: 313167 URL: http://svnweb.freebsd.org/changeset/ports/313167 Log: - Install standard libraries separated as other ports to the same place with other standard libraries (${PYTHON_LIBDIR}/lib-dynload) - Improve consistency of the Makefile(s) - Whitespace cleanup for the patches Modified: head/databases/py-bsddb/Makefile head/databases/py-bsddb/files/setup.py head/databases/py-gdbm/Makefile head/databases/py-gdbm/files/setup.py head/databases/py-gdbm/files/setup3.py head/databases/py-sqlite3/Makefile head/databases/py-sqlite3/files/setup.py head/databases/py-sqlite3/files/setup3.py head/x11-toolkits/py-tkinter/Makefile head/x11-toolkits/py-tkinter/files/setup.py head/x11-toolkits/py-tkinter/files/setup3.py Modified: head/databases/py-bsddb/Makefile ============================================================================== --- head/databases/py-bsddb/Makefile Fri Mar 1 19:51:19 2013 (r313166) +++ head/databases/py-bsddb/Makefile Fri Mar 1 20:12:01 2013 (r313167) @@ -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 .if ${PYTHON_REL} >= 300 Modified: head/databases/py-bsddb/files/setup.py ============================================================================== --- head/databases/py-bsddb/files/setup.py Fri Mar 1 19:51:19 2013 (r313166) +++ head/databases/py-bsddb/files/setup.py Fri Mar 1 20:12:01 2013 (r313167) @@ -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, Modified: head/databases/py-gdbm/Makefile ============================================================================== --- head/databases/py-gdbm/Makefile Fri Mar 1 19:51:19 2013 (r313166) +++ head/databases/py-gdbm/Makefile Fri Mar 1 20:12:01 2013 (r313167) @@ -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,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 Modified: head/databases/py-gdbm/files/setup.py ============================================================================== --- head/databases/py-gdbm/files/setup.py Fri Mar 1 19:51:19 2013 (r313166) +++ head/databases/py-gdbm/files/setup.py Fri Mar 1 20:12:01 2013 (r313167) @@ -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, Modified: head/databases/py-gdbm/files/setup3.py ============================================================================== --- head/databases/py-gdbm/files/setup3.py Fri Mar 1 19:51:19 2013 (r313166) +++ head/databases/py-gdbm/files/setup3.py Fri Mar 1 20:12:01 2013 (r313167) @@ -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, Modified: head/databases/py-sqlite3/Makefile ============================================================================== --- head/databases/py-sqlite3/Makefile Fri Mar 1 19:51:19 2013 (r313166) +++ head/databases/py-sqlite3/Makefile Fri Mar 1 20:12:01 2013 (r313167) @@ -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 .if ${ARCH} == "arm" Modified: head/databases/py-sqlite3/files/setup.py ============================================================================== --- head/databases/py-sqlite3/files/setup.py Fri Mar 1 19:51:19 2013 (r313166) +++ head/databases/py-sqlite3/files/setup.py Fri Mar 1 20:12:01 2013 (r313167) @@ -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, Modified: head/databases/py-sqlite3/files/setup3.py ============================================================================== --- head/databases/py-sqlite3/files/setup3.py Fri Mar 1 19:51:19 2013 (r313166) +++ head/databases/py-sqlite3/files/setup3.py Fri Mar 1 20:12:01 2013 (r313167) @@ -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, Modified: head/x11-toolkits/py-tkinter/Makefile ============================================================================== --- head/x11-toolkits/py-tkinter/Makefile Fri Mar 1 19:51:19 2013 (r313166) +++ head/x11-toolkits/py-tkinter/Makefile Fri Mar 1 20:12:01 2013 (r313167) @@ -1,32 +1,32 @@ -# 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+ -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 Modified: head/x11-toolkits/py-tkinter/files/setup.py ============================================================================== --- head/x11-toolkits/py-tkinter/files/setup.py Fri Mar 1 19:51:19 2013 (r313166) +++ head/x11-toolkits/py-tkinter/files/setup.py Fri Mar 1 20:12:01 2013 (r313167) @@ -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, Modified: head/x11-toolkits/py-tkinter/files/setup3.py ============================================================================== --- head/x11-toolkits/py-tkinter/files/setup3.py Fri Mar 1 19:51:19 2013 (r313166) +++ head/x11-toolkits/py-tkinter/files/setup3.py Fri Mar 1 20:12:01 2013 (r313167) @@ -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,