Move some stuff from a patch to a sed script. Add ability to set root of

http tree to somewhere other than /usr/pkg/http. Move pid file to /var/run.

2 files changed, 27 insertions, 27 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index df02478ee3e..348516622c7 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Sun Mar  1 13:41:17 PST 1998
 # Whom:                 cjs@netbsd.org
 #
-# $NetBSD: Makefile,v 1.1 1998/03/05 08:02:22 cjs Exp $
+# $NetBSD: Makefile,v 1.2 1998/03/05 11:42:42 cjs Exp $
 # FreeBSD Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp
 #
 
@@ -15,12 +15,14 @@ WRKSRC=         ${WRKROOT}/src
 CATEGORIES=	www
 MASTER_SITES=   http://www.apache.org/dist/
 
+HTTP_ROOT=	${PREFIX}/http
+
 MAINTAINER=	cjs@netbsd.org
 
 CONFIGURE_SCRIPT=Configure
 HAS_CONFIGURE=	YES
 
-CONF_DIR=   ${PREFIX}/http/conf
+CONF_DIR=   ${HTTP_ROOT}/conf
 MAN1=   apachectl.1 htpasswd.1
 MAN8=   httpd.8
 
@@ -31,21 +33,34 @@ post-build:
 	(cd ${WRKSRC}/support && make)
 
 post-patch:
+	@cd ${WRKSRC} && \
+	    sed -e 's#^EXTRA_CFLAGS=#& -DHTTPD_ROOT=\\"${HTTP_ROOT}\\"#' \
+		< Configuration > Configuration.new && \
+		mv Configuration.new Configuration
 	@cd ${WRKROOT}/conf && \
-	for I in httpd.conf-dist access.conf-dist srm.conf-dist; do \
-	    sed -e "s#@@ServerRoot@@#${PREFIX}/http#g" < $${I} > $${I}.new; \
-	    mv $${I}.new $${I}; \
-	done
+	    for I in httpd.conf-dist access.conf-dist srm.conf-dist; do \
+		sed -e 's#@@ServerRoot@@#${HTTP_ROOT}#g' < $${I} > $${I}.new && \
+		mv $${I}.new $${I}; \
+	    done
+	@cd ${WRKROOT}/conf && \
+	    sed -e "s#^PidFile .*/#PidFile /var/run/#" < httpd.conf-dist \
+		>httpd.conf-dist.new && \
+	    mv httpd.conf-dist.new httpd.conf-dist
+	@cd ${WRKSRC}/support && \
+	    sed -e 's#/usr/local/apache/logs/#/var/run/#' \
+		-e 's#/usr/local/apache/src/#/usr/pkg/sbin/#' \
+		< apachectl >apachectl.new && \
+	    mv apachectl.new apachectl
 .if defined(VERS_ID)
 	@cd ${WRKSRC} && \
-	mv Configuration Configuration.old && \
-	sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
-	< Configuration.old > Configuration
+	    mv Configuration Configuration.old && \
+	    sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \
+	    < Configuration.old > Configuration
 .endif
 
 do-install:
-	install -d -m 755 -o bin -g bin ${CONF_DIR} ${PREFIX}/http/htdocs \
-		${PREFIX}/http/icons ${PREFIX}/http/cgi-bin
+	install -d -m 755 -o bin -g bin ${CONF_DIR} ${HTTP_ROOT}/htdocs \
+		${HTTP_ROOT}/icons ${HTTP_ROOT}/cgi-bin
 	${INSTALL_PROGRAM} ${WRKSRC}/httpd ${PREFIX}/sbin
 	cd ${WRKSRC}/support && \
 		${INSTALL_PROGRAM} htdigest htpasswd dbmmanage logresolve \
@@ -53,7 +68,7 @@ do-install:
 	cd ${WRKSRC}/support && \
 		${INSTALL_SCRIPT} rotatelogs apachectl log_server_status \
 		${PREFIX}/sbin
-	${INSTALL_DATA} -o nobody ${WRKROOT}/icons/* ${PREFIX}/http/icons
+	${INSTALL_DATA} -o nobody ${WRKROOT}/icons/* ${HTTP_ROOT}/icons
 	${INSTALL_MAN} ${WRKSRC}/support/httpd.8 \
 		${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/support/htpasswd.1 \
diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab
deleted file mode 100644
index 6c1401739c0..00000000000
--- a/www/apache/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- support/apachectl.old	Sat Oct 25 15:35:19 1997
-+++ support/apachectl	Wed Mar  4 22:54:49 1998
-@@ -21,10 +21,10 @@
- # --------------------                              --------------------
- # 
- # the path to your PID file
--PIDFILE=/usr/local/apache/logs/httpd.pid
-+PIDFILE=/usr/pkg/http/logs/httpd.pid
- #
- # the path to your httpd binary
--HTTPD=/usr/local/apache/src/httpd
-+HTTPD=/usr/pkg/sbin/httpd
- #
- # a command that outputs a formatted text version of the HTML at the
- # url given on the command line.  Designed for lynx, however other