svn commit: r316749 - in head/security: amavisd-new clamsmtp dazuko dirmngr ftimes gnupg1 heimdal ike john krb5-appl maia mailzu medusa metasploit oidentd openct osiris p5-openxpki pam_bsdbioapi ph...

Baptiste Daroussin bapt at FreeBSD.org
Sun Apr 28 21:02:42 UTC 2013


Author: bapt
Date: Sun Apr 28 21:02:39 2013
New Revision: 316749
URL: http://svnweb.freebsd.org/changeset/ports/316749

Log:
  Convert security to new options framework

Modified:
  head/security/amavisd-new/Makefile
  head/security/clamsmtp/Makefile
  head/security/dazuko/Makefile
  head/security/dirmngr/Makefile
  head/security/ftimes/Makefile
  head/security/gnupg1/Makefile
  head/security/heimdal/Makefile
  head/security/ike/Makefile
  head/security/john/Makefile
  head/security/krb5-appl/Makefile
  head/security/maia/Makefile
  head/security/mailzu/Makefile
  head/security/medusa/Makefile
  head/security/metasploit/Makefile
  head/security/oidentd/Makefile
  head/security/openct/Makefile
  head/security/osiris/Makefile
  head/security/p5-openxpki/Makefile
  head/security/pam_bsdbioapi/Makefile
  head/security/php-Auth_OpenID/Makefile
  head/security/php-Auth_OpenID2/Makefile
  head/security/racoon2/Makefile
  head/security/scrypt/Makefile
  head/security/shibboleth2-sp/Makefile
  head/security/snortsam/Makefile
  head/security/spybye/Makefile
  head/security/tripwire/Makefile
  head/security/yapet/Makefile

Modified: head/security/amavisd-new/Makefile
==============================================================================
--- head/security/amavisd-new/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/amavisd-new/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -36,34 +36,38 @@ AMAVISDIR?=	/var/amavis
 AMAVISQUARANTINE?=	/var/virusmails
 DAEMON?=	/usr/sbin/daemon -p
 
-OPTIONS=	IPV6		"Support IPv6"					on \
-		BDB		"Use BerkeleyDB for nanny/cache/snmp"		on \
-		SNMP		"Install amavisd snmp subagent"			off \
-		SQLITE		"Use SQLite for lookups"			off \
-		MYSQL		"Use MySQL for lookups/logging/quarantine"	off \
-		PGSQL		"Use PgSQL for lookups/logging/quarantine"	off \
-		LDAP		"Use LDAP for lookups"				off \
-		SASL		"Use SASL authentication"			off \
-		SPAMASSASSIN	"Use mail/p5-Mail-SpamAssassin"			on \
-		P0F		"Passive operating system fingerprinting"	off \
-		ALTERMIME	"Use AlterMime for defanging/disclaimers"	off \
-		FILE		"Use newer file(1) utility from ports"		on \
-		RAR		"RAR support with archivers/rar"		off \
-		UNRAR		"RAR support with archivers/unrar"		on \
-		ARJ		"ARJ support with archivers/arj"		on \
-		UNARJ		"ARJ support with archivers/unarj"		off \
-		LHA		"LHA support with archivers/lha"		on \
-		ARC		"ARC support with archivers/arc"		on \
-		NOMARCH		"ARC support with archivers/nomarch"		off \
-		CAB		"CAB support with archivers/cabextract"		on \
-		RPM		"RPM support with archivers/rpm2cpio"		on \
-		ZOO		"ZOO support with archivers/zoo"		on \
-		UNZOO		"ZOO support with archivers/unzoo"		off \
-		LZOP		"LZOP support with archivers/lzop"		on \
-		FREEZE		"FREEZE support with archivers/freeze"		on \
-		P7ZIP		"P7ZIP support with archivers/p7zip"		on \
-		MSWORD		"Ms Word support with textproc/ripole"		on \
-		TNEF		"Add external tnef decoder converters/tnef"	off
+OPTIONS_DEFINE=	IPV6 BDB SNMP SQLITE MYSQL PGSQL LDAP SASL SPAMASSASSIN P0F ALTERMIME \
+		FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB RPM ZOO UNZOO LZOP FREEZE \
+		P7ZIP MSWORD TNEF DOCS
+OPTIONS_DEFAULT=	IPV6 BDB SPAMASSASSIN FILE UNRAR ARJ LHA ARC CAB RPM ZOO LZOP \
+			FREEZE P7ZIP MSWORD
+BDB_DESC=		Use BerkeleyDB for nanny/cache/snmp
+SNMP_DESC=		Install amavisd snmp subagent
+SQLITE_DESC=		Use SQLite for lookups
+MYSQL_DESC=		Use MySQL for lookups/logging/quarantine
+PGSQL_DESC=		Use PgSQL for lookups/logging/quarantine
+LDAP_DESC=		Use LDAP for lookups
+SASL_DESC=		Use SASL authentication
+SPAMASSASSIN_DESC=	Use mail/p5-Mail-SpamAssassin
+P0F_DESC=		Passive operating system fingerprinting
+ALTERMIME_DESC=		Use AlterMime for defanging/disclaimers
+FILE_DESC=		Use newer file(1) utility from ports
+RAR_DESC=		RAR support with archivers/rar
+UNRAR_DESC=		RAR support with archivers/unrar
+ARJ_DESC=		ARJ support with archivers/arj
+UNARJ_DESC=		ARJ support with archivers/unarj
+LHA_DESC=		LHA support with archivers/lha
+ARC_DESC=		ARC support with archivers/arc
+NOMARCH_DESC=		ARC support with archivers/nomarch
+CAB_DESC=		CAB support with archivers/cabextract
+RPM_DESC=		RPM support with archivers/rpm2cpio
+ZOO_DESC=		ZOO support with archivers/zoo
+UNZOO_DESC=		ZOO support with archivers/unzoo
+LZOP_DESC=		LZOP support with archivers/lzop
+FREEZE_DESC=		FREEZE support with archivers/freeze
+P7ZIP_DESC=		P7ZIP support with archivers/p7zip
+MSWORD_DESC=		Ms Word support with textproc/ripole
+TNEF_DESC=		Add external tnef decoder converters/tnef
 
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
 
