Date: Fri, 30 Apr 2004 22:48:37 +0900 (JST) From: Norikatsu Shigemura <nork@FreeBSD.org> To: dinoex@FreeBSD.org Cc: ports@FreeBSD.org Subject: rcNG-fy www/apache13-modssl Message-ID: <200404301348.i3UDmWGf055730@sakura.ninth-nine.com>
next in thread | raw e-mail | index | archive | help
Hi I made a patch which rcNG-fy www/apache13-modssl. Please review my patch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/apache13-modssl/Makefile,v retrieving revision 1.146 diff -u -r1.146 Makefile --- Makefile 3 Apr 2004 08:20:36 -0000 1.146 +++ Makefile 30 Apr 2004 13:44:47 -0000 @@ -7,7 +7,7 @@ PORTNAME= apache+mod_ssl PORTVERSION= ${VERSION_APACHE}+${VERSION_MODSSL}${PVERSION_MODSNMP}${PVERSION_MODACCEL}${PVERSION_MODDEFLATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_MODSSL:S/$/:mod_ssl/} \ @@ -43,6 +43,8 @@ USE_OPENSSL= yes HAS_CONFIGURE= yes USE_PERL5_BUILD= yes +USE_RC_SUBR= yes +RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MASTER_SITES_MODSSL= http://www.modssl.org/source/ \ ftp://ftp.modssl.org/source/ \ ftp://ftp.blatzheim.com/pub/mod_ssl/ \ @@ -310,8 +312,8 @@ post-extract: post-extract: - @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \ - > ${WRKSRC}/apache.sh + @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${FILESDIR}/apache.sh > ${WRKSRC}/apache.sh .if defined(APACHE_WITH_MODSNMP) (cd ${WRKSRC}; ${TAR} xfz ${DISTDIR}/${MODSNMP_FILE}) .endif @@ -356,11 +358,7 @@ @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - ${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh-dist - @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ - ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ - fi + ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh .if defined(APACHE_WITH_MODSNMP) @${MKDIR} ${DATADIR}/buckets @${CHOWN} www:www ${DATADIR}/buckets Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/apache13-modssl/pkg-plist,v retrieving revision 1.40 diff -u -r1.40 pkg-plist --- pkg-plist 31 Mar 2004 16:24:24 -0000 1.40 +++ pkg-plist 30 Apr 2004 13:45:08 -0000 @@ -38,8 +38,7 @@ etc/apache/ssl.prm/README.PRM etc/apache/ssl.prm/snakeoil-ca-dsa.prm etc/apache/ssl.prm/snakeoil-dsa.prm -@unexec if cmp -s %D/etc/rc.d/apache.sh %D/etc/rc.d/apache.sh-dist; then rm -f %D/etc/rc.d/apache.sh; fi -etc/rc.d/apache.sh-dist +etc/rc.d/apache.sh include/apache/ap.h include/apache/ap_alloc.h include/apache/ap_compat.h Index: files/apache.sh =================================================================== RCS file: /home/ncvs/ports/www/apache13-modssl/files/apache.sh,v retrieving revision 1.4 diff -u -r1.4 apache.sh --- files/apache.sh 7 Dec 2003 16:48:54 -0000 1.4 +++ files/apache.sh 30 Apr 2004 13:46:10 -0000 @@ -1,16 +1,30 @@ #!/bin/sh +# $FreeBSD$ -case "$1" in -start) - [ -x %%PREFIX%%/sbin/apachectl ] && %%PREFIX%%/sbin/apachectl startssl > /dev/null && echo -n ' apache' - ;; -stop) - [ -r /var/run/httpd.pid ] && %%PREFIX%%/sbin/apachectl stop > /dev/null && echo -n ' apache' - ;; -*) - echo "Usage: ${0##*/} { start | stop }" >&2 - exit 64 - ;; -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="-DSSL" +apache_pidfile="/var/run/httpd.pid" + +. %%RC_SUBR%% + +name="apache" +rcvar=`set_rcvar` +command="%%PREFIX%%/sbin/httpd" + +load_rc_config $name + +pidfile="${apache_pidfile}" + +run_rc_commmand "$1" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404301348.i3UDmWGf055730>