From linpc2@tbsd5.cs.nctu.edu.tw  Thu Aug  9 02:52:52 2012
Return-Path: <linpc2@tbsd5.cs.nctu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 818BA106566C;
	Thu,  9 Aug 2012 02:52:52 +0000 (UTC)
	(envelope-from linpc2@tbsd5.cs.nctu.edu.tw)
Received: from tbsd5.cs.nctu.edu.tw (tbsd5.cs.nctu.edu.tw [140.113.235.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 21E7E8FC19;
	Thu,  9 Aug 2012 02:52:51 +0000 (UTC)
Received: from tbsd5.cs.nctu.edu.tw (smmsp@localhost [127.0.0.1])
	by tbsd5.cs.nctu.edu.tw (8.14.4/8.14.4) with ESMTP id q792qJDH039982;
	Thu, 9 Aug 2012 10:52:19 +0800 (CST)
	(envelope-from linpc2@tbsd5.cs.nctu.edu.tw)
Received: (from root@localhost)
	by tbsd5.cs.nctu.edu.tw (8.14.4/8.14.4/Submit) id q792qJSJ039981;
	Thu, 9 Aug 2012 10:52:19 +0800 (CST)
	(envelope-from linpc2)
Message-Id: <201208090252.q792qJSJ039981@tbsd5.cs.nctu.edu.tw>
Date: Thu, 9 Aug 2012 10:52:19 +0800 (CST)
From: Po-Chien Lin <linpc@cs.nctu.edu.tw>
To: FreeBSD-gnats-submit@freebsd.org
Cc: lwhsu@freebsd.org
Subject: [PATCH] www/py-django13: update to 1.3.3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170496
>Category:       ports
>Synopsis:       [PATCH] www/py-django13: update to 1.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lwhsu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 09 03:00:08 UTC 2012
>Closed-Date:    Fri Aug 31 17:55:30 UTC 2012
>Last-Modified:  Fri Aug 31 18:00:24 UTC 2012
>Originator:     Po-Chien Lin
>Release:        FreeBSD 8.2-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD tbsd5.cs.nctu.edu.tw 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:45:57 UTC 2011
>Description:
- Update to 1.3.3
- Convert to new options framework

Port maintainer (lwhsu@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- py27-django-1.3.3.patch begins here ---
diff -ruN --exclude=CVS ../py-django13.orig/Makefile ./Makefile
--- ../py-django13.orig/Makefile	2012-08-09 10:26:16.611419235 +0800
+++ ./Makefile	2012-08-09 10:46:52.175107596 +0800
@@ -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,14 @@
 
 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=	POSTGRESQL MYSQL SQLITE FASTCGI DOCS
+OPTIONS_DEFAULT=
+
+POSTGRESQL_DESC=	PostgreSQL support
+MYSQL_DESC=	MySQL support
+SQLITE_DESC=	SQLite support
+FASTCGI_DESC=	FastCGI support
+DOCS_DESC=	Install HTML documentation (requires Sphinx)
 
 MAN1=		daily_cleanup.1 django-admin.1 gather_profile_stats.1
 
@@ -43,31 +46,31 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPOSTGRESQL}
 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:MDOCS}
 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 ${PORT_OPTIONS:MDOCS}
 .	if defined(NOPORTDOCS)
 IGNORE=	you cannot build documentation while setting NOPORTDOCS
 .	endif
@@ -79,7 +82,7 @@
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	"			* See http://docs.djangoproject.com/ for complete documentation"
 	@${ECHO_MSG}	""
-.if defined(WITH_DOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/_build/html ${DOCSDIR}
 .endif
diff -ruN --exclude=CVS ../py-django13.orig/distinfo ./distinfo
--- ../py-django13.orig/distinfo	2012-08-09 10:26:16.611419235 +0800
+++ ./distinfo	2012-08-09 10:47:25.436001338 +0800
@@ -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
--- py27-django-1.3.3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lwhsu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Aug 9 03:00:35 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170496 
State-Changed-From-To: open->closed 
State-Changed-By: lwhsu 
State-Changed-When: Fri Aug 31 17:55:28 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170496 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170496: commit references a PR
Date: Fri, 31 Aug 2012 17:55:35 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
