Attachment 152513 Details for Bug 197289 – diff from old format Makefile

[patch] diff from old format Makefile

e2guardian.diff (text/plain), 9.64 KB, created by marcellocoutinho on 2015-02-03 14:50:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: marcellocoutinho

Created: 2015-02-03 14:50:53 UTC

Size: 9.64 KB

patch

obsolete

>diff -Nru e2guardian/Makefile e2guardian.new/Makefile
>--- e2guardian/Makefile	2015-02-03 12:45:19.233864082 -0200
>+++ e2guardian.new/Makefile	2015-02-03 12:45:02.237432133 -0200
>@@ -7,16 +7,15 @@
> MASTER_SITES=	GH
> 
> MAINTAINER=	marcellocoutinho@gmail.com
>+COMMENT=	Dansguardian fork with many improvements and bug fixes
> 
>-LICENSE=	BSD
>+LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils pcretest:${PORTSDIR}/devel/pcre
>-
>-COMMENT=	Dansguardian fork with many improvements and bug fixes.
>+BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
>+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	${PORTNAME}
>-GH_PROJECT=	${PORTNAME}
> GH_COMMIT=	8fbf487
> GH_TAGNAME=	${PORTVERSION:S/^/v/}
> 
>@@ -31,6 +30,7 @@
> 
> OPTIONS_DEFINE=	APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM DNS EMAIL DEBUG SSL DOCS
> OPTIONS_DEFAULT=TRICKLE DOCS 1024
>+OPTIONS_SUB=	yes
> 
> APACHE_DESC=	Enable Apache support for access denied page
> TRICKLE_DESC=	Enable the trickle download manager
>@@ -56,100 +56,36 @@
> CFLAGS+=	-I${LOCALBASE}/include
> WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
> 
>+APACHE_USE=APACHE_RUN=22+
>+TRICKLE_CONFIGURE_ENABLE=	trickledm
>+CLISCAN_CONFIGURE_ENABLE=	commandline
>+CLAMD_CONFIGURE_ENABLE=		clamd=yes
>+ICAP_CONFIGURE_ENABLE=		icap
>+KAV_CONFIGURE_ENABLE=		kavd
>+NTLM_CONFIGURE_ENABLE=		ntlm
>+DNS_CONFIGURE_ENABLE=		dnsauth
>+EMAIL_CONFIGURE_ENABLE=		email
>+DEBUG_CONFIGURE_WITH=		dgdebug
>+1024_CONFIGURE_ON=		--with-filedescriptors=1024
>+2048_CONFIGURE_ON=		--with-filedescriptors=2048
>+4096_CONFIGURE_ON=		--with-filedescriptors=4096
>+8192_CONFIGURE_ON=		--with-filedescriptors=8192
>+
>+CLAMD_RUN_DEPENDS=	${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
>+NTLM_RUN_DEPENDS=	${LOCALBASE}/bin/iconv:${PORTSDIR}/converters/libiconv
>+NTLM_USES=	iconv
>+
> .include <bsd.port.pre.mk>
> 
> pre-configure:
> 	@${REINPLACE_CMD} -e 's|.lresolv||g'    ${WRKSRC}/configure.ac
> 	cd ${WRKSRC}; ${SH} autogen.sh
> 
>-.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=yes
>-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
>-
>-.if ${PORT_OPTIONS:MKAV}
>-CONFIGURE_ARGS+=	--enable-kavd
>-PLIST_SUB+=		KAVDCONF=""
>-.else
>-PLIST_SUB+=		KAVDCONF="@comment "
>-.endif
>-
> .if ${PORT_OPTIONS:MCLAMD} || ${PORT_OPTIONS:MICAP} || \
>-    ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN}
>-PLIST_SUB+=		SCANNERS=""
>+   ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN}
>+PLIST_SUB+=	SCANNERS=""
> .else
>-PLIST_SUB+=		SCANNERS="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MNTLM}
>-CONFIGURE_ARGS+=	--enable-ntlm
>-RUN_DEPENDS+=		${LOCALBASE}/bin/iconv:${PORTSDIR}/converters/libiconv
>-USES+=			iconv
>-PLIST_SUB+=		NTLMCONF=""
>-.else
>-PLIST_SUB+=		NTLMCONF="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MDNS}
>-CONFIGURE_ARGS+=	--enable-dnsauth
>-PLIST_SUB+=		DNSCONF=""
>-.else
>-PLIST_SUB+=		DNSCONF="@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
>-
>-.if ${PORT_OPTIONS:M1024}
>-CONFIGURE_ARGS+=	--with-filedescriptors=1024
>-.endif
>-
>-.if ${PORT_OPTIONS:M2048}
>-CONFIGURE_ARGS+=	--with-filedescriptors=2048
>-.endif
>-
>-.if ${PORT_OPTIONS:M4096}
>-CONFIGURE_ARGS+=	--with-filedescriptors=4096
>-.endif
>-
>-.if ${PORT_OPTIONS:M8192}
>-CONFIGURE_ARGS+=	--with-filedescriptors=8192
>+PLIST_SUB+=	SCANNERS="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MSSL}
>diff -Nru e2guardian/pkg-plist e2guardian.new/pkg-plist
>--- e2guardian/pkg-plist	2015-02-03 12:45:19.243878484 -0200
>+++ e2guardian.new/pkg-plist	2015-02-03 12:45:02.237432133 -0200
>@@ -1,12 +1,12 @@
>-%%ETCDIR%%/authplugins/dnsauth.conf
>+%%DNS%%%%ETCDIR%%/authplugins/dnsauth.conf
> %%ETCDIR%%/authplugins/ident.conf
> %%ETCDIR%%/authplugins/ip.conf
> %%ETCDIR%%/authplugins/port.conf
> %%ETCDIR%%/authplugins/proxy-basic.conf
> %%ETCDIR%%/authplugins/proxy-digest.conf
>-%%ETCDIR%%/authplugins/proxy-ntlm.conf
>-%%ETCDIR%%/contentscanners/clamdscan.conf
>-%%ETCDIR%%/contentscanners/icapscan.conf
>+%%NTLM%%%%ETCDIR%%/authplugins/proxy-ntlm.conf
>+%%CLAMD%%%%ETCDIR%%/contentscanners/clamdscan.conf
>+%%ICAP%%%%ETCDIR%%/contentscanners/icapscan.conf
> %%ETCDIR%%/downloadmanagers/default.conf
> %%ETCDIR%%/downloadmanagers/fancy.conf
> %%ETCDIR%%/e2guardian.conf
>@@ -31,10 +31,10 @@
> %%ETCDIR%%/lists/blacklists/ads/domains
> %%ETCDIR%%/lists/blacklists/ads/urls
> %%ETCDIR%%/lists/contentregexplist
>-%%ETCDIR%%/lists/contentscanners/exceptionvirusextensionlist
>-%%ETCDIR%%/lists/contentscanners/exceptionvirusmimetypelist
>-%%ETCDIR%%/lists/contentscanners/exceptionvirussitelist
>-%%ETCDIR%%/lists/contentscanners/exceptionvirusurllist
>+%%SCANNERS%%%%ETCDIR%%/lists/contentscanners/exceptionvirusextensionlist
>+%%SCANNERS%%%%ETCDIR%%/lists/contentscanners/exceptionvirusmimetypelist
>+%%SCANNERS%%%%ETCDIR%%/lists/contentscanners/exceptionvirussitelist
>+%%SCANNERS%%%%ETCDIR%%/lists/contentscanners/exceptionvirusurllist
> %%ETCDIR%%/lists/downloadmanagers/managedextensionlist
> %%ETCDIR%%/lists/downloadmanagers/managedmimetypelist
> %%ETCDIR%%/lists/embededreferersitelist
>@@ -156,92 +156,3 @@
> %%PORTDOCS%%%%DOCSDIR%%/FAQ
> %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
> %%PORTDOCS%%%%DOCSDIR%%/Plugins
>-%%DATADIR%%/blockedflash.swf
>-%%DATADIR%%/e2guardian.pl
>-%%DATADIR%%/languages/arspanish/fancydmtemplate.html
>-%%DATADIR%%/languages/arspanish/messages
>-%%DATADIR%%/languages/arspanish/template.html
>-%%DATADIR%%/languages/bulgarian/fancydmtemplate.html
>-%%DATADIR%%/languages/bulgarian/messages
>-%%DATADIR%%/languages/bulgarian/template.html
>-%%DATADIR%%/languages/chinesebig5/fancydmtemplate.html
>-%%DATADIR%%/languages/chinesebig5/messages
>-%%DATADIR%%/languages/chinesebig5/template.html
>-%%DATADIR%%/languages/chinesegb2312/fancydmtemplate.html
>-%%DATADIR%%/languages/chinesegb2312/messages
>-%%DATADIR%%/languages/chinesegb2312/template.html
>-%%DATADIR%%/languages/czech/fancydmtemplate.html
>-%%DATADIR%%/languages/czech/messages
>-%%DATADIR%%/languages/czech/template.html
>-%%DATADIR%%/languages/danish/fancydmtemplate.html
>-%%DATADIR%%/languages/danish/messages
>-%%DATADIR%%/languages/danish/template.html
>-%%DATADIR%%/languages/dutch/fancydmtemplate.html
>-%%DATADIR%%/languages/dutch/messages
>-%%DATADIR%%/languages/dutch/template.html
>-%%DATADIR%%/languages/french/fancydmtemplate.html
>-%%DATADIR%%/languages/french/messages
>-%%DATADIR%%/languages/french/template.html
>-%%DATADIR%%/languages/german/fancydmtemplate.html
>-%%DATADIR%%/languages/german/messages
>-%%DATADIR%%/languages/german/template.html
>-%%DATADIR%%/languages/hebrew/fancydmtemplate.html
>-%%DATADIR%%/languages/hebrew/messages
>-%%DATADIR%%/languages/hebrew/template.html
>-%%DATADIR%%/languages/hungarian/fancydmtemplate.html
>-%%DATADIR%%/languages/hungarian/messages
>-%%DATADIR%%/languages/hungarian/template.html
>-%%DATADIR%%/languages/indonesian/fancydmtemplate.html
>-%%DATADIR%%/languages/indonesian/messages
>-%%DATADIR%%/languages/indonesian/template.html
>-%%DATADIR%%/languages/italian/fancydmtemplate.html
>-%%DATADIR%%/languages/italian/messages
>-%%DATADIR%%/languages/italian/template.html
>-%%DATADIR%%/languages/japanese/fancydmtemplate.html
>-%%DATADIR%%/languages/japanese/messages
>-%%DATADIR%%/languages/japanese/template.html
>-%%DATADIR%%/languages/lithuanian/fancydmtemplate.html
>-%%DATADIR%%/languages/lithuanian/messages
>-%%DATADIR%%/languages/lithuanian/template.html
>-%%DATADIR%%/languages/malay/fancydmtemplate.html
>-%%DATADIR%%/languages/malay/messages
>-%%DATADIR%%/languages/malay/template.html
>-%%DATADIR%%/languages/mxspanish/fancydmtemplate.html
>-%%DATADIR%%/languages/mxspanish/messages
>-%%DATADIR%%/languages/mxspanish/template.html
>-%%DATADIR%%/languages/polish/fancydmtemplate.html
>-%%DATADIR%%/languages/polish/messages
>-%%DATADIR%%/languages/polish/template.html
>-%%DATADIR%%/languages/portuguese/fancydmtemplate.html
>-%%DATADIR%%/languages/portuguese/messages
>-%%DATADIR%%/languages/portuguese/template.html
>-%%DATADIR%%/languages/ptbrazilian/fancydmtemplate.html
>-%%DATADIR%%/languages/ptbrazilian/messages
>-%%DATADIR%%/languages/ptbrazilian/template.html
>-%%DATADIR%%/languages/russian-1251/fancydmtemplate.html
>-%%DATADIR%%/languages/russian-1251/messages
>-%%DATADIR%%/languages/russian-1251/template.html
>-%%DATADIR%%/languages/russian-koi8-r/fancydmtemplate.html
>-%%DATADIR%%/languages/russian-koi8-r/messages
>-%%DATADIR%%/languages/russian-koi8-r/template.html
>-%%DATADIR%%/languages/slovak/fancydmtemplate.html
>-%%DATADIR%%/languages/slovak/messages
>-%%DATADIR%%/languages/slovak/template.html
>-%%DATADIR%%/languages/spanish/fancydmtemplate.html
>-%%DATADIR%%/languages/spanish/messages
>-%%DATADIR%%/languages/spanish/template.html
>-%%DATADIR%%/languages/swedish/fancydmtemplate.html
>-%%DATADIR%%/languages/swedish/messages
>-%%DATADIR%%/languages/swedish/template.html
>-%%DATADIR%%/languages/turkish/fancydmtemplate.html
>-%%DATADIR%%/languages/turkish/messages
>-%%DATADIR%%/languages/turkish/template.html
>-%%DATADIR%%/languages/ukenglish/fancydmtemplate.html
>-%%DATADIR%%/languages/ukenglish/messages
>-%%DATADIR%%/languages/ukenglish/template.html
>-%%DATADIR%%/scripts/bsd-init
>-%%DATADIR%%/scripts/e2guardian
>-%%DATADIR%%/scripts/logrotation
>-%%DATADIR%%/scripts/solaris-init
>-%%DATADIR%%/scripts/systemv-init
>-%%DATADIR%%/transparent1x1.gif

Actions: View | Diff

Attachments on bug 197289: 152508 | 152513 | 152523