From 2a01a5eaf753ca392f926ae3786b12f68c756faa Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Fri, 20 Jun 2014 07:44:23 +0000 Subject: [PATCH] Use OPTIONS helpers, and change NOPORTDOCS reference to DOCS. --- www/py-django-cms/Makefile | 19 +++---------------- www/py-django-devel/Makefile | 23 ++++++----------------- www/py-django-photologue/Makefile | 6 +----- www/py-django/Makefile | 25 +++++++------------------ www/py-django14/Makefile | 23 ++++++----------------- www/py-django15/Makefile | 23 ++++++----------------- www/py-django_compressor/Makefile | 16 +++------------- 7 files changed, 32 insertions(+), 103 deletions(-) diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile index aa0fa55e451f..c484e0e9048a 100644 --- a/www/py-django-cms/Makefile +++ b/www/py-django-cms/Makefile @@ -29,21 +29,8 @@ OPTIONS_MULTI= DATABASE OPTIONS_DEFAULT=SQLITE OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE -.include - -.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 diff --git a/www/py-django-devel/Makefile b/www/py-django-devel/Makefile index 853d595e6efe..455db6c4e39f 100644 --- a/www/py-django-devel/Makefile +++ b/www/py-django-devel/Makefile @@ -39,27 +39,16 @@ HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) PLIST_FILES= man/man1/django-admin.1.gz \ man/man1/gather_profile_stats.1.gz +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 + .include -.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 - -.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 - .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= * diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index de4b3ed7a9e0..ac20e27e0f62 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -25,10 +25,6 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= TAGGING OPTIONS_DEFAULT= TAGGING -.include - -.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 diff --git a/www/py-django/Makefile b/www/py-django/Makefile index 64638ead0b2d..a0be0c258633 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -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 +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 + .include -.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 - -.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 - .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= * diff --git a/www/py-django14/Makefile b/www/py-django14/Makefile index 47214f029c5a..fcdfe57d8ec4 100644 --- a/www/py-django14/Makefile +++ b/www/py-django14/Makefile @@ -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 +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 + .include -.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 - -.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 - .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= * diff --git a/www/py-django15/Makefile b/www/py-django15/Makefile index 73bd061bc00f..79e58f1c52fc 100644 --- a/www/py-django15/Makefile +++ b/www/py-django15/Makefile @@ -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 +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 + .include -.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 - -.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 - .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= * diff --git a/www/py-django_compressor/Makefile b/www/py-django_compressor/Makefile index 949655996cdc..f76885929e56 100644 --- a/www/py-django_compressor/Makefile +++ b/www/py-django_compressor/Makefile @@ -25,18 +25,8 @@ BEAUTIFULSOUP_DESC= Enable BeautifulSoupParser LXML_DESC= Enable LxmlParser HTML5LIB_DESC= Enable Html5LibParser -.include - -.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