From 7a8091a2ff1c0ffb66e37f8e69d5746b54bf2fc6 Mon Sep 17 00:00:00 2001 From: rm Date: Thu, 25 Oct 2012 10:12:42 +0000 Subject: - update django ports to 1.3.4 and 1.4.2, that fixing couple of security issues. All users are encouraged to upgrade immediately. - add vuxml entry changes common for both ports: - trim Makefile header - strict python version to 2.x only - utilize options framework multiple choice feature to let user to choose database backends needed. Make SQLITE option default - shorten description of HTMLDOCS_DESC to make it fit into dialog screen - SITELIBDIR -> PKGNAMEPREFIX change in dependencies - convert NOPORTDOCS condition to optionsng - tab -> space change in pkg-descr PR: 173017 Submitted by: rm (myself) Approved by: lwhsu (maintainer, by mail) Security: 5f326d75-1db9-11e2-bc8f-d0df9acfd7e5 Feature safe: yes --- www/py-django/Makefile | 34 +++++++++++++++------------------- www/py-django/distinfo | 4 ++-- www/py-django/pkg-descr | 2 +- www/py-django/pkg-plist | 3 +++ www/py-django13/Makefile | 34 +++++++++++++++------------------- www/py-django13/distinfo | 4 ++-- www/py-django13/pkg-descr | 2 +- 7 files changed, 39 insertions(+), 44 deletions(-) (limited to 'www') diff --git a/www/py-django/Makefile b/www/py-django/Makefile index a460610fd5b7..d02fb35479e3 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: django -# Date created: 2005-11-19 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= django -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \ CHEESESHOP @@ -20,7 +16,7 @@ COMMENT= High-level Python Web framework LICENSE= BSD USE_GETTEXT= yes -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= Django @@ -28,20 +24,20 @@ CONFLICTS= py2[0-9]-django-devel-[0-9]* py2[0-9]-django-1.[23].* DOCSDIR= ${PREFIX}/share/doc/py-django -OPTIONS_DEFINE= PGSQL MYSQL SQLITE FASTCGI HTMLDOCS -OPTIONS_DEFAULT= - -HTMLDOCS_DESC= Build and install the HTML documentation (requires Sphinx) - -MAN1= daily_cleanup.1 django-admin.1 gather_profile_stats.1 - # bypass infrastructure bug OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options +OPTIONS_DEFINE= FASTCGI HTMLDOCS +OPTIONS_DEFAULT=SQLITE +OPTIONS_MULTI= DATABASE +OPTIONS_MULTI_DATABASE= PGSQL MYSQL SQLITE +HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) + +MAN1= daily_cleanup.1 django-admin.1 gather_profile_stats.1 -.include +.include .if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopg2/_psycopg.so:${PORTSDIR}/databases/py-psycopg2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 .endif .if ${PORT_OPTIONS:MMYSQL} @@ -49,7 +45,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MyS .endif .if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .endif .if ${PORT_OPTIONS:MFASTCGI} @@ -57,7 +53,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup .endif .if ${PORT_OPTIONS:MHTMLDOCS} -. if defined(NOPORTDOCS) +. if empty(PORT_OPTIONS:MDOCS) IGNORE= you cannot build documentation while setting NOPORTDOCS . endif BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx @@ -79,4 +75,4 @@ post-install: ${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR} .endif -.include +.include diff --git a/www/py-django/distinfo b/www/py-django/distinfo index 3958193eddfa..a4b32b90039f 100644 --- a/www/py-django/distinfo +++ b/www/py-django/distinfo @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.4.1.tar.gz) = 4d8d20eba350d3d29613cc5a6302d5c23730c7f9e150985bc58b3175b755409b -SIZE (python/Django-1.4.1.tar.gz) = 7656756 +SHA256 (python/Django-1.4.2.tar.gz) = edfd8733f45bbaa524cee25bcac3080ce28c21242c27227464eae3fa6b3d80e7 +SIZE (python/Django-1.4.2.tar.gz) = 7722026 diff --git a/www/py-django/pkg-descr b/www/py-django/pkg-descr index 4356d5ad924d..1eefec3fb492 100644 --- a/www/py-django/pkg-descr +++ b/www/py-django/pkg-descr @@ -7,4 +7,4 @@ intensive deadlines of a newsroom and the stringent requirements of experienced Web developers. It has convenient niceties for developing content-management systems, but it's an excellent tool for building any Web site. -WWW: http://www.djangoproject.com/ +WWW: http://www.djangoproject.com/ diff --git a/www/py-django/pkg-plist b/www/py-django/pkg-plist index de460b6bf767..c07c2ed69cb7 100644 --- a/www/py-django/pkg-plist +++ b/www/py-django/pkg-plist @@ -5294,6 +5294,9 @@ bin/django-admin.py %%PYTHON_SITELIBDIR%%/django/utils/simplejson/tool.py %%PYTHON_SITELIBDIR%%/django/utils/simplejson/tool.pyc %%PYTHON_SITELIBDIR%%/django/utils/simplejson/tool.pyo +%%PYTHON_SITELIBDIR%%/django/utils/six.py +%%PYTHON_SITELIBDIR%%/django/utils/six.pyc +%%PYTHON_SITELIBDIR%%/django/utils/six.pyo %%PYTHON_SITELIBDIR%%/django/utils/synch.py %%PYTHON_SITELIBDIR%%/django/utils/synch.pyc %%PYTHON_SITELIBDIR%%/django/utils/synch.pyo diff --git a/www/py-django13/Makefile b/www/py-django13/Makefile index c137e75fbada..5f6acfb8f1f0 100644 --- a/www/py-django13/Makefile +++ b/www/py-django13/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: django -# Date created: 2005-11-19 -# Whom: Jose Alonso Cardenas Marquez -# +# Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -# PORTNAME= django -PORTVERSION= 1.3.3 +PORTVERSION= 1.3.4 CATEGORIES= www python MASTER_SITES= http://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \ CHEESESHOP @@ -22,7 +18,7 @@ LICENSE= BSD LATEST_LINK= ${PYTHON_PKGNAMEPREFIX}django13 USE_GETTEXT= yes -USE_PYTHON= yes +USE_PYTHON= -2.7 USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= Django @@ -30,20 +26,20 @@ CONFLICTS= py2[0-9]-django-devel-[0-9]* py2[0-9]-django-1.[24]* DOCSDIR= ${PREFIX}/share/doc/py-django -OPTIONS_DEFINE= PGSQL MYSQL SQLITE FASTCGI HTMLDOCS -OPTIONS_DEFAULT= - -HTMLDOCS_DESC= Build and install the HTML documentation (requires Sphinx) - -MAN1= daily_cleanup.1 django-admin.1 gather_profile_stats.1 - # bypass infrastructure bug OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options +OPTIONS_DEFINE= FASTCGI HTMLDOCS +OPTIONS_DEFAULT=SQLITE +OPTIONS_MULTI= DATABASE +OPTIONS_MULTI_DATABASE= PGSQL MYSQL SQLITE +HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) + +MAN1= daily_cleanup.1 django-admin.1 gather_profile_stats.1 -.include +.include .if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopg2/_psycopg.so:${PORTSDIR}/databases/py-psycopg2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-changeset_16520.diff .endif @@ -52,7 +48,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MyS .endif .if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .endif .if ${PORT_OPTIONS:MFASTCGI} @@ -60,7 +56,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup .endif .if ${PORT_OPTIONS:MHTMLDOCS} -. if defined(NOPORTDOCS) +. if empty(PORT_OPTIONS:MDOCS) IGNORE= you cannot build documentation while setting NOPORTDOCS . endif BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx @@ -83,4 +79,4 @@ post-install: ${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR} .endif -.include +.include diff --git a/www/py-django13/distinfo b/www/py-django13/distinfo index bec9c2d35805..f35765755656 100644 --- a/www/py-django13/distinfo +++ b/www/py-django13/distinfo @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.3.3.tar.gz) = 8ef44cfd89dee0331018ec56a2ed27dc14ae8d65feb664c10e128b3437cbd46a -SIZE (python/Django-1.3.3.tar.gz) = 6507280 +SHA256 (python/Django-1.3.4.tar.gz) = 2626e6b216e1bdef887bd923f00d94d94b4d4e75fc2e336c6f156d842d10a607 +SIZE (python/Django-1.3.4.tar.gz) = 6507771 diff --git a/www/py-django13/pkg-descr b/www/py-django13/pkg-descr index 4356d5ad924d..1eefec3fb492 100644 --- a/www/py-django13/pkg-descr +++ b/www/py-django13/pkg-descr @@ -7,4 +7,4 @@ intensive deadlines of a newsroom and the stringent requirements of experienced Web developers. It has convenient niceties for developing content-management systems, but it's an excellent tool for building any Web site. -WWW: http://www.djangoproject.com/ +WWW: http://www.djangoproject.com/ -- cgit