aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Samorodov <bsam@FreeBSD.org>2013-10-17 13:41:44 +0000
committerBoris Samorodov <bsam@FreeBSD.org>2013-10-17 13:41:44 +0000
commit3bcf402cd3a8801d28b618ab5d4329647f35e1b2 (patch)
tree814c609f86b37d63e383947a6c6ba8caad98be1a
parentfd63fcc98e65811599b522c3a17c1936dabbe56b (diff)
downloadports-3bcf402cd3a8801d28b618ab5d4329647f35e1b2.tar.gz
ports-3bcf402cd3a8801d28b618ab5d4329647f35e1b2.zip
Notes
-rw-r--r--www/dansguardian-devel/Makefile6
-rw-r--r--www/dansguardian/Makefile7
2 files changed, 6 insertions, 7 deletions
diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index ab2a211665f9..a39109fcea53 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dansguardian
PORTVERSION= 2.12.0.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= SF/dansguardian
@@ -13,7 +14,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
USE_RC_SUBR= dansguardian
-USES= pkgconfig
+USES= iconv pkgconfig
USE_BZIP2= yes
CONFLICTS= dansguardian-2.10.*
@@ -97,8 +98,7 @@ PLIST_SUB+= SCANNERS="@comment "
.endif
.if ${PORT_OPTIONS:MNTLM}
-CONFIGURE_ARGS+= --enable-ntlm ${ICONV_CONFIGURE_BASE}
-USES+= iconv
+CONFIGURE_ARGS+= --enable-ntlm
PLIST_SUB+= NTLMCONF=""
.else
PLIST_SUB+= NTLMCONF="@comment "
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index 241c3d1e18b3..bb885390ba73 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dansguardian
PORTVERSION= 2.10.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= # empty, see below
@@ -14,7 +14,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
USE_RC_SUBR= dansguardian
-USES= pkgconfig
+USES= pkgconfig iconv
CONFLICTS= dansguardian-2.12.*
LATEST_LINK= dansguardian
@@ -97,8 +97,7 @@ PLIST_SUB+= SCANNERS="@comment "
.endif
.if ${PORT_OPTIONS:MNTLM}
-CONFIGURE_ARGS+= --enable-ntlm ${ICONV_CONFIGURE_BASE}
-USES+= iconv
+CONFIGURE_ARGS+= --enable-ntlm
PLIST_SUB+= NTLMCONF=""
.else
PLIST_SUB+= NTLMCONF="@comment "