From owner-svn-ports-head@FreeBSD.ORG Fri Aug 31 17:55:23 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F8AB10657E8; Fri, 31 Aug 2012 17:55:23 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8A27F8FC18; Fri, 31 Aug 2012 17:55:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7VHtNlZ071479; Fri, 31 Aug 2012 17:55:23 GMT (envelope-from lwhsu@svn.freebsd.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7VHtNaD071476; Fri, 31 Aug 2012 17:55:23 GMT (envelope-from lwhsu@svn.freebsd.org) Message-Id: <201208311755.q7VHtNaD071476@svn.freebsd.org> From: Li-Wen Hsu Date: Fri, 31 Aug 2012 17:55:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303438 - head/www/py-django13 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Aug 2012 17:55:23 -0000 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 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 -.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