pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/apache22 Update apache22 to apache-2.2.3nb1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/92ecbc7618f4
branches:  trunk
changeset: 523261:92ecbc7618f4
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Jan 04 13:42:39 2007 +0000

description:
Update apache22 to apache-2.2.3nb1
  abs_srcdir in config_vars.mk is used during install so needs to reference
  the work dir path, and by other packages such as ap2-fastcgi after install,
  so we fix after install to reference the installed path
  - Fixes ap2-fastcgi build

diffstat:

 www/apache22/Makefile |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r de0040dfbc4d -r 92ecbc7618f4 www/apache22/Makefile
--- a/www/apache22/Makefile     Thu Jan 04 13:29:41 2007 +0000
+++ b/www/apache22/Makefile     Thu Jan 04 13:42:39 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/01/04 13:22:06 obache Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/04 13:42:39 abs Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       apache-${APACHE_VERSION}
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    www
 
 HOMEPAGE=      http://httpd.apache.org/
@@ -169,6 +169,15 @@
 SUBST_SED.confs+=      -e 's|^\(User[   ]\).*|\1${APACHE_USER}|g'
 SUBST_SED.confs+=      -e 's|^\(Group[  ]\).*|\1${APACHE_GROUP}|g'
 
+# abs_srcdir in config_vars.mk is used during install so needs to reference
+# the work dir path, and by other packages such as ap2-fastcgi after install,
+# so we fix after install to reference the installed path
+SUBST_CLASSES+=                abs_srcdir
+SUBST_STAGE.abs_srcdir=        post-install
+SUBST_FILES.abs_srcdir=        ${PREFIX}/share/httpd/build/config_vars.mk
+SUBST_SED.abs_srcdir=  -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|'
+SUBST_MESSAGE.abs_srcdir=      Fixing abs_srcdir
+
 .include "options.mk"
 
 # Add dependencies for the modules that will be built.  For each module



Home | Main Index | Thread Index | Old Index