Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Aug 2012 17:55:23 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r303438 - head/www/py-django13
Message-ID:  <201208311755.q7VHtNaD071476@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu
Date: Fri Aug 31 17:55:22 2012
New Revision: 303438
URL: http://svn.freebsd.org/changeset/ports/303438

Log:
  - Update to 1.3.3
  - Convert to new options framework
  
  PR:		ports/170496
  Submitted by:	Po-Chien Lin <linpc@cs.nctu.edu.tw>

Modified:
  head/www/py-django13/Makefile
  head/www/py-django13/distinfo

Modified: head/www/py-django13/Makefile
==============================================================================
--- head/www/py-django13/Makefile	Fri Aug 31 17:36:09 2012	(r303437)
+++ head/www/py-django13/Makefile	Fri Aug 31 17:55:22 2012	(r303438)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	django
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.3
 CATEGORIES=	www python
 MASTER_SITES=	http://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \
 		CHEESESHOP
@@ -30,11 +30,10 @@ CONFLICTS=	py2[0-9]-django-devel-[0-9]* 
 
 DOCSDIR=	${PREFIX}/share/doc/py-django
 
-OPTIONS=	POSTGRESQL	"PostgreSQL support"	off \
-		MYSQL	"MySQL support"	off \
-		SQLITE	"SQLite support"	off \
-		FASTCGI	"FastCGI support"	off \
-		DOCS	"Install HTML documentation (requires Sphinx)"	off
+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
 
@@ -43,34 +42,34 @@ OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/_psycopg.so:${PORTSDIR}/databases/py-psycopg2
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-changeset_16520.diff
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 .endif
 
-.if defined(WITH_FASTCGI)
+.if ${PORT_OPTIONS:MFASTCGI}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}flup>0:${PORTSDIR}/www/py-flup
 .endif
 
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MHTMLDOCS}
+.	if defined(NOPORTDOCS)
+IGNORE=	you cannot build documentation while setting NOPORTDOCS
+.	endif
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-changeset_16223_16231.diff
 PORTDOCS=	*
 .endif
 
 post-build:
-.if defined(WITH_DOCS)
-.	if defined(NOPORTDOCS)
-IGNORE=	you cannot build documentation while setting NOPORTDOCS
-.	endif
+.if ${PORT_OPTIONS:MHTMLDOCS}
 	cd ${WRKSRC}/docs && ${MAKE} html
 .endif
 
@@ -79,7 +78,7 @@ post-install:
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MHTMLDOCS}
 	${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR}
 .endif

Modified: head/www/py-django13/distinfo
==============================================================================
--- head/www/py-django13/distinfo	Fri Aug 31 17:36:09 2012	(r303437)
+++ head/www/py-django13/distinfo	Fri Aug 31 17:55:22 2012	(r303438)
@@ -1,2 +1,2 @@
-SHA256 (python/Django-1.3.2.tar.gz) = 72c4080fe30863c4581521ef6f7bfcc12d01e7c55b9ad1935acaa43e466dd764
-SIZE (python/Django-1.3.2.tar.gz) = 6507042
+SHA256 (python/Django-1.3.3.tar.gz) = 8ef44cfd89dee0331018ec56a2ed27dc14ae8d65feb664c10e128b3437cbd46a
+SIZE (python/Django-1.3.3.tar.gz) = 6507280



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208311755.q7VHtNaD071476>