Sat Mar 11 17:22:45 2017 UTC ()
Fix e2guardian build. Reported by joerg@


(prlw1)
diff -r1.1 -r1.2 pkgsrc/www/e2guardian/Makefile
diff -r1.1 -r1.2 pkgsrc/www/e2guardian/PLIST
diff -r1.1 -r1.2 pkgsrc/www/e2guardian/distinfo
diff -r1.1 -r1.2 pkgsrc/www/e2guardian/files/configfiles

cvs diff -r1.1 -r1.2 pkgsrc/www/e2guardian/Makefile (expand / switch to unified diff)

--- pkgsrc/www/e2guardian/Makefile 2017/03/03 14:09:18 1.1
+++ pkgsrc/www/e2guardian/Makefile 2017/03/11 17:22:45 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.1 2017/03/03 14:09:18 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.2 2017/03/11 17:22:45 prlw1 Exp $
2 2
3DISTNAME= e2guardian-3.5.0 3DISTNAME= e2guardian-3.5.0
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_GITHUB:=e2guardian/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=e2guardian/}
6GITHUB_PROJECT= e2guardian 6GITHUB_PROJECT= e2guardian
7GITHUB_TAG= v${PKGVERSION} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= prlw1@cam.ac.uk 9MAINTAINER= prlw1@cam.ac.uk
10HOMEPAGE= http://www.e2guardian.org/ 10HOMEPAGE= http://www.e2guardian.org/
11COMMENT= Web content filtering proxy 11COMMENT= Web content filtering proxy
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LANGUAGES= c++ 15USE_LANGUAGES= c++
16USE_TOOLS= autoconf automake perl pkg-config 16USE_TOOLS= autoconf automake perl pkg-config
17RCD_SCRIPTS+= e2guardian 17RCD_SCRIPTS+= e2guardian
18 18
19# Fix bug in configure.ac: the paths are expanded too soon 19# Fix bug in configure.ac: the paths are expanded too soon
20SUBST_CLASSES+= pathfix 20SUBST_CLASSES+= pathfix

cvs diff -r1.1 -r1.2 pkgsrc/www/e2guardian/PLIST (expand / switch to unified diff)

--- pkgsrc/www/e2guardian/PLIST 2017/03/03 14:09:18 1.1
+++ pkgsrc/www/e2guardian/PLIST 2017/03/11 17:22:45 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2017/03/03 14:09:18 prlw1 Exp $ 1@comment $NetBSD: PLIST,v 1.2 2017/03/11 17:22:45 prlw1 Exp $
2man/man8/e2guardian.8 2man/man8/e2guardian.8
3sbin/e2guardian 3sbin/e2guardian
4share/doc/e2guardian/AuthPlugins 4share/doc/e2guardian/AuthPlugins
5share/doc/e2guardian/ContentScanners 5share/doc/e2guardian/ContentScanners
6share/doc/e2guardian/DownloadManagers 6share/doc/e2guardian/DownloadManagers
7share/doc/e2guardian/FAQ 7share/doc/e2guardian/FAQ
8share/doc/e2guardian/FAQ.html 8share/doc/e2guardian/FAQ.html
9share/doc/e2guardian/Plugins 9share/doc/e2guardian/Plugins
10share/e2guardian/blockedflash.swf 10share/e2guardian/blockedflash.swf
11share/e2guardian/e2guardian.pl 11share/e2guardian/e2guardian.pl
12share/e2guardian/languages/arspanish/fancydmtemplate.html 12share/e2guardian/languages/arspanish/fancydmtemplate.html
13share/e2guardian/languages/arspanish/messages 13share/e2guardian/languages/arspanish/messages
14share/e2guardian/languages/arspanish/template.html 14share/e2guardian/languages/arspanish/template.html
@@ -94,26 +94,27 @@ share/e2guardian/languages/ukenglish/mes @@ -94,26 +94,27 @@ share/e2guardian/languages/ukenglish/mes
94share/e2guardian/languages/ukenglish/template.html 94share/e2guardian/languages/ukenglish/template.html
95share/e2guardian/scripts/bsd-init 95share/e2guardian/scripts/bsd-init
96share/e2guardian/scripts/e2guardian 96share/e2guardian/scripts/e2guardian
97share/e2guardian/scripts/e2guardian.service 97share/e2guardian/scripts/e2guardian.service
98share/e2guardian/scripts/logrotation 98share/e2guardian/scripts/logrotation
99share/e2guardian/scripts/solaris-init 99share/e2guardian/scripts/solaris-init
100share/e2guardian/scripts/systemv-init 100share/e2guardian/scripts/systemv-init
101share/e2guardian/transparent1x1.gif 101share/e2guardian/transparent1x1.gif
102share/examples/e2guardian/authplugins/ident.conf 102share/examples/e2guardian/authplugins/ident.conf
103share/examples/e2guardian/authplugins/ip.conf 103share/examples/e2guardian/authplugins/ip.conf
104share/examples/e2guardian/authplugins/port.conf 104share/examples/e2guardian/authplugins/port.conf
105share/examples/e2guardian/authplugins/proxy-basic.conf 105share/examples/e2guardian/authplugins/proxy-basic.conf
106share/examples/e2guardian/authplugins/proxy-digest.conf 106share/examples/e2guardian/authplugins/proxy-digest.conf
 107share/examples/e2guardian/authplugins/proxy-header.conf
