diff options
-rw-r--r-- | www/squid/Makefile | 8 | ||||
-rw-r--r-- | www/squid/pkg-install | 4 | ||||
-rw-r--r-- | www/squid25/Makefile | 8 | ||||
-rw-r--r-- | www/squid25/pkg-install | 4 | ||||
-rw-r--r-- | www/squid26/Makefile | 8 | ||||
-rw-r--r-- | www/squid26/pkg-install | 4 | ||||
-rw-r--r-- | www/squid27/Makefile | 8 | ||||
-rw-r--r-- | www/squid27/pkg-install | 4 | ||||
-rw-r--r-- | www/squid30/Makefile | 8 | ||||
-rw-r--r-- | www/squid30/pkg-install | 4 | ||||
-rw-r--r-- | www/squid31/Makefile | 8 | ||||
-rw-r--r-- | www/squid31/pkg-install | 4 |
12 files changed, 30 insertions, 42 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 6151e7e8bb6a..08f5725df41e 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.12 -PORTREVISION= 2 +PORTREVISION= 3 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${rc_suffix} squid/cachemgr.conf.default \ +etc_files= rc.d/squid.sh squid/cachemgr.conf.default \ squid/mib.txt squid/mime.conf.default \ squid/msntauth.conf.default squid/squid.conf.default @@ -317,11 +317,9 @@ 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: @@ -388,7 +386,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/squid${rc_suffix} + ${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} diff --git a/www/squid/pkg-install b/www/squid/pkg-install index 2fe7823411a2..b277f08d2660 100644 --- a/www/squid/pkg-install +++ b/www/squid/pkg-install @@ -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 is a" + echo " Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh 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 for more" + echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more" echo " configuration options." echo "" echo " If you want the port to install an old style rc script, run" diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 6151e7e8bb6a..08f5725df41e 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.12 -PORTREVISION= 2 +PORTREVISION= 3 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${rc_suffix} squid/cachemgr.conf.default \ +etc_files= rc.d/squid.sh squid/cachemgr.conf.default \ squid/mib.txt squid/mime.conf.default \ squid/msntauth.conf.default squid/squid.conf.default @@ -317,11 +317,9 @@ 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: @@ -388,7 +386,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/squid${rc_suffix} + ${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} diff --git a/www/squid25/pkg-install b/www/squid25/pkg-install index 2fe7823411a2..b277f08d2660 100644 --- a/www/squid25/pkg-install +++ b/www/squid25/pkg-install @@ -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 is a" + echo " Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh 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 for more" + echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more" echo " configuration options." echo "" echo " If you want the port to install an old style rc script, run" diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 6151e7e8bb6a..08f5725df41e 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.12 -PORTREVISION= 2 +PORTREVISION= 3 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${rc_suffix} squid/cachemgr.conf.default \ +etc_files= rc.d/squid.sh squid/cachemgr.conf.default \ squid/mib.txt squid/mime.conf.default \ squid/msntauth.conf.default squid/squid.conf.default @@ -317,11 +317,9 @@ 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: @@ -388,7 +386,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/squid${rc_suffix} + ${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} diff --git a/www/squid26/pkg-install b/www/squid26/pkg-install index 2fe7823411a2..b277f08d2660 100644 --- a/www/squid26/pkg-install +++ b/www/squid26/pkg-install @@ -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 is a" + echo " Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh 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 for more" + echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more" echo " configuration options." echo "" echo " If you want the port to install an old style rc script, run" diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 6151e7e8bb6a..08f5725df41e 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.12 -PORTREVISION= 2 +PORTREVISION= 3 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${rc_suffix} squid/cachemgr.conf.default \ +etc_files= rc.d/squid.sh squid/cachemgr.conf.default \ squid/mib.txt squid/mime.conf.default \ squid/msntauth.conf.default squid/squid.conf.default @@ -317,11 +317,9 @@ 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: @@ -388,7 +386,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/squid${rc_suffix} + ${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} diff --git a/www/squid27/pkg-install b/www/squid27/pkg-install index 2fe7823411a2..b277f08d2660 100644 --- a/www/squid27/pkg-install +++ b/www/squid27/pkg-install @@ -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 is a" + echo " Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh 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 for more" + echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more" echo " configuration options." echo "" echo " If you want the port to install an old style rc script, run" diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 6151e7e8bb6a..08f5725df41e 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.12 -PORTREVISION= 2 +PORTREVISION= 3 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${rc_suffix} squid/cachemgr.conf.default \ +etc_files= rc.d/squid.sh squid/cachemgr.conf.default \ squid/mib.txt squid/mime.conf.default \ squid/msntauth.conf.default squid/squid.conf.default @@ -317,11 +317,9 @@ 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: @@ -388,7 +386,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/squid${rc_suffix} + ${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} diff --git a/www/squid30/pkg-install b/www/squid30/pkg-install index 2fe7823411a2..b277f08d2660 100644 --- a/www/squid30/pkg-install +++ b/www/squid30/pkg-install @@ -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 is a" + echo " Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh 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 for more" + echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more" echo " configuration options." echo "" echo " If you want the port to install an old style rc script, run" diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 6151e7e8bb6a..08f5725df41e 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -73,7 +73,7 @@ PORTNAME= squid PORTVERSION= 2.5.12 -PORTREVISION= 2 +PORTREVISION= 3 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${rc_suffix} squid/cachemgr.conf.default \ +etc_files= rc.d/squid.sh squid/cachemgr.conf.default \ squid/mib.txt squid/mime.conf.default \ squid/msntauth.conf.default squid/squid.conf.default @@ -317,11 +317,9 @@ 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: @@ -388,7 +386,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/squid${rc_suffix} + ${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR} diff --git a/www/squid31/pkg-install b/www/squid31/pkg-install index 2fe7823411a2..b277f08d2660 100644 --- a/www/squid31/pkg-install +++ b/www/squid31/pkg-install @@ -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 is a" + echo " Please note that ${PKG_PREFIX}/etc/rc.d/squid.sh 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 for more" + echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more" echo " configuration options." echo "" echo " If you want the port to install an old style rc script, run" |