Wed Sep 21 13:51:12 2011 UTC ()
Rewrite example configuration file to use CGI (not CLI) version of PHP


(adam)
diff -r1.15 -r1.16 pkgsrc/www/ap2-suphp/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/www/ap2-suphp/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-suphp/Attic/Makefile 2011/04/11 19:57:54 1.15
+++ pkgsrc/www/ap2-suphp/Attic/Makefile 2011/09/21 13:51:11 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2011/04/11 19:57:54 gls Exp $ 1# $NetBSD: Makefile,v 1.16 2011/09/21 13:51:11 adam Exp $
2# 2#
3 3
4DISTNAME= suphp-0.7.1 4DISTNAME= suphp-0.7.1
5PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME} 5PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://www.suphp.org/download/ 7MASTER_SITES= http://www.suphp.org/download/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.suphp.org/ 10HOMEPAGE= http://www.suphp.org/
11COMMENT= SuEXEC-like wrapper for PHP scripts 11COMMENT= SuEXEC-like wrapper for PHP scripts
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -27,21 +27,21 @@ PKG_USERS_VARS+= APACHE_USER @@ -27,21 +27,21 @@ PKG_USERS_VARS+= APACHE_USER
27BUILD_DEFS+= VARBASE 27BUILD_DEFS+= VARBASE
28 28
29EGDIR= ${PREFIX}/share/examples/suphp 29EGDIR= ${PREFIX}/share/examples/suphp
30CONF_FILES= ${EGDIR}/suphp.conf ${PKG_SYSCONFDIR}/suphp.conf 30CONF_FILES= ${EGDIR}/suphp.conf ${PKG_SYSCONFDIR}/suphp.conf
31 31
32USE_APR= yes 32USE_APR= yes
33PKG_APACHE_ACCEPTED= apache2 apache22 33PKG_APACHE_ACCEPTED= apache2 apache22
34 34
35SUBST_CLASSES+= suphp 35SUBST_CLASSES+= suphp
36SUBST_STAGE.suphp= post-configure 36SUBST_STAGE.suphp= post-configure
37SUBST_FILES.suphp= doc/suphp.conf-example 37SUBST_FILES.suphp= doc/suphp.conf-example
38SUBST_SED.suphp= -e "s,wwwrun,${APACHE_USER},g" 38SUBST_SED.suphp= -e "s,wwwrun,${APACHE_USER},g"
39SUBST_SED.suphp+= -e "s,/var/log/suphp.log,${VARBASE}/httpd/suphp_log,g" 39SUBST_SED.suphp+= -e "s,/var/log/suphp.log,${VARBASE}/httpd/suphp_log,g"
40SUBST_SED.suphp+= -e "s,/usr/bin/php,${PREFIX}/bin/php,g" 40SUBST_SED.suphp+= -e "s,/usr/bin/php,${PREFIX}/libexec/cgi-bin/php,g"
41 41
42post-install: 42post-install:
43 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 43 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
44 ${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${DESTDIR}${EGDIR}/suphp.conf 44 ${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${DESTDIR}${EGDIR}/suphp.conf
45 45
46.include "../../mk/apache.mk" 46.include "../../mk/apache.mk"
47.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"