[pkgsrc/trunk]: pkgsrc/databases/phpldapadmin Add a depends on apache

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/edacd62e6906
branches:  trunk
changeset: 498733:edacd62e6906
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Thu Sep 01 19:56:57 2005 +0000

description:
Add a depends on apache
Fix up previous handling of new patch as suggested by salo@ in private email.
Bump PKGREVISION

diffstat:

 databases/phpldapadmin/Makefile |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 515a7e0aab9d -r edacd62e6906 databases/phpldapadmin/Makefile
--- a/databases/phpldapadmin/Makefile   Thu Sep 01 18:12:54 2005 +0000
+++ b/databases/phpldapadmin/Makefile   Thu Sep 01 19:56:57 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/08/30 15:28:48 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2005/09/01 19:56:57 adrianp Exp $
 
 DISTNAME=      phpldapadmin-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
 
@@ -29,9 +29,6 @@
        @${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin|g" \
                ${FILESDIR}/phpldapadmin.conf > ${WRKDIR}/phpldapadmin.conf
 
-pre-install:
-       @${RM} ${WRKSRC}/login.php.orig
-
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpldapadmin
 
@@ -46,6 +43,8 @@
        cd ${WRKSRC} && ${PAX}          \
                -s /\.#//               \
                -s /\.cvsignore//       \
+               -s /\.orig//            \
                -rwppm . ${PREFIX}/share/phpldapadmin
 
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"