- Update to nb1

- Add apache configuration file fragment
- Use CONF_FILES for config.php and newly added apache file fragment
- Change permissions on installed config.php to www:wheel 0600 as it can
  contain sensitive information in some installations
- Update MESSAGE pointing to new files installed

4 files changed, 54 insertions, 16 deletions

diff --git a/databases/phpldapadmin/MESSAGE b/databases/phpldapadmin/MESSAGE
index 3fe49666b92..538656df177 100644
--- a/databases/phpldapadmin/MESSAGE
+++ b/databases/phpldapadmin/MESSAGE
@@ -1,21 +1,16 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/03/26 11:10:10 seb Exp $
+$NetBSD: MESSAGE,v 1.3 2005/05/23 22:01:42 adrianp Exp $
 
-To enable this web application, first go to
-${PREFIX}/share/phpldapadmin
+You will need to edit ${PREFIX}/share/phpldapadmin/config.php to
+initially setup your site.
 
-cp config.php.example config.php
+You will also need to make phpLDAPAdmin accessible through your HTTP server.
+If you are running Apache then you can add the following line to httpd.conf:
 
-and edit to taste. Then you need to update your webserver config to serve
-up that directory, either by symlinking it from your document root or
-using an alias , like so:
+	Include ${PKG_SYSCONFDIR}/httpd/ldapadmin.conf
 
-    Alias /ldapadmin /${PREFIX}/share/phpldapadmin
-
-  # strongly recommended
-    <Location /ldapadmin >
-        Require user adminaccount
-    </Location>
+to make phpLDAPAdmin accessible through:
 
+	http://www.domain.com/ldapadmin/
 
 ===========================================================================
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index 1c44bfe276f..6cc5dd5f48e 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/05/19 23:12:17 seb Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/23 22:01:42 adrianp Exp $
 
 DISTNAME=	phpldapadmin-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
 
@@ -12,10 +13,32 @@ DEPENDS+=	php-ldap>=4.1.2:../../databases/php-ldap
 
 VERSION=	0.9.6c
 NO_BUILD=	YES
+USE_PKGINSTALL=	YES
+APACHE_USER?=	www
+
+CONF_FILES=	${PREFIX}/share/examples/phpldapadmin/config.php.example \
+		${PREFIX}/share/phpldapadmin/config.php
+CONF_FILES+=	${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \
+		${PKG_SYSCONFDIR}/httpd/phpldapadmin.conf		
+SPECIAL_PERMS=	${PREFIX}/share/phpldapadmin/config.php \
+		${APACHE_USER} wheel 0600
 
 INSTALLATION_DIRS=	${PREFIX}/share/phpldapadmin
 
+do-configure:
+	@${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin|g" \
+		${FILESDIR}/phpldapadmin.conf > ${WRKDIR}/phpldapadmin.conf
+
 do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpldapadmin
+
+	${INSTALL_DATA} ${WRKSRC}/config.php.example \
+		${PREFIX}/share/examples/phpldapadmin
+	${INSTALL_DATA} ${WRKDIR}/phpldapadmin.conf \
+		${PREFIX}/share/examples/phpldapadmin
+
+	@${RM} ${WRKSRC}/config.php.example
+
 	${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
 	cd ${WRKSRC} && ${PAX}		\
 		-s /\.#//		\
diff --git a/databases/phpldapadmin/PLIST b/databases/phpldapadmin/PLIST
index 421156a9395..b0509257022 100644
--- a/databases/phpldapadmin/PLIST
+++ b/databases/phpldapadmin/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/19 23:12:17 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/05/23 22:01:42 adrianp Exp $
+share/examples/phpldapadmin/config.php.example
 share/phpldapadmin/INSTALL
 share/phpldapadmin/LICENSE
 share/phpldapadmin/VERSION
@@ -14,7 +15,6 @@ share/phpldapadmin/collapse.php
 share/phpldapadmin/common.php
 share/phpldapadmin/compare.php
 share/phpldapadmin/compare_form.php
-share/phpldapadmin/config.php.example
 share/phpldapadmin/copy.php
 share/phpldapadmin/copy_form.php
 share/phpldapadmin/create.php
diff --git a/databases/phpldapadmin/files/phpldapadmin.conf b/databases/phpldapadmin/files/phpldapadmin.conf
new file mode 100644
index 00000000000..cd944922487
--- /dev/null
+++ b/databases/phpldapadmin/files/phpldapadmin.conf
@@ -0,0 +1,20 @@
+# $NetBSD: phpldapadmin.conf,v 1.1 2005/05/23 22:01:42 adrianp Exp $
+#
+# phpLDAPAdmin configuration file fragment for Apache
+
+<IfModule mod_alias.c>
+    Alias /ldapadmin/ "@LDAPADMINDIR@/"
+</IfModule>
+
+<Directory "@LDAPADMINDIR@">
+    Options Indexes
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+# strongly recommended
+#
+<Location /ldapadmin >
+    Require user adminaccount
+</Location>