summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2007-05-29 22:17:19 +0000
committerschmonz <schmonz@pkgsrc.org>2007-05-29 22:17:19 +0000
commit9fa51c07dea85211b34cba8323718341cdc79b82 (patch)
tree8e475ba1801e88ee0edd2a9804d6b71b67e3af3d
parent38ecd9aaaa39aa59ccfff162cee67f18cc26aebc (diff)
downloadpkgsrc-9fa51c07dea85211b34cba8323718341cdc79b82.tar.gz
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.
-rw-r--r--www/ap2-suphp/Makefile11
-rw-r--r--www/ap2-suphp/PLIST3
2 files changed, 6 insertions, 8 deletions
diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile
index f2ba48d6cc3..d7bf0ae92d1 100644
--- a/www/ap2-suphp/Makefile
+++ b/www/ap2-suphp/Makefile
@@ -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 @@ GCC_REQD+= 3.0 # the C++ code uses the .at() method
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 @@ PKG_APACHE_ACCEPTED= apache2 apache22
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 --git a/www/ap2-suphp/PLIST b/www/ap2-suphp/PLIST
index 7889b94ba81..7c78347626f 100644
--- a/www/ap2-suphp/PLIST
+++ b/www/ap2-suphp/PLIST
@@ -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