cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Maintainer] www/squid: rc(8) related fixups

Browse Source 
- 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)

PR:		ports/90858
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de>
This commit is contained in:
Edwin Groothuis 2005-12-25 23:38:48 +00:00
parent 0614d0e773
commit b3f2631a43
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=152035
18 changed files with 66 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/squid/Makefile
View File

@ -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 @@ OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
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 @@ STRIP= ""
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 @@ pre-install:
# 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 @@ post-install:
${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}

5
www/squid/files/squid.sh
View File

@ -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

6
www/squid/pkg-install
View File

@ -147,13 +147,13 @@ POST-INSTALL)
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"

10
www/squid25/Makefile
View File

@ -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 @@ OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
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 @@ STRIP= ""
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 @@ pre-install:
# 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 @@ post-install:
${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}

5
www/squid25/files/squid.sh
View File

@ -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

6
www/squid25/pkg-install
View File

@ -147,13 +147,13 @@ POST-INSTALL)
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"

10
www/squid26/Makefile
View File

@ -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 @@ OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
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 @@ STRIP= ""
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 @@ pre-install:
# 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 @@ post-install:
${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}

5
www/squid26/files/squid.sh
View File

@ -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

6
www/squid26/pkg-install
View File

@ -147,13 +147,13 @@ POST-INSTALL)
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"

10
www/squid27/Makefile
View File

@ -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 @@ OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
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 @@ STRIP= ""
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 @@ pre-install:
# 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 @@ post-install:
${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}

5
www/squid27/files/squid.sh
View File

@ -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

6
www/squid27/pkg-install
View File

@ -147,13 +147,13 @@ POST-INSTALL)
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"

10
www/squid30/Makefile
View File

@ -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 @@ OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
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 @@ STRIP= ""
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 @@ pre-install:
# 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 @@ post-install:
${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}

5
www/squid30/files/squid.sh
View File

@ -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

6
www/squid30/pkg-install
View File

@ -147,13 +147,13 @@ POST-INSTALL)
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"

10
www/squid31/Makefile
View File

@ -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 @@ OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
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 @@ STRIP= ""
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 @@ pre-install:
# 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 @@ post-install:
${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}

5
www/squid31/files/squid.sh
View File

@ -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

6
www/squid31/pkg-install
View File

@ -147,13 +147,13 @@ POST-INSTALL)
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"