Wed Apr 16 14:55:29 2008 UTC ()
Fix required_files line in rc.d script now that we are using
PKG_SYSCONFSUBDIR.
Bump PKGREVISION


(sborrill)
diff -r1.3 -r1.4 pkgsrc/www/dansguardian/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/www/dansguardian/files/dansguardian.sh
cvs diff -r1.3 -r1.4 pkgsrc/www/dansguardian/Makefile (switch to unified diff)

--- pkgsrc/www/dansguardian/Makefile 2008/04/03 10:19:17 1.3
+++ pkgsrc/www/dansguardian/Makefile 2008/04/16 14:55:29 1.4
@@ -1,178 +1,178 @@ @@ -1,178 +1,178 @@
1# $NetBSD: Makefile,v 1.3 2008/04/03 10:19:17 sborrill Exp $ 1# $NetBSD: Makefile,v 1.4 2008/04/16 14:55:29 sborrill Exp $
2 2
3DISTNAME= dansguardian-2.8.0.6.source 3DISTNAME= dansguardian-2.8.0.6.source
4PKGNAME= dansguardian-2.8.0.6 4PKGNAME= dansguardian-2.8.0.6
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://dansguardian.org/downloads/2/Stable/ 7MASTER_SITES= http://dansguardian.org/downloads/2/Stable/
8 8
9MAINTAINER= sborrill@NetBSD.org 9MAINTAINER= sborrill@NetBSD.org
10HOMEPAGE= http://dansguardian.org/ 10HOMEPAGE= http://dansguardian.org/
11COMMENT= Fast, featureful web content filter for Squid proxy servers 11COMMENT= Fast, featureful web content filter for Squid proxy servers
12 12
13WRKSRC= ${WRKDIR}/dansguardian-2.8.0.6 13WRKSRC= ${WRKDIR}/dansguardian-2.8.0.6
14HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
15MANCOMPRESSED= yes 15MANCOMPRESSED= yes
16RCD_SCRIPTS+= dansguardian 16RCD_SCRIPTS+= dansguardian
17 17
18PKG_SYSCONFSUBDIR= dansguardian 18PKG_SYSCONFSUBDIR= dansguardian
19 19
20EGDIR= ${PREFIX}/share/examples/dansguardian 20EGDIR= ${PREFIX}/share/examples/dansguardian
21 21
22SUBST_CLASSES+= egconfpath 22SUBST_CLASSES+= egconfpath
23SUBST_STAGE.egconfpath= pre-configure 23SUBST_STAGE.egconfpath= pre-configure
24SUBST_MESSAGE.egconfpath= Setting example configuration path 24SUBST_MESSAGE.egconfpath= Setting example configuration path
25SUBST_FILES.egconfpath= autoconf/*.in 25SUBST_FILES.egconfpath= autoconf/*.in
26SUBST_SED.egconfpath= -e 's,\$$(CONFFILELOCATION),${EGDIR}/,g' 26SUBST_SED.egconfpath= -e 's,\$$(CONFFILELOCATION),${EGDIR}/,g'
27SUBST_SED.egconfpath+= -e '/SYSVLOCATION/d' 27SUBST_SED.egconfpath+= -e '/SYSVLOCATION/d'
28SUBST_SED.egconfpath+= -e '/chmod.*dansguardian.pl/s,o\+x,+x,' 28SUBST_SED.egconfpath+= -e '/chmod.*dansguardian.pl/s,o\+x,+x,'
29 29
30SUBST_CLASSES+= perlpath 30SUBST_CLASSES+= perlpath
31SUBST_STAGE.perlpath= pre-configure 31SUBST_STAGE.perlpath= pre-configure
32SUBST_MESSAGE.perlpath= Fixing path to perl executable 32SUBST_MESSAGE.perlpath= Fixing path to perl executable
33SUBST_FILES.perlpath= *.pl 33SUBST_FILES.perlpath= *.pl
34SUBST_SED.perlpath= -e 's,/usr/bin,${PREFIX}/bin,g' 34SUBST_SED.perlpath= -e 's,/usr/bin,${PREFIX}/bin,g'
35 35
36DANSGUARDIAN_USER?= nobody 36DANSGUARDIAN_USER?= nobody
37DANSGUARDIAN_GROUP?= nobody 37DANSGUARDIAN_GROUP?= nobody
38 38
39CONFIGURE_ARGS= --prefix=${PREFIX:Q} \ 39CONFIGURE_ARGS= --prefix=${PREFIX:Q} \
40 --cgidir=/libexec/cgi-bin/ \ 40 --cgidir=/libexec/cgi-bin/ \
41 --sysconfdir=/etc/dansguardian/ \ 41 --sysconfdir=/etc/dansguardian/ \
42 --bindir=/sbin/ \ 42 --bindir=/sbin/ \
43 --mandir=/man/ \ 43 --mandir=/man/ \
44 --runas_usr=${DANSGUARDIAN_USER} \ 44 --runas_usr=${DANSGUARDIAN_USER} \
45 --runas_grp=${DANSGUARDIAN_GROUP} \ 45 --runas_grp=${DANSGUARDIAN_GROUP} \
46 --logdir=${VARBASE}/log/dansguardian/ 46 --logdir=${VARBASE}/log/dansguardian/
47 47
48OWN_DIRS+= ${VARBASE}/log/dansguardian 48OWN_DIRS+= ${VARBASE}/log/dansguardian
49OWN_DIRS_PERMS+= ${VARBASE}/log/dansguardian \ 49OWN_DIRS_PERMS+= ${VARBASE}/log/dansguardian \
50 ${DANSGUARDIAN_USER} ${DANSGUARDIAN_GROUP} 0755 50 ${DANSGUARDIAN_USER} ${DANSGUARDIAN_GROUP} 0755
51  51
52DEPENDS+= squid>=2.5:../../www/squid 52DEPENDS+= squid>=2.5:../../www/squid
53 53
54.for f in logrotation pics transparent1x1.gif \ 54.for f in logrotation pics transparent1x1.gif \
55 dansguardian.conf \ 55 dansguardian.conf \
56 dansguardianf1.conf \ 56 dansguardianf1.conf \
57 bannedextensionlist \ 57 bannedextensionlist \
58 bannediplist \ 58 bannediplist \
59 bannedmimetypelist \ 59 bannedmimetypelist \
60 bannedphraselist \ 60 bannedphraselist \
61 bannedregexpurllist \ 61 bannedregexpurllist \
62 bannedsitelist \ 62 bannedsitelist \
63 bannedurllist \ 63 bannedurllist \
64 banneduserlist \ 64 banneduserlist \
65 contentregexplist \ 65 contentregexplist \
66 exceptioniplist \ 66 exceptioniplist \
67 exceptionphraselist \ 67 exceptionphraselist \
68 exceptionsitelist \ 68 exceptionsitelist \
69 exceptionurllist \ 69 exceptionurllist \
70 exceptionuserlist \ 70 exceptionuserlist \
71 filtergroupslist \ 71 filtergroupslist \
72 greysitelist \ 72 greysitelist \
73 greyurllist \ 73 greyurllist \
74 weightedphraselist \ 74 weightedphraselist \
75 phraselists/badwords/weighted_dutch \ 75 phraselists/badwords/weighted_dutch \
76 phraselists/badwords/weighted_french \ 76 phraselists/badwords/weighted_french \
77 phraselists/badwords/weighted_german \ 77 phraselists/badwords/weighted_german \
78 phraselists/badwords/weighted_portuguese \ 78 phraselists/badwords/weighted_portuguese \
79 phraselists/badwords/weighted_spanish \ 79 phraselists/badwords/weighted_spanish \
80 phraselists/chat/weighted \ 80 phraselists/chat/weighted \
81 phraselists/chat/weighted_italian \ 81 phraselists/chat/weighted_italian \
82 phraselists/drugadvocacy/weighted \ 82 phraselists/drugadvocacy/weighted \
83 phraselists/gambling/banned \ 83 phraselists/gambling/banned \
84 phraselists/gambling/banned_portuguese \ 84 phraselists/gambling/banned_portuguese \
85 phraselists/gambling/weighted \ 85 phraselists/gambling/weighted \
86 phraselists/gambling/weighted_portuguese \ 86 phraselists/gambling/weighted_portuguese \
87 phraselists/games/weighted \ 87 phraselists/games/weighted \
88 phraselists/goodphrases/exception \ 88 phraselists/goodphrases/exception \
89 phraselists/goodphrases/exception_email \ 89 phraselists/goodphrases/exception_email \
90 phraselists/goodphrases/weighted_general \ 90 phraselists/goodphrases/weighted_general \
91 phraselists/goodphrases/weighted_general_danish \ 91 phraselists/goodphrases/weighted_general_danish \
92 phraselists/goodphrases/weighted_general_portuguese \ 92 phraselists/goodphrases/weighted_general_portuguese \
93 phraselists/goodphrases/weighted_news \ 93 phraselists/goodphrases/weighted_news \
94 phraselists/googlesearches/banned \ 94 phraselists/googlesearches/banned \
95 phraselists/gore/weighted \ 95 phraselists/gore/weighted \
96 phraselists/gore/weighted_portuguese \ 96 phraselists/gore/weighted_portuguese \
97 phraselists/illegaldrugs/banned \ 97 phraselists/illegaldrugs/banned \
98 phraselists/illegaldrugs/banned_portuguese \ 98 phraselists/illegaldrugs/banned_portuguese \
99 phraselists/illegaldrugs/weighted \ 99 phraselists/illegaldrugs/weighted \
100 phraselists/illegaldrugs/weighted_portuguese \ 100 phraselists/illegaldrugs/weighted_portuguese \
101 phraselists/intolerance/banned_portuguese \ 101 phraselists/intolerance/banned_portuguese \
102 phraselists/intolerance/weighted \ 102 phraselists/intolerance/weighted \
103 phraselists/intolerance/weighted_portuguese \ 103 phraselists/intolerance/weighted_portuguese \
104 phraselists/legaldrugs/weighted \ 104 phraselists/legaldrugs/weighted \
105 phraselists/malware/weighted \ 105 phraselists/malware/weighted \
106 phraselists/news/weighted \ 106 phraselists/news/weighted \
107 phraselists/nudism/weighted \ 107 phraselists/nudism/weighted \
108 phraselists/peer2peer/weighted \ 108 phraselists/peer2peer/weighted \
109 phraselists/personals/weighted \ 109 phraselists/personals/weighted \
110 phraselists/personals/weighted_portuguese \ 110 phraselists/personals/weighted_portuguese \
111 phraselists/pornography/banned \ 111 phraselists/pornography/banned \
112 phraselists/pornography/banned_portuguese \ 112 phraselists/pornography/banned_portuguese \
113 phraselists/pornography/weighted \ 113 phraselists/pornography/weighted \
114 phraselists/pornography/weighted_danish \ 114 phraselists/pornography/weighted_danish \
115 phraselists/pornography/weighted_dutch \ 115 phraselists/pornography/weighted_dutch \
116 phraselists/pornography/weighted_french \ 116 phraselists/pornography/weighted_french \
117 phraselists/pornography/weighted_german \ 117 phraselists/pornography/weighted_german \
118 phraselists/pornography/weighted_italian \ 118 phraselists/pornography/weighted_italian \
119 phraselists/pornography/weighted_portuguese \ 119 phraselists/pornography/weighted_portuguese \
120 phraselists/pornography/weighted_spanish \ 120 phraselists/pornography/weighted_spanish \
121 phraselists/proxies/weighted \ 121 phraselists/proxies/weighted \
122 phraselists/sport/weighted \ 122 phraselists/sport/weighted \
123 phraselists/violence/weighted \ 123 phraselists/violence/weighted \
124 phraselists/violence/weighted_portuguese \ 124 phraselists/violence/weighted_portuguese \
125 phraselists/warezhacking/weighted \ 125 phraselists/warezhacking/weighted \
126 phraselists/weapons/weighted \ 126 phraselists/weapons/weighted \
127 phraselists/weapons/weighted_portuguese \ 127 phraselists/weapons/weighted_portuguese \
128 phraselists/webmail/weighted \ 128 phraselists/webmail/weighted \
129 languages/ReadMe 129 languages/ReadMe
130CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 130CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
131.endfor 131.endfor
132 132
133PHRASEDIRS= badwords chat drugadvocacy gambling games \ 133PHRASEDIRS= badwords chat drugadvocacy gambling games \
134 goodphrases googlesearches gore illegaldrugs \ 134 goodphrases googlesearches gore illegaldrugs \
135 intolerance legaldrugs malware news nudism \ 135 intolerance legaldrugs malware news nudism \
136 peer2peer personals pornography proxies sport \ 136 peer2peer personals pornography proxies sport \
137 violence warezhacking weapons webmail 137 violence warezhacking weapons webmail
138 138
139LANGUAGEDIRS= arspanish bulgarian chinesebig5 chinesegb2312 \ 139LANGUAGEDIRS= arspanish bulgarian chinesebig5 chinesegb2312 \
140 czech danish dutch french german hebrew \ 140 czech danish dutch french german hebrew \
141 indonesian italian lithuanian mxspanish polish \ 141 indonesian italian lithuanian mxspanish polish \
142 portuguese russian-1251 slovak spanish \ 142 portuguese russian-1251 slovak spanish \
143 swedish turkish ukenglish 143 swedish turkish ukenglish
144 144
145.for d in ${PHRASEDIRS} 145.for d in ${PHRASEDIRS}
146OWN_DIRS+= ${PKG_SYSCONFDIR}/phraselists/${d} 146OWN_DIRS+= ${PKG_SYSCONFDIR}/phraselists/${d}
147.endfor 147.endfor
148 148
149.for d in ${LANGUAGEDIRS} 149.for d in ${LANGUAGEDIRS}
150OWN_DIRS+= ${PKG_SYSCONFDIR}/languages/${d} 150OWN_DIRS+= ${PKG_SYSCONFDIR}/languages/${d}
151CONF_FILES+= ${EGDIR}/languages/${d}/messages \ 151CONF_FILES+= ${EGDIR}/languages/${d}/messages \
152 ${PKG_SYSCONFDIR}/languages/${d}/messages 152 ${PKG_SYSCONFDIR}/languages/${d}/messages
153CONF_FILES+= ${EGDIR}/languages/${d}/template.html \ 153CONF_FILES+= ${EGDIR}/languages/${d}/template.html \
154 ${PKG_SYSCONFDIR}/languages/${d}/template.html 154 ${PKG_SYSCONFDIR}/languages/${d}/template.html
155.endfor 155.endfor
156 156
157show-conffiles: 157show-conffiles:
158 cd ${WRKSRC}; \ 158 cd ${WRKSRC}; \
159 for file in *.conf *list; \ 159 for file in *.conf *list; \
160 do \ 160 do \
161 ${PRINTF} "\\t$${file}\\t\\\\\\n"; \ 161 ${PRINTF} "\\t$${file}\\t\\\\\\n"; \
162 done; \ 162 done; \
163 for dir in phraselists/* languages/*; \ 163 for dir in phraselists/* languages/*; \
164 do \ 164 do \
165 if [ -d $${dir} ]; then \ 165 if [ -d $${dir} ]; then \
166 for file in $${dir}/*; \ 166 for file in $${dir}/*; \
167 do \ 167 do \
168 ${PRINTF} "\\t$${file}\\t\\\\\\n"; \ 168 ${PRINTF} "\\t$${file}\\t\\\\\\n"; \
169 done; \ 169 done; \
170 else \ 170 else \
171 ${PRINTF} "\\t$${dir}\\t\\\\\\n"; \ 171 ${PRINTF} "\\t$${dir}\\t\\\\\\n"; \
172 fi; \ 172 fi; \
173 done 173 done
174 174
175USE_LANGUAGES= c c++ 175USE_LANGUAGES= c c++
176 176
177.include "../../lang/perl5/buildlink3.mk" 177.include "../../lang/perl5/buildlink3.mk"
178.include "../../mk/bsd.pkg.mk" 178.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/dansguardian/files/dansguardian.sh (switch to unified diff)

--- pkgsrc/www/dansguardian/files/dansguardian.sh 2008/02/22 17:13:29 1.1.1.1
+++ pkgsrc/www/dansguardian/files/dansguardian.sh 2008/04/16 14:55:29 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: dansguardian.sh,v 1.1.1.1 2008/02/22 17:13:29 sborrill Exp $ 3# $NetBSD: dansguardian.sh,v 1.2 2008/04/16 14:55:29 sborrill Exp $
4# 4#
5# PROVIDE: dansguardian 5# PROVIDE: dansguardian
6# REQUIRE: DAEMON LOGIN 6# REQUIRE: DAEMON LOGIN
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8 8
9. /etc/rc.subr 9. /etc/rc.subr
10 10
11name="dansguardian" 11name="dansguardian"
12rcvar=$name 12rcvar=$name
13command="/usr/pkg/sbin/${name}" 13command="/usr/pkg/sbin/${name}"
14pidfile="/var/run/${name}.pid" 14pidfile="/var/run/${name}.pid"
15required_files="@PKG_SYSCONFDIR@/${name}/${name}.conf" 15required_files="@PKG_SYSCONFDIR@/${name}.conf"
16extra_commands="reload" 16extra_commands="reload"
17 17
18load_rc_config $name 18load_rc_config $name
19run_rc_command "$1" 19run_rc_command "$1"