summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2005-09-01 19:56:57 +0000
committeradrianp <adrianp@pkgsrc.org>2005-09-01 19:56:57 +0000
commitc748eb60a46a484e22e1efb481b0cc606208209e (patch)
tree62d61bb0c61aac8c7cc012d2ece651fad4e47193
parent3591882fc13742982a01bb3c9db5bd55cefeb23a (diff)
downloadpkgsrc-c748eb60a46a484e22e1efb481b0cc606208209e.tar.gz
Add a depends on apache
Fix up previous handling of new patch as suggested by salo@ in private email. Bump PKGREVISION
-rw-r--r--databases/phpldapadmin/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index 217270d4f93..4b03f516391 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -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 @@ do-configure:
@${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 @@ do-install:
cd ${WRKSRC} && ${PAX} \
-s /\.#// \
-s /\.cvsignore// \
+ -s /\.orig// \
-rwppm . ${PREFIX}/share/phpldapadmin
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"