svn commit: r395745 - in head/www: py-django14 py-django16 py-django17 py-django18
Kubilay Kocak
koobs at FreeBSD.org
Tue Sep 1 05:47:42 UTC 2015
Author: koobs
Date: Tue Sep 1 05:47:40 2015
New Revision: 395745
URL: https://svnweb.freebsd.org/changeset/ports/395745
Log:
www/django1{4,6,7,8}: Reduce diffs between ports
Reduce diffs between Django ports, standardizing on:
* Prefer CHEESESHOP (Geo CDN) over DjangoProject.com for DISTFILES
* Include version and optionally "LTS" in COMMENT suffixes
* De-scope CONFLICTS to CONFLICTS_INSTALL and update match strings
* Whitespace alignment and improve readability
* Use empty(VARIABLE) instead of ! ${VARIABLE}
* Sort Makefile entries (CPE_VENDOR and CONFLICTS_INSTALL)
Approved by: python (with hat)
Modified:
head/www/py-django14/Makefile
head/www/py-django16/Makefile
head/www/py-django17/Makefile
head/www/py-django18/Makefile
Modified: head/www/py-django14/Makefile
==============================================================================
--- head/www/py-django14/Makefile Tue Sep 1 05:34:39 2015 (r395744)
+++ head/www/py-django14/Makefile Tue Sep 1 05:47:40 2015 (r395745)
@@ -4,15 +4,15 @@
PORTNAME= django
PORTVERSION= 1.4.22
CATEGORIES= www python
-MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \
- CHEESESHOP
+MASTER_SITES= CHEESESHOP \
+ https://www.djangoproject.com/m/releases/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 14
DISTNAME= Django-${PORTVERSION}
DIST_SUBDIR= python
MAINTAINER= python at FreeBSD.org
-COMMENT= High-level Python Web framework
+COMMENT= High-level Python Web Framework (1.4.x LTS)
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -20,15 +20,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cpe python:2
USE_PYTHON= autoplist distutils
-CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-35-9].*
-CPE_VENDOR= djangoproject
+CONFLICTS_INSTALL= py??-django-devel-* py??-django-1.[012356789].*
+CPE_VENDOR= djangoproject
DOCSDIR= ${PREFIX}/share/doc/py-django
-OPTIONS_DEFINE= FASTCGI HTMLDOCS
-OPTIONS_DEFAULT=SQLITE
-OPTIONS_GROUP= DATABASE
+OPTIONS_DEFINE= FASTCGI HTMLDOCS
+OPTIONS_DEFAULT= SQLITE
+
+OPTIONS_GROUP= DATABASE
OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE
+
HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/daily_cleanup.1.gz \
@@ -43,7 +45,7 @@ FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPRE
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MHTMLDOCS}
-. if ! ${PORT_OPTIONS:MDOCS}
+. 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
Modified: head/www/py-django16/Makefile
==============================================================================
--- head/www/py-django16/Makefile Tue Sep 1 05:34:39 2015 (r395744)
+++ head/www/py-django16/Makefile Tue Sep 1 05:47:40 2015 (r395745)
@@ -4,15 +4,15 @@
PORTNAME= django
PORTVERSION= 1.6.11
CATEGORIES= www python
-MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \
- CHEESESHOP
+MASTER_SITES= CHEESESHOP \
+ https://www.djangoproject.com/m/releases/${PORTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 16
DISTNAME= Django-${PORTVERSION}
DIST_SUBDIR= python
MAINTAINER= python at FreeBSD.org
-COMMENT= High-level Python Web framework
+COMMENT= High-level Python Web Framework (1.6.x)
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -23,9 +23,8 @@ EXPIRATION_DATE= 2015-10-01
USES= cpe python
USE_PYTHON= autoplist distutils
-CPE_VENDOR= djangoproject
-
-CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-57-9].*
+CONFLICTS_INSTALL= py??-django-devel-* py??-django-1.[012345789].*
+CPE_VENDOR= djangoproject
DOCSDIR= ${PREFIX}/share/doc/py-django
Modified: head/www/py-django17/Makefile
==============================================================================
--- head/www/py-django17/Makefile Tue Sep 1 05:34:39 2015 (r395744)
+++ head/www/py-django17/Makefile Tue Sep 1 05:47:40 2015 (r395745)
@@ -4,15 +4,15 @@
PORTNAME= django
PORTVERSION= 1.7.10
CATEGORIES= www python
-MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \
- CHEESESHOP
+MASTER_SITES= CHEESESHOP \
+ https://www.djangoproject.com/m/releases/${PORTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX= 17
DISTNAME= Django-${PORTVERSION}
DIST_SUBDIR= python
MAINTAINER= python at FreeBSD.org
-COMMENT= High-level Python Web framework
+COMMENT= High-level Python Web Framework (1.7.x)
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -20,16 +20,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cpe python
USE_PYTHON= autoplist distutils
-CPE_VENDOR= djangoproject
-
-CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-57-9].*
+CONFLICTS_INSTALL= py??-django-devel-* py??-django-1.[012345689].*
+CPE_VENDOR= djangoproject
DOCSDIR= ${PREFIX}/share/doc/py-django
-OPTIONS_DEFINE= FASTCGI HTMLDOCS
-OPTIONS_DEFAULT=SQLITE
-OPTIONS_GROUP= DATABASE
+OPTIONS_DEFINE= FASTCGI HTMLDOCS
+OPTIONS_DEFAULT= SQLITE
+
+OPTIONS_GROUP= DATABASE
OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE
+
HTMLDOCS_DESC= Install HTML documentation (requires Sphinx)
PLIST_FILES= man/man1/django-admin.1.gz \
Modified: head/www/py-django18/Makefile
==============================================================================
--- head/www/py-django18/Makefile Tue Sep 1 05:34:39 2015 (r395744)
+++ head/www/py-django18/Makefile Tue Sep 1 05:47:40 2015 (r395745)
@@ -20,9 +20,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cpe python
USE_PYTHON= autoplist distutils
-CPE_VENDOR= djangoproject
-
CONFLICTS_INSTALL= py??-django-devel-* py??-django-1.[012345679].*
+CPE_VENDOR= djangoproject
DOCSDIR= ${PREFIX}/share/doc/py-django
More information about the svn-ports-head
mailing list