summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2006-05-23 20:51:44 +0000
committeradrianp <adrianp@pkgsrc.org>2006-05-23 20:51:44 +0000
commit83dd3fa01ba7b7a884ce7ae1b9087721c0f568e2 (patch)
tree5707eaa613f536699165785b5729e1c77338b1cb /databases
parent0fdf1ef4e093bbda8c10c0a59c7d2cb2a2752b86 (diff)
downloadpkgsrc-83dd3fa01ba7b7a884ce7ae1b9087721c0f568e2.tar.gz
Watch for non-empty config/ directory
Use CONF_FILES_PERMS to install the conf.php file Don't use WWW_USER to set permissions as that assumes apache is always installed Bump PKGREVISION Fix binary packages (pointed out by salo@)
Diffstat (limited to 'databases')
-rw-r--r--databases/phpldapadmin/MESSAGE7
-rw-r--r--databases/phpldapadmin/Makefile26
-rw-r--r--databases/phpldapadmin/PLIST5
3 files changed, 17 insertions, 21 deletions
diff --git a/databases/phpldapadmin/MESSAGE b/databases/phpldapadmin/MESSAGE
index ed25101adc6..18ef5308f0b 100644
--- a/databases/phpldapadmin/MESSAGE
+++ b/databases/phpldapadmin/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2006/05/18 22:13:46 adrianp Exp $
+$NetBSD: MESSAGE,v 1.6 2006/05/23 20:51:44 adrianp Exp $
You will need to edit ${PREFIX}/share/phpldapadmin/config/config.php to
initially setup your site.
@@ -11,6 +11,9 @@ If you are running Apache then you can add the following line to httpd.conf:
to make phpLDAPAdmin accessible through:
- http://www.domain.com/ldapadmin/
+ http://localhost/ldapadmin/
+In addition to this it is highly recommended that you check the permissions
+on the phpLDAPAdmin configuration file (config.php) as this can contain
+sensitive information.
===========================================================================
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index 1da4de76c22..87b32e9f259 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2006/05/18 22:22:37 adrianp Exp $
+# $NetBSD: Makefile,v 1.21 2006/05/23 20:51:44 adrianp Exp $
DISTNAME= phpldapadmin-${VERSION}
CATEGORIES= databases www
+PKGREVISION= 1
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
MAINTAINER= rasputnik@hellooperator.net
HOMEPAGE= http://phpldapadmin.sourceforge.net/
COMMENT= Set of PHP-scripts to administer an LDAP directory over the WWW
+.include "../../mk/bsd.prefs.mk"
.include "../../lang/php/phpversion.mk"
DEPENDS+= php-ldap>=4.1.2:../../databases/php-ldap
@@ -20,24 +22,14 @@ DEPENDS+= php-dom-[0-9]*:../../textproc/php5-dom
VERSION= 0.9.8.3
NO_BUILD= YES
-BUILD_DEFS+= WWW_USER
-CONF_FILES= ${PREFIX}/share/examples/phpldapadmin/config.php.example \
- ${PREFIX}/share/phpldapadmin/config/config.php
+CONF_FILES_PERMS+= ${PREFIX}/share/examples/phpldapadmin/config.php.example \
+ ${PREFIX}/share/phpldapadmin/config/config.php \
+ ${ROOT_USER} ${ROOT_GROUP} 0644
CONF_FILES+= ${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf \
${PKG_SYSCONFDIR}/phpldapadmin.conf
-SPECIAL_PERMS= ${PREFIX}/share/phpldapadmin/config/config.php \
- ${WWW_USER} ${ROOT_GROUP} 0600
PAX_DIRS= config doc htdocs lib locale templates tools
-# NOTE: If you're running apache under an account other than www or
-# are running a different web server under a specific user account
-# you should set WWW_USER in your mk.conf.
-#
-.if !defined(WWW_USER)
-WWW_USER= ${APACHE_USER}
-.endif
-
do-configure:
${SED} -e "s|@LDAPADMINDIR@|${PREFIX}/share/phpldapadmin/htdocs|g" \
${FILESDIR}/phpldapadmin.conf > ${WRKDIR}/phpldapadmin.conf
@@ -46,15 +38,15 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/phpldapadmin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/phpldapadmin
${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/phpldapadmin/config
${INSTALL_DATA} ${WRKSRC}/config/config.php.example \
- ${PREFIX}/share/examples/phpldapadmin
+ ${PREFIX}/share/examples/phpldapadmin/config.php.example
${INSTALL_DATA} ${WRKDIR}/phpldapadmin.conf \
- ${PREFIX}/share/examples/phpldapadmin
+ ${PREFIX}/share/examples/phpldapadmin/phpldapadmin.conf
${RM} ${WRKSRC}/.cvsignore
${RM} ${WRKSRC}/config/.cvsignore
- ${RM} ${WRKSRC}/config/config.php.example
${INSTALL_DATA} ${WRKSRC}/index.php ${PREFIX}/share/phpldapadmin
diff --git a/databases/phpldapadmin/PLIST b/databases/phpldapadmin/PLIST
index 065f1350945..e100b15e128 100644
--- a/databases/phpldapadmin/PLIST
+++ b/databases/phpldapadmin/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2006/05/18 22:13:46 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/05/23 20:51:44 adrianp Exp $
share/doc/phpldapadmin/INSTALL
share/doc/phpldapadmin/LICENSE
share/examples/phpldapadmin/config.php.example
share/examples/phpldapadmin/phpldapadmin.conf
share/phpldapadmin/VERSION
+share/phpldapadmin/config/config.php.example
share/phpldapadmin/doc/README-translation.txt
share/phpldapadmin/doc/pla-test-i18n.ldif
share/phpldapadmin/htdocs/add_attr.php
@@ -532,7 +533,7 @@ share/phpldapadmin/tools/unit_test.php
@dirrm share/phpldapadmin/htdocs/css
@dirrm share/phpldapadmin/htdocs
@dirrm share/phpldapadmin/doc
-@dirrm share/phpldapadmin/config
+@unexec ${RMDIR} %D/share/phpldapadmin/config 2>/dev/null || ${TRUE}
@unexec ${RMDIR} %D/share/phpldapadmin 2>/dev/null || ${TRUE}
@dirrm share/examples/phpldapadmin
@dirrm share/doc/phpldapadmin