cvs commit: ports/www/apache13-modssl Makefile
ports/www/apache13-modssl/files
apache.in ports/www/apache20 Makefile ports/www/apache20/files
apache2.sh.in ports/www/nginx Makefile ports/www/nginx/files
nginx.sh.in ports/www/nginx-devel Makefile ...
Philip M. Gollucci
pgollucci at p6m7g8.com
Sun Mar 28 05:17:08 UTC 2010
I didn't mean to speak for nginx......
On 3/28/2010 12:44 AM, Doug Barton wrote:
> dougb 2010-03-28 04:44:55 UTC
>
> FreeBSD ports repository
>
> Modified files:
> www/apache13-modssl Makefile
> www/apache13-modssl/files apache.in
> www/apache20 Makefile
> www/apache20/files apache2.sh.in
> www/nginx Makefile
> www/nginx/files nginx.sh.in
> www/nginx-devel Makefile
> www/nginx-devel/files nginx.sh.in
> Log:
> Cleanse uneeded RC_SUBR variables
>
> Approved by: pgolluci
>
> Revision Changes Path
> 1.197 +0 -1 ports/www/apache13-modssl/Makefile
> 1.3 +2 -2 ports/www/apache13-modssl/files/apache.in
> 1.262 +0 -2 ports/www/apache20/Makefile
> 1.7 +2 -2 ports/www/apache20/files/apache2.sh.in
> 1.303 +1 -1 ports/www/nginx-devel/Makefile
> 1.11 +2 -2 ports/www/nginx-devel/files/nginx.sh.in
> 1.206 +1 -1 ports/www/nginx/Makefile
> 1.9 +2 -2 ports/www/nginx/files/nginx.sh.in
>
> http://cvsweb.FreeBSD.org/ports/www/apache13-modssl/Makefile.diff?r1=1.196&r2=1.197&f=h
> | --- ports/www/apache13-modssl/Makefile 2010/02/04 06:10:45 1.196
> | +++ ports/www/apache13-modssl/Makefile 2010/03/28 04:44:53 1.197
> | @@ -2,7 +2,7 @@
> | # Date created: Sat Aug 22 12:00:00 CDT 1998
> | # Whom: rse at engelschall.com
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache13-modssl/Makefile,v 1.196 2010/02/04 06:10:45 dinoex Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache13-modssl/Makefile,v 1.197 2010/03/28 04:44:53 dougb Exp $
> | #
> |
> | PORTNAME= apache+mod_ssl
> | @@ -55,7 +55,6 @@ MASTER_SITES_MODSSL= http://www.modssl.o
> | ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mod_ssl/source,}
> | MODSSL_FILE= mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}
> | MODSNMP_FILE= mod_snmp_${VERSION_MODSNMP}${EXTRACT_SUFX}
> | -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
> |
> | USE_RC_SUBR= apache
> |
> http://cvsweb.FreeBSD.org/ports/www/apache13-modssl/files/apache.in.diff?r1=1.2&r2=1.3&f=h
> | --- ports/www/apache13-modssl/files/apache.in 2010/03/27 00:15:09 1.2
> | +++ ports/www/apache13-modssl/files/apache.in 2010/03/28 04:44:53 1.3
> | @@ -1,6 +1,6 @@
> | #!/bin/sh
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache13-modssl/files/apache.in,v 1.2 2010/03/27 00:15:09 dougb Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache13-modssl/files/apache.in,v 1.3 2010/03/28 04:44:53 dougb Exp $
> | #
> |
> | # PROVIDE: apache
> | @@ -114,7 +114,7 @@ else
> | ;;
> | esac
> | echo "===> apache profile: ${profile}"
> | - %%PREFIX%%/etc/rc.d/apache%%RC_SUBR_SUFFIX%% $1 ${profile}
> | + %%PREFIX%%/etc/rc.d/apache $1 ${profile}
> | retcode="$?"
> | if [ "0${retcode}" -ne 0 ]; then
> | failed="${profile} (${retcode}) ${failed:-}"
> http://cvsweb.FreeBSD.org/ports/www/apache20/Makefile.diff?r1=1.261&r2=1.262&f=h
> | --- ports/www/apache20/Makefile 2009/08/02 19:35:55 1.261
> | +++ ports/www/apache20/Makefile 2010/03/28 04:44:54 1.262
> | @@ -2,7 +2,7 @@
> | # Date created: 7 April 2001
> | # Whom: Hye-Shik Chang <perky at fallin.lv>
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache20/Makefile,v 1.261 2009/08/02 19:35:55 mezz Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache20/Makefile,v 1.262 2010/03/28 04:44:54 dougb Exp $
> | #
> | # For more information, please read Makefile.doc
> | #
> | @@ -54,7 +54,6 @@ USE_ICONV= yes
> | USE_AUTOTOOLS= autoconf:262 libtool:22
> | USE_PERL5= yes
> | USE_RC_SUBR= apache2.sh
> | -SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
> | USE_APACHE= common20
> | LIBTOOLFILES= configure
> | USE_LDCONFIG= ${PREFIX}/lib/apache2
> | @@ -75,7 +74,6 @@ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CP
> | LOCALBASE="${LOCALBASE}"
> |
> | PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,}
> | -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
> |
> | MAKE_ENV+= EXPR_COMPAT=yes
> |
> http://cvsweb.FreeBSD.org/ports/www/apache20/files/apache2.sh.in.diff?r1=1.6&r2=1.7&f=h
> | --- ports/www/apache20/files/apache2.sh.in 2010/03/27 00:15:10 1.6
> | +++ ports/www/apache20/files/apache2.sh.in 2010/03/28 04:44:54 1.7
> | @@ -1,6 +1,6 @@
> | #!/bin/sh
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache20/files/apache2.sh.in,v 1.6 2010/03/27 00:15:10 dougb Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/apache20/files/apache2.sh.in,v 1.7 2010/03/28 04:44:54 dougb Exp $
> | #
> |
> | # PROVIDE: apache2
> | @@ -71,7 +71,7 @@ else
> | if [ "x${apache2_profiles}" != "x" -a "x$1" != "x" ]; then
> | for profile in ${apache2_profiles}; do
> | echo "===> apache2 profile: ${profile}"
> | - %%PREFIX%%/etc/rc.d/apache2%%RC_SUBR_SUFFIX%% $1 ${profile}
> | + %%PREFIX%%/etc/rc.d/apache2 $1 ${profile}
> | retcode="$?"
> | if [ "0${retcode}" -ne 0 ]; then
> | failed="${profile} (${retcode}) ${failed:-}"
> http://cvsweb.FreeBSD.org/ports/www/nginx-devel/Makefile.diff?r1=1.302&r2=1.303&f=h
> | --- ports/www/nginx-devel/Makefile 2010/03/25 10:02:43 1.302
> | +++ ports/www/nginx-devel/Makefile 2010/03/28 04:44:54 1.303
> | @@ -2,7 +2,7 @@
> | # Date created: 11 Oct 2004
> | # Whom: osa
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/nginx-devel/Makefile,v 1.302 2010/03/25 10:02:43 osa Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/nginx-devel/Makefile,v 1.303 2010/03/28 04:44:54 dougb Exp $
> | #
> |
> | PORTNAME= nginx
> | @@ -95,7 +95,7 @@ NGINX_ERRORLOG?= ${NGINX_LOGDIR}/nginx-e
> |
> | CONFLICTS?= nginx-0.7.*
> | USE_RC_SUBR= nginx.sh
> | -SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} WWWOWN=${WWWOWN}
> | +SUB_LIST+= WWWOWN=${WWWOWN}
> |
> | HAS_CONFIGURE= yes
> | CONFIGURE_ARGS+=--prefix=${ETCDIR} \
> http://cvsweb.FreeBSD.org/ports/www/nginx-devel/files/nginx.sh.in.diff?r1=1.10&r2=1.11&f=h
> | --- ports/www/nginx-devel/files/nginx.sh.in 2010/03/27 00:15:15 1.10
> | +++ ports/www/nginx-devel/files/nginx.sh.in 2010/03/28 04:44:55 1.11
> | @@ -1,5 +1,5 @@
> | #!/bin/sh
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/nginx-devel/files/nginx.sh.in,v 1.10 2010/03/27 00:15:15 dougb Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/nginx-devel/files/nginx.sh.in,v 1.11 2010/03/28 04:44:55 dougb Exp $
> |
> | # PROVIDE: nginx
> | # REQUIRE: LOGIN cleanvar
> | @@ -64,7 +64,7 @@ else
> | if [ "x${nginx_profiles}" != "x" -a "x$1" != "x" ]; then
> | for profile in ${nginx_profiles}; do
> | echo "===> nginx profile: ${profile}"
> | - %%PREFIX%%/etc/rc.d/nginx%%RC_SUBR_SUFFIX%% $1 ${profile}
> | + %%PREFIX%%/etc/rc.d/nginx $1 ${profile}
> | retcode="$?"
> | if [ "0${retcode}" -ne 0 ]; then
> | failed="${profile} (${retcode}) ${failed:-}"
> http://cvsweb.FreeBSD.org/ports/www/nginx/Makefile.diff?r1=1.205&r2=1.206&f=h
> | --- ports/www/nginx/Makefile 2010/03/25 10:02:43 1.205
> | +++ ports/www/nginx/Makefile 2010/03/28 04:44:54 1.206
> | @@ -2,7 +2,7 @@
> | # Date created: 11 Oct 2004
> | # Whom: osa
> | #
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/nginx/Makefile,v 1.205 2010/03/25 10:02:43 osa Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/nginx/Makefile,v 1.206 2010/03/28 04:44:54 dougb Exp $
> | #
> |
> | PORTNAME= nginx
> | @@ -92,7 +92,7 @@ NGINX_ERRORLOG?= ${NGINX_LOGDIR}/nginx-e
> |
> | CONFLICTS?= nginx-devel-0.*
> | USE_RC_SUBR= nginx.sh
> | -SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} WWWOWN=${WWWOWN}
> | +SUB_LIST+= WWWOWN=${WWWOWN}
> |
> | HAS_CONFIGURE= yes
> | CONFIGURE_ARGS+=--prefix=${ETCDIR} \
> http://cvsweb.FreeBSD.org/ports/www/nginx/files/nginx.sh.in.diff?r1=1.8&r2=1.9&f=h
> | --- ports/www/nginx/files/nginx.sh.in 2010/03/27 00:15:15 1.8
> | +++ ports/www/nginx/files/nginx.sh.in 2010/03/28 04:44:54 1.9
> | @@ -1,5 +1,5 @@
> | #!/bin/sh
> | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/nginx/files/nginx.sh.in,v 1.8 2010/03/27 00:15:15 dougb Exp $
> | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/nginx/files/nginx.sh.in,v 1.9 2010/03/28 04:44:54 dougb Exp $
> |
> | # PROVIDE: nginx
> | # REQUIRE: LOGIN cleanvar
> | @@ -64,7 +64,7 @@ else
> | if [ "x${nginx_profiles}" != "x" -a "x$1" != "x" ]; then
> | for profile in ${nginx_profiles}; do
> | echo "===> nginx profile: ${profile}"
> | - %%PREFIX%%/etc/rc.d/nginx%%RC_SUBR_SUFFIX%% $1 ${profile}
> | + %%PREFIX%%/etc/rc.d/nginx $1 ${profile}
> | retcode="$?"
> | if [ "0${retcode}" -ne 0 ]; then
> | failed="${profile} (${retcode}) ${failed:-}"
--
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci at p6m7g8.com) c: 703.336.9354
VP Apache Infrastructure; Member, Apache Software Foundation
Committer, FreeBSD Foundation
Sr. System Admin, Ridecharge Inc.
Consultant, P6M7G8 Inc.
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
More information about the cvs-ports
mailing list