Date: Sat, 28 Sep 2013 11:13:16 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328563 - in head/databases: gadfly pgworksheet py-PyGreSQL py-cdb py-forgetsql py-mssql py-oops py-rrdtool_lgpl Message-ID: <201309281113.r8SBDGJe007757@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Sat Sep 28 11:13:15 2013 New Revision: 328563 URL: http://svnweb.freebsd.org/changeset/ports/328563 Log: - Convert to PYDISTUTILS_AUTOPLIST - Enable stage support - Limit to the supported python versions - Change to new LIB_DEPENDS where necessary - Switch to new OPTIONS framework where necessary Deleted: head/databases/pgworksheet/pkg-plist head/databases/py-mssql/pkg-plist head/databases/py-oops/pkg-plist head/databases/py-rrdtool_lgpl/pkg-plist Modified: head/databases/gadfly/Makefile (contents, props changed) head/databases/gadfly/pkg-plist (contents, props changed) head/databases/pgworksheet/Makefile (contents, props changed) head/databases/py-PyGreSQL/Makefile head/databases/py-PyGreSQL/pkg-plist head/databases/py-cdb/Makefile (contents, props changed) head/databases/py-cdb/pkg-plist (contents, props changed) head/databases/py-forgetsql/Makefile (contents, props changed) head/databases/py-forgetsql/pkg-plist (contents, props changed) head/databases/py-mssql/Makefile (contents, props changed) head/databases/py-oops/Makefile (contents, props changed) head/databases/py-rrdtool_lgpl/Makefile (contents, props changed) Modified: head/databases/gadfly/Makefile ============================================================================== --- head/databases/gadfly/Makefile Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/gadfly/Makefile Sat Sep 28 11:13:15 2013 (r328563) @@ -8,26 +8,30 @@ CATEGORIES= databases MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org -COMMENT= An SQL database written in Python +COMMENT= SQL database written in Python RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kjbuckets.so:${PORTSDIR}/devel/py-kjbuckets -USE_PYTHON= yes -USE_PYDISTUTILS=yes +USE_PYTHON= -2.7 +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes + +OPTIONS_DEFINE= DOCS EXAMPLES + +.include <bsd.port.options.mk> -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.txt ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/build_html.py ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.txt ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/build_html.py ${STAGEDIR}${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR}/kjParsing +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/kjParsing @${INSTALL_DATA} ${WRKSRC}/doc/demo/kjParsing/*.py \ - ${EXAMPLESDIR}/kjParsing + ${STAGEDIR}${EXAMPLESDIR}/kjParsing .endif .include <bsd.port.mk> Modified: head/databases/gadfly/pkg-plist ============================================================================== --- head/databases/gadfly/pkg-plist Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/gadfly/pkg-plist Sat Sep 28 11:13:15 2013 (r328563) @@ -1,71 +1,3 @@ -bin/gfplus -bin/gfserver -%%PYTHON_SITELIBDIR%%/gadfly/__init__.py -%%PYTHON_SITELIBDIR%%/gadfly/__init__.pyc -%%PYTHON_SITELIBDIR%%/gadfly/__init__.pyo -%%PYTHON_SITELIBDIR%%/gadfly/bindings.py -%%PYTHON_SITELIBDIR%%/gadfly/bindings.pyc -%%PYTHON_SITELIBDIR%%/gadfly/bindings.pyo -%%PYTHON_SITELIBDIR%%/gadfly/client.py -%%PYTHON_SITELIBDIR%%/gadfly/client.pyc -%%PYTHON_SITELIBDIR%%/gadfly/client.pyo -%%PYTHON_SITELIBDIR%%/gadfly/database.py -%%PYTHON_SITELIBDIR%%/gadfly/database.pyc -%%PYTHON_SITELIBDIR%%/gadfly/database.pyo -%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.py -%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.pyc -%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.pyo -%%PYTHON_SITELIBDIR%%/gadfly/grammar.py -%%PYTHON_SITELIBDIR%%/gadfly/grammar.pyc -%%PYTHON_SITELIBDIR%%/gadfly/grammar.pyo -%%PYTHON_SITELIBDIR%%/gadfly/introspection.py -%%PYTHON_SITELIBDIR%%/gadfly/introspection.pyc -%%PYTHON_SITELIBDIR%%/gadfly/introspection.pyo -%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.py -%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.pyc -%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.pyo -%%PYTHON_SITELIBDIR%%/gadfly/kjParser.py -%%PYTHON_SITELIBDIR%%/gadfly/kjParser.pyc -%%PYTHON_SITELIBDIR%%/gadfly/kjParser.pyo -%%PYTHON_SITELIBDIR%%/gadfly/kjSet.py -%%PYTHON_SITELIBDIR%%/gadfly/kjSet.pyc -%%PYTHON_SITELIBDIR%%/gadfly/kjSet.pyo -%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.py -%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.pyc -%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.pyo -%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.py -%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.pyc -%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.pyo -%%PYTHON_SITELIBDIR%%/gadfly/operations.py -%%PYTHON_SITELIBDIR%%/gadfly/operations.pyc -%%PYTHON_SITELIBDIR%%/gadfly/operations.pyo -%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.py -%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.pyc -%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.pyo -%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.py -%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.pyc -%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.pyo -%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.py -%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.pyc -%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.pyo -%%PYTHON_SITELIBDIR%%/gadfly/semantics.py -%%PYTHON_SITELIBDIR%%/gadfly/semantics.pyc -%%PYTHON_SITELIBDIR%%/gadfly/semantics.pyo -%%PYTHON_SITELIBDIR%%/gadfly/serialize.py -%%PYTHON_SITELIBDIR%%/gadfly/serialize.pyc -%%PYTHON_SITELIBDIR%%/gadfly/serialize.pyo -%%PYTHON_SITELIBDIR%%/gadfly/server.py -%%PYTHON_SITELIBDIR%%/gadfly/server.pyc -%%PYTHON_SITELIBDIR%%/gadfly/server.pyo -%%PYTHON_SITELIBDIR%%/gadfly/sql.py -%%PYTHON_SITELIBDIR%%/gadfly/sql.pyc -%%PYTHON_SITELIBDIR%%/gadfly/sql.pyo -%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.py -%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.pyc -%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.pyo -%%PYTHON_SITELIBDIR%%/gadfly/store.py -%%PYTHON_SITELIBDIR%%/gadfly/store.pyc -%%PYTHON_SITELIBDIR%%/gadfly/store.pyo %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.txt %%PORTDOCS%%%%DOCSDIR%%/announcement.txt @@ -90,5 +22,3 @@ bin/gfserver %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/kjParsing %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%PYTHON_SITELIBDIR%%/gadfly/scripts -@dirrm %%PYTHON_SITELIBDIR%%/gadfly Modified: head/databases/pgworksheet/Makefile ============================================================================== --- head/databases/pgworksheet/Makefile Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/pgworksheet/Makefile Sat Sep 28 11:13:15 2013 (r328563) @@ -15,11 +15,11 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyPgSQ USE_PGSQL= yes USE_BZIP2= yes USE_GNOME= pygtk2 -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGVERSION= 1.9 -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e \ 's|@PIXMAP_PATH@|${PREFIX}/share/pixmaps/pgworksheet|' \ Modified: head/databases/py-PyGreSQL/Makefile ============================================================================== --- head/databases/py-PyGreSQL/Makefile Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-PyGreSQL/Makefile Sat Sep 28 11:13:15 2013 (r328563) @@ -15,14 +15,14 @@ COMMENT= Python interface to PostgreSQL, USE_PGSQL= yes USE_PYTHON= -2.7 USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes -NO_STAGE= yes .include <bsd.port.options.mk> post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/databases/py-PyGreSQL/pkg-plist ============================================================================== --- head/databases/py-PyGreSQL/pkg-plist Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-PyGreSQL/pkg-plist Sat Sep 28 11:13:15 2013 (r328563) @@ -1,10 +1,3 @@ -%%PYTHON_SITELIBDIR%%/_pg.so -%%PYTHON_SITELIBDIR%%/pg.py -%%PYTHON_SITELIBDIR%%/pg.pyc -%%PYTHON_SITELIBDIR%%/pg.pyo -%%PYTHON_SITELIBDIR%%/pgdb.py -%%PYTHON_SITELIBDIR%%/pgdb.pyc -%%PYTHON_SITELIBDIR%%/pgdb.pyo %%PORTDOCS%%%%DOCSDIR%%/announce.html %%PORTDOCS%%%%DOCSDIR%%/announce.txt %%PORTDOCS%%%%DOCSDIR%%/changelog.html Modified: head/databases/py-cdb/Makefile ============================================================================== --- head/databases/py-cdb/Makefile Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-cdb/Makefile Sat Sep 28 11:13:15 2013 (r328563) @@ -11,8 +11,9 @@ DISTNAME= python-${PORTNAME}-${PORTVERSI MAINTAINER= ports@FreeBSD.org COMMENT= Python interface to DJB's constant database library -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGNAME= python-cdb DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} @@ -21,13 +22,18 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${ DOCS= ChangeLog README EXAMPLES= Example -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXAMPLES + +.include <bsd.port.options.mk> + post-install: - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR} +.endif +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/databases/py-cdb/pkg-plist ============================================================================== --- head/databases/py-cdb/pkg-plist Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-cdb/pkg-plist Sat Sep 28 11:13:15 2013 (r328563) @@ -1,6 +1,5 @@ -%%PYTHON_SITELIBDIR%%/cdbmodule.so -%%EXAMPLESDIR%%/Example -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/databases/py-forgetsql/Makefile ============================================================================== --- head/databases/py-forgetsql/Makefile Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-forgetsql/Makefile Sat Sep 28 11:13:15 2013 (r328563) @@ -3,6 +3,7 @@ PORTNAME= forgetsql PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= SF PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,37 +12,37 @@ DISTNAME= forgetSQL-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python module for object-oriented access to SQL databases -.if defined(WITH_POSTGRESQL) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg -.endif -.if defined(WITH_MYSQL) -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb -.endif - -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGNAME= forgetSQL DOCS= BUGS README TODO -NO_STAGE= yes +OPTIONS_DEFINE= DOCS MYSQL PGSQL + +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb +PGSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg + +.include <bsd.port.options.mk> + post-build: @cd ${WRKSRC}/lib && ${PYTHON_CMD} -c 'import forgetSQL' @cd ${WRKSRC}/lib && ${PYTHON_CMD} -O -c 'import forgetSQL' post-install: - ${INSTALL_DATA} ${WRKSRC}/lib/forgetSQL.pyc ${PYTHON_SITELIBDIR}/ - ${INSTALL_DATA} ${WRKSRC}/lib/forgetSQL.pyo ${PYTHON_SITELIBDIR}/ -.if !defined(WITH_POSTGRESQL) && !defined(WITH_MYSQL) + ${INSTALL_DATA} ${WRKSRC}/lib/forgetSQL.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/ + ${INSTALL_DATA} ${WRKSRC}/lib/forgetSQL.pyo ${STAGEDIR}${PYTHON_SITELIBDIR}/ +.if !${PORT_OPTIONS:MPGSQL} && !${PORT_OPTIONS:MMYSQL} @${ECHO} - @${ECHO_MSG} "===> You did not set WITH_MYSQL or WITH_POSTGRESQL. To make this port usable," + @${ECHO_MSG} "===> You did not set MYSQL or PGSQL. To make this port usable," @${ECHO_MSG} "===> you should install py-psycopg or py-MySQLdb from ports/databases." @${ECHO} .endif -.if !defined(NOPORTDOCS) - ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + ${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor .endif Modified: head/databases/py-forgetsql/pkg-plist ============================================================================== --- head/databases/py-forgetsql/pkg-plist Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-forgetsql/pkg-plist Sat Sep 28 11:13:15 2013 (r328563) @@ -1,7 +1,3 @@ -bin/forgetsql-generate -%%PYTHON_SITELIBDIR%%/forgetSQL.py -%%PYTHON_SITELIBDIR%%/forgetSQL.pyc -%%PYTHON_SITELIBDIR%%/forgetSQL.pyo %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO Modified: head/databases/py-mssql/Makefile ============================================================================== --- head/databases/py-mssql/Makefile Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-mssql/Makefile Sat Sep 28 11:13:15 2013 (r328563) @@ -11,11 +11,11 @@ DISTNAME= pymssql-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python database interface for simple MS-SQL access -LIB_DEPENDS= sybdb.5:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib -USE_PYTHON= 2.5+ -USE_PYDISTUTILS=yes +USE_PYTHON= -2.7 +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGNAME= pymssql -NO_STAGE= yes .include <bsd.port.mk> Modified: head/databases/py-oops/Makefile ============================================================================== --- head/databases/py-oops/Makefile Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-oops/Makefile Sat Sep 28 11:13:15 2013 (r328563) @@ -10,8 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Object Oriented Database Library For Persistent Storage in Python -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes -NO_STAGE= yes .include <bsd.port.mk> Modified: head/databases/py-rrdtool_lgpl/Makefile ============================================================================== --- head/databases/py-rrdtool_lgpl/Makefile Sat Sep 28 09:34:52 2013 (r328562) +++ head/databases/py-rrdtool_lgpl/Makefile Sat Sep 28 11:13:15 2013 (r328563) @@ -12,13 +12,13 @@ DISTNAME= py-rrdtool-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python interface to RRDTool, the graphing and logging utility -LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool +LIB_DEPENDS= librrd.so:${PORTSDIR}/databases/rrdtool -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGNAME= py-rrdtool LIBDIR?= ${LOCALBASE}/lib # directory where librrd.so lives -NO_STAGE= yes .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309281113.r8SBDGJe007757>