Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/www/apache2/Attic/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/apache2/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.90 retrieving revision 1.91 diff -u -p -r1.90 -r1.91 --- pkgsrc/www/apache2/Attic/Makefile 2005/12/29 06:22:21 1.90 +++ pkgsrc/www/apache2/Attic/Makefile 2006/01/05 10:01:20 1.91 @@ -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+= ${VARBASE}/db/httpd 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