Date: Fri, 20 Jun 2014 07:44:23 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358521 - in head/www: py-django py-django-cms py-django-devel py-django-photologue py-django14 py-django15 py-django_compressor Message-ID: <201406200744.s5K7iNR1051031@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Jun 20 07:44:23 2014 New Revision: 358521 URL: http://svnweb.freebsd.org/changeset/ports/358521 QAT: https://qat.redports.org/buildarchive/r358521/ Log: Use OPTIONS helpers, and change NOPORTDOCS reference to DOCS. Modified: head/www/py-django-cms/Makefile head/www/py-django-devel/Makefile head/www/py-django-photologue/Makefile head/www/py-django/Makefile head/www/py-django14/Makefile head/www/py-django15/Makefile head/www/py-django_compressor/Makefile Modified: head/www/py-django-cms/Makefile ============================================================================== --- head/www/py-django-cms/Makefile Fri Jun 20 07:41:12 2014 (r358520) +++ head/www/py-django-cms/Makefile Fri Jun 20 07:44:23 2014 (r358521) @@ -29,21 +29,8 @@ OPTIONS_MULTI= DATABASE OPTIONS_DEFAULT=SQLITE OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb -.endif - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -.endif - -post-install: - @${CAT} ${PKGMESSAGE} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 +SQLIE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .include <bsd.port.mk> Modified: head/www/py-django-devel/Makefile ============================================================================== --- head/www/py-django-devel/Makefile Fri Jun 20 07:41:12 2014 (r358520) +++ head/www/py-django-devel/Makefile Fri Jun 20 07:44:23 2014 (r358521) @@ -39,27 +39,16 @@ HTMLDOCS_DESC= Install the HTML document PLIST_FILES= man/man1/django-admin.1.gz \ man/man1/gather_profile_stats.1.gz -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb -.endif +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 +FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MFASTCGI} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MHTMLDOCS} . if ! ${PORT_OPTIONS:MDOCS} -IGNORE= you cannot build documentation while setting NOPORTDOCS +IGNORE= you cannot build documentation with DOCS option disabled . endif BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx PORTDOCS= * Modified: head/www/py-django-photologue/Makefile ============================================================================== --- head/www/py-django-photologue/Makefile Fri Jun 20 07:41:12 2014 (r358520) +++ head/www/py-django-photologue/Makefile Fri Jun 20 07:44:23 2014 (r358521) @@ -25,10 +25,6 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAM OPTIONS_DEFINE= TAGGING OPTIONS_DEFAULT= TAGGING -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MTAGGING} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/tagging/models.py:${PORTSDIR}/www/py-django-tagging -.endif +TAGGING_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tagging/models.py:${PORTSDIR}/www/py-django-tagging .include <bsd.port.mk> Modified: head/www/py-django/Makefile ============================================================================== --- head/www/py-django/Makefile Fri Jun 20 07:41:12 2014 (r358520) +++ head/www/py-django/Makefile Fri Jun 20 07:44:23 2014 (r358521) @@ -35,27 +35,16 @@ PLIST_FILES= man/man1/daily_cleanup.1.gz man/man1/django-admin.1.gz \ man/man1/gather_profile_stats.1.gz -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb -.endif +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 +FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MFASTCGI} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MHTMLDOCS} -. if ! ${PORT_OPTIONS:MDOCS} -IGNORE= you cannot build documentation while setting NOPORTDOCS +. if empty(PORT_OPTIONS:MDOCS) +IGNORE= you cannot build documentation with DOCS option disabled . endif BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx PORTDOCS= * Modified: head/www/py-django14/Makefile ============================================================================== --- head/www/py-django14/Makefile Fri Jun 20 07:41:12 2014 (r358520) +++ head/www/py-django14/Makefile Fri Jun 20 07:44:23 2014 (r358521) @@ -36,27 +36,16 @@ PLIST_FILES= man/man1/daily_cleanup.1.gz man/man1/django-admin.1.gz \ man/man1/gather_profile_stats.1.gz -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb -.endif +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 +FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MFASTCGI} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MHTMLDOCS} . if ! ${PORT_OPTIONS:MDOCS} -IGNORE= you cannot build documentation while setting NOPORTDOCS +IGNORE= you cannot build documentation with DOCS option disabled . endif BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx PORTDOCS= * Modified: head/www/py-django15/Makefile ============================================================================== --- head/www/py-django15/Makefile Fri Jun 20 07:41:12 2014 (r358520) +++ head/www/py-django15/Makefile Fri Jun 20 07:44:23 2014 (r358521) @@ -36,27 +36,16 @@ PLIST_FILES= man/man1/daily_cleanup.1.gz man/man1/django-admin.1.gz \ man/man1/gather_profile_stats.1.gz -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb -.endif +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 +FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MFASTCGI} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MHTMLDOCS} . if ! ${PORT_OPTIONS:MDOCS} -IGNORE= you cannot build documentation while setting NOPORTDOCS +IGNORE= you cannot build documentation with DOCS option disabled . endif BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx PORTDOCS= * Modified: head/www/py-django_compressor/Makefile ============================================================================== --- head/www/py-django_compressor/Makefile Fri Jun 20 07:41:12 2014 (r358520) +++ head/www/py-django_compressor/Makefile Fri Jun 20 07:44:23 2014 (r358521) @@ -25,18 +25,8 @@ BEAUTIFULSOUP_DESC= Enable BeautifulSoup LXML_DESC= Enable LxmlParser HTML5LIB_DESC= Enable Html5LibParser -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MBEAUTIFULSOUP} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 -.endif - -.if ${PORT_OPTIONS:MLXML} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml -.endif - -.if ${PORT_OPTIONS:MHTML5LIB} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib -.endif +BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml +HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406200744.s5K7iNR1051031>