[pkgsrc/trunk]: pkgsrc/www Fix the default config and ServerRoot paths in apa...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7faf51a95177
branches:  trunk
changeset: 505589:7faf51a95177
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Thu Jan 05 10:01:20 2006 +0000

description:
Fix the default config and ServerRoot paths in apache and apache2 manpages,
as suggested by PR pkg/32300, bump PKGREVISION.  Ok by tron, wiz.

diffstat:

 www/apache/Makefile  |  17 +++++++++++++++--
 www/apache2/Makefile |  13 +++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r 3bd14c3a9a4d -r 7faf51a95177 www/apache/Makefile
--- a/www/apache/Makefile       Thu Jan 05 07:04:47 2006 +0000
+++ b/www/apache/Makefile       Thu Jan 05 10:01:20 2006 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.177 2005/12/29 06:22:21 jlam Exp $
+# $NetBSD: Makefile,v 1.178 2006/01/05 10:01:20 ghen Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=              apache_1.3.34
 PKGNAME=               ${DISTNAME:S/_/-/}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/}
@@ -145,6 +145,19 @@
 OWN_DIRS+=             ${VARBASE}/log/httpd
 OWN_DIRS_PERMS+=       ${VARBASE}/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
 
+#
+# Fix paths in the apache manpages.
+#
+SUBST_CLASSES+=                man
+SUBST_STAGE.man=       post-patch
+SUBST_FILES.man=       src/support/*.1 src/support/*.8
+SUBST_SED.man=         -e 's,/usr/local/apache/conf,${PKG_SYSCONFDIR},'
+SUBST_SED.man+=                -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
+SUBST_SED.man+=                -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},'
+SUBST_SED.man+=                -e 's,/usr/local/apache/logs,${VARBASE}/log/httpd,'
+SUBST_SED.man+=                -e 's,/usr/local/apache,${PREFIX}/share/httpd/htdocs,'
+SUBST_SED.man+=                -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
+
 PKG_GROUPS=            ${APACHE_GROUP}
 PKG_USERS=             ${APACHE_USER}:${APACHE_GROUP}::Apache\ user
 
diff -r 3bd14c3a9a4d -r 7faf51a95177 www/apache2/Makefile
--- a/www/apache2/Makefile      Thu Jan 05 07:04:47 2006 +0000
+++ b/www/apache2/Makefile      Thu Jan 05 10:01:20 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.90 2005/12/29 06:22:21 jlam Exp $
+# $NetBSD: Makefile,v 1.91 2006/01/05 10:01:20 ghen Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       apache-${APACHE_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 
 HOMEPAGE=      http://httpd.apache.org/
@@ -87,6 +87,15 @@
 OWN_DIRS_PERMS+=       ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
 FIX_PERMS=             apachectl apxs dbmmanage envvars-std mkcert
 
+# Fix paths in the apache manpages.
+SUBST_CLASSES+=                man
+SUBST_STAGE.man=       post-patch
+SUBST_FILES.man=       docs/man/*.1 docs/man/*.8
+SUBST_SED.man=         -e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
+SUBST_SED.man+=                -e 's,/path/to/apache/etc,${PKG_SYSCONFDIR},'
+SUBST_SED.man+=                -e 's,/usr/local/apache2,${PREFIX}/share/httpd/htdocs,'
+SUBST_SED.man+=                -e 's,/usr/web,${PREFIX}/share/httpd/htdocs,'
+
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     config.layout