svn commit: r317826 - in head/news: nntpcache py-pynzb

[Baptiste Daroussin]

Author: bapt
Date: Fri May 10 16:24:05 2013
New Revision: 317826
URL: http://svnweb.freebsd.org/changeset/ports/317826

Log:
  Convert to new options framework

Modified:
  head/news/nntpcache/Makefile
  head/news/py-pynzb/Makefile

Modified: head/news/nntpcache/Makefile
==============================================================================
--- head/news/nntpcache/Makefile	Fri May 10 16:07:42 2013	(r317825)
+++ head/news/nntpcache/Makefile	Fri May 10 16:24:05 2013	(r317826)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nntpcache
-# Date created:		6 January 1997
-# Whom:			proff at suburbia.net
-#
+# Created by: proff at suburbia.net
 # $FreeBSD$
-#
 
 PORTNAME=	nntpcache
 PORTVERSION=	3.0.2
@@ -28,18 +24,17 @@ CONFIGURE_ARGS=	--localstatedir=${SPOOLD
 AUTHINFO_EXT=	authinfo_pam.ext
 USE_RC_SUBR=	nntpcached
 
-OPTIONS=	LDAP "OpenLDAP support" off \
-		RADIUS "RADIUS support" off \
-		SPAMPHOBIA "Spamphobia NoCeM support" off
+OPTIONS_DEFINE=	LDAP RADIUS SPAMPHOBIA
+SPAMPHOBIA_DESC=	Spamphobia NoCeM support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_RADIUS)
+.if ${PORT_OPTIONS:MRADIUS}
 CONFIGURE_ARGS+=	--with-authinfo-radius
 AUTHINFO_EXT+=		authinfo_radius.ext
 .endif
 
-.if defined(WITH_LDAP) || defined(WITH_LDAP2)
+.if ${PORT_OPTIONS:MLDAP) || defined(WITH_LDAP2}
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=	--with-authinfo-ldap
 CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include
@@ -55,7 +50,7 @@ MAN8=		nntpcached.8 newshound.8
 PORTDOCS=	AUTHORS ChangeLog FAQ FAQ.html HACKING HTML \
 		INSTALL LICENSING NEWS README README.INN VERSION
 
-.if defined(WITH_SPAMPHOBIA)
+.if ${PORT_OPTIONS:MSPAMPHOBIA}
 REVISEDATE=	20060903
 PATCH_SITES+=	http://people.freebsd.org/~leeym/:SPAMPHOBIA
 PATCHFILES+=	${DISTNAME}-spamphobia-${REVISEDATE}.diff.gz:SPAMPHOBIA
@@ -69,10 +64,10 @@ post-install:
 	@ ${CP} ${PREFIX}/etc/${PORTNAME}/VERSION ${NNTPSPOOLDIR} && \
 	  ${CHMOD} 640 ${NNTPSPOOLDIR}/VERSION
 	@ ${CHOWN} -R news:news ${NNTPSPOOLDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@ ${MKDIR} ${DOCSDIR}
 	@ cd ${WRKSRC} && ${FIND} ${PORTDOCS} \
 	  | ${CPIO_CMD} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/news/py-pynzb/Makefile
==============================================================================
--- head/news/py-pynzb/Makefile	Fri May 10 16:07:42 2013	(r317825)
+++ head/news/py-pynzb/Makefile	Fri May 10 16:24:05 2013	(r317826)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	pynzb
-# Date created:		Wed Apr  7 13:06:51 UTC 2010
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pynzb
@@ -20,12 +17,14 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_NOEGGINFO=	yes
 
-OPTIONS=	LXML		"Add support for py-lxml" Off
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+OPTIONS_DEFINE=	LXML
+LXML_DESC=	Add support for py-lxml
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_LXML)
+.if ${PORT_OPTIONS:MLXML}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:${PORTSDIR}/devel/py-lxml
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>