svn commit: r330640 - in head/www: dansguardian dansguardian-devel

[Boris Samorodov]

Author: bsam
Date: Thu Oct 17 13:41:44 2013
New Revision: 330640
URL: http://svnweb.freebsd.org/changeset/ports/330640

Log:
  . fix build with NTLM option -- use iconv unconditionally
  (as it has always been before using iconv.mk);
  . bump PORTREVISION.
  
  Reported by:	Marko Cupać <marko.cupac at mimar.rs>
  Tested by:	Marko Cupać <marko.cupac at mimar.rs>
  Approved by:	garga (maintainer)

Modified:
  head/www/dansguardian-devel/Makefile
  head/www/dansguardian/Makefile

Modified: head/www/dansguardian-devel/Makefile
==============================================================================
--- head/www/dansguardian-devel/Makefile	Thu Oct 17 13:39:36 2013	(r330639)
+++ head/www/dansguardian-devel/Makefile	Thu Oct 17 13:41:44 2013	(r330640)
@@ -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:${P
 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 "

Modified: head/www/dansguardian/Makefile
==============================================================================
--- head/www/dansguardian/Makefile	Thu Oct 17 13:39:36 2013	(r330639)
+++ head/www/dansguardian/Makefile	Thu Oct 17 13:41:44 2013	(r330640)
@@ -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:${P
 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 "