Date: Tue, 21 Mar 2006 10:18:13 -0800 (PST) From: Freddie Cash <fcash@sd73.bc.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/94802: [MAINTAINER] www/dansguardian: updates to RC script and pkg-plist Message-ID: <20060321181813.D991818CC4C@imap.sd73.bc.ca> Resent-Message-ID: <200603211820.k2LIKEAj022641@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94802
>Category: ports
>Synopsis: [MAINTAINER] www/dansguardian: updates to RC script and pkg-plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 21 18:20:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Freddie Cash
>Release: FreeBSD 6.0-STABLE i386
>Organization:
School District 73
>Environment:
System: FreeBSD imap.sd73.bc.ca 6.0-STABLE FreeBSD 6.0-STABLE #1: Fri Nov 4 10:41:38 PST
>Description:
Updated port to use the new RC framework, updated startup script to work correctly in rcorder,
and updated pkg-plist to list all the files correctly.
Added file(s):
- files/dansguardian.sh.in
Removed file(s):
- files/dansguardian.sh
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- dansguardian-2.8.0.6_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/dansguardian.orig/Makefile /usr/ports/www/dansguardian/Makefile
--- /usr/ports/www/dansguardian.orig/Makefile Tue Mar 21 09:22:43 2006
+++ /usr/ports/www/dansguardian/Makefile Tue Mar 21 09:41:25 2006
@@ -7,7 +7,7 @@
PORTNAME= dansguardian
PORTVERSION= 2.8.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= # empty, see below
DISTNAME= ${PORTNAME}-${PORTVERSION}.source
@@ -17,8 +17,7 @@
RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
-USE_RC_SUBR= yes
-RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+USE_RC_SUBR= dansguardian.sh
CONFLICTS= dansguardian-2.[67]*
LATEST_LINK= dansguardian
@@ -36,15 +35,15 @@
MAN8= dansguardian.8
NOMANCOMPRESSED= yes
-OPTIONS= DG_APACHE "Enable Apache support." on \
+OPTIONS= DG_APACHE "Enable Apache support for access denied page" on \
DG_PHRASELISTS "Install new phraselists over the old ones." off
DG_URL= http://dansguardian.org/index.php?page=copyright2
CONFDIR= ${PREFIX}/etc/dansguardian
-NO_CDROM= "Commercial download is restricted. Check ${DG_URL} for more info"
-NO_PACKAGE= "Redistribution is restricted. Check ${DG_URL} for more info"
-RESTRICTED= "${NO_PACKAGE}"
+NO_CDROM= Commercial download is restricted. Check ${DG_URL} for more info
+NO_PACKAGE= Redistribution is restricted. Check ${DG_URL} for more info
+RESTRICTED= ${NO_PACKAGE}
.include <bsd.port.pre.mk>
@@ -55,7 +54,7 @@
CONFIGURE_ARGS+= --gccver=2
.endif
-.if !defined(WITHOUT_DG_APACHE)
+.if defined(WITH_DG_APACHE)
USE_APACHE= 1.3+
.endif
@@ -64,10 +63,6 @@
IGNORE="Commercial source download is restricted. Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make"
.endif
-post-extract:
- @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${FILESDIR}/dansguardian.sh > ${WRKSRC}/dansguardian.sh
-
pre-install:
# Configure pkg-plist based on whether phraselists are to be installed or not
.if defined(WITH_DG_PHRASELISTS)
@@ -86,8 +81,8 @@
.endif
# Install startup script
- @${ECHO_MSG} "===> Installing startup script into ${PREFIX}/etc/rc.d"
- @${INSTALL_SCRIPT} ${WRKSRC}/dansguardian.sh ${PREFIX}/etc/rc.d/start-dg.sh
+# @${ECHO_MSG} "===> Installing startup script into ${PREFIX}/etc/rc.d"
+# @${INSTALL_SCRIPT} ${WRKSRC}/dansguardian.sh ${PREFIX}/etc/rc.d/start-dg.sh
# Display post-install message
@${CAT} pkg-message
diff -ruN --exclude=CVS /usr/ports/www/dansguardian.orig/files/dansguardian.sh /usr/ports/www/dansguardian/files/dansguardian.sh
--- /usr/ports/www/dansguardian.orig/files/dansguardian.sh Tue Mar 21 09:22:43 2006
+++ /usr/ports/www/dansguardian/files/dansguardian.sh Wed Dec 31 16:00:00 1969
@@ -1,31 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/www/dansguardian/files/dansguardian.sh,v 1.3 2004/08/10 11:48:14 sem Exp $
-
-# PROVIDE: dansguardian
-# REQUIRE: DAEMON squid
-# BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-# Define these dansguardian_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-# /etc/rc.conf.d/dansguardian
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-dansguardian_enable=${dansguardian_enable-"NO"}
-dansguardian_flags=${dansguardian_flags-""}
-dansguardian_pidfile=${dansguardian_pidfile-"/var/run/dansguardian.pid"}
-
-. %%RC_SUBR%%
-
-name="dansguardian"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/dansguardian"
-
-load_rc_config ${name}
-
-pidfile="${dansguardian_pidfile}"
-
-run_rc_command "${1}"
-
diff -ruN --exclude=CVS /usr/ports/www/dansguardian.orig/files/dansguardian.sh.in /usr/ports/www/dansguardian/files/dansguardian.sh.in
--- /usr/ports/www/dansguardian.orig/files/dansguardian.sh.in Wed Dec 31 16:00:00 1969
+++ /usr/ports/www/dansguardian/files/dansguardian.sh.in Tue Mar 21 09:24:04 2006
@@ -0,0 +1,31 @@
+#!/bin/sh
+# $FreeBSD: ports/www/dansguardian/files/dansguardian.sh,v 1.3 2004/08/10 11:48:14 sem Exp $
+
+# PROVIDE: dansguardian
+# REQUIRE: NETWORKING SERVERS squid
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD shutdown
+
+# Define these dansguardian_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/dansguardian
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+dansguardian_enable=${dansguardian_enable:-"NO"}
+dansguardian_flags=${dansguardian_flags:-""}
+dansguardian_pidfile=${dansguardian_pidfile:-"/var/run/dansguardian.pid"}
+
+. %%RC_SUBR%%
+
+name="dansguardian"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/dansguardian"
+
+load_rc_config ${name}
+
+pidfile="${dansguardian_pidfile}"
+
+run_rc_command "${1}"
+
diff -ruN --exclude=CVS /usr/ports/www/dansguardian.orig/pkg-message /usr/ports/www/dansguardian/pkg-message
--- /usr/ports/www/dansguardian.orig/pkg-message Tue Mar 21 09:22:43 2006
+++ /usr/ports/www/dansguardian/pkg-message Tue Mar 21 09:41:33 2006
@@ -1,10 +1,15 @@
===> Please Note:
*******************************************************************************
- This port has placed a log file in /var/log/ named dansguardian.log
- This log file can get quite large. Please read the newsyslog(8) man
- page for instructions on setting up log rotation and compression.
+ All initial config files have been placed under a samples/ directory.
+ You will need to copy these files into the config directory before
+ running DansGuardian for the first time.
- WARNING: This port uses RCng. Please read the comments in the startup
- script for instructions on enabling the daemon.
+ This port has created a log file named dansguardian.log that can get
+ quite large. Please read the newsyslog(8) man page for instructions
+ on setting up log rotation and compression.
+
+ This port hasa been converted to the new RC framework and should work
+ correctly via rcorder. Please read the comments in the startup script
+ for instructions on enabling the daemon.
*******************************************************************************
diff -ruN --exclude=CVS /usr/ports/www/dansguardian.orig/pkg-plist /usr/ports/www/dansguardian/pkg-plist
--- /usr/ports/www/dansguardian.orig/pkg-plist Tue Mar 21 09:22:43 2006
+++ /usr/ports/www/dansguardian/pkg-plist Tue Mar 21 10:02:33 2006
@@ -8,7 +8,6 @@
@exec mkdir -p etc/dansguardian/languages/danish
@exec mkdir -p etc/dansguardian/languages/french
@exec mkdir -p etc/dansguardian/languages/german
-@exec mkdir -p etc/dansguardian/languages/german2
@exec mkdir -p etc/dansguardian/languages/hebrew
@exec mkdir -p etc/dansguardian/languages/indonesian
@exec mkdir -p etc/dansguardian/languages/italian
@@ -16,6 +15,9 @@
@exec mkdir -p etc/dansguardian/languages/mxspanish
@exec mkdir -p etc/dansguardian/languages/polish
@exec mkdir -p etc/dansguardian/languages/portuguese
+@exec mkdir -p etc/dansguardian/languages/russian-1251
+@exec mkdir -p etc/dansguardian/languages/slovak
+@exec mkdir -p etc/dansguardian/languages/spanish
@exec mkdir -p etc/dansguardian/languages/swedish
@exec mkdir -p etc/dansguardian/languages/turkish
@exec mkdir -p etc/dansguardian/languages/ukenglish
@@ -82,8 +84,6 @@
etc/dansguardian/languages/french/template.html
etc/dansguardian/languages/german/messages
etc/dansguardian/languages/german/template.html
-etc/dansguardian/languages/german2/messages
-etc/dansguardian/languages/german2/template.html
etc/dansguardian/languages/hebrew/messages
etc/dansguardian/languages/hebrew/template.html
etc/dansguardian/languages/indonesian/messages
@@ -97,6 +97,7 @@
etc/dansguardian/languages/polish/messages
etc/dansguardian/languages/polish/template.html
etc/dansguardian/languages/portuguese/messages
+etc/dansguardian/languages/portuguese/messagesaccents
etc/dansguardian/languages/portuguese/template.html
etc/dansguardian/languages/swedish/messages
etc/dansguardian/languages/swedish/template.html
@@ -104,6 +105,12 @@
etc/dansguardian/languages/turkish/template.html
etc/dansguardian/languages/ukenglish/messages
etc/dansguardian/languages/ukenglish/template.html
+etc/dansguardian/languages/spanish/messages
+etc/dansguardian/languages/spanish/template.html
+etc/dansguardian/languages/slovak/messages
+etc/dansguardian/languages/slovak/template.html
+etc/dansguardian/languages/russian-1251/messages
+etc/dansguardian/languages/russian-1251/template.html
%%PHRASELISTS%%etc/dansguardian/phraselists/chat/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/drugadvocacy/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/dutchbadwords/weighted
@@ -127,7 +134,6 @@
%%PHRASELISTS%%etc/dansguardian/phraselists/violence/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/warezhacking/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/weapons/weighted
-etc/rc.d/start-dg.sh
sbin/dansguardian
@dirrm etc/dansguardian/languages/arspanish
@dirrm etc/dansguardian/languages/bulgarian
@@ -138,7 +144,6 @@
@dirrm etc/dansguardian/languages/dutch
@dirrm etc/dansguardian/languages/french
@dirrm etc/dansguardian/languages/german
-@dirrm etc/dansguardian/languages/german2
@dirrm etc/dansguardian/languages/hebrew
@dirrm etc/dansguardian/languages/indonesian
@dirrm etc/dansguardian/languages/italian
@@ -146,6 +151,9 @@
@dirrm etc/dansguardian/languages/mxspanish
@dirrm etc/dansguardian/languages/polish
@dirrm etc/dansguardian/languages/portuguese
+@dirrm etc/dansguardian/languages/russian-1251
+@dirrm etc/dansguardian/languages/slovak
+@dirrm etc/dansguardian/languages/spanish
@dirrm etc/dansguardian/languages/swedish
@dirrm etc/dansguardian/languages/turkish
@dirrm etc/dansguardian/languages/ukenglish
--- dansguardian-2.8.0.6_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060321181813.D991818CC4C>