[pkgsrc/trunk]: pkgsrc/www/ap2-suphp Actually respect PKG_SYSCONFDIR. Now tha...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbfc25f73d31
branches:  trunk
changeset: 529274:fbfc25f73d31
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue May 29 22:17:19 2007 +0000

description:
Actually respect PKG_SYSCONFDIR. Now that devel/apr0/buildlink3.mk
sets BUILDLINK_INCDIRS.apr, remove custom CPPFLAGS. Use -e for the
SUBST_SED expression to mollify pkglint. Add APACHE_USER and VARBASE
to BUILD_DEFS. Don't try to remove lib/httpd on deinstall, as it
belongs to Apache. Bump PKGREVISION.

diffstat:

 www/ap2-suphp/Makefile |  11 +++++------
 www/ap2-suphp/PLIST    |   3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r 0507cb752f44 -r fbfc25f73d31 www/ap2-suphp/Makefile
--- a/www/ap2-suphp/Makefile    Tue May 29 22:13:41 2007 +0000
+++ b/www/ap2-suphp/Makefile    Tue May 29 22:17:19 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:26 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/05/29 22:17:19 schmonz Exp $
 #
 
 DISTNAME=              suphp-0.6.0
 PKGNAME=               ap2-${DISTNAME}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            www
 MASTER_SITES=          http://www.suphp.org/download/
 
@@ -18,10 +18,9 @@
 CONFIGURE_ARGS+=       APXS=${APXS}
 CONFIGURE_ARGS+=       --with-apache-user=${APACHE_USER:Q}
 CONFIGURE_ARGS+=       --with-logfile=${VARBASE}/httpd/suphp_log
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
-# I don't know why this is necessary, but it is.
-CPPFLAGS+=             -I${BUILDLINK_DIR}/include/httpd
-CPPFLAGS+=             -I${BUILDLINK_DIR}/include/apr-0
+BUILD_DEFS+=           APACHE_USER VARBASE
 
 EGDIR=                 ${PREFIX}/share/examples/suphp
 CONF_FILES=            ${EGDIR}/suphp.conf ${PKG_SYSCONFDIR}/suphp.conf
@@ -32,7 +31,7 @@
 SUBST_CLASSES+=                suphp
 SUBST_STAGE.suphp=     post-configure
 SUBST_FILES.suphp=     doc/suphp.conf-example
-SUBST_SED.suphp=       s,wwwrun,${APACHE_USER},g
+SUBST_SED.suphp=       -e "s,wwwrun,${APACHE_USER},g"
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR:Q}
diff -r 0507cb752f44 -r fbfc25f73d31 www/ap2-suphp/PLIST
--- a/www/ap2-suphp/PLIST       Tue May 29 22:13:41 2007 +0000
+++ b/www/ap2-suphp/PLIST       Tue May 29 22:17:19 2007 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/03 16:43:38 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/05/29 22:17:19 schmonz Exp $
 lib/httpd/mod_suphp.so
 sbin/suphp
 share/examples/suphp/suphp.conf
 @dirrm share/examples/suphp
-@dirrm lib/httpd