107share/examples/e2guardian/downloadmanagers/default.conf 108share/examples/e2guardian/downloadmanagers/default.conf
108share/examples/e2guardian/downloadmanagers/fancy.conf 109share/examples/e2guardian/downloadmanagers/fancy.conf
109share/examples/e2guardian/e2guardian.conf 110share/examples/e2guardian/e2guardian.conf
110share/examples/e2guardian/e2guardianf1.conf 111share/examples/e2guardian/e2guardianf1.conf
111share/examples/e2guardian/lists/addheaderregexplist 112share/examples/e2guardian/lists/addheaderregexplist
112share/examples/e2guardian/lists/authexceptionsitelist 113share/examples/e2guardian/lists/authexceptionsitelist
113share/examples/e2guardian/lists/authexceptionurllist 114share/examples/e2guardian/lists/authexceptionurllist
114share/examples/e2guardian/lists/authplugins/ipgroups 115share/examples/e2guardian/lists/authplugins/ipgroups
115share/examples/e2guardian/lists/authplugins/portgroups 116share/examples/e2guardian/lists/authplugins/portgroups
116share/examples/e2guardian/lists/bannedextensionlist 117share/examples/e2guardian/lists/bannedextensionlist
117share/examples/e2guardian/lists/bannediplist 118share/examples/e2guardian/lists/bannediplist
118share/examples/e2guardian/lists/bannedmimetypelist 119share/examples/e2guardian/lists/bannedmimetypelist
119share/examples/e2guardian/lists/bannedphraselist 120share/examples/e2guardian/lists/bannedphraselist

cvs diff -r1.1 -r1.2 pkgsrc/www/e2guardian/distinfo (expand / switch to unified diff)

--- pkgsrc/www/e2guardian/distinfo 2017/03/03 14:09:18 1.1
+++ pkgsrc/www/e2guardian/distinfo 2017/03/11 17:22:45 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1 2017/03/03 14:09:18 prlw1 Exp $ 1$NetBSD: distinfo,v 1.2 2017/03/11 17:22:45 prlw1 Exp $
2 2
3SHA1 (e2guardian-3.5.0.tar.gz) = 622d792484ca1a606708421730b097bf3416411e 3SHA1 (e2guardian-3.5.0.tar.gz) = 4d6b7bec574be82cc443a40683be6cabdaca2185
4RMD160 (e2guardian-3.5.0.tar.gz) = aad0d47b434e1f6190d0a8365856c89ce4353fc1 4RMD160 (e2guardian-3.5.0.tar.gz) = ced0c0583f9ea408703654bf2c022f7703ca87e7
5SHA512 (e2guardian-3.5.0.tar.gz) = 818d73fb7f0bdad0a03c26bfd0fca71a03acec97c27bb87e39aed29ad7fe7164b2ba3297c372886d52e65d846ab08b99e7c8b67b14fc53dd4b69878cc646590c 5SHA512 (e2guardian-3.5.0.tar.gz) = 44498dad84a048c4b9e2d9416b8d6b7921959d0447633f991c85bac8740f7f59fccf0d0f5bbd8746d6d1748efbcbde82c8397dea6dffe125bbfc8626860f9ffb
6Size (e2guardian-3.5.0.tar.gz) = 596570 bytes 6Size (e2guardian-3.5.0.tar.gz) = 529493 bytes

cvs diff -r1.1 -r1.2 pkgsrc/www/e2guardian/files/configfiles (expand / switch to unified diff)

--- pkgsrc/www/e2guardian/files/configfiles 2017/03/03 14:09:18 1.1
+++ pkgsrc/www/e2guardian/files/configfiles 2017/03/11 17:22:45 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1authplugins/ident.conf 1authplugins/ident.conf
2authplugins/ip.conf 2authplugins/ip.conf
3authplugins/port.conf 3authplugins/port.conf
4authplugins/proxy-basic.conf 4authplugins/proxy-basic.conf
5authplugins/proxy-digest.conf 5authplugins/proxy-digest.conf
 6authplugins/proxy-header.conf
6downloadmanagers/default.conf 7downloadmanagers/default.conf
7downloadmanagers/fancy.conf 8downloadmanagers/fancy.conf
8e2guardian.conf 9e2guardian.conf
9e2guardianf1.conf 10e2guardianf1.conf
10lists/addheaderregexplist 11lists/addheaderregexplist
11lists/authexceptionsitelist 12lists/authexceptionsitelist
12lists/authexceptionurllist 13lists/authexceptionurllist
13lists/authplugins/ipgroups 14lists/authplugins/ipgroups
14lists/authplugins/portgroups 15lists/authplugins/portgroups
15lists/bannedextensionlist 16lists/bannedextensionlist
16lists/bannediplist 17lists/bannediplist
17lists/bannedmimetypelist 18lists/bannedmimetypelist
18lists/bannedphraselist 19lists/bannedphraselist