svn commit: r318650 - in head/devel: py-simpy py-tables

[Jason Helfman]

Author: jgh
Date: Tue May 21 07:09:46 2013
New Revision: 318650
URL: http://svnweb.freebsd.org/changeset/ports/318650

Log:
  - adoption of optionsNG
  
  Approved by:	maintainer, wen@

Modified:
  head/devel/py-simpy/Makefile
  head/devel/py-tables/Makefile

Modified: head/devel/py-simpy/Makefile
==============================================================================
--- head/devel/py-simpy/Makefile	Tue May 21 06:44:17 2013	(r318649)
+++ head/devel/py-simpy/Makefile	Tue May 21 07:09:46 2013	(r318650)
@@ -17,17 +17,20 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	SimPy
 
-OPTIONS=	TKINTER		"Install py-tkinter for plot"      off
+OPTIONS_DEFINE=	TKINTER
+TKINTER_DESC=	py-tkinter for plot
+
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TKINTER)
+.if ${PORT_OPTIONS:MTKINTER}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR})
 .endif

Modified: head/devel/py-tables/Makefile
==============================================================================
--- head/devel/py-tables/Makefile	Tue May 21 06:44:17 2013	(r318649)
+++ head/devel/py-tables/Makefile	Tue May 21 07:09:46 2013	(r318650)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	PyTables
-# Date created:			Dec 19, 2003
-# Whom:				ijliao
-#
+# Created by: ijliao at FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	tables
 PORTVERSION=	2.4.0
@@ -15,7 +10,7 @@ DISTFILES=	tables-${PORTVERSION}.tar.gz 
 EXTRACT_ONLY=	tables-${PORTVERSION}.tar.gz
 
 MAINTAINER=	wen at FreeBSD.org
-COMMENT=	A hierarchical database for Python
+COMMENT=	Hierarchical database for Python
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${LOCALBASE}/bin/cython:${PORTSDIR}/lang/cython \
@@ -30,12 +25,15 @@ USE_PYDISTUTILS=	yes
 
 PLIST_FILES=	bin/nctoh5 bin/ptdump bin/ptrepack
 
-OPTIONS=	PYREX "Use code generated by Pyrex to build" off
+OPTIONS_DEFINE=	PYREX
+PYREX_DESC=	Use code generated by Pyrex to build
+
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_PYREX)
+.if ${PORT_OPTIONS:MPYREX}
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
 .endif
 
@@ -48,7 +46,7 @@ post-install:
 	@${FIND} ${PYTHONPREFIX_SITELIBDIR}/tables -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/pytablesmanual-${PORTVERSION}.pdf ${DOCSDIR}
 	${ECHO} '${DOCSDIR}/pytablesmanual-${PORTVERSION}.pdf' | ${SED} 's,^${PREFIX}/,,' \
@@ -57,7 +55,7 @@ post-install:
 		>> ${TMPPLIST}
 .endif
 
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 	@${FIND} ${EXAMPLESDIR} ! -type d | \