From owner-svn-ports-all@FreeBSD.ORG Thu Oct 17 13:41:45 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 394A4DCA; Thu, 17 Oct 2013 13:41:45 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0D2DA20AB; Thu, 17 Oct 2013 13:41:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HDfi5l006999; Thu, 17 Oct 2013 13:41:44 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HDfisa006997; Thu, 17 Oct 2013 13:41:44 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201310171341.r9HDfisa006997@svn.freebsd.org> From: Boris Samorodov Date: Thu, 17 Oct 2013 13:41:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330640 - in head/www: dansguardian dansguardian-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 13:41:45 -0000 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ć Tested by: Marko Cupać 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 "