Update ap2-suphp to 0.6.3.

While here, add DESTDIR support and more adapt sample config file to default settings.

* Version 0.6.3 (30 March 2008)
- Fixed a possible race condition concerning the check for the
  right symlink owner.
- Added checks for the owner of the parent directories were added.

* Version 0.6.2 (19 November 2006)
- Made mod_suphp compatible with Apache 2.2
- Modified SmartPtr implementation (hopefully) fixing
  double free problem
- Fixed problem that caused the process to block
  when more than 4096 were written to stderr
- Implemented userdir support
- Fixed problem with PATH_INFO and PHP scripts

* Version 0.6.1 (26 November 2005)
- Changed usage of STL to gain better compatibility with old GCC versions
  (credits to Jeremy Chadwick for finding the relevant code)
- Fixed typos in mod_suphp.c (Apache 1.3)
  (credits to Johan Ekenberg for finding these typos)
- Fixed potential buffer overflow in function suphp_bucket_read() in
  src/apache2/mod_suphp.c
- Fix problems with scripts sending "Last-Modified" headers
- Extended autoconf script to look for an installation of APR
  and to use its includedir when building mod_suphp for Apache 2
- Added support for chroot() call before execution of script

1 files changed, 8 insertions, 5 deletions

diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile
index c47d63ba9d1..0461870b723 100644
--- a/www/ap2-suphp/Makefile
+++ b/www/ap2-suphp/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2008/03/04 11:02:26 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2008/05/17 02:37:24 obache Exp $
 #
 
-DISTNAME=		suphp-0.6.0
+DISTNAME=		suphp-0.6.3
 PKGNAME=		${APACHE_PKG_PREFIX}-${DISTNAME}
-PKGREVISION=		3
 CATEGORIES=		www
 MASTER_SITES=		http://www.suphp.org/download/
 
@@ -11,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.suphp.org/
 COMMENT=		SuEXEC-like wrapper for PHP scripts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		lex
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -34,10 +35,12 @@ SUBST_CLASSES+=		suphp
 SUBST_STAGE.suphp=	post-configure
 SUBST_FILES.suphp=	doc/suphp.conf-example
 SUBST_SED.suphp=	-e "s,wwwrun,${APACHE_USER},g"
+SUBST_SED.suphp+=	-e "s,/var/log/suphp.log,${VARBASE}/httpd/suphp_log,g"
+SUBST_SED.suphp+=	-e "s,/usr/bin/php,${PREFIX}/bin/php,g"
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR:Q}
-	${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${EGDIR}/suphp.conf
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR:Q}
+	${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${DESTDIR}${EGDIR}/suphp.conf
 
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"