From 00dd1ca2e35ffc199824a9e9fe16254ecd316670 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Wed, 14 Mar 2007 20:21:31 +0000
Subject: - 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
---
 www/apache13-modperl/Makefile        | 10 ++--------
 www/apache13-modperl/files/apache.in | 32 ++++++++++++++++++++++++++++++++
 www/apache13-modperl/files/apache.sh | 32 --------------------------------
 www/apache13-modperl/pkg-plist       |  1 -
 4 files changed, 34 insertions(+), 41 deletions(-)
 create mode 100644 www/apache13-modperl/files/apache.in
 delete mode 100644 www/apache13-modperl/files/apache.sh

(limited to 'www/apache13-modperl')

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.in b/www/apache13-modperl/files/apache.in
new file mode 100644
index 000000000000..1dcf95bb3866
--- /dev/null
+++ b/www/apache13-modperl/files/apache.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+# $FreeBSD$
+
+# PROVIDE: apache
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# 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="${apache_enable-NO}"
+apache_flags="${apache_flags=''}"
+apache_pidfile="${apache_pidfile='/var/run/httpd.pid'}"
+
+. %%RC_SUBR%%
+
+name="apache"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/httpd"
+
+load_rc_config $name
+
+pidfile="${apache_pidfile}"
+
+start_precmd="`/usr/bin/limits -e -U www`"
+
+run_rc_command "$1"
diff --git a/www/apache13-modperl/files/apache.sh b/www/apache13-modperl/files/apache.sh
deleted file mode 100644
index f98638ebbff0..000000000000
--- a/www/apache13-modperl/files/apache.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/www/apache13-modperl/files/Attic/apache.sh,v 1.3 2006-02-20 20:47:46 dougb Exp $
-
-# PROVIDE: apache
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# 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="${apache_enable-NO}"
-apache_flags=""
-apache_pidfile="/var/run/httpd.pid"
-
-. %%RC_SUBR%%
-
-name="apache"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/httpd"
-
-load_rc_config $name
-
-pidfile="${apache_pidfile}"
-
-start_precmd="`/usr/bin/limits -e -U www`"
-
-run_rc_command "$1"
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
-- 
cgit v1.2.3