kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix abs_srcdir definition as done in apache22. Also install

Browse source 
mkdir.sh as expected e.g. by www/ap2-fcgid. Bump revision.
This commit is contained in:
joerg 2008-07-10 15:18:23 +00:00
parent e1a6feb45e
commit 0f8c0087f2
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
www/apache2/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.124 2008/06/22 23:01:19 he Exp $
# $NetBSD: Makefile,v 1.125 2008/07/10 15:18:23 joerg Exp $
.include "Makefile.common"
PKGNAME= apache-${APACHE_VERSION}
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/
@ -152,6 +152,15 @@ SUBST_SED.confs+= -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g'
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
REPLACE_PERL= docs/cgi-examples/printenv
.include "options.mk"
@ -236,4 +245,6 @@ post-install:
${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/${PKGMANDIR}/$$file; \
done
${INSTALL_SCRIPT} ${WRKSRC}/build/mkdir.sh ${PREFIX}/share/httpd/build
.include "../../mk/bsd.pkg.mk"

3
www/apache2/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.36 2008/04/12 22:43:13 jlam Exp $
@comment $NetBSD: PLIST,v 1.37 2008/07/10 15:18:23 joerg Exp $
include/httpd/ap_compat.h
include/httpd/ap_config.h
include/httpd/ap_config_auto.h
@ -92,6 +92,7 @@ share/httpd/build/instdso.sh
share/httpd/build/library.mk
share/httpd/build/libtool
share/httpd/build/ltlib.mk
share/httpd/build/mkdir.sh
share/httpd/build/program.mk
share/httpd/build/rules.mk
share/httpd/build/special.mk