2 files changed, 25 insertions, 35 deletions

diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index d3f069496613..df101f97f3d0 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -32,16 +32,18 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 
 MAN8=		dansguardian.8
 
-OPTIONS=	APACHE  "Enable Apache support for access denied page" on \
-		TRICKLE "Enable the trickle download manager" on \
-		CLISCAN "Enable support for CLI content scanners" off \
-		CLAMD   "Enable ClamAV daemon support (clamd)" off \
-		ICAP    "Enable ICAP AV content scanner support (testing)" off \
-		KAV     "Enable Kaspersky AV support (testing)" off \
-		NTLM    "Enable NTLM authentication plugin" off \
-		EMAIL   "Enable e-mail reporting support" off \
-		DEBUG   "Enable debug options - not for production use" off \
-		SSL     "Enable SSL Cert verify and filtering (experimental)" off
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL DEBUG SSL
+OPTIONS_DEFAULT=APACHE TRICKLE
+
+APACHE_DESC=	Enable Apache support for access denied page
+TRICKLE_DESC=	Enable the trickle download manager
+CLISCAN_DESC=	Enable support for CLI content scanners
+CLAMD_DESC=	Enable ClamAV daemon support (clamd)
+ICAP_DESC=	Enable ICAP AV content scanner support (testing)
+KAV_DESC=	Enable Kaspersky AV support (testing)
+EMAIL_DESC=	Enable e-mail reporting support
 
 DG_URL=		http://dansguardian.org/index.php?page=copyright2
 CONFDIR=	${PREFIX}/etc/dansguardian
@@ -50,25 +52,25 @@ RESTRICTED=	Redistribution and commercial download is restricted.  Check ${DG_UR
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE=	20+
 .endif
 
-.if !defined(WITHOUT_TRICKLE)
+.if ${PORT_OPTIONS:MTRICKLE}
 CONFIGURE+=		--enable-trickledm
 PLIST_SUB+=		TRICKLECONF=""
 .else
 PLIST_SUB+=		TRICKLECONF="@comment "
 .endif
 
-.if defined(WITH_CLISCAN)
+.if ${PORT_OPTIONS:MCLISCAN}
 CONFIGURE_ARGS+=	--enable-commandline
 PLIST_SUB+=		CLISCANCONF=""
 .else
 PLIST_SUB+=		CLISCANCONF="@comment "
 .endif
 
-.if defined(WITH_CLAMD)
+.if ${PORT_OPTIONS:MCLAMD}
 CONFIGURE_ARGS+=	--enable-clamd
 RUN_DEPENDS+=		${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
 PLIST_SUB+=		CLAMDCONF=""
@@ -76,27 +78,28 @@ PLIST_SUB+=		CLAMDCONF=""
 PLIST_SUB+=		CLAMDCONF="@comment "
 .endif
 
-.if defined(WITH_ICAP)
+.if ${PORT_OPTIONS:MICAP}
 CONFIGURE_ARGS+=	--enable-icap
 PLIST_SUB+=		ICAPCONF=""
 .else
 PLIST_SUB+=		ICAPCONF="@comment "
 .endif
 
-.if defined(WITH_KAV)
+.if ${PORT_OPTIONS:MKAV}
 CONFIGURE_ARGS+=	--enable-kavd
 PLIST_SUB+=		KAVDCONF=""
 .else
 PLIST_SUB+=		KAVDCONF="@comment "
 .endif
 
-.if defined(WITH_CLAMD) || defined(WITH_ICAP) || defined(WITH_KAV) || defined(WITH_CLISCAN)
+.if ${PORT_OPTIONS:MCLAMD} || ${PORT_OPTIONS:MICAP} || \
+    ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN}
 PLIST_SUB+=		SCANNERS=""
 .else
 PLIST_SUB+=		SCANNERS="@comment "
 .endif
 
-.if defined(WITH_NTLM)
+.if ${PORT_OPTIONS:MNTLM}
 CONFIGURE_ARGS+=	--enable-ntlm --with-libiconv=${LOCALBASE}
 USE_ICONV=	yes
 PLIST_SUB+=		NTLMCONF=""
@@ -104,34 +107,28 @@ PLIST_SUB+=		NTLMCONF=""
 PLIST_SUB+=		NTLMCONF="@comment "
 .endif
 
-.if defined(WITH_EMAIL)
+.if ${PORT_OPTIONS:MEMAIL}
 CONFIGURE_ARGS+=	--enable-email
 PLIST_SUB+=		EMAILCONF=""
 .else
 PLIST_SUB+=		EMAILCONF="@comment "
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--with-dgdebug
 .endif
 
-#.if defined(NOPORTDOCS)
-#PLISTSUB+=              DOCINST="@comment "
-#.else
-#PLISTSUB+=              DOCINST=""
-#.endif
-
 # User needs to manually download the distfile
 .if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})) && !defined(PACKAGE_BUILDING)
 IGNORE=	commercial source download is restricted.  Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make
 .endif
 
 post-patch:
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e '/install-data-am/ s|install-dist_docDATA||' \
 		${WRKSRC}/doc/Makefile.in
 .endif
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 	@${REINPLACE_CMD} -e 's|ifdef __SSLCERT|ifdef __SSLCERT_ERROR_AUTH|' \
 		${WRKSRC}/src/Auth.cpp
 LDFLAGS+=	-lssl -lcrypto
diff --git a/www/dansguardian-devel/pkg-plist b/www/dansguardian-devel/pkg-plist
index 46c359bf15e2..f307759073fc 100644
--- a/www/dansguardian-devel/pkg-plist
+++ b/www/dansguardian-devel/pkg-plist
@@ -290,13 +290,6 @@ etc/dansguardian/downloadmanagers/fancy.conf
 %%CLISCANCONF%%etc/dansguardian/contentscanners/commandlinescan.conf
 etc/dansguardian/dansguardian.conf
 etc/dansguardian/dansguardianf1.conf
-%%PORTDOCS%%%%DOCSDIR%%/AuthPlugins
-%%PORTDOCS%%%%DOCSDIR%%/ContentScanners
-%%PORTDOCS%%%%DOCSDIR%%/DownloadManagers
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/Plugins
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/languages/arspanish
 @dirrm %%DATADIR%%/languages/bulgarian