svn commit: r332320 - head/www/dansguardian

[Renato Botelho]

Author: garga
Date: Thu Oct 31 23:48:37 2013
New Revision: 332320
URL: http://svnweb.freebsd.org/changeset/ports/332320

Log:
  . Add LICENSE
  . Support STAGE
  . Remove LATEST_LINK
  . Simplify Makefile

Modified:
  head/www/dansguardian/Makefile
  head/www/dansguardian/pkg-plist   (contents, props changed)

Modified: head/www/dansguardian/Makefile
==============================================================================
--- head/www/dansguardian/Makefile	Thu Oct 31 23:46:07 2013	(r332319)
+++ head/www/dansguardian/Makefile	Thu Oct 31 23:48:37 2013	(r332320)
@@ -10,14 +10,15 @@ MASTER_SITES=	# empty, see below
 MAINTAINER=	garga at FreeBSD.org
 COMMENT=	A fast, feature-rich web content filter for Squid proxy servers
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 
 USE_RC_SUBR=	dansguardian
-USES=		pkgconfig iconv
+USES=		pkgconfig iconv shebangfix
 
-CONFLICTS=	dansguardian-2.12.*
-LATEST_LINK=	dansguardian
+CONFLICTS=	dansguardian-devel-2.12.*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
@@ -26,12 +27,13 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		${ICONV_CONFIGURE_BASE} \
 		--enable-fancydm
 
-MAN8=		dansguardian.8
-
 PORTDOCS=	*
 
+SHEBANG_FILES=	${WRKSRC}/data/dansguardian.pl
+
 OPTIONS_DEFINE=	APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL DEBUG DOCS
 OPTIONS_DEFAULT=APACHE TRICKLE DOCS
+OPTIONS_SUB=	TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL
 
 APACHE_DESC=	Enable Apache support for access denied page
 TRICKLE_DESC=	Enable the trickle download manager
@@ -46,48 +48,18 @@ CONFDIR=	${PREFIX}/etc/dansguardian
 
 RESTRICTED=	Redistribution and commercial download is restricted.  Check ${DG_URL} for more info
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22+
-.endif
-
-.if ${PORT_OPTIONS:MTRICKLE}
-CONFIGURE+=		--enable-trickledm
-PLIST_SUB+=		TRICKLECONF=""
-.else
-PLIST_SUB+=		TRICKLECONF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCLISCAN}
-CONFIGURE_ARGS+=	--enable-commandline
-PLIST_SUB+=		CLISCANCONF=""
-.else
-PLIST_SUB+=		CLISCANCONF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCLAMD}
-CONFIGURE_ARGS+=	--enable-clamd
-RUN_DEPENDS+=		${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
-PLIST_SUB+=		CLAMDCONF=""
-.else
-PLIST_SUB+=		CLAMDCONF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MICAP}
-CONFIGURE_ARGS+=	--enable-icap
-PLIST_SUB+=		ICAPCONF=""
-.else
-PLIST_SUB+=		ICAPCONF="@comment "
-.endif
+APACHE_USE=			APACHE_RUN=22+
+TRICKLE_CONFIGURE_ENABLE=	trickledm
+CLISCAN_CONFIGURE_ENABLE=	commandline
+CLAMD_CONFIGURE_ENABLE=		clamd
+CLAMD_RUN_DEPENDS=		${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
+ICAP_CONFIGURE_ENABLE=		icap
+KAV_CONFIGURE_ENABLE=		kavd
+NTLM_CONFIGURE_ENABLE=		ntlm
+EMAIL_CONFIGURE_ENABLE=		email
+DEBUG_CONFIGURE_WITH=		dgdebug
 
-.if ${PORT_OPTIONS:MKAV}
-CONFIGURE_ARGS+=	--enable-kavd
-PLIST_SUB+=		KAVDCONF=""
-.else
-PLIST_SUB+=		KAVDCONF="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MCLAMD} || ${PORT_OPTIONS:MICAP} || \
     ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN}
@@ -96,24 +68,6 @@ PLIST_SUB+=		SCANNERS=""
 PLIST_SUB+=		SCANNERS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MNTLM}
-CONFIGURE_ARGS+=	--enable-ntlm
-PLIST_SUB+=		NTLMCONF=""
-.else
-PLIST_SUB+=		NTLMCONF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MEMAIL}
-CONFIGURE_ARGS+=	--enable-email
-PLIST_SUB+=		EMAILCONF=""
-.else
-PLIST_SUB+=		EMAILCONF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--with-dgdebug
-.endif
-
 # User needs to manually download the distfile
 .if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}))
 IGNORE=	commercial source download is restricted.  Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make
@@ -125,8 +79,4 @@ post-patch:
 		${WRKSRC}/doc/Makefile.in
 .endif
 
-post-install:
-# Display post-install message
-	@${CAT} pkg-message
-
 .include <bsd.port.post.mk>

Modified: head/www/dansguardian/pkg-plist
==============================================================================
--- head/www/dansguardian/pkg-plist	Thu Oct 31 23:46:07 2013	(r332319)
+++ head/www/dansguardian/pkg-plist	Thu Oct 31 23:48:37 2013	(r332320)
@@ -162,11 +162,12 @@ sbin/dansguardian
 %%DATADIR%%/scripts/bsd-init
 %%DATADIR%%/scripts/solaris-init
 %%DATADIR%%/scripts/systemv-init
+man/man8/dansguardian.8.gz
 etc/dansguardian/authplugins/ident.conf
 etc/dansguardian/authplugins/ip.conf
 etc/dansguardian/authplugins/proxy-basic.conf
 etc/dansguardian/authplugins/proxy-digest.conf
-%%NTLMCONF%%etc/dansguardian/authplugins/proxy-ntlm.conf
+%%NTLM%%etc/dansguardian/authplugins/proxy-ntlm.conf
 etc/dansguardian/lists/authplugins/ipgroups
 etc/dansguardian/lists/exceptionextensionlist
 etc/dansguardian/lists/exceptionfilesitelist
@@ -281,10 +282,11 @@ etc/dansguardian/lists/exceptionregexpur
 %%SCANNERS%%etc/dansguardian/lists/contentscanners/exceptionvirusurllist
 etc/dansguardian/downloadmanagers/default.conf
 etc/dansguardian/downloadmanagers/fancy.conf
-%%CLAMDCONF%%etc/dansguardian/contentscanners/clamdscan.conf
-%%KAVDCONF%%etc/dansguardian/contentscanners/kavdscan.conf
-%%ICAPCONF%%etc/dansguardian/contentscanners/icapscan.conf
-%%CLISCANCONF%%etc/dansguardian/contentscanners/commandlinescan.conf
+%%CLAMD%%etc/dansguardian/contentscanners/clamdscan.conf
+%%KAV%%etc/dansguardian/contentscanners/kavdscan.conf
+%%ICAP%%etc/dansguardian/contentscanners/icapscan.conf
+%%CLISCAN%%etc/dansguardian/contentscanners/commandlinescan.conf
+%%TRICKLE%%etc/dansguardian/downloadmanagers/trickle.conf
 etc/dansguardian/dansguardian.conf
 etc/dansguardian/dansguardianf1.conf
 @dirrm %%DATADIR%%/scripts