Date: Mon, 16 Jul 2012 20:03:57 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r300976 - head/www/dansguardian-devel Message-ID: <201207162003.q6GK3vSG077431@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Mon Jul 16 20:03:57 2012 New Revision: 300976 URL: http://svn.freebsd.org/changeset/ports/300976 Log: - Move to OPTIONSng - Handle DOCS using PORTDOCS and cleanup pkg-plist Modified: head/www/dansguardian-devel/Makefile head/www/dansguardian-devel/pkg-plist Modified: head/www/dansguardian-devel/Makefile ============================================================================== --- head/www/dansguardian-devel/Makefile Mon Jul 16 19:45:27 2012 (r300975) +++ head/www/dansguardian-devel/Makefile Mon Jul 16 20:03:57 2012 (r300976) @@ -32,16 +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 \ - SSL "Enable SSL Cert verify and filtering (experimental)" off +PORTDOCS= * + +OPTIONS_DEFINE= APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM EMAIL DEBUG SSL +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 @@ -50,25 +52,25 @@ RESTRICTED= Redistribution and commercia .include <bsd.port.pre.mk> -.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="" @@ -76,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="" @@ -104,34 +107,28 @@ 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 -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} @${REINPLACE_CMD} -e 's|ifdef __SSLCERT|ifdef __SSLCERT_ERROR_AUTH|' \ ${WRKSRC}/src/Auth.cpp LDFLAGS+= -lssl -lcrypto Modified: head/www/dansguardian-devel/pkg-plist ============================================================================== --- head/www/dansguardian-devel/pkg-plist Mon Jul 16 19:45:27 2012 (r300975) +++ head/www/dansguardian-devel/pkg-plist Mon Jul 16 20:03:57 2012 (r300976) @@ -290,13 +290,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207162003.q6GK3vSG077431>