diff options
| author | pav <pav@FreeBSD.org> | 2007-03-15 04:21:31 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2007-03-15 04:21:31 +0800 |
| commit | 798c05de0e3123109828d0642b08d60bd449ba29 (patch) | |
| tree | 6abfbc4a689989399f8936e684f13ac1a900ae22 /www | |
| parent | ff2ab0a2dedcf7bdf20a65eb22b59b45b06ca83a (diff) | |
| download | freebsd-ports-gnome-798c05de0e3123109828d0642b08d60bd449ba29.tar.gz freebsd-ports-gnome-798c05de0e3123109828d0642b08d60bd449ba29.tar.zst freebsd-ports-gnome-798c05de0e3123109828d0642b08d60bd449ba29.zip | |
- Fix rc script to have overridable apache_flags and apache_pidfile
PR: ports/104465
Reported by: Andrey Alakozov <aa29@mail.ru>
Submitted by: Volker <volker@vwsoft.com>
Approved by: maintainer timeout (apache; 5 months)
- While here, modernize USE_RC_SUBR usage
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13-modperl/Makefile | 10 | ||||
| -rw-r--r-- | www/apache13-modperl/files/apache.in (renamed from www/apache13-modperl/files/apache.sh) | 6 | ||||
| -rw-r--r-- | www/apache13-modperl/pkg-plist | 1 |
3 files changed, 5 insertions, 12 deletions
diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile index bb830614e418..bdf7763edd14 100644 --- a/www/apache13-modperl/Makefile +++ b/www/apache13-modperl/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache+mod_perl PORTVERSION= ${VERSION_APACHE} +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD:S/$/:apache/} \ ${MASTER_SITE_PERL_CPAN:S/$/Apache\/:modperl/} @@ -30,7 +31,7 @@ CONFLICTS= apache-1.* apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+ apache-*-2.* USE_PERL5= YES -USE_RC_SUBR= yes +USE_RC_SUBR= apache DATADIR= ${PREFIX}/www DOCUMENT_ROOT= ${DATADIR}/data @@ -147,10 +148,6 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \ MAN3+= Apache::MyConfig.3 .endif -post-extract: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/apache.sh > ${WRKSRC}/apache.sh - pre-configure: @ cd ${WRKSRC_MODPERL}; \ ${PERL5} Makefile.PL EVERYTHING=1 APACHE_SRC=../apache_${VERSION_APACHE}\ @@ -168,7 +165,4 @@ pre-install: @ cd ${WRKSRC_MODPERL} ; \ ${MAKE} install -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh - .include <bsd.port.post.mk> diff --git a/www/apache13-modperl/files/apache.sh b/www/apache13-modperl/files/apache.in index f98638ebbff0..1dcf95bb3866 100644 --- a/www/apache13-modperl/files/apache.sh +++ b/www/apache13-modperl/files/apache.in @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/www/apache13-modperl/files/Attic/apache.sh,v 1.3 2006-02-20 20:47:46 dougb Exp $ +# $FreeBSD$ # PROVIDE: apache # REQUIRE: DAEMON @@ -14,8 +14,8 @@ # DO NOT CHANGE THESE DEFAULT VALUES HERE # apache_enable="${apache_enable-NO}" -apache_flags="" -apache_pidfile="/var/run/httpd.pid" +apache_flags="${apache_flags=''}" +apache_pidfile="${apache_pidfile='/var/run/httpd.pid'}" . %%RC_SUBR%% diff --git a/www/apache13-modperl/pkg-plist b/www/apache13-modperl/pkg-plist index a5e39f8b3a58..4f026b8b82a2 100644 --- a/www/apache13-modperl/pkg-plist +++ b/www/apache13-modperl/pkg-plist @@ -17,7 +17,6 @@ etc/apache/mime.types-dist @unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi etc/apache/srm.conf-dist @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf -etc/rc.d/apache.sh include/apache/ap.h include/apache/ap_alloc.h include/apache/ap_compat.h |