Date: Tue, 8 Jan 2013 07:06:25 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> 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 Message-ID: <201301080706.r0876PQr060152@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>) 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 <gerhard.haering@gmx.de> -# +# Created by: Gerhard Haering <gerhard.haering@gmx.de> # $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 <bsd.port.options.mk> + +.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 <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.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 <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301080706.r0876PQr060152>