@@ -80,55 +84,55 @@ PLIST_SUB+=	AMAVIS_NOP0F=${AMAVIS_NOP0F}
 
 USE_RC_SUBR+=	amavisd
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 .endif
 
-.if defined(WITH_SNMP) && defined(WITH_BDB)
+.if ${PORT_OPTIONS:MSNMP) && defined(WITH_BDB}
 USE_RC_SUBR+=	amavisd-snmp
 RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 .endif
 
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 RUN_DEPENDS+=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
-.if defined(WITH_SASL)
+.if ${PORT_OPTIONS:MSASL}
 RUN_DEPENDS+=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
 .endif
 
-.if defined(WITH_SPAMASSASSIN)
+.if ${PORT_OPTIONS:MSPAMASSASSIN}
 RUN_DEPENDS+=	p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
-.if defined(WITH_P0F)
+.if ${PORT_OPTIONS:MP0F}
 RUN_DEPENDS+=	${LOCALBASE}/bin/p0f:${PORTSDIR}/net-mgmt/p0f
 USE_RC_SUBR+=	amavis-p0fanalyzer
 .else
 AMAVIS_NOP0F=	"@comment "
 .endif
 
-.if defined(WITH_ALTERMIME)
+.if ${PORT_OPTIONS:MALTERMIME}
 RUN_DEPENDS+=	${LOCALBASE}/bin/altermime:${PORTSDIR}/mail/altermime
 .endif
 
-.if defined(WITH_FILE)
+.if ${PORT_OPTIONS:MFILE}
 # security fix, file > 4.21 needed
 RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
 .endif
@@ -137,7 +141,7 @@ RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sys
 # at that port, therefore we will block instantly here if the platform does
 # not suit rar.
 
-.if defined(WITH_RAR)
+.if ${PORT_OPTIONS:MRAR}
 # support for archivers/rar is broken on ia64
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 RUN_DEPENDS+=	${LOCALBASE}/bin/rar:${PORTSDIR}/archivers/rar
@@ -146,64 +150,64 @@ IGNORE=	archviers/rar is a 32-bit binary
 .endif
 .endif
 
-.if defined(WITH_UNRAR)
+.if ${PORT_OPTIONS:MUNRAR}
 RUN_DEPENDS+=	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar
 .endif
 
-.if defined(WITH_ARJ)
+.if ${PORT_OPTIONS:MARJ}
 RUN_DEPENDS+=	${LOCALBASE}/bin/arj:${PORTSDIR}/archivers/arj
 .endif
 
-.if defined(WITH_UNARJ)
+.if ${PORT_OPTIONS:MUNARJ}
 RUN_DEPENDS+=	${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj
 .endif
 
-.if defined(WITH_LHA)
+.if ${PORT_OPTIONS:MLHA}
 RUN_DEPENDS+=	${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
 .endif
 
-.if defined(WITH_ARC)
+.if ${PORT_OPTIONS:MARC}
 RUN_DEPENDS+=	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc
 .endif
 
-.if defined(WITH_NOMARCH)
+.if ${PORT_OPTIONS:MNOMARCH}
 RUN_DEPENDS+=	${LOCALBASE}/bin/nomarch:${PORTSDIR}/archivers/nomarch
 .endif
 
-.if defined(WITH_CAB)
+.if ${PORT_OPTIONS:MCAB}
 RUN_DEPENDS+=	${LOCALBASE}/bin/cabextract:${PORTSDIR}/archivers/cabextract
 .endif
 
-.if defined(WITH_RPM)
+.if ${PORT_OPTIONS:MRPM}
 RUN_DEPENDS+=	${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 .endif
 
-.if defined(WITH_ZOO)
+.if ${PORT_OPTIONS:MZOO}
 # DOS condition in 2.10.1_2
 RUN_DEPENDS+=	zoo>=2.10.1_2:${PORTSDIR}/archivers/zoo
 .endif
 
-.if defined(WITH_UNZOO)
+.if ${PORT_OPTIONS:MUNZOO}
 RUN_DEPENDS+=	unzoo>=4.4_1:${PORTSDIR}/archivers/unzoo
 .endif
 
-.if defined(WITH_LZOP)
+.if ${PORT_OPTIONS:MLZOP}
 RUN_DEPENDS+=	${LOCALBASE}/bin/lzop:${PORTSDIR}/archivers/lzop
 .endif
 
-.if defined(WITH_FREEZE)
+.if ${PORT_OPTIONS:MFREEZE}
 RUN_DEPENDS+=	${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze
 .endif
 
-.if defined(WITH_P7ZIP)
+.if ${PORT_OPTIONS:MP7ZIP}
 RUN_DEPENDS+=	${LOCALBASE}/bin/7zr:${PORTSDIR}/archivers/p7zip
 .endif
 
-.if defined(WITH_MSWORD)
+.if ${PORT_OPTIONS:MMSWORD}
 RUN_DEPENDS+=	${LOCALBASE}/bin/ripole:${PORTSDIR}/textproc/ripole
 .endif
 
-.if defined(WITH_TNEF)
+.if ${PORT_OPTIONS:MTNEF}
 RUN_DEPENDS+=	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
 .endif
 
@@ -238,7 +242,7 @@ pre-install:
 	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
 
 do-install:
-.if defined(WITH_P0F)
+.if ${PORT_OPTIONS:MP0F}
 	${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${PREFIX}/sbin
 .endif
 .for i in amavisd amavisd-agent amavisd-nanny amavisd-release amavisd-snmp-subagent
@@ -257,7 +261,7 @@ do-install:
 .if !exists(${PREFIX}/etc/amavisd-custom.conf)
 	${INSTALL} -o root -g ${AMAVISGROUP} -m 640 ${WRKSRC}/amavisd-custom.conf ${PREFIX}/etc
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/images
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}

Modified: head/security/clamsmtp/Makefile
==============================================================================
--- head/security/clamsmtp/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/clamsmtp/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -1,6 +1,5 @@
 # Created by: Cheng-Lung Sung <clsung at dragon2.net>
 # $FreeBSD$
-#
 
 PORTNAME=	clamsmtp
 PORTVERSION=	1.10
@@ -24,31 +23,29 @@ MAN8=		clamsmtpd.8
 
 PORTDOCS=	README
 
-OPTIONS=	LOCAL_CLAMAV "RUN_DEPEND on security/clamav" on
-OPTIONS+=	LOCAL_CLAMAV_DEVEL "RUN_DEPEND on security/clamav-devel" off
+OPTIONS_RADIO=	CLAMAV
+OPTIONS_RADIO_CLAMAV=	LOCAL_CLAMAV LOCAL_CLAMAV_DEVEL
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=	LOCAL_CLAMAV
+LOCAL_CLAMAV_DESC=		RUN_DEPEND on security/clamav
+LOCAL_CLAMAV_DEVEL_DESC=	RUN_DEPEND on security/clamav-devel
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_LOCAL_CLAMAV)
+.if ${PORT_OPTIONS:MLOCAL_CLAMAV}
 RUN_DEPENDS+=	clamav>=0:${PORTSDIR}/security/clamav
 .endif
 
-.if defined(WITH_LOCAL_CLAMAV_DEVEL)
+.if ${PORT_OPTIONS:MLOCAL_CLAMAV_DEVEL}
 RUN_DEPENDS+=	clamav-devel>=0:${PORTSDIR}/security/clamav-devel
 .endif
 
-.if defined(WITH_LOCAL_CLAMAV) || defined(WITH_LOCAL_CLAMAV_DEVEL)
+.if ${PORT_OPTIONS:MLOCAL_CLAMAV} || ${PORT_OPTIONS:MLOCAL_CLAMAV_DEVEL}
 SUB_LIST+=	CLAMD=clamd
 .else
 SUB_LIST+=	CLAMD=
 .endif
 
-pre-extract:
-.if defined(WITH_LOCAL_CLAMAV) && defined(WITH_LOCAL_CLAMAV_DEVEL)
-	@${ECHO_CMD} "Please select only one clamav port"
-	exit 1
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS}," ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s,/var/run/clamav/clamd,/var/run/clamav/clamd.sock," \
@@ -58,7 +55,7 @@ post-patch:
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${PREFIX}/etc/clamsmtpd.conf-sample
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
@@ -66,4 +63,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/virus_action.sh ${EXAMPLESDIR}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/dazuko/Makefile
==============================================================================
--- head/security/dazuko/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/dazuko/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -12,15 +12,13 @@ COMMENT=	Common interface for 3rd party 
 HAS_CONFIGURE=	yes
 SUB_FILES=	pkg-message
 
-OPTIONS=	EXAMPLEC	"Install C example programs"	on
+OPTIONS_DEFINE=	EXAMPLEC
+OPTIONS_DEFAULT=	EXAMPLEC
+EXAMPLEC_DESC+		Install C example programs
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} >= 800014
-BROKEN=	does not build
-.endif
-
-.if defined(WITH_EXAMPLEC)
+.if ${PORT_OPTIONS:MEXAMPLEC}
 PLIST_FILES=	%%EXAMPLESDIR%%/example %%EXAMPLESDIR%%/example_mt
 PLIST_DIRS=	%%EXAMPLESDIR%%
 .endif
@@ -29,7 +27,7 @@ post-configure:
 	${REINPLACE_CMD} -e 's|^NOMAN|NO_MAN|g' ${WRKSRC}/library/Makefile
 
 do-install:
-.if defined(WITH_EXAMPLEC)
+.if ${PORT_OPTIONS:MEXAMPLEC}
 	@cd ${WRKSRC}/example_c && \
 		${MAKE}
 	@${MKDIR} ${EXAMPLESDIR}
@@ -42,4 +40,4 @@ post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/dirmngr/Makefile
==============================================================================
--- head/security/dirmngr/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/dirmngr/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -1,6 +1,5 @@
 # Created by: michaelnottebrock at gmx.net
 # $FreeBSD$
-#
 
 PORTNAME=	dirmngr
 PORTVERSION=	1.1.0
@@ -31,19 +30,19 @@ MAN1=		dirmngr-client.1 dirmngr.1
 CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	NLS "National Language Support" off
+OPTIONS_DEFINE=	NLS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+USE+=	gettext
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
 .endif
 
 verify: checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/ftimes/Makefile
==============================================================================
--- head/security/ftimes/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/ftimes/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -1,6 +1,5 @@
 # Created by: Klayton Monroe <klm at uidzero.org>
 # $FreeBSD$
-#
 
 PORTNAME=		ftimes
 PORTVERSION=		3.8.0
@@ -17,22 +16,22 @@ USE_PERL5=		yes
 
 MAN1=			ftimes.1
 
-OPTIONS=		DIG_TOOLS "install dig tools" on \
-			HASHDIG_TOOLS "install hashdig tools" on \
-			MAP_TOOLS "install map tools" on \
-			PCRE "PCRE support" on \
-			SSL "OpenSSL support" on \
-			XMAGIC "XMagic support" on
+OPTIONS_DEFINE=	DIG_TOOLS HASHDIG_TOOLS MAP_TOOLS PCRE SSL XMAGIC
+OPTIONS_DEFAULT=	DIG_TOOLS HASHDIG_TOOLS MAP_TOOLS PCRE SSL XMAGIC
+DIG_TOOLS_DESC=		install dig tools
+HASHDIG_TOOLS_DESC=	install hashdig tools
+MAP_TOOLS_DESC=		install map tools
+XMAGIC_DESC=		XMagic support
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DIG_TOOLS) || defined(WITH_MAP_TOOLS)
+.if ${PORT_OPTIONS:MDIG_TOOLS} || ${PORT_OPTIONS:MMAP_TOOLS}
 . if ${PERL_LEVEL} < 500703
 RUN_DEPENDS+=		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5
 . endif
 .endif
 
-.if defined(WITH_DIG_TOOLS)
+.if ${PORT_OPTIONS:MDIG_TOOLS}
 PLIST_SUB+=		DIG_TOOLS=""
 CONFIGURE_ARGS+=	--with-dig-tools
 MAN1+=			ftimes-crv2dbi.1 ftimes-crv2raw.1 ftimes-dig2ctx.1 ftimes-dig2dbi.1 hipdig.1
@@ -41,7 +40,7 @@ RUN_DEPENDS+=		p5-Digest-SHA1>=0:${PORTS
 PLIST_SUB+=		DIG_TOOLS="@comment "
 .endif
 
-.if defined(WITH_HASHDIG_TOOLS)
+.if ${PORT_OPTIONS:MHASHDIG_TOOLS}
 PLIST_SUB+=		HASHDIG_TOOLS=""
 CONFIGURE_ARGS+=	--with-hashdig-tools
 MAN1+=			hashdig-bash.1 hashdig-bind.1 hashdig-dump.1 hashdig-find.1 hashdig-filter.1 hashdig-harvest-sunsolve.1 hashdig-harvest.1 hashdig-make.1 hashdig-resolve-sunsolve.1 hashdig-stat.1 hashdig-weed.1
@@ -49,7 +48,7 @@ MAN1+=			hashdig-bash.1 hashdig-bind.1 h
 PLIST_SUB+=		HASHDIG_TOOLS="@comment "
 .endif
 
-.if defined(WITH_MAP_TOOLS)
+.if ${PORT_OPTIONS:MMAP_TOOLS}
 PLIST_SUB+=		MAP_TOOLS=""
 CONFIGURE_ARGS+=	--with-map-tools
 MAN1+=			ftimes-cmp2dbi.1 ftimes-map2dbi.1 ftimes-map2mac.1 tarmap.1
@@ -57,14 +56,14 @@ MAN1+=			ftimes-cmp2dbi.1 ftimes-map2dbi
 PLIST_SUB+=		MAP_TOOLS="@comment "
 .endif
 
-.if defined(WITH_PCRE)
+.if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=		pcre.3:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-pcre
 .endif
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
@@ -72,7 +71,7 @@ CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBAS
 CONFIGURE_ARGS+=	--without-ssl
 .endif
 
-.if defined(WITH_XMAGIC)
+.if ${PORT_OPTIONS:MXMAGIC}
 PLIST_SUB+=		XMAGIC=""
 CONFIGURE_ARGS+=	--enable-xmagic
 .else
@@ -82,4 +81,4 @@ PLIST_SUB+=		XMAGIC="@comment "
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/ftimes
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/gnupg1/Makefile
==============================================================================
--- head/security/gnupg1/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/gnupg1/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -1,5 +1,4 @@
 # $FreeBSD$
-# Created by: kuriyama at FreeBSD.org
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.13
@@ -28,14 +27,15 @@ LATEST_LINK=	gnupg1
 
 PORTDOCS=	*
 
-OPTIONS=	LDAP "LDAP keyserver interface" off \
-		LIBICONV "use libiconv" off \
-		LIBUSB "use libusb" off \
-		SUID_GPG "install GPG with suid" off \
-		NLS "Native Language Support" on \
-		CURL "use libcurl for the keyserver interface" on
+OPTIONS_DEFINE=	LDAP LIBICONV LIBUSB SUID_GPG NLS CURL DOCS
+OPTIONS_DEFAULT=	CURL
+LDAP_DESC=	LDAP keyserver interface
+LIBICONV_DESC=	use libiconv
+LIBUSB_DESC=	use libusb
+SUID_GPG_DESC=	install GPG with suid
+CURL_DESC=	use libcurl for the keyserver interface
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${CC} == "clang" || ${OSVERSION} >= 1000024
 CFLAGS:=	${CFLAGS:S/$/ -std=c89/}
@@ -44,22 +44,19 @@ CFLAGS:=	${CFLAGS:S/$/ -fheinous-gnu-ext
 .endif
 .endif
 
-.if defined(WITH_LIBICONV)
+.if ${PORT_OPTIONS:MLIBICONV}
 USES+=		iconv
 .else
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 .endif
 
-.if defined(WITH_LIBUSB)
+.if ${PORT_OPTIONS:MLIBUSB}
 CONFIGURE_ARGS+=	--with-libusb=${LOCALBASE}
-. if ${OSVERSION} < 800069
-LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
-. endif
 .else
 CONFIGURE_ARGS+=	--without-libusb
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 PLIST_SUB+=	WITH_LDAP=""
 CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
@@ -69,7 +66,7 @@ PLIST_SUB+=	WITH_LDAP="@comment "
 CONFIGURE_ARGS+=	--disable-ldap
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	YES
 PLIST_SUB+=	NLS=""
 .else
@@ -77,7 +74,7 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_CURL)
+.if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
 # Work around a GnuPG configure buglet
@@ -87,7 +84,7 @@ CONFIGURE_ARGS+=--without-libcurl
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in DETAILS FAQ HACKING OpenPGP
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
@@ -97,11 +94,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-.if defined(WITH_SUID_GPG)
+.if ${PORT_OPTIONS:MSUID_GPG}
 	${CHMOD} u+s ${PREFIX}/bin/gpg
 .endif
 
 check:
 	(cd ${WRKSRC}; ${MAKE} check)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/heimdal/Makefile
==============================================================================
--- head/security/heimdal/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/heimdal/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -1,6 +1,5 @@
 # Created by: nectar at FreeBSD.ORG
 # $FreeBSD$
-#
 
 PORTNAME=	heimdal
 PORTVERSION=	1.5.2
@@ -16,16 +15,17 @@ COMMENT=	Popular BSD-licensed implementa
 
 CONFLICTS=	krb4-[0-9]* krb5-[0-9]* srp-[0-9]*
 
-OPTIONS=	IPV6	"Enable IPV6 support"				on \
-		KCM	"Enable Kerberos Credentials Manager"		on \
-		BDB	"Enable BerkeleyDB KDC backend support"		on \
-		SQLITE	"Enable SQLite KDC backend support"		off \
-		LDAP	"Enable OpenLDAP KDC backend support"		off \
-		PKINIT	"Enable PK-INIT support"			on \
-		DIGEST	"Enable DIGEST support"				on \
-		KX509	"Enable kx509 support"				on \
-		CRACKLIB "Use CrackLib for password quality checking"	off \
-		X11	 "Build X11 utilies"				off
+OPTIONS_DEFINE=	IPV6 KCM BDB SQLITE LDAP PKINIT DIGEST KX509 CRACKLIB X11
+OPTIONS_DEFAULT=	KCM BDB PKINIT DIGEST KX509
+KCM_DESC=	Enable Kerberos Credentials Manager
+BDB_DESC=	Enable BerkeleyDB KDC backend support
+SQLITE_DESC=	Enable SQLite KDC backend support
+LDAP_DESC=	Enable OpenLDAP KDC backend support
+PKINIT_DESC=	Enable PK-INIT support
+DIGEST_DESC=	Enable DIGEST support
+KX509_DESC=	Enable kx509 support
+CRACKLIB_DESC=	Use CrackLib for password quality checking
+X11_DESC=	Build X11 utilies
 
 USE_AUTOTOOLS=	autoconf autoheader libtool
 USE_GNOME=	gnomehack pkgconfig
@@ -43,7 +43,7 @@ MAKE_ENV+=	INSTALL_CATPAGES=no
 INFO=		heimdal hx509
 PLIST=		${WRKDIR}/PLIST
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
@@ -55,13 +55,13 @@ PLIST_SUB+=	HCRYPTO="@comment "
 PLIST_SUB+=	HCRYPTO=""
 .endif
 
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--without-ipv6
-.else
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--with-ipv6
+.else
+CONFIGURE_ARGS+=	--without-ipv6
 .endif
 
-.if !defined(WITHOUT_KCM)
+.if ${PORT_OPTIONS:MKCM}
 CONFIGURE_ARGS+=	--enable-kcm
 PLIST_SUB+=	KCM=""
 .else
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--disable-kcm
 PLIST_SUB+=	KCM="@comment "
 .endif
 
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 USE_BDB=	yes
 CFLAGS+=	-I${BDB_INCLUDE_DIR}
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
@@ -80,7 +80,7 @@ CONFIGURE_ARGS+=	--with-berkeley-db=${LO
 CONFIGURE_ARGS+=	--with-berkeley-db=no
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 PLIST_SUB+=	SQLITE="@comment "
@@ -89,7 +89,7 @@ CONFIGURE_ARGS+=	--without-sqlite3
 PLIST_SUB+=	SQLITE=""
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-openldap=${LOCALBASE}
 .  if defined(LDAP_SOCKET_PATH)
@@ -102,29 +102,29 @@ _SOCK=		${LDAP_RUN_DIR:C|/|%2f|g}%2fldap
 CONFIGURE_ARGS+=	--without-openldap
 .endif
 
-.if defined(WITHOUT_PKINIT)
+.if ! ${PORT_OPTIONS:MPKINIT}
 CONFIGURE_ARGS+=	--disable-pk-init
 .else
 CONFIGURE_ARGS+=	--enable-pk-init
 .endif
 
-.if defined(WITHOUT_DIGEST)
+.if ! ${PORT_OPTIONS:MDIGEST}
 CONFIGURE_ARGS+=	--disable-digest
 .else
 CONFIGURE_ARGS+=	--enable-digest
 .endif
 
-.if defined(WITHOUT_KX509)
+.if ! ${PORT_OPTIONS:MKX509}
 CONFIGURE_ARGS+=	--disable-kx509
 .else
 CONFIGURE_ARGS+=	--enable-kx509
 .endif
 
-.if defined(WITH_CRACKLIB)
+.if ${PORT_OPTIONS:MCRACKLIB}
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
 .endif
 
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=		x11 xt
 CONFIGURE_ARGS+=	--with-x
 .else
@@ -138,7 +138,7 @@ CONFLICTS+=	wu-ftpd-[0-9]* wu-ftpd+ipv6-
 .endif
 
 post-patch:
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 	@${REINPLACE_CMD} -e 's|%%LDAP_SOCKET%%|${_SOCK:Q}|g' \
 		${WRKSRC}/lib/hdb/hdb-ldap.c
 .endif
@@ -148,7 +148,7 @@ post-patch:
 		${WRKSRC}/lib/ipc/Makefile.in
 
 post-build:
-.if defined(WITH_CRACKLIB)
+.if ${PORT_OPTIONS:MCRACKLIB}
 	${SED} -e "s;%%LOCALBASE%%;${LOCALBASE};g" \
 		${FILESDIR}/kpasswdd-cracklib.c.in > ${WRKSRC}/kpasswdd-cracklib.c
 	(cd ${WRKSRC} && \
@@ -161,13 +161,13 @@ pre-install:
 	@if [ -f ${WRKSRC}/lib/com_err/.libs/compile_et ]; then \
 		${CAT} ${PKGDIR}/pkg-plist.com_err >> ${PLIST}; \
 	fi
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 	@${CAT} ${PKGDIR}/pkg-plist.x11 >> ${PLIST}
 .endif
 .if !exists(/usr/include/ifaddrs.h)
 	@${ECHO_CMD} include/ifaddrs.h >> ${PLIST}
 .endif
-.if defined(WITH_CRACKLIB)
+.if ${PORT_OPTIONS:MCRACKLIB}
 	${INSTALL_PROGRAM} ${WRKSRC}/kpasswdd-cracklib.so ${PREFIX}/lib/
 	@${ECHO_CMD} lib/kpasswdd-cracklib.so >> ${PLIST}
 .endif
@@ -178,4 +178,4 @@ post-install:
 	${SED} 's;%%PREFIX%%;${PREFIX};g' ${FILESDIR}/kdc.sh > \
 		${PREFIX}/etc/rc.d/kdc.sh.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/ike/Makefile
==============================================================================
--- head/security/ike/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/ike/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -25,30 +25,30 @@ CMAKE_ARGS+=	-DETCDIR:PATH="${PREFIX}/et
 		-DLIBDIR:PATH="${PREFIX}/lib" \
 		-DMANDIR:PATH="${PREFIX}/man"
 
-OPTIONS=	QTGUI		"Enable QT client front end applications" on \
-		NATT		"Enable NAT-Traversal (kernel-patch required)" off \
-		LDAP		"Enable LDAP XAuth daemon support" off \
-		DEBUG		"Enable Debug support" off
+OPTIONS_DEFINE=	QTGUI NATT LDAP DEBUG
+QTGUI_DESC=	Enable QT client front end applications
+NATT_DESC=	Enable NAT-Traversal (kernel-patch required)
+LDAP_DESC=	Enable LDAP XAuth daemon support
 
 .include <bsd.port.options.mk>
 
 MAN5=		iked.conf.5
 MAN8=		iked.8
 
-.ifdef(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CMAKE_ARGS+=	-DDEBUG=YES
 .endif
 
-.ifdef(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	YES
 CMAKE_ARGS+=	-DLDAP=YES
 .endif
 
-.ifdef(WITH_NATT)
+.if ${PORT_OPTIONS:MNATT}
 CMAKE_ARGS+=	-DNATT=YES
 .endif
 
-.ifdef(WITH_QTGUI)
+.if ${PORT_OPTIONS:MQTGUI}
 CMAKE_ARGS+=	-DQTGUI=YES
 USE_QT_VER=	3
 MAN1=		ikea.1 ikec.1
@@ -60,7 +60,7 @@ PLIST_SUB+=	QTGUI="@comment "
 .include <bsd.port.pre.mk>
 
 post-patch:
-.if defined(WITH_NATT)
+.if ${PORT_OPTIONS:MNATT}
 . if ${OSVERSION} < 800000
 	@${ECHO_MSG} "===> -------------------------------------------------------------------------"
 	@${ECHO_MSG} "===> WARNING: You will need to patch your kernel for NAT-T functionality!"
@@ -88,7 +88,7 @@ post-install:
 	${ECHO_MSG} "===>   http://www.freebsd.org/doc/en/books/handbook/ipsec.html"; \
 	${ECHO_MSG} "===> -------------------------------------------------------------------------"; \
 	fi ;
-.if defined(WITH_NATT)
+.if ${PORT_OPTIONS:MNATT}
 	@${ECHO_MSG} "===> -------------------------------------------------------------------------"
 	@${ECHO_MSG} "===> WARNING: To use NAT Traversal ( NAT-T ) support, please be sure to"
 	@${ECHO_MSG} "===> include the following line in your kernel config file."

Modified: head/security/john/Makefile
==============================================================================
--- head/security/john/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/john/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	John the Ripper
-# Date created:				Sun Mar 09, 1997
-# Whom:					David O'Brien <obrien at FreeBSD.org>
-#
+# Created by: David O'Brien <obrien at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	john
 DISTVERSION=	1.7.9-jumbo-5
@@ -38,7 +34,8 @@ CFLAGS+=	-DJOHN_SYSTEMWIDE=1 \
 PORTDOCS=	CHANGES CONFIG EXAMPLES EXTERNAL FAQ MODES OPTIONS README \
 		RULES CONTACT CREDITS
 
-OPTIONS=	OPENMP	"Compile with OpenMP support"	off
+OPTIONS_DEFINE=	OPENMP DOCS
+OPENMP_DESC=	Compile with OpenMP support
 
 .include <bsd.port.pre.mk>
 
@@ -65,7 +62,7 @@ BROKEN=		Does not compile on sparc64
 post-patch:
 	@${REINPLACE_CMD} -e 's|= gcc|= ${CC}|' \
 		-e '/^CFLAGS =/s|-O2|${CFLAGS}|' ${WRKSRC}/src/Makefile
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
 	@${REINPLACE_CMD} -E \
 		'/(fopenmp|-m${MACHINE_CPU:Msse2})$$/s,#(OMPFLAGS =),\1,' \
 			${WRKSRC}/src/Makefile
@@ -93,9 +90,9 @@ do-install:
 .if !exists(${PREFIX}/etc/john.conf)
 	${INSTALL_DATA} ${WRKSRC}/run/john.conf ${PREFIX}/etc
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/krb5-appl/Makefile
==============================================================================
--- head/security/krb5-appl/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/krb5-appl/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -1,6 +1,5 @@
 # Created by: cy at FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=		krb5-appl
 PORTVERSION=		1.0.3
@@ -33,15 +32,16 @@ CONFIGURE_ENV=		INSTALL="${INSTALL}" YAC
 MAKE_ARGS=		INSTALL="${INSTALL}"
 PATCH_DIST_STRIP=	-p1
 
-OPTIONS=		KRB5_RENAME_FTP "Rename ftp to kftp" off \
-			KRB5_RENAME_TELNET "Rename telnet to ktelnet" off \
-			KRB5_RENAME_RLOGIN "Rename rlogin to krlogin" off \
-			KRB5_RENAME_RSH "Rename rsh to krsh" off \
-			KRB5_RENAME_RCP "Rename rcp to krcp" off
+OPTIONS_DEFINE=	KRB5_RENAME_FTP KRB5_RENAME_TELNET KRB5_RENAME_RLOGIN KRB5_RENAME_RSH KRB5_RENAME_RCP
+KRB5_RENAME_FTP_DESC=		Rename ftp to kftp
+KRB5_RENAME_TELNET_DESC=	Rename telnet to ktelnet
+KRB5_RENAME_RLOGIN_DESC=	Rename rlogin to krlogin
+KRB5_RENAME_RSH_DESC=		Rename rsh to krsh
+KRB5_RENAME_RCP_DESC=		Rename rcp to krcp
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_KRB5_DOC)
+.if ${PORT_OPTIONS:MKRB5_DOC}
 BUILD_DEPENDS+=		texi2dvi:${PORTSDIR}/print/texinfo \
 			dvips:${PORTSDIR}/print/dvipsk-tetex
 INFO=			krb5-admin krb5-install krb5-user
@@ -57,7 +57,7 @@ LDFLAGS+=		-L${PREFIX}/lib
 MAN1=			rsh.1 rcp.1 rlogin.1 ftp.1 telnet.1
 MAN8=			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
 
-.if defined(WITH_KRB5_RENAME_FTP)
+.if ${PORT_OPTIONS:MKRB5_RENAME_FTP}
 MAN1:=			${MAN1:C/ftp/kftp/}
 MAN8:=			${MAN8:C/ftp/kftp/}
 PROGRAM_TRANSFORM_NAME+=	s/^ftp/kftp/;
@@ -66,7 +66,7 @@ PLIST_SUB+=		FTP_PROG="kftp"
 PLIST_SUB+=		FTP_PROG="ftp"
 .endif
 
-.if defined(WITH_KRB5_RENAME_TELNET)
+.if ${PORT_OPTIONS:MKRB5_RENAME_TELNET}
 MAN1:=			${MAN1:C/telnet/ktelnet/}
 MAN8:=			${MAN8:C/telnet/ktelnet/}
 PROGRAM_TRANSFORM_NAME+=	s/^telnet/ktelnet/;
@@ -75,7 +75,7 @@ PLIST_SUB+=		TELNET_PROG="ktelnet"
 PLIST_SUB+=		TELNET_PROG="telnet"
 .endif
 
-.if defined(WITH_KRB5_RENAME_RLOGIN)
+.if ${PORT_OPTIONS:MKRB5_RENAME_RLOGIN}
 MAN1:=			${MAN1:C/rlogin/krlogin/}
 PROGRAM_TRANSFORM_NAME+=	s/^rlogin/krlogin/;
 PLIST_SUB+=		RLOGIN_PROG="krlogin"
@@ -83,7 +83,7 @@ PLIST_SUB+=		RLOGIN_PROG="krlogin"
 PLIST_SUB+=		RLOGIN_PROG="rlogin"
 .endif
 
-.if defined(WITH_KRB5_RENAME_RSH)
+.if ${PORT_OPTIONS:MKRB5_RENAME_RSH}
 MAN1:=			${MAN1:C/rsh/krsh/}
 PROGRAM_TRANSFORM_NAME+=	s/^rsh/krsh/;
 PLIST_SUB+=		RSH_PROG="krsh"
@@ -91,7 +91,7 @@ PLIST_SUB+=		RSH_PROG="krsh"
 PLIST_SUB+=		RSH_PROG="rsh"
 .endif
 
-.if defined(WITH_KRB5_RENAME_RCP)
+.if ${PORT_OPTIONS:MKRB5_RENAME_RCP}
 MAN1:=			${MAN1:C/rcp/krcp/}
 PROGRAM_TRANSFORM_NAME+=	s/^rcp/krcp/;
 PLIST_SUB+=		RCP_PROG="krcp"

Modified: head/security/maia/Makefile
==============================================================================
--- head/security/maia/Makefile	Sun Apr 28 20:50:13 2013	(r316748)
+++ head/security/maia/Makefile	Sun Apr 28 21:02:39 2013	(r316749)
@@ -1,6 +1,5 @@
 # Created by: Janky Jay <ek at purplehat.org>
 # $FreeBSD$
-#
 
 PORTNAME=	maia
 DISTVERSION=	1.0.3-${SVNREVISION}
@@ -39,43 +38,49 @@ MAIADIR?=	/var/maiad
 MAIAQUARANTINE?=	/var/maiad/virusmails
 PEAR_DIR?=	${LOCALBASE}/share/pear
 
-OPTIONS=	APACHE	"Use Apache web server"	off\
-		LIGHTTPD	"Use LighTTPD web server"	off \
-		WEBHOST	"PHP, PEAR, etc... for Maia web interface"	off \
-		MYSQL	"Use MySQL datebase"		on \
-		MYSQLSERVER	"Install MySQL Server"	on \
-		PGSQL	"Use PgSQL database"		off \
-		PGSQLSERVER	"Install PGSQL Server"	off \
-		DOVECOT	"Use Dovecot IMAP/POP3"	on \
-		POSTFIX	"Use Postfix MTA"	on \
-		PFA	"Use Postfixadmin"	off \
-		FUZZYOCR	"Use FuzzyOcr"	off \
-		CLAMAV	"Use ClamAV anti-virus"	on \
-		SPAMASSASSIN	"Use SpamAssassin"	on \
-		GRAPHICS	"Enable pie chart stats"	off \
-		BDB	"Use BerkeleyDB"	on \
-		ALTERMIME	"Use AlterMime"	off \
-		CRYPT	"Encryption support"	off \
-		IPCOUNTRY	"SpamAssassin IP Country plugin"	on \
-		DOMAINKEYS	"SpamAssassin DomainKey plugin"	on \
-		SPF	"SpamAssassin SPF plugin"	on \
-		DKIM	"SpamAssassin DKIM plugin"	on \
-		FILE	"Use newer file(1) utility from ports"	on \
-		RAR	"RAR support with archivers/rar"	off \
-		UNRAR	"RAR support with archivers/unrar"	on \
-		ARJ	"ARJ support with archivers/arj"	on \
-		UNARJ	"ARJ support with archivers/unarj"	off \
-		LHA	"LHA support with archivers/lha"	on \
-		ARC	"ARC support with archivers/arc"	on \
-		NOMARCH	"ARC support with archivers/nomarch"	off \
-		CAB	"CAB support with archivers/cabextract"	on \
-		RPM	"RPM support with archivers/rpm2cpio"	on \
-		ZOO	"ZOO support with archivers/zoo"	on \
-		UNZOO	"ZOO support with archivers/unzoo"	off \
-		LZOP	"LZOP support with archivers/lzop"	off \
-		FREEZE	"FREEZE support with archivers/freeze"	on \
-		P7ZIP	"P7ZIP support with archivers/p7zip"	on \
-		TNEF	"Add external tnef decoder"	off
+OPTIONS_DEFINE=	APACHE LIGHTTPD WEBHOST MYSQL MYSQLSERVER PGSQL PGSQLSERVER DOVECOT \
+		POSTFIX PFA FUZZYOCR CLAMAV SPAMASSASSIN GRAPHICS BDB ALTERMIME CRYPT \
+		IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR ARJ UNARJ LHA ARC NOMARCH CAB \
+		RPM ZOO UNZOO LZOP FREEZE P7ZIP TNEF
+OPTIONS_DEFAULT=	MYSQL MYSQLSERVER DOVECOT POSTFIX CLAMAV SPAMASSASSIN BDB IPCOUNTRY \
+			DOMAINKEYS SPF DKIM FILE UNRAR ARJ LHA ARC CAB RPM ZOO FREEZE P7ZIP
+APACHE_DESC=		Use Apache web server
+LIGHTTPD_DESC=		Use LighTTPD web server
+WEBHOST_DESC=		PHP, PEAR, etc... for Maia web interface
+MYSQL_DESC=		Use MySQL datebase
+MYSQLSERVER_DESC=	Install MySQL Server
+PGSQL_DESC=		Use PgSQL database
+PGSQLSERVER_DESC=	Install PGSQL Server
+DOVECOT_DESC=		Use Dovecot IMAP/POP3
+POSTFIX_DESC=		Use Postfix MTA
+PFA_DESC=		Use Postfixadmin
+FUZZYOCR_DESC=		Use FuzzyOcr
+CLAMAV_DESC=		Use ClamAV anti-virus
+SPAMASSASSIN_DESC=	Use SpamAssassin
+GRAPHICS_DESC=		Enable pie chart stats
+BDB_DESC=		Use BerkeleyDB
+ALTERMIME_DESC=		Use AlterMime
+CRYPT_DESC=		Encryption support
+IPCOUNTRY_DESC=		SpamAssassin IP Country plugin
+DOMAINKEYS_DESC=	SpamAssassin DomainKey plugin
+SPF_DESC=		SpamAssassin SPF plugin
+DKIM_DESC=		SpamAssassin DKIM plugin
+FILE_DESC=		Use newer file(1) utility from ports
+RAR_DESC=		RAR support with archivers/rar
+UNRAR_DESC=		RAR support with archivers/unrar
+ARJ_DESC=		ARJ support with archivers/arj
+UNARJ_DESC=		ARJ support with archivers/unarj

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-ports-head mailing list