Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Dec 2005 17:31:52 +0100 (CET)
From:      Thomas-Martin Seck <tmseck@netcologne.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/90858: [Maintainer] www/squid: rc(8) related fixups
Message-ID:  <200512231631.jBNGVq2A045411@hardy.tmseck.homedns.org>
Resent-Message-ID: <200512231640.jBNGe64c076665@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         90858
>Category:       ports
>Synopsis:       [Maintainer] www/squid: rc(8) related fixups
>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:   Fri Dec 23 16:40:05 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of December 23, 2005.

	
>Description:
- Fix rc(8) preamble in the squid run script
- Use the .sh suffix only for the old style script
- Do not refer to "rcNG" in pkg-install anymore, rcNG is the default
  rc style by now
- Bump PORTREVISION (to mark this change and because the package content
  changes)
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: files/squid.sh
===================================================================
--- files/squid.sh	(.../www/squid)	(revision 651)
+++ files/squid.sh	(.../local/squid)	(revision 651)
@@ -4,9 +4,8 @@
 #
 # --begin rcng
 # PROVIDE: squid
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
 # 
 # Note:
 # Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
Index: pkg-install
===================================================================
--- pkg-install	(.../www/squid)	(revision 651)
+++ pkg-install	(.../local/squid)	(revision 651)
@@ -147,13 +147,13 @@
 	echo "       initialize the cache directory by running \"squid -z\""
 	echo "       as 'root' or '${squid_user}' before starting squid."
 	echo ""
-	echo "     Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh is now"
-	echo "     an rcNG script by default. This means that squid will not"
+	echo "     Please note that ${PKG_PREFIX}/etc/rc.d/squid is a"
+	echo "     new style rc script. This means that squid will not"
 	echo "     start automatically at boot time."
 	echo ""
 	echo "     To enable squid, set squid_enable=yes in either"
 	echo "     /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid"
-	echo "     See ${PKG_PREFIX}/etc/rc.d/squid.sh for more"
+	echo "     See ${PKG_PREFIX}/etc/rc.d/squid for more"
 	echo "     configuration options."
 	echo ""
 	echo "     If you want the port to install an old style rc script, run"
Index: Makefile
===================================================================
--- Makefile	(.../www/squid)	(revision 651)
+++ Makefile	(.../local/squid)	(revision 651)
@@ -73,7 +73,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -132,7 +132,7 @@
 		SQUID_STACKTRACES "Create backtraces on fatal errors" off \
 		SQUID_RCNG "Install an rcNG startup script" on
 
-etc_files=	rc.d/squid.sh squid/cachemgr.conf.default \
+etc_files=	rc.d/squid${rc_suffix} squid/cachemgr.conf.default \
 		squid/mib.txt squid/mime.conf.default \
 		squid/msntauth.conf.default squid/squid.conf.default
 
@@ -317,9 +317,11 @@
 USE_RC_SUBR=	yes
 rc_del=		rcold
 rc_state=	rcng
+rc_suffix=
 .else
 rc_del=		rcng
 rc_state=	rcold
+rc_suffix=	.sh
 .endif
 
 # Languages:
@@ -364,7 +366,7 @@
 # Prevent installation of .orig files by deleting them.
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
-# create an rcOld/rcNG squid.sh:
+# create the start script:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 	    -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
 	    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
@@ -386,7 +388,7 @@
 	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
 	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
 .endif
-	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid${rc_suffix} 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
	


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512231631.jBNGVq2A045411>