aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2013-04-29 05:02:39 +0800
committerbapt <bapt@FreeBSD.org>2013-04-29 05:02:39 +0800
commit63cff4fb52ecbe8ce9260e04e0049980d8cb41d5 (patch)
tree933fd11da647dda8c169bc24693094174bdc0355
parent65f6091f0d07908b50e6042a48cdadec0073a2ac (diff)
downloadfreebsd-ports-gnome-63cff4fb52ecbe8ce9260e04e0049980d8cb41d5.tar.gz
freebsd-ports-gnome-63cff4fb52ecbe8ce9260e04e0049980d8cb41d5.tar.zst
freebsd-ports-gnome-63cff4fb52ecbe8ce9260e04e0049980d8cb41d5.zip
Convert security to new options framework
-rw-r--r--security/amavisd-new/Makefile120
-rw-r--r--security/clamsmtp/Makefile27
-rw-r--r--security/dazuko/Makefile16
-rw-r--r--security/dirmngr/Makefile15
-rw-r--r--security/ftimes/Makefile29
-rw-r--r--security/gnupg1/Makefile35
-rw-r--r--security/heimdal/Makefile58
-rw-r--r--security/ike/Makefile20
-rw-r--r--security/john/Makefile15
-rw-r--r--security/krb5-appl/Makefile24
-rw-r--r--security/maia/Makefile163
-rw-r--r--security/mailzu/Makefile30
-rw-r--r--security/medusa/Makefile10
-rw-r--r--security/metasploit/Makefile4
-rw-r--r--security/oidentd/Makefile9
-rw-r--r--security/openct/Makefile10
-rw-r--r--security/osiris/Makefile28
-rw-r--r--security/p5-openxpki/Makefile9
-rw-r--r--security/pam_bsdbioapi/Makefile19
-rw-r--r--security/php-Auth_OpenID/Makefile20
-rw-r--r--security/php-Auth_OpenID2/Makefile22
-rw-r--r--security/racoon2/Makefile19
-rw-r--r--security/scrypt/Makefile11
-rw-r--r--security/shibboleth2-sp/Makefile11
-rw-r--r--security/snortsam/Makefile23
-rw-r--r--security/spybye/Makefile11
-rw-r--r--security/tripwire/Makefile44
-rw-r--r--security/yapet/Makefile26
28 files changed, 393 insertions, 435 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index c3368e4000c8..40c85ed392e7 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -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}/sysutils/file
# 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 port and is not compatible with ${ARCH}
.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}
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index e5e75fcef9b7..d649ce557be8 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -1,6 +1,5 @@
# Created by: Cheng-Lung Sung <clsung@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>
diff --git a/security/dazuko/Makefile b/security/dazuko/Makefile
index 662fd49f9713..88ed03b161b5 100644
--- a/security/dazuko/Makefile
+++ b/security/dazuko/Makefile
@@ -12,15 +12,13 @@ COMMENT= Common interface for 3rd party file access control
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>
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 8ab7df899c3b..72a7441f033d 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,6 +1,5 @@
# Created by: michaelnottebrock@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>
diff --git a/security/ftimes/Makefile b/security/ftimes/Makefile
index 5f6ad8b0c8d4..0fd53f149804 100644
--- a/security/ftimes/Makefile
+++ b/security/ftimes/Makefile
@@ -1,6 +1,5 @@
# Created by: Klayton Monroe <klm@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:${PORTSDIR}/security/p5-Digest-SHA1
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 hashdig-dump.1 hashdig-find.1 hashdig-fil
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.1 ftimes-map2mac.1 tarmap.1
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=${OPENSSLBASE}
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>
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 828ce2806e28..3d120fe1c0bc 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -1,5 +1,4 @@
# $FreeBSD$
-# Created by: kuriyama@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-extensions/}
.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>
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index a3624351fd34..3e53eab87cd5 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,6 +1,5 @@
# Created by: nectar@FreeBSD.ORG
# $FreeBSD$
-#
PORTNAME= heimdal
PORTVERSION= 1.5.2
@@ -16,16 +15,17 @@ COMMENT= Popular BSD-licensed implementation of Kerberos 5
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=${LOCALBASE} \
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}%2fldapi
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-[0-9]*
.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>
diff --git a/security/ike/Makefile b/security/ike/Makefile
index bc5c8f922789..7a1dad3dc6a0 100644
--- a/security/ike/Makefile
+++ b/security/ike/Makefile
@@ -25,30 +25,30 @@ CMAKE_ARGS+= -DETCDIR:PATH="${PREFIX}/etc" \
-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."
diff --git a/security/john/Makefile b/security/john/Makefile
index 02f504ae288a..c4557bdd24d4 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: John the Ripper
-# Date created: Sun Mar 09, 1997
-# Whom: David O'Brien <obrien@FreeBSD.org>
-#
+# Created by: David O'Brien <obrien@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>
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index abe322039a65..82fff3925ab3 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -1,6 +1,5 @@
# Created by: cy@FreeBSD.org
# $FreeBSD$
-#
PORTNAME= krb5-appl
PORTVERSION= 1.0.3
@@ -33,15 +32,16 @@ CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc
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"
diff --git a/security/maia/Makefile b/security/maia/Makefile
index f5c4ad1fc8c5..d1442e66202c 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -1,6 +1,5 @@
# Created by: Janky Jay <ek@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
+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
+TNEF_DESC= Add external tnef decoder
SUB_FILES= pkg-install pkg-deinstall pkg-message
SUB_LIST+= MAIAUSER=${USERS} \
@@ -90,33 +95,33 @@ USE_RC_SUBR+= maiad
# to duplicate some WITH_ parts like WEBHOST that use pre.mk vars as well as
# setting USE_ variables. C'est la vie.
-.if defined(WITH_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
USE_APACHE_RUN= 22+
.endif
-.if defined(WITH_WEBHOST)
+.if ${PORT_OPTIONS:MWEBHOST}
USE_PHP= bcmath ctype dom gettext hash iconv imap json mbstring \
mcrypt pdo pdo_sqlite posix session simplexml sockets \
sqlite3 tokenizer xml wddx xmlreader xmlwriter xmlrpc
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
USE_PHP+= mysql mysqli
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
USE_PHP+= pgsql
.endif
.include <bsd.port.pre.mk>
-.if defined(WITH_LIGHTTPD)
+.if ${PORT_OPTIONS:MLIGHTTPD}
RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd
.endif
-.if defined(WITH_WEBHOST)
+.if ${PORT_OPTIONS:MWEBHOST}
RUN_DEPENDS+= ${PEAR_DIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime \
${PEAR_DIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode \
${PEAR_DIR}/DB.php:${PORTSDIR}/databases/pear-DB \
@@ -127,47 +132,47 @@ RUN_DEPENDS+= ${PEAR_DIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime \
${LOCALBASE}/share/smarty/Smarty.class.php:${PORTSDIR}/www/smarty2
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
.endif
-.if defined(WITH_MYSQLSERVER)
+.if ${PORT_OPTIONS:MMYSQLSERVER}
RUN_DEPENDS+= ${LOCALBASE}/bin/mysqld_safe:${PORTSDIR}/databases/mysql55-server
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
.endif
-.if defined(WITH_PGSQLSERVER)
+.if ${PORT_OPTIONS:MPGSQLSERVER}
RUN_DEPENDS+= ${LOCALBASE}/bin/pg_ctl:${PORTSDIR}/databases/postgresql84-server
.endif
-.if defined(WITH_DOVECOT)
+.if ${PORT_OPTIONS:MDOVECOT}
RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot
.endif
-.if defined(WITH_POSTFIX)
+.if ${PORT_OPTIONS:MPOSTFIX}
RUN_DEPENDS+= postfix:${PORTSDIR}/mail/postfix
.endif
-.if defined(WITH_PFA)
+.if ${PORT_OPTIONS:MPFA}
RUN_DEPENDS+= ${LOCALBASE}/www/postfixadmin/config.inc.php:${PORTSDIR}/mail/postfixadmin
.endif
-.if defined(WITH_FUZZYOCR)
+.if ${PORT_OPTIONS:MFUZZYOCR}
RUN_DEPENDS+= p5-FuzzyOcr-devel>=0:${PORTSDIR}/mail/p5-FuzzyOcr-devel
.endif
-.if defined(WITH_CLAMAV)
+.if ${PORT_OPTIONS:MCLAMAV}
RUN_DEPENDS+= clamd:${PORTSDIR}/security/clamav
.endif
-.if defined(WITH_SPAMASSASSIN)
+.if ${PORT_OPTIONS:MSPAMASSASSIN}
RUN_DEPENDS+= p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
.endif
-.if defined(WITH_GRAPHICS)
+.if ${PORT_OPTIONS:MGRAPHICS}
RUN_DEPENDS+= ${PEAR_DIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color \
${PEAR_DIR}/Image/Canvas.php:${PORTSDIR}/graphics/pear-Image_Canvas \
${PEAR_DIR}/Image/Graph.php:${PORTSDIR}/graphics/pear-Image_Graph \
@@ -175,37 +180,37 @@ RUN_DEPENDS+= ${PEAR_DIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color
${PEAR_DIR}/Numbers/Words.php:${PORTSDIR}/textproc/pear-Numbers_Words
.endif
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
RUN_DEPENDS+= p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
.endif
-.if defined(WITH_ALTERMIME)
+.if ${PORT_OPTIONS:MALTERMIME}
RUN_DEPENDS+= altermime:${PORTSDIR}/mail/altermime
.endif
-.if defined(WITH_CRYPT)
+.if ${PORT_OPTIONS:MCRYPT}
RUN_DEPENDS+= p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
.endif
-.if defined(WITH_IPCOUNTRY)
+.if ${PORT_OPTIONS:MIPCOUNTRY}
RUN_DEPENDS+= p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
.endif
-.if defined(WITH_DOMAINKEYS)
+.if ${PORT_OPTIONS:MDOMAINKEYS}
RUN_DEPENDS+= p5-Mail-DomainKeys>=0:${PORTSDIR}/mail/p5-Mail-DomainKeys
.endif
-.if defined(WITH_SPF)
+.if ${PORT_OPTIONS:MSPF}
RUN_DEPENDS+= p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF
.endif
-.if defined(WITH_DKIM)
+.if ${PORT_OPTIONS:MDKIM}
RUN_DEPENDS+= p5-Mail-DKIM>=0:${PORTSDIR}/mail/p5-Mail-DKIM
.endif
-.if defined(WITH_FILE)
+.if ${PORT_OPTIONS:MFILE}
# security fix, file > 4.21 needed
RUN_DEPENDS+= file>=4.21:${PORTSDIR}/sysutils/file
.endif
@@ -213,65 +218,65 @@ RUN_DEPENDS+= file>=4.21:${PORTSDIR}/sysutils/file
# archviers/rar is a 32-bit binary port, we don't want the install to fail
# at that port, therefore we will block instantly here if the platform does
# not suit rar.
-.if defined(WITH_RAR)
+.if ${PORT_OPTIONS:MRAR}
IA32_BINARY_PORT= yes
RUN_DEPENDS+= rar:${PORTSDIR}/archivers/rar
.endif
-.if defined(WITH_UNRAR)
+.if ${PORT_OPTIONS:MUNRAR}
RUN_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar
.endif
-.if defined(WITH_ARJ)
+.if ${PORT_OPTIONS:MARJ}
RUN_DEPENDS+= arj:${PORTSDIR}/archivers/arj
.endif
-.if defined(WITH_UNARJ)
+.if ${PORT_OPTIONS:MUNARJ}
RUN_DEPENDS+= unarj:${PORTSDIR}/archivers/unarj
.endif
-.if defined(WITH_LHA)
+.if ${PORT_OPTIONS:MLHA}
RUN_DEPENDS+= lha:${PORTSDIR}/archivers/lha
.endif
-.if defined(WITH_ARC)
+.if ${PORT_OPTIONS:MARC}
RUN_DEPENDS+= arc:${PORTSDIR}/archivers/arc
.endif
-.if defined(WITH_NOMARCH)
+.if ${PORT_OPTIONS:MNOMARCH}
RUN_DEPENDS+= nomarch:${PORTSDIR}/archivers/nomarch
.endif
-.if defined(WITH_CAB)
+.if ${PORT_OPTIONS:MCAB}
RUN_DEPENDS+= cabextract:${PORTSDIR}/archivers/cabextract
.endif
-.if defined(WITH_RPM)
+.if ${PORT_OPTIONS:MRPM}
RUN_DEPENDS+= 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+= lzop:${PORTSDIR}/archivers/lzop
.endif
-.if defined(WITH_FREEZE)
+.if ${PORT_OPTIONS:MFREEZE}
RUN_DEPENDS+= unfreeze:${PORTSDIR}/archivers/freeze
.endif
-.if defined(WITH_P7ZIP)
+.if ${PORT_OPTIONS:MP7ZIP}
RUN_DEPENDS+= 7zr:${PORTSDIR}/archivers/p7zip
.endif
-.if defined(WITH_TNEF)
+.if ${PORT_OPTIONS:MTNEF}
RUN_DEPENDS+= tnef:${PORTSDIR}/converters/tnef
.endif
@@ -333,7 +338,7 @@ do-install:
${WRKSRC}/php/config.php.dist \
${PREFIX}/www/${PORTNAME}/config.php
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for i in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile
index a5bc77850159..36747e4e145b 100644
--- a/security/mailzu/Makefile
+++ b/security/mailzu/Makefile
@@ -1,6 +1,5 @@
# Created by: Sahil Tandon <sahil@tandon.net>
# $FreeBSD$
-#
PORTNAME= mailzu
DISTVERSION= 0.8rc3
@@ -27,34 +26,35 @@ NO_BUILD= yes
USE_PHP= sockets
WANT_PHP_WEB= yes
-OPTIONS= MYSQL "Use MySQL database storage/auth backend (default)" On \
- PGSQL "Use PostgreSQL database/auth storage backend" Off \
- IMAP "Use IMAP auth backend" Off \
- LDAP "Use LDAP auth backend" Off
+OPTIONS_DEFINE= IMAP LDAP DOCS
+OPTIONS_MULTI= SQL
+OPTIONS_MULTI_SQL= MYSQL PGSQL
+OPTIONS_DEFAULT= MYSQL
+SQL_DESC= SQL sotage backend
+MYSQL_DESC= Use MySQL database storage/auth backend (default)
+PGSQL_DESC= Use PostgreSQL database/auth storage backend
+IMAP_DESC= Use IMAP auth backend
+LDAP_DESC= Use LDAP auth backend
.include <bsd.port.pre.mk>
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysql
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
.endif
-.if defined(WITH_IMAP)
+.if ${PORT_OPTIONS:MIMAP}
USE_PHP+= imap
.endif
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
USE_PHP+= ldap
.endif
-.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL)
-IGNORE= you must choose a SQL storage backend with 'make config'
-.endif
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
.endif
@@ -66,7 +66,7 @@ do-install:
@cd ${WRKSRC} && ${COPYTREE_BIN} scripts ${WWWDIR}
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
@${INSTALL_MAN} ${WRKSRC}/CHANGELOG ${WRKSRC}/README ${DOCSDIR}
@${INSTALL_MAN} ${WRKSRC}/docs/* ${DOCSDIR}
diff --git a/security/medusa/Makefile b/security/medusa/Makefile
index dcd70c03a9a6..d598e8769288 100644
--- a/security/medusa/Makefile
+++ b/security/medusa/Makefile
@@ -1,6 +1,5 @@
# Created by: David Thiel <lx@redundancy.redundancy.org>
# $FreeBSD$
-#
PORTNAME= medusa
PORTVERSION= 2.1
@@ -12,8 +11,7 @@ MASTER_SITES= http://www.foofus.net/~jmk/tools/ \
MAINTAINER= lx@FreeBSD.org
COMMENT= Speedy, massively parallel, modular, login brute-forcer
-OPTIONS= SVN "Enable Subversion module" off \
- POSTGRESQL "Enable PostgreSQL module" off
+OPTIONS_DEFINE= SVN PGSQL DOCS
LIB_DEPENDS+= ssh2:${PORTSDIR}/security/libssh2 \
pcre:${PORTSDIR}/devel/pcre
@@ -29,7 +27,7 @@ MAN1= medusa.1
BROKEN= Does not build on ia64
.endif
-.if defined(WITH_SVN)
+.if ${PORT_OPTIONS:MSVN}
PLIST_SUB+= SVN=""
LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
CFLAGS+= -I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1
@@ -38,7 +36,7 @@ CONFIGURE_ARGS+= --enable-module-svn=no
PLIST_SUB+= SVN="@comment "
.endif
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
PLIST_SUB+= POSTGRESQL=""
USE_PGSQL= yes
CONFIGURE_ARGS+= --enable-module-postgres
@@ -51,7 +49,7 @@ post-install:
${MKDIR} ${PREFIX}/share/zsh/site-functions
${INSTALL_DATA} ${WRKSRC}/misc/zsh/_medusa ${PREFIX}/share/zsh/site-functions/_medusa
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
.endif
diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index 0c6cfa6a7b63..ba8e0393f699 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/msf3
SCRIPTS= msfcli msfconsole msfd msfelfscan msfencode msfmachscan \
msfopcode msfpayload msfpescan msfweb
-OPTIONS= SVN "Use subversion" off
+OPTIONS_DEFINE= SVN
NO_BUILD= yes
USE_RUBY= yes
@@ -37,7 +37,7 @@ RUN_DEPENDS+= rubygem-actionpack>0:${PORTSDIR}/www/rubygem-actionpack \
rubygem-activesupport>0:${PORTSDIR}/devel/rubygem-activesupport
.endif
-.if defined(WITH_SVN)
+.if ${PORT_OPTIONS:MSVN}
RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion
.endif
diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile
index 80eecea55a79..f66980e923a3 100644
--- a/security/oidentd/Makefile
+++ b/security/oidentd/Makefile
@@ -19,18 +19,19 @@ PLIST_FILES= sbin/oidentd etc/oidentd.conf.sample \
etc/oidentd_masq.conf.sample
USE_CSTD= gnu89
-OPTIONS= IPV6 "Enable IPv6 support" on \
- MASQ "Enable NAT/IP masq support" on
+OPTIONS_DEFINE= IPV6 MASQ
+OPTIONS_DEFAULT= MASQ
+MASQ_DESC= Enable NAT/IP masq support
.include <bsd.port.pre.mk>
-.if defined(WITHOUT_IPV6)
+.if ! ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+=--disable-ipv6
.else
CATEGORIES+= ipv6
.endif
-.if defined(WITHOUT_MASQ) || ${OSVERSION} >= 800000
+.if ! ${PORT_OPTIONS:MMASQ} || ${OSVERSION} >= 800000
CONFIGURE_ARGS+=--disable-masq
.endif
diff --git a/security/openct/Makefile b/security/openct/Makefile
index d0d4100d5dce..490c4a91bdd3 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -1,6 +1,5 @@
# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
# $FreeBSD$
-#
PORTNAME= openct
PORTVERSION= 0.6.20
@@ -11,7 +10,8 @@ MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ \
MAINTAINER= ale@FreeBSD.org
COMMENT= Middleware framework for smart card terminals
-OPTIONS= PCSC "Enable PC/SC support" off
+OPTIONS_DEFINE= PCSC DOCS
+PCSC_DESC= Enable PC/SC support
USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
@@ -39,7 +39,7 @@ CONFIGURE_ENV+= LIBUSB_CFLAGS="-I/usr/include" \
CONFIGURE_ARGS+=--enable-usb
.endif
-.if defined(WITH_PCSC)
+.if ${PORT_OPTIONS:MPCSC}
LIB_DEPENDS+= pcsclite.1:${PORTSDIR}/devel/pcsc-lite
CONFIGURE_ARGS+=--enable-pcsc
PLIST_SUB+= PCSC=""
@@ -47,14 +47,14 @@ PLIST_SUB+= PCSC=""
PLIST_SUB+= PCSC="@comment "
.endif
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
CONFIGURE_ARGS+=--enable-doc
.endif
post-patch:
@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
${WRKSRC}/configure
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${REINPLACE_CMD} 's|install-data-am: install-dist_apidocDATA install-dist_docDATA|install-data-am: install-dist_docDATA|' \
${WRKSRC}/doc/Makefile.in
.else
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index fc285bbfb7ae..a58ab73df990 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -10,10 +10,12 @@ MASTER_SITES= http://osiris.shmoo.com/data/ \
MAINTAINER= lx@FreeBSD.org
COMMENT= The Shmoo client/server host integrity checker
-OPTIONS= OSIRISMD "Enable to build the management daemon" off \
- OSIRISD "Enable to build the osirisd scan agent" on \
- PRINTDB "Build database print tool" off \
- CLI "Enable to build the management CLI" off
+OPTIONS_DEFINE= OSIRISMD OSIRISD PRINTDB CLI
+OPTIONS_DEFAULT= OSIRISD
+OSIRISMD_DESC= Enable to build the management daemon
+OSIRISD_DESC= Enable to build the osirisd scan agent
+PRINTDB_DESC= Build database print tool
+CLI_DESC= Enable to build the management CLI
GNU_CONFIGURE= yes
USE_RC_SUBR= yes
@@ -24,42 +26,42 @@ USE_RC_SUBR= yes
LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline
.endif
-.if defined(WITH_OSIRISMD)
+.if ${PORT_OPTIONS:MOSIRISMD}
PLIST_SUB+= OSIRISMD=""
.else
PLIST_SUB+= OSIRISMD="@comment "
.endif
-.if defined(WITHOUT_OSIRISD)
+.if ! ${PORT_OPTIONS:MOSIRISD}
PLIST_SUB+= OSIRISD="@comment "
.else
PLIST_SUB+= OSIRISD=""
.endif
-.if defined(WITH_CLI)
+.if ${PORT_OPTIONS:MCLI}
PLIST_SUB+= CLI=""
.else
PLIST_SUB+= CLI="@comment "
.endif
-.if defined(WITH_PRINTDB)
+.if ${PORT_OPTIONS:MPRINTDB}
PLIST_SUB+= PRINTDB=""
.else
PLIST_SUB+= PRINTDB="@comment "
.endif
post-build:
-.if defined(WITH_PRINTDB)
+.if ${PORT_OPTIONS:MPRINTDB}
cd ${WRKSRC}/src/tools && ${MAKE}
.endif
do-install:
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@${MKDIR} ${PREFIX}/osiris
-.if defined(WITH_CLI)
+.if ${PORT_OPTIONS:MCLI}
${INSTALL_PROGRAM} ${WRKSRC}/src/cli/osiris ${PREFIX}/sbin
.endif
-.if defined(WITH_PRINTDB)
+.if ${PORT_OPTIONS:MPRINTDB}
${INSTALL_PROGRAM} ${WRKSRC}/src/tools/printdb ${PREFIX}/bin
.endif
-.if !defined(WITHOUT_OSIRISD)
+.if ${PORT_OPTIONS:MOSIRISD}
${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \
-e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \
${WRKSRC}/src/install/freebsd/osirisd.in > \
@@ -68,7 +70,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/src/install/freebsd/osirisd.sh \
${PREFIX}/etc/rc.d
.endif
-.if defined(WITH_OSIRISMD)
+.if ${PORT_OPTIONS:MOSIRISMD}
${SED} -e 's|@INSTALLDIR@|${PREFIX}/sbin|g' \
-e 's|@OSIRISDIR@|${PREFIX}/osiris|g' \
${WRKSRC}/src/install/freebsd/osirismd.in > \
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 1c7de00026f7..25f4c988e1f6 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -288,8 +288,9 @@ GROUPS= openxpki
LICENSE= ART20
-OPTIONS= DEVELOPER "Install development tools for OpenXPKI?" off \
- GRAPHVIZ "With graphical visualization of workflows?" off
+OPTIONS_DEFINE= DEVELOPER GRAPHVIZ
+DEVELOPER_DESC= Install development tools for OpenXPKI?
+GRAPHVIZ_DESC= With graphical visualization of workflows?
# If DEVELOPER is checked, then docbook, Java and Xorg libraries are installed.
# They are needed only if you plan to fetch development svn snapshot,
# then edit XML prototypes for collection of OpenXPKI guides, and then
@@ -313,13 +314,13 @@ WITH_OPENSSL_BASE= yes
.include <bsd.port.pre.mk>
-.if defined(WITH_DEVELOPER)
+.if ${PORT_OPTIONS:MDEVELOPER}
RUN_DEPENDS+= ${LOCALBASE}/bin/fop:${PORTSDIR}/textproc/fop \
${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
${LOCALBASE}/share/java/jai/lib/libmlib_jai.so:${PORTSDIR}/java/jai
.endif
-.if defined(WITH_GRAPHVIZ)
+.if ${PORT_OPTIONS:MGRAPHVIZ}
RUN_DEPENDS+= ${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz \
${LOCALBASE}/bin/imgsize:${PORTSDIR}/graphics/p5-Image-Size
.endif
diff --git a/security/pam_bsdbioapi/Makefile b/security/pam_bsdbioapi/Makefile
index f2013f61c480..840ca6ce8bed 100644
--- a/security/pam_bsdbioapi/Makefile
+++ b/security/pam_bsdbioapi/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for: pam_bsdbioapi
-# Date created: 13 January 2006
-# Whom: Fredrik Lindberg <fli@shapeshifter.se>
-#
+# Created by: Fredrik Lindberg <fli@shapeshifter.se>
# $FreeBSD$
-#
PORTNAME= pam_bsdbioapi
PORTVERSION= 1.5.1
@@ -21,24 +17,25 @@ MAN8= pam_bsdbioapi.8
MAN3= libbirdb.3
MAN1= bbdm.1
-OPTIONS= FILEDB "Filebacked database backend" on \
- MYSQL "MySQL backend" off \
- PLAIN "Plain ASCII backend" on
+OPTIONS_DEFINE= FILEDB MYSQL PLAIN
+OPTIONS_DEFAULT= FILEDB PLAIN
+FILEDB_DESC= Filebacked database backend
+PLAIN_DESC= Plain ASCII backend
.include <bsd.port.pre.mk>
PLIST_FILES= etc/birdb.conf.sample
BACKENDS=
-.if defined(WITH_FILEDB)
+.if ${PORT_OPTIONS:MFILEDB}
BACKENDS+= filedb
PLIST_FILES+= share/birdb/birdb_filedb.so
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
BACKENDS+= mysql
PLIST_FILES+= share/birdb/birdb_mysql.so
.endif
-.if defined(WITH_PLAIN)
+.if ${PORT_OPTIONS:MPLAIN}
BACKENDS+= plain
PLIST_FILES+= share/birdb/birdb_plain.so
.endif
diff --git a/security/php-Auth_OpenID/Makefile b/security/php-Auth_OpenID/Makefile
index f698e21a09dc..ea76f48b6b38 100644
--- a/security/php-Auth_OpenID/Makefile
+++ b/security/php-Auth_OpenID/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: php-Auth_OpenID
-# Date created: 2007-04-24
-# Whom: Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
# $FreeBSD$
-#
PORTNAME= Auth_OpenID
PORTVERSION= 1.2.3
@@ -22,30 +18,28 @@ CONFLICTS= pear-Auth_OpenID-2.*
USE_BZIP2= yes
NO_BUILD= yes
-OPTIONS= BCMATH "Use bcmath instead of libgmp" off \
- MYSQL "Use mysql" off \
- PGSQL "Use pgsql" off \
- SQLITE "Use sqlite" off
+OPTIONS_DEFINE= BCMATH MYSQL PGSQL SQLITE
+BCMATH_DESC= Use bcmath instead of libgmp
USE_PHP= curl dom
.include <bsd.port.pre.mk>
-.ifdef(WITH_BCMATH)
+.if ${PORT_OPTIONS:MBCMATH}
USE_PHP+= bcmath
.else
USE_PHP+= gmp
.endif
-.ifdef(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysql
.endif
-.ifdef(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
.endif
-.ifdef(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
USE_PHP+= sqlite
.endif
diff --git a/security/php-Auth_OpenID2/Makefile b/security/php-Auth_OpenID2/Makefile
index 1a26c1fe6e52..ccefc4cf5041 100644
--- a/security/php-Auth_OpenID2/Makefile
+++ b/security/php-Auth_OpenID2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: php-Auth_OpenID
-# Date created: 2007-04-24
-# Whom: Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
# $FreeBSD$
-#
PORTNAME= Auth_OpenID2
PORTVERSION= 2.1.3
@@ -22,30 +18,28 @@ CONFLICTS= pear-Auth_OpenID-2.*
USE_BZIP2= yes
NO_BUILD= yes
-OPTIONS= BCMATH "Use bcmath instead of libgmp" off \
- MYSQL "Use mysql" off \
- PGSQL "Use pgsql" off \
- SQLITE "Use sqlite" off
+OPTIONS_DEFINE= BCMATH MYSQL PGSQL SQLITE EXAMPLES
+BCMATH_DESC= Use bcmath instead of libgmp
USE_PHP= curl dom
.include <bsd.port.pre.mk>
-.ifdef(WITH_BCMATH)
+.if ${PORT_OPTIONS:MBCMATH}
USE_PHP+= bcmath
.else
USE_PHP+= gmp
.endif
-.ifdef(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysql
.endif
-.ifdef(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
.endif
-.ifdef(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
USE_PHP+= sqlite
.endif
@@ -55,7 +49,7 @@ do-install:
${CP} ${WRKSRC}/Auth/OpenID/* ${PREFIX}/share/pear/Auth/OpenID
${MKDIR} ${PREFIX}/share/pear/Auth/Yadis
${CP} -R ${WRKSRC}/Auth/Yadis/* ${PREFIX}/share/pear/Auth/Yadis
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
${MKDIR} ${EXAMPLESDIR}
${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
.endif
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 41e67bd1cac6..aaa771474ca2 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: racoon2
-# Date created: 4 Feb 2005
-# Whom: sumikawa
-#
+# Created by: sumikawa
# $FreeBSD$
-#
PORTNAME= racoon2
PORTVERSION= 20100526a
@@ -23,12 +19,13 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/racoon2
CONFIGURE_ENV= YACC=/usr/bin/yacc
-OPTIONS= KINK "enable KINK support" off
+OPTIONS_DEFINE= KINK DOCS
+KINK_DESC= Enable KINK support
.include <bsd.port.pre.mk>
pre-configure:
-.if defined (WITH_KINK)
+.if ${PORT_OPTIONS:MKINK}
.if !exists(/usr/lib/libkrb5.a)
@${ECHO_MSG} 'Required Kerberos5 is not in this system. Disable KINK support.'
CONFIGURE_ARGS+= --disable-kinkd
@@ -44,11 +41,11 @@ CONFIGURE_ARGS+= --disable-kinkd
PLIST_SUB+= KINK="@comment "
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS+= INSTALL USAGE config-usage.ja.txt config-usage.txt
PORTDOCS+= iked-memo.ja.txt libracoon.ja.txt specification.ja.txt
PORTDOCS+= spmif.txt style.txt system-message.ja.txt
-.if defined (WITH_KINK)
+.if ${PORT_OPTIONS:MKINK}
PORTDOCS+= kinkd-data-struct.obj kinkd-impl.ja.txt
PORTDOCS+= kinkd-install.ja.txt kinkd-state-txn.obj
.endif
@@ -57,14 +54,14 @@ PORTDOCS+= kinkd-install.ja.txt kinkd-state-txn.obj
MAN8+= spmd.8 spmdctl.8 pskgen.8 iked.8
post-patch:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
.for FILE in ${PORTDOCS}
@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${LOCALBASE}|' ${WRKSRC}/doc/${FILE}
.endfor
.endif
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.jp ${DOCSDIR}
diff --git a/security/scrypt/Makefile b/security/scrypt/Makefile
index f3215ea9b9d0..38fd158cc2aa 100644
--- a/security/scrypt/Makefile
+++ b/security/scrypt/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: scrypt
-# Date created: 26 May, 2009
-# Whom: Wen Heping <wenheping@gmail.com>
-#
+# Created by: Wen Heping <wenheping@gmail.com>
# $FreeBSD$
-#
PORTNAME= scrypt
PORTVERSION= 1.1.6
@@ -21,11 +17,12 @@ PLIST_FILES= bin/scrypt
MAN1= scrypt.1
-OPTIONS= SSE2 "Use SSE2-optimized code" Off
+OPTIONS_DEFINE= SSE2
+SSE2_DESC= Use SSE2-optimized code
.include <bsd.port.options.mk>
-.if defined(WITH_SSE2)
+.if ${PORT_OPTIONS:MSSE2}
CONFIGURE_ARGS+= --enable-sse2
.else
CONFIGURE_ARGS+= --disable-sse2
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
index 739d7d6e9a20..8d573b5b61a6 100644
--- a/security/shibboleth2-sp/Makefile
+++ b/security/shibboleth2-sp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: security/shibboleth2-sp
-# Date created: 17 Sept2008
-# Whom: Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
# $FreeBSD$
-#
PORTNAME= shibboleth-sp
PORTVERSION= 2.4.3
@@ -16,7 +12,8 @@ COMMENT= C++ Shibboleth Service Provider (Internet2) for Apache
LIB_DEPENDS= saml.7:${PORTSDIR}/security/opensaml2
-OPTIONS= APACHE22 "Use Apache version 2.2 instead of version 2.0" on
+OPTIONS_DEFINE= APACHE22
+APACHE22_DESC= Use Apache version 2.2 instead of version 2.0
MAKE_JOBS_SAFE= yes
USE_GMAKE= yes
@@ -30,7 +27,7 @@ LATEST_LINK= shibboleth2-sp
.include <bsd.port.pre.mk>
-.if defined(WITH_APACHE22)
+.if ${PORT_OPTIONS:MAPACHE22}
USE_APACHE= 22
CONFIGURE_ARGS= --enable-apache-22 --with-apxs22=${APXS}
PLIST_SUB+= WITH_APACHE_22=""
diff --git a/security/snortsam/Makefile b/security/snortsam/Makefile
index 14030bb3aba9..f065363b3e73 100644
--- a/security/snortsam/Makefile
+++ b/security/snortsam/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: SnortSam
-# Date created: 27 August 2008
-# Whom: Danton Dorati <urisso@bsd.com.br>
-#
+# Created by: Danton Dorati <urisso@bsd.com.br>
# $FreeBSD$
-#
PORTNAME= snortsam
PORTVERSION= 2.70
@@ -15,9 +11,10 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= urisso@bsd.com.br
COMMENT= SnortSam is a output plugin for Snort
-OPTIONS= IPFW "checks if configured tables are available" on \
- SAMTOOL "install samtool" on \
- DEBUG "build with verbose messages" off
+OPTIONS_DEFINE= IPFW SAMTOOL DEBUG DOCS
+OPTIONS_DEFAULT= IPFW SAMTOOL
+IPFW_DESC= checks if configured tables are available
+SAMTOOL_DESC= install samtool
.include <bsd.port.pre.mk>
@@ -37,7 +34,7 @@ PLIST_FILES= sbin/snortsam \
etc/snortsam/country-rootservers.conf.sample \
etc/snortsam/rootservers.cfg.sample
-.if defined(WITH_SAMTOOL)
+.if ${PORT_OPTIONS:MSAMTOOL}
PLIST_FILES+= sbin/samtool
.endif
@@ -46,11 +43,11 @@ PORTDOCS= AUTHORS BUGS CREDITS FAQ INSTALL LICENSE README README.ciscoacl \
README.rules README.slackware README.snmp_interface_down README.wgrd \
README_8signs.rtf TODO
-.if defined(WITHOUT_IPFW)
+.if ! ${PORT_OPTIONS:MIPFW}
EXTRA_PATCHES+= ${FILESDIR}/ssp_ipfw2_no_table_check.patch
.endif
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
DEBUG=-DDEBUG
.endif
@@ -71,7 +68,7 @@ do-configure:
# no access to snortsam.conf and samtool for non root users!
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/snortsam ${PREFIX}/sbin
-.if defined(WITH_SAMTOOL)
+.if ${PORT_OPTIONS:MSAMTOOL}
@${INSTALL} -o root -g wheel -m 500 ${WRKSRC}/samtool ${PREFIX}/sbin
.endif
@${MKDIR} -m 700 ${CONFIG_DIR}
@@ -79,7 +76,7 @@ do-install:
@${INSTALL_DATA} ${WRKSRC}/conf/rootservers.cfg ${CONFIG_DIR}/rootservers.cfg.sample
@${INSTALL_DATA} ${WRKSRC}/conf/country-rootservers.conf ${CONFIG_DIR}/country-rootservers.conf.sample
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for f in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
diff --git a/security/spybye/Makefile b/security/spybye/Makefile
index a072780a507d..1f8b1b7c8612 100644
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: spybye
-# Date created: 23 May 2008
-# Whom: pauls
-#
+# Created by: pauls
# $FreeBSD$
-#
PORTNAME= spybye
PORTVERSION= 0.3
@@ -16,7 +12,8 @@ COMMENT= A web proxy to detect malware
LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
-OPTIONS= CLAMAV "Enable CLAMAV support" off
+OPTIONS_DEFINE= CLAMAV
+CLAMAV_DESC= Enable CLAMAV support
USE_RC_SUBR= spybye
GNU_CONFIGURE= yes
@@ -25,7 +22,7 @@ MAN1= spybye.1
.include <bsd.port.pre.mk>
-.if defined(WITH_CLAMAV)
+.if ${PORT_OPTIONS:MCLAMAV}
LIB_DEPENDS+= clamav.7:${PORTSDIR}/security/clamav
CONFIGURE_ARGS+= --with-libclamav=${PREFIX}/bin
.endif
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index b4cb17c9f0d2..808d02424143 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: tripwire 2.3.1
-# Date created: Tue Mar 6 06:57:58 PST 2001
-# Whom: Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
-#
+# Created by: Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
# $FreeBSD$
-#
PORTNAME= tripwire
PORTVERSION= 2.4.2.2
@@ -36,38 +32,34 @@ TWDB?= /var/db/tripwire
#
# If TW_PROMPT is set to true, the install script is interactive.
-OPTIONS= TWCFG_ETC "Put config files in ${ETCDIR}" on \
- TWCFG_TWDB "Put config files in ${TWDB}/etc" off \
- TW_CLOBBER "Clobber existing database files at install" off \
- TW_PROMPT "Interactive install (ignored when PACKAGE_BUILDING)" on \
- SW_ONLY "Install software only, do not post-configure (ignored when PACKAGE_BUILDING)" off \
- DB_BUILD "Build database during post-install (ignored when PACKAGE_BUILDING)" on
+OPTIONS_SINGLE= TWCFG
+OPTIONS_SINGLE_TWCFG= TWCFG_ETC TWCFG_TWDB
+OPTIONS_DEFINE= TW_CLOBBER TW_PROMPT SW_ONLY DB_BUILD
+OPTIONS_DEFAULT= TWCFG_ETC TW_PROMPT DB_BUILD
+TWCFG_ETC_DESC= Put config files in ${ETCDIR}
+TWCFG_TWDB_DESC= Put config files in ${TWDB}/etc
+TW_CLOBBER_DESC= Clobber existing database files at install
+TW_PROMPT_DESC= Interactive install (ignored when PACKAGE_BUILDING)
+SW_ONLY_DESC= Install software only, do not post-configure (ignored when PACKAGE_BUILDING)
+DB_BUILD_DESC= Build database during post-install (ignored when PACKAGE_BUILDING)
.include <bsd.port.pre.mk>
-.if defined(WITH_TWCFG_ETC) && ${WITH_TWCFG_ETC} == "true" && defined(WITH_TWCFG_TWDB) && ${WITH_TWCFG_TWDB} == "true"
-BROKEN= Must select only one of WITH_TWCFG_ETC or WITH_TWCFG_TWDB
-.endif
-
# Tripwire config files are stored in TWCFG
-.if defined(WITH_TWCFG_ETC) && ${WITH_TWCFG_ETC} == "true"
+.if ${PORT_OPTIONS:MTWCFG_ETC}
TWCFG?= ${ETCDIR}
.endif
-.if defined(WITH_TWCFG_TWDB) && ${WITH_TWCFG_TWDB} == "true"
+.if ${PORT_OPTIONS:MTWCFG_TWDB}
TWCFG?= ${TWDB}/etc
.endif
-.ifndef TWCFG
-BROKEN= TWCFG must be defined
-.endif
-
-.if defined(WITH_TW_CLOBBER) && ${WITH_TW_CLOBBER} == "true"
+.if ${PORT_OPTIONS:MTW_CLOBBER}
TW_CLOBBER= true
.else
TW_CLOBBER= false
.endif
-.if defined(WITH_TW_PROMPT) && ${WITH_TW_PROMPT} == "true"
+.if ${PORT_OPTIONS:MTW_PROMPT}
TW_PROMPT= true
.else
TW_PROMPT= false
@@ -125,7 +117,7 @@ install-config-files:
.ifdef PACKAGE_BUILDING
@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
.else
-.if defined(WITH_SW_ONLY) && ${WITH_SW_ONLY} == "true"
+.if ${PORT_OPTIONS:MSW_ONLY} && ${WITH_SW_ONLY} == "true"
@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
.else
@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook
@@ -167,8 +159,8 @@ make-pkg-install:
@ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/install/install.sh >> ${PKGINSTALL}
create-database:
-.if defined(WITH_DB_BUILD) && ${WITH_DB_BUILD} == "true"
-.if defined(WITH_SW_ONLY) && ${WITH_SW_ONLY} == "true"
+.if ${PORT_OPTIONS:MDB_BUILD} && ${WITH_DB_BUILD} == "true"
+.if ${PORT_OPTIONS:MSW_ONLY} && ${WITH_SW_ONLY} == "true"
@ ${ECHO} SW_ONLY has been specified, database will not be built.
.else
@ ${MKDIR} -p ${TWCFG} ${TWPOLICY} ${TWSITEKEYDIR} ${TWLOCALKEYDIR} \
diff --git a/security/yapet/Makefile b/security/yapet/Makefile
index b1e676eab7cd..65120d8d7ed0 100644
--- a/security/yapet/Makefile
+++ b/security/yapet/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: yapet
-# Date created: 01 March 2008
-# Whom: Rafael Ostertag <rafi@guengel.ch>
-#
+# Created by: Rafael Ostertag <rafi@guengel.ch>
# $FreeBSD$
-#
PORTNAME= yapet
PORTVERSION= 0.7
@@ -19,9 +15,11 @@ MANCOMPRESSED= no
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-OPTIONS= TTITLE "Enable Terminal Title" ON \
- PWGEN "Enable Password Generator" ON \
- CSV2YAPET "Build csv2yapet" ON
+OPTIONS_DEFINE= TTITLE PWGEN CSV2YAPET DOCS
+OPTIONS_DEFAULT= TTITLE PWGEN CSV2YAPET
+TTITLE_DESC= Enable Terminal Title
+PWGEN_DESC= Enable Password Generator
+CSV2YAPET_DESC= Build csv2yapet
.include <bsd.port.pre.mk>
@@ -29,19 +27,19 @@ OPTIONS= TTITLE "Enable Terminal Title" ON \
# --disable-install-doc: I take care of installing docs
CONFIGURE_ARGS+= --enable-silent-rules --disable-install-doc
-.if defined(WITH_TTITLE)
+.if ${PORT_OPTIONS:MTTITLE}
CONFIGURE_ARGS+= --enable-terminal-title
.else
CONFIGURE_ARGS+= --disable-terminal-title
.endif
-.if defined(WITH_PWGEN)
+.if ${PORT_OPTIONS:MPWGEN}
CONFIGURE_ARGS+= --enable-pwgen
.else
CONFIGURE_ARGS+= --disable-pwgen
.endif
-.if defined(WITH_CSV2YAPET)
+.if ${PORT_OPTIONS:MCSV2YAPET}
CONFIGURE_ARGS+= --enable-csv2yapet
MAN1+= csv2yapet.1
PLIST_SUB+= CSV2YAPET=""
@@ -50,7 +48,7 @@ CONFIGURE_ARGS+= --disable-csv2yapet
PLIST_SUB+= CSV2YAPET="@comment "
.endif
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
@@ -61,7 +59,7 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PLIST_SUB+= NOPORTDOCS=""
.else
PLIST_SUB+= NOPORTDOCS="@comment "
@@ -70,7 +68,7 @@ PLIST_SUB+= NOPORTDOCS="@comment "
# Taking care of installing docs due to --disable-install-doc
# configure switch.
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/AUTHORS ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/DESIGN ${DOCSDIR}