From owner-svn-ports-head@FreeBSD.ORG Tue Jan 8 07:06:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A248326F; Tue, 8 Jan 2013 07:06:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 89FB6E87; Tue, 8 Jan 2013 07:06:25 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0876PZ0060154; Tue, 8 Jan 2013 07:06:25 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0876PQr060152; Tue, 8 Jan 2013 07:06:25 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201301080706.r0876PQr060152@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 8 Jan 2013 07:06:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310073 - in head: databases/py-pyPgSQL x11-toolkits/py-gui X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Tue, 08 Jan 2013 07:06:25 -0000 Author: bapt Date: Tue Jan 8 07:06:24 2013 New Revision: 310073 URL: http://svnweb.freebsd.org/changeset/ports/310073 Log: Convert last python@ ports to new options framework for both make options work as expected (previous version were missing include ) for databases/py-pyPgSQL reverse the logic for the option test so that it actually works as expected Approved by: python (crees) Modified: head/databases/py-pyPgSQL/Makefile head/x11-toolkits/py-gui/Makefile Modified: head/databases/py-pyPgSQL/Makefile ============================================================================== --- head/databases/py-pyPgSQL/Makefile Tue Jan 8 06:58:16 2013 (r310072) +++ head/databases/py-pyPgSQL/Makefile Tue Jan 8 07:06:24 2013 (r310073) @@ -1,9 +1,5 @@ -# New ports collection makefile for: py-pypgsql -# Date created: 01 Nov 2001 -# Whom: Gerhard Haering -# +# Created by: Gerhard Haering # $FreeBSD$ -# PORTNAME= pyPgSQL PORTVERSION= 2.5.1 @@ -26,12 +22,16 @@ EXAMPLES= examples/*.py DATETIME_DEP= ${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py -OPTIONS= BYTEA_CONN "Apply Bytea connection patch" On +OPTIONS_DEFINE= BYTEA_CONN EXAMPLES DOCS +OPTIONS_DEFAULT= BYTEA_CONN +BYTEA_CONN_DESC= Apply Bytea connection patch # bypass infrastructure bug OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options -.if !defined(WITH_BYTEA_CONN) +.include + +.if ${PORT_OPTIONS:MBYTEA_CONN} PATCH_SITES= http://sourceforge.net/tracker/download.php?group_id=16528&atid=316528&file_id=273956&aid=1939119/ PATCHFILES= pyPgSQL-patch_byteaconn .endif @@ -40,13 +40,13 @@ DOCSDIR= ${PREFIX}/share/doc/py-pyPgSQL EXAMPLESDIR= ${PREFIX}/share/examples/py-pyPgSQL post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} .for f in ${EXAMPLES} @${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR} Modified: head/x11-toolkits/py-gui/Makefile ============================================================================== --- head/x11-toolkits/py-gui/Makefile Tue Jan 8 06:58:16 2013 (r310072) +++ head/x11-toolkits/py-gui/Makefile Tue Jan 8 07:06:24 2013 (r310073) @@ -1,7 +1,4 @@ -# Ports collection makefile for: py-gui -# Date created: 21 June 2004 -# Whom: Hye-Shik Chang -# +# Created by: Hye-Shik Chang # $FreeBSD$ PORTNAME= gui @@ -32,11 +29,12 @@ LATEST_LINK= py-${PORTNAME} WRKSRC= ${WRKDIR}/PyGUI-${PORTVERSION} -OPTIONS= GL "Enable GL support" off +OPTIONS_DEFINE= OPENGL DOCS +OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options -.include +.include -.if defined(WITH_GL) +.if ${PORT_OPTIONS:MOPENGL} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext .endif @@ -49,7 +47,7 @@ post-patch: ${REINPLACE_CMD} -e 's/"GUI.Cocoa",//g' ${WRKSRC}/setup.py post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${PREFIX}/${DOCSDIR} ${TAR} -C ${WRKSRC}/Doc -cf - . | ${TAR} -C ${PREFIX}/${DOCSDIR} -xf - ${MKDIR} ${PREFIX}/${EXAMPLESDIR} @@ -59,4 +57,4 @@ post-install: ${TAR} -C ${PREFIX}/${EXAMPLESDIR} -xf - .endif -.include +.include