FreeBSD Bugzilla – Attachment 43044 Details for
Bug 66955
rcNG-fy www/apache2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
apache2.diff
apache2.diff (text/plain), 2.59 KB, created by
Norikatsu Shigemura
on 2004-05-20 19:50:16 UTC
(
hide
)
Description:
apache2.diff
Filename:
MIME Type:
Creator:
Norikatsu Shigemura
Created:
2004-05-20 19:50:16 UTC
Size:
2.59 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /home/ncvs/ports/www/apache2/Makefile,v >retrieving revision 1.177 >diff -u -r1.177 Makefile >--- Makefile 18 May 2004 11:58:56 -0000 1.177 >+++ Makefile 20 May 2004 18:38:34 -0000 >@@ -9,6 +9,7 @@ > > PORTNAME= apache > PORTVERSION= 2.0.49 >+PORTREVISION= 1 > CATEGORIES= www ipv6 > MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ > http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo >@@ -47,6 +48,7 @@ > USE_LIBTOOL_VER= 15 > USE_PERL5= yes > USE_REINPLACE= yes >+USE_RC_SUBR= yes > LIBTOOLFILES= configure > > CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ >@@ -63,7 +65,8 @@ > LOCALBASE="${LOCALBASE}" > > PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} >-RC_SUB= -e 's,@@PREFIX@@,${PREFIX_RELDEST},g' >+RC_SCRIPTS_SUB= PREFIX_RELDEST=${PREFIX_RELDEST} RC_SUBR=${RC_SUBR} >+ > MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes > > WITH_MPM?= prefork # or worker, perchild >@@ -165,7 +168,8 @@ > ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \ > ); done > @${RM} -f ${WRKSRC}/docs/docroot/*.bak >- @${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh >+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ >+ ${FILESDIR}/apache.sh > ${WRKDIR}/apache2.sh > @${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout > @${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr > >Index: files/apache.sh >=================================================================== >RCS file: /home/ncvs/ports/www/apache2/files/apache.sh,v >retrieving revision 1.5 >diff -u -r1.5 apache.sh >--- files/apache.sh 18 Jun 2002 23:02:05 -0000 1.5 >+++ files/apache.sh 3 May 2004 17:30:38 -0000 >@@ -1,17 +1,30 @@ > #!/bin/sh >-PREFIX=@@PREFIX@@ >+# $FreeBSD$ > >-case "$1" in >-start) >- [ "@@SSL@@" = "ssl" -a -f "$PREFIX/etc/apache2/ssl.crt/server.crt" ] && SSL=ssl >- [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2' >- ;; >-stop) >- [ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2' >- ;; >-*) >- echo "Usage: `basename $0` {start|stop}" >&2 >- ;; >-esac >+# PROVIDE: apache >+# REQUIRE: DAEMON >+# BEFORE: LOGIN >+# KEYWORD: FreeBSD shutdown > >-exit 0 >+# Define these apache_* variables in one of these files: >+# /etc/rc.conf >+# /etc/rc.conf.local >+# /etc/rc.conf.d/apache >+# >+# DO NOT CHANGE THESE DEFAULT VALUES HERE >+# >+apache_enable="NO" >+apache_flags="" >+apache_pidfile="/var/run/httpd.pid" >+ >+. %%RC_SUBR%% >+ >+name="apache" >+rcvar=`set_rcvar` >+command="%%PREFIX_RELDEST%%/sbin/httpd" >+ >+load_rc_config $name >+ >+pidfile="${apache_pidfile}" >+ >+run_rc_command "$1"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 66955
: 43044