From owner-svn-ports-head@FreeBSD.ORG Thu Oct 31 23:49:35 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DD3FB4F3; Thu, 31 Oct 2013 23:49:35 +0000 (UTC) (envelope-from garga@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 BB6922CB1; Thu, 31 Oct 2013 23:49:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VNnZ0n016517; Thu, 31 Oct 2013 23:49:35 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VNnZpl016515; Thu, 31 Oct 2013 23:49:35 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201310312349.r9VNnZpl016515@svn.freebsd.org> From: Renato Botelho Date: Thu, 31 Oct 2013 23:49:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332322 - head/www/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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 23:49:35 -0000 Author: garga Date: Thu Oct 31 23:49:35 2013 New Revision: 332322 URL: http://svnweb.freebsd.org/changeset/ports/332322 Log: . Add LICENSE . Support STAGE . Remove LATEST_LINK and use PKGNAMESUFFIX . Simplify Makefile Modified: head/www/dansguardian-devel/Makefile head/www/dansguardian-devel/pkg-plist (contents, props changed) Modified: head/www/dansguardian-devel/Makefile ============================================================================== --- head/www/dansguardian-devel/Makefile Thu Oct 31 23:49:04 2013 (r332321) +++ head/www/dansguardian-devel/Makefile Thu Oct 31 23:49:35 2013 (r332322) @@ -6,19 +6,21 @@ PORTVERSION= 2.12.0.3 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/dansguardian +PKGNAMESUFFIX= -devel MAINTAINER= garga@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= iconv pkgconfig +USES= iconv pkgconfig shebangfix USE_BZIP2= yes CONFLICTS= dansguardian-2.10.* -LATEST_LINK= dansguardian-devel GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ @@ -27,12 +29,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 SSL 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 @@ -47,48 +50,20 @@ CONFDIR= ${PREFIX}/etc/dansguardian RESTRICTED= Redistribution and commercial download is restricted. Check ${DG_URL} for more info -NO_STAGE= yes -.include - -.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 +SSL_LDFLAGS= -lssl -lcrypto +SSL_CFLAGS= -D__SSLMITM -D__SSLCERT -.if ${PORT_OPTIONS:MKAV} -CONFIGURE_ARGS+= --enable-kavd -PLIST_SUB+= KAVDCONF="" -.else -PLIST_SUB+= KAVDCONF="@comment " -.endif +.include .if ${PORT_OPTIONS:MCLAMD} || ${PORT_OPTIONS:MICAP} || \ ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN} @@ -97,24 +72,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 - post-patch: .if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e '/install-data-am/ s|install-dist_docDATA||' \ @@ -123,12 +80,6 @@ post-patch: .if ${PORT_OPTIONS:MSSL} @${REINPLACE_CMD} -e 's|ifdef __SSLCERT|ifdef __SSLCERT_ERROR_AUTH|' \ ${WRKSRC}/src/Auth.cpp -LDFLAGS+= -lssl -lcrypto -CFLAGS+= -D__SSLMITM -D__SSLCERT .endif -post-install: -# Display post-install message - @${CAT} pkg-message - .include Modified: head/www/dansguardian-devel/pkg-plist ============================================================================== --- head/www/dansguardian-devel/pkg-plist Thu Oct 31 23:49:04 2013 (r332321) +++ head/www/dansguardian-devel/pkg-plist Thu Oct 31 23:49:35 2013 (r332322) @@ -163,11 +163,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/bannedrooms/default etc/dansguardian/lists/exceptionextensionlist @@ -284,10 +285,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