From owner-svn-ports-head@FreeBSD.ORG Mon Jul 16 20:04:11 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B844E1065676; Mon, 16 Jul 2012 20:04:11 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9913F8FC12; Mon, 16 Jul 2012 20:04:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6GK4BY4077519; Mon, 16 Jul 2012 20:04:11 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GK4Bnd077516; Mon, 16 Jul 2012 20:04:11 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201207162004.q6GK4Bnd077516@svn.freebsd.org> From: Renato Botelho Date: Mon, 16 Jul 2012 20:04:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r300977 - head/www/dansguardian X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 16 Jul 2012 20:04:11 -0000 Author: garga Date: Mon Jul 16 20:04:11 2012 New Revision: 300977 URL: http://svn.freebsd.org/changeset/ports/300977 Log: - Move to OPTIONSng - Handle DOCS using PORTDOCS and cleanup pkg-plist Modified: head/www/dansguardian/Makefile head/www/dansguardian/pkg-plist Modified: head/www/dansguardian/Makefile ============================================================================== --- head/www/dansguardian/Makefile Mon Jul 16 20:03:57 2012 (r300976) +++ head/www/dansguardian/Makefile Mon Jul 16 20:04:11 2012 (r300977) @@ -32,15 +32,18 @@ CONFIGURE_ARGS= --localstatedir=/var \ MAN8= dansguardian.8 -OPTIONS= APACHE "Enable Apache support for access denied page" on \ - TRICKLE "Enable the trickle download manager" on \ - CLISCAN "Enable support for CLI content scanners" off \ - CLAMD "Enable ClamAV daemon support (clamd)" off \ - ICAP "Enable ICAP AV content scanner support (testing)" off \ - KAV "Enable Kaspersky AV support (testing)" off \ - NTLM "Enable NTLM authentication plugin" off \ - EMAIL "Enable e-mail reporting support" off \ - DEBUG "Enable debug options - not for production use" off +PORTDOCS= * + +OPTIONS_DEFINE= APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL DEBUG +OPTIONS_DEFAULT=APACHE TRICKLE + +APACHE_DESC= Enable Apache support for access denied page +TRICKLE_DESC= Enable the trickle download manager +CLISCAN_DESC= Enable support for CLI content scanners +CLAMD_DESC= Enable ClamAV daemon support (clamd) +ICAP_DESC= Enable ICAP AV content scanner support (testing) +KAV_DESC= Enable Kaspersky AV support (testing) +EMAIL_DESC= Enable e-mail reporting support DG_URL= http://dansguardian.org/index.php?page=copyright2 CONFDIR= ${PREFIX}/etc/dansguardian @@ -49,25 +52,25 @@ RESTRICTED= Redistribution and commercia .include -.if !defined(WITHOUT_APACHE) +.if ${PORT_OPTIONS:MAPACHE} USE_APACHE= 20+ .endif -.if !defined(WITHOUT_TRICKLE) +.if ${PORT_OPTIONS:MTRICKLE} CONFIGURE+= --enable-trickledm PLIST_SUB+= TRICKLECONF="" .else PLIST_SUB+= TRICKLECONF="@comment " .endif -.if defined(WITH_CLISCAN) +.if ${PORT_OPTIONS:MCLISCAN} CONFIGURE_ARGS+= --enable-commandline PLIST_SUB+= CLISCANCONF="" .else PLIST_SUB+= CLISCANCONF="@comment " .endif -.if defined(WITH_CLAMD) +.if ${PORT_OPTIONS:MCLAMD} CONFIGURE_ARGS+= --enable-clamd RUN_DEPENDS+= ${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav PLIST_SUB+= CLAMDCONF="" @@ -75,27 +78,28 @@ PLIST_SUB+= CLAMDCONF="" PLIST_SUB+= CLAMDCONF="@comment " .endif -.if defined(WITH_ICAP) +.if ${PORT_OPTIONS:MICAP} CONFIGURE_ARGS+= --enable-icap PLIST_SUB+= ICAPCONF="" .else PLIST_SUB+= ICAPCONF="@comment " .endif -.if defined(WITH_KAV) +.if ${PORT_OPTIONS:MKAV} CONFIGURE_ARGS+= --enable-kavd PLIST_SUB+= KAVDCONF="" .else PLIST_SUB+= KAVDCONF="@comment " .endif -.if defined(WITH_CLAMD) || defined(WITH_ICAP) || defined(WITH_KAV) || defined(WITH_CLISCAN) +.if ${PORT_OPTIONS:MCLAMD} || ${PORT_OPTIONS:MICAP} || \ + ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN} PLIST_SUB+= SCANNERS="" .else PLIST_SUB+= SCANNERS="@comment " .endif -.if defined(WITH_NTLM) +.if ${PORT_OPTIONS:MNTLM} CONFIGURE_ARGS+= --enable-ntlm --with-libiconv=${LOCALBASE} USE_ICONV= yes PLIST_SUB+= NTLMCONF="" @@ -103,30 +107,24 @@ PLIST_SUB+= NTLMCONF="" PLIST_SUB+= NTLMCONF="@comment " .endif -.if defined(WITH_EMAIL) +.if ${PORT_OPTIONS:MEMAIL} CONFIGURE_ARGS+= --enable-email PLIST_SUB+= EMAILCONF="" .else PLIST_SUB+= EMAILCONF="@comment " .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --with-dgdebug .endif -#.if defined(NOPORTDOCS) -#PLISTSUB+= DOCINST="@comment " -#.else -#PLISTSUB+= DOCINST="" -#.endif - # User needs to manually download the distfile .if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})) && !defined(PACKAGE_BUILDING) IGNORE= commercial source download is restricted. Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make .endif post-patch: -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e '/install-data-am/ s|install-dist_docDATA||' \ ${WRKSRC}/doc/Makefile.in .endif Modified: head/www/dansguardian/pkg-plist ============================================================================== --- head/www/dansguardian/pkg-plist Mon Jul 16 20:03:57 2012 (r300976) +++ head/www/dansguardian/pkg-plist Mon Jul 16 20:04:11 2012 (r300977) @@ -287,13 +287,6 @@ etc/dansguardian/downloadmanagers/fancy. %%CLISCANCONF%%etc/dansguardian/contentscanners/commandlinescan.conf etc/dansguardian/dansguardian.conf etc/dansguardian/dansguardianf1.conf -%%PORTDOCS%%%%DOCSDIR%%/AuthPlugins -%%PORTDOCS%%%%DOCSDIR%%/ContentScanners -%%PORTDOCS%%%%DOCSDIR%%/DownloadManagers -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/FAQ.html -%%PORTDOCS%%%%DOCSDIR%%/Plugins -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%%/languages/arspanish @dirrm %%DATADIR%%/languages/bulgarian