Date: Thu, 19 Nov 2015 01:28:38 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401909 - in head: databases databases/py-gdbm databases/py-sqlite3 databases/py32-gdbm databases/py32-sqlite3 databases/py33-gdbm databases/py33-sqlite3 databases/py34-gdbm databases/p... Message-ID: <201511190128.tAJ1ScIU041232@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Thu Nov 19 01:28:38 2015 New Revision: 401909 URL: https://svnweb.freebsd.org/changeset/ports/401909 Log: Add version specified ports of separated standard Python modules for non-default Python versions: - Add pyXY-{sqlite3,gdbm,tkinter} ports for generating binary packages - Improve/add pkg-message to point users to install respective packages of separated Python standard modules - Add COMMENT to explicitly show the Python version that package should be used with - Simplify version-related PYTHON_* for lang/python35 Reviewed by: koobs Differential Revision: https://reviews.freebsd.org/D4170 Added: head/databases/py32-gdbm/ head/databases/py32-gdbm/Makefile (contents, props changed) head/databases/py32-sqlite3/ head/databases/py32-sqlite3/Makefile (contents, props changed) head/databases/py33-gdbm/ head/databases/py33-gdbm/Makefile (contents, props changed) head/databases/py33-sqlite3/ head/databases/py33-sqlite3/Makefile (contents, props changed) head/databases/py34-gdbm/ head/databases/py34-gdbm/Makefile (contents, props changed) head/databases/py34-sqlite3/ head/databases/py34-sqlite3/Makefile (contents, props changed) head/databases/py35-gdbm/ head/databases/py35-gdbm/Makefile (contents, props changed) head/databases/py35-sqlite3/ head/databases/py35-sqlite3/Makefile (contents, props changed) head/lang/python32/files/pkg-message.in - copied, changed from r401908, head/lang/python32/pkg-message head/lang/python33/files/pkg-message.in - copied, changed from r401908, head/lang/python33/pkg-message head/lang/python34/files/pkg-message.in (contents, props changed) head/lang/python35/files/pkg-message.in (contents, props changed) head/x11-toolkits/py32-tkinter/ head/x11-toolkits/py32-tkinter/Makefile (contents, props changed) head/x11-toolkits/py33-tkinter/ head/x11-toolkits/py33-tkinter/Makefile (contents, props changed) head/x11-toolkits/py34-tkinter/ head/x11-toolkits/py34-tkinter/Makefile (contents, props changed) head/x11-toolkits/py35-tkinter/ head/x11-toolkits/py35-tkinter/Makefile (contents, props changed) Deleted: head/lang/python32/pkg-message head/lang/python33/pkg-message Modified: head/databases/Makefile head/databases/py-gdbm/Makefile head/databases/py-sqlite3/Makefile head/lang/python32/Makefile head/lang/python33/Makefile head/lang/python34/Makefile head/lang/python35/Makefile head/x11-toolkits/Makefile head/x11-toolkits/py-tkinter/Makefile Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/databases/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -723,6 +723,10 @@ SUBDIR += py-flask-sqlalchemy SUBDIR += py-forgetsql SUBDIR += py-gdbm + SUBDIR += py32-gdbm + SUBDIR += py33-gdbm + SUBDIR += py34-gdbm + SUBDIR += py35-gdbm SUBDIR += py-geoalchemy SUBDIR += py-geoalchemy2 SUBDIR += py-hiredis @@ -766,6 +770,10 @@ SUBDIR += py-sqlalchemy-migrate SUBDIR += py-sqlalchemy06 SUBDIR += py-sqlite3 + SUBDIR += py32-sqlite3 + SUBDIR += py33-sqlite3 + SUBDIR += py34-sqlite3 + SUBDIR += py35-sqlite3 SUBDIR += py-sqlite3dbm SUBDIR += py-sqlkit SUBDIR += py-sqlobject Modified: head/databases/py-gdbm/Makefile ============================================================================== --- head/databases/py-gdbm/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/databases/py-gdbm/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -3,14 +3,14 @@ PORTNAME= gdbm PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases python MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Python-${PORTVERSION} MAINTAINER= python@FreeBSD.org -COMMENT= Python bindings to the GNU dbm library +COMMENT= Python bindings to the GNU dbm library (Python ${PYTHON_VER}) LICENSE= PSFL Modified: head/databases/py-sqlite3/Makefile ============================================================================== --- head/databases/py-sqlite3/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/databases/py-sqlite3/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -3,7 +3,7 @@ PORTNAME= sqlite3 PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases python MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,7 +11,7 @@ DISTNAME= Python-${PORTVERSION} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org -COMMENT= Standard Python binding to the SQLite3 library +COMMENT= Standard Python binding to the SQLite3 library (Python ${PYTHON_VER}) LICENSE= PSFL LICENSE_FILE= ${WRKDIR}/Python-${PORTVERSION}/LICENSE Added: head/databases/py32-gdbm/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py32-gdbm/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-gdbm + +PYTHON_VERSION= python3.2 + +.include "${MASTERDIR}/Makefile" Added: head/databases/py32-sqlite3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py32-sqlite3/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-sqlite3 + +PYTHON_VERSION= python3.2 + +.include "${MASTERDIR}/Makefile" Added: head/databases/py33-gdbm/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py33-gdbm/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-gdbm + +PYTHON_VERSION= python3.3 + +.include "${MASTERDIR}/Makefile" Added: head/databases/py33-sqlite3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py33-sqlite3/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-sqlite3 + +PYTHON_VERSION= python3.3 + +.include "${MASTERDIR}/Makefile" Added: head/databases/py34-gdbm/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py34-gdbm/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-gdbm + +PYTHON_VERSION= python3.4 + +.include "${MASTERDIR}/Makefile" Added: head/databases/py34-sqlite3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py34-sqlite3/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-sqlite3 + +PYTHON_VERSION= python3.4 + +.include "${MASTERDIR}/Makefile" Added: head/databases/py35-gdbm/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py35-gdbm/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-gdbm + +PYTHON_VERSION= python3.5 + +.include "${MASTERDIR}/Makefile" Added: head/databases/py35-sqlite3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/py35-sqlite3/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-sqlite3 + +PYTHON_VERSION= python3.5 + +.include "${MASTERDIR}/Makefile" Modified: head/lang/python32/Makefile ============================================================================== --- head/lang/python32/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/lang/python32/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -2,7 +2,7 @@ PORTNAME= python32 PORTVERSION= 3.2.5 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -30,6 +30,9 @@ MAKE_ARGS+= INSTALL_SHARED="${INSTALL_L MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974 +SUB_FILES= pkg-message +SUB_LIST= PYTHON_SUFFIX=${PORTVERSION:R:S/.//g} + PLIST_SUB= ABI=${ABIFLAGS} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 Copied and modified: head/lang/python32/files/pkg-message.in (from r401908, head/lang/python32/pkg-message) ============================================================================== --- head/lang/python32/pkg-message Thu Nov 19 00:51:21 2015 (r401908, copy source) +++ head/lang/python32/files/pkg-message.in Thu Nov 19 01:28:38 2015 (r401909) @@ -3,8 +3,8 @@ Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: -gdbm databases/py-gdbm -sqlite3 databases/py-sqlite3 -tkinter x11-toolkits/py-tkinter +py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm +py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter =========================================================================== Modified: head/lang/python33/Makefile ============================================================================== --- head/lang/python33/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/lang/python33/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= 3.3.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -30,6 +30,9 @@ MAKE_ARGS+= INSTALL_SHARED="${INSTALL_L MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974 +SUB_FILES= pkg-message +SUB_LIST= PYTHON_SUFFIX=${PORTVERSION:R:S/.//g} + PLIST_SUB= ABI=${ABIFLAGS} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 Copied and modified: head/lang/python33/files/pkg-message.in (from r401908, head/lang/python33/pkg-message) ============================================================================== --- head/lang/python33/pkg-message Thu Nov 19 00:51:21 2015 (r401908, copy source) +++ head/lang/python33/files/pkg-message.in Thu Nov 19 01:28:38 2015 (r401909) @@ -3,8 +3,8 @@ Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: -gdbm databases/py-gdbm -sqlite3 databases/py-sqlite3 -tkinter x11-toolkits/py-tkinter +py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm +py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter =========================================================================== Modified: head/lang/python34/Makefile ============================================================================== --- head/lang/python34/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/lang/python34/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -3,7 +3,7 @@ PORTNAME= python34 PORTVERSION= 3.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} DISTNAME= Python-${PORTVERSION} @@ -32,6 +32,9 @@ MAKE_ARGS+= INSTALL_SHARED="${INSTALL_L MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974 +SUB_FILES= pkg-message +SUB_LIST= PYTHON_SUFFIX=${PORTVERSION:R:S/.//g} + PLIST_SUB= ABI=${ABIFLAGS} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 Added: head/lang/python34/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python34/files/pkg-message.in Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,10 @@ +=========================================================================== + +Note that some standard Python modules are provided as separate ports +as they require additional dependencies. They are available as: + +py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm +py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter + +=========================================================================== Modified: head/lang/python35/Makefile ============================================================================== --- head/lang/python35/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/lang/python35/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -3,9 +3,10 @@ PORTNAME= python DISTVERSION= 3.5.0 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} -PKGNAMESUFFIX= 35 +PKGNAMESUFFIX= ${PYTHON_SUFFIX} DISTNAME= Python-${DISTVERSION} DIST_SUBDIR= python @@ -24,9 +25,9 @@ CPE_PRODUCT= ${CPE_VENDOR} CPE_VERSION= ${DISTVERSION} # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${DISTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PYTHON_VERSION= python${PYTHON_VER} PYTHON_PORTVERSION= ${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} +PYTHON_VER= ${PYTHON_PORTVERSION:R} +PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm @@ -38,6 +39,9 @@ MAKE_ARGS+= INSTALL_SHARED="${INSTALL_L MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pkgconfig" # Until pathfix gets support for files other than Makefile.in MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974 +SUB_FILES= pkg-message +SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} + PLIST_SUB= XYDOT=${PYTHON_VER} XY=${PYTHON_SUFFIX} \ XYZDOT=${PYTHON_PORTVERSION} ABI=${ABIFLAGS} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 Added: head/lang/python35/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python35/files/pkg-message.in Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,10 @@ +=========================================================================== + +Note that some standard Python modules are provided as separate ports +as they require additional dependencies. They are available as: + +py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm +py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter + +=========================================================================== Modified: head/x11-toolkits/Makefile ============================================================================== --- head/x11-toolkits/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/x11-toolkits/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -193,6 +193,10 @@ SUBDIR += py-qt4-gui SUBDIR += py-sexy SUBDIR += py-tkinter + SUBDIR += py32-tkinter + SUBDIR += py33-tkinter + SUBDIR += py34-tkinter + SUBDIR += py35-tkinter SUBDIR += py-tktreectrl SUBDIR += py-traitsbackendwx SUBDIR += py-traitsgui Modified: head/x11-toolkits/py-tkinter/Makefile ============================================================================== --- head/x11-toolkits/py-tkinter/Makefile Thu Nov 19 00:51:21 2015 (r401908) +++ head/x11-toolkits/py-tkinter/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -3,14 +3,14 @@ PORTNAME= tkinter PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits python MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Python-${PORTVERSION} MAINTAINER= python@FreeBSD.org -COMMENT= Python bindings to the Tk widget set +COMMENT= Python bindings to the Tk widget set (Python ${PYTHON_VER}) LICENSE= PSFL Added: head/x11-toolkits/py32-tkinter/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/py32-tkinter/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-tkinter + +PYTHON_VERSION= python3.2 + +.include "${MASTERDIR}/Makefile" Added: head/x11-toolkits/py33-tkinter/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/py33-tkinter/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-tkinter + +PYTHON_VERSION= python3.3 + +.include "${MASTERDIR}/Makefile" Added: head/x11-toolkits/py34-tkinter/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/py34-tkinter/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-tkinter + +PYTHON_VERSION= python3.4 + +.include "${MASTERDIR}/Makefile" Added: head/x11-toolkits/py35-tkinter/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/py35-tkinter/Makefile Thu Nov 19 01:28:38 2015 (r401909) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +MASTERDIR= ${.CURDIR}/../py-tkinter + +PYTHON_VERSION= python3.5 + +.include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511190128.tAJ1ScIU041232>