3 files changed, 23 insertions, 20 deletions

diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 14304c47dd4f..a722c73ca8d6 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ldap-account-manager
-PORTVERSION=	2.4.0
-PORTREVISION=	3
+PORTVERSION=	2.5.0
 CATEGORIES=	sysutils www
 MASTER_SITES=	SF/${PNAME}
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
@@ -26,8 +25,8 @@ WANT_PHP_WEB=	yes
 DEFAULT_PHP_VER=	5
 
 PNAME=		lam
-PORTDOCS=	docs COPYING HISTORY INSTALL README
-LAMDATA=	index.html VERSION config graphics help lib locale sess style templates tmp
+PORTDOCS=	docs COPYING HISTORY INSTALL README copyright
+LAMDATA=	config graphics help lib locale sess style templates tmp VERSION index.html
 WWWDIR?=	${PREFIX}/www/${PNAME}
 SUB_FILES=	pkg-message
 
@@ -38,20 +37,20 @@ do-configure:
 
 do-install:
 	-@${MKDIR} ${WWWDIR}
-.for i in ${LAMDATA}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR}
-.endfor
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${LAMDATA}" ${WWWDIR}
 .if !defined(NOPORTDOCS)
 	-@${MKDIR} ${DOCSDIR}
-.for j in ${PORTDOCS}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${j} ${DOCSDIR}
-.endfor
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${DOCSDIR}
 .endif
-	@[ -e ${WWWDIR}/config/config.cfg ] || ${INSTALL_DATA} ${WRKSRC}/config/config.cfg_sample ${WWWDIR}/config/config.cfg
-	@[ -e ${WWWDIR}/config/lam.conf   ] || ${INSTALL_DATA} ${WRKSRC}/config/lam.conf_sample   ${WWWDIR}/config/lam.conf
 
 post-install:
-	@${ECHO_MSG} "===> Setting correct permissions"
+	@if [ ! -f ${WWWDIR}/config/config.conf ]; then \
+	    ${CP} -p ${WWWDIR}/config/config.cfg_sample ${WWWDIR}/config/config.cfg ; \
+	fi
+	@if [ ! -f ${WWWDIR}/config/lam.conf ]; then \
+	    ${CP} -p ${WWWDIR}/config/lam.conf_sample ${WWWDIR}/config/lam.conf ; \
+	fi
+
 	@${FIND} ${WWWDIR} -type f -exec ${CHMOD} 644 {} \;
 	@${FIND} ${WWWDIR} -type d -exec ${CHMOD} 755 {} \;
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/config ${WWWDIR}/sess ${WWWDIR}/tmp
diff --git a/sysutils/ldap-account-manager/distinfo b/sysutils/ldap-account-manager/distinfo
index 2fedec5c2618..eef4d248e2c7 100644
--- a/sysutils/ldap-account-manager/distinfo
+++ b/sysutils/ldap-account-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (ldap-account-manager-2.4.0.tar.gz) = 032aad0335a04784060a62b0c1bb38c4
-SHA256 (ldap-account-manager-2.4.0.tar.gz) = 22415ebe55de404cd8e8ad4af8b77ffa2de9db3af28ba8791ab99d128fbbaa89
-SIZE (ldap-account-manager-2.4.0.tar.gz) = 2522241
+MD5 (ldap-account-manager-2.5.0.tar.gz) = 42b642978b78fcee519510349aa33b66
+SHA256 (ldap-account-manager-2.5.0.tar.gz) = 8e79d29503b90a5103725c1b99445a938a7fb8dbba027cc4d2e69e550507b187
+SIZE (ldap-account-manager-2.5.0.tar.gz) = 2540193
diff --git a/sysutils/ldap-account-manager/pkg-plist b/sysutils/ldap-account-manager/pkg-plist
index babce0200878..6e5af6b5eba2 100644
--- a/sysutils/ldap-account-manager/pkg-plist
+++ b/sysutils/ldap-account-manager/pkg-plist
@@ -1,12 +1,15 @@
 %%WWWDIR%%/VERSION
 %%WWWDIR%%/config/.htaccess
+@unexec if cmp -s %D/%%WWWDIR%%/config/config.cfg %D/%%WWWDIR%%/config/config.cfg_sample; then rm -f %D/%%WWWDIR%%/config/config.cfg; fi
 %%WWWDIR%%/config/config.cfg_sample
-%%WWWDIR%%/config/config.cfg
+@exec if [ ! -f %D/www/lam/config/config.cfg ] ; then cp -p %D/%F %B/config.cfg; fi
+@unexec if cmp -s %D/%%WWWDIR%%/config/lam.conf %D/%%WWWDIR%%/config/lam.conf_sample; then rm -f %D/%%WWWDIR%%/config/lam.conf; fi
 %%WWWDIR%%/config/lam.conf_sample
-%%WWWDIR%%/config/lam.conf
+@exec if [ ! -f %D/www/lam/lam.conf ] ; then cp -p %D/%F %B/lam.conf; fi
 %%WWWDIR%%/config/language
 %%WWWDIR%%/config/passwordMailTemplate.txt
 %%WWWDIR%%/config/pdf/.htaccess
+%%WWWDIR%%/config/pdf/default.dhcp.xml
 %%WWWDIR%%/config/pdf/default.group.xml
 %%WWWDIR%%/config/pdf/default.host.xml
 %%WWWDIR%%/config/pdf/default.mailAlias.xml
@@ -63,6 +66,7 @@
 %%WWWDIR%%/graphics/lam.png
 %%WWWDIR%%/graphics/ldap-server.png
 %%WWWDIR%%/graphics/light.png
+%%WWWDIR%%/graphics/logo32.png
 %%WWWDIR%%/graphics/locality.png
 %%WWWDIR%%/graphics/lock.png
 %%WWWDIR%%/graphics/mail.png
@@ -333,5 +337,5 @@
 @dirrm %%WWWDIR%%/config/profiles
 @dirrm %%WWWDIR%%/config/pdf/logos
 @dirrm %%WWWDIR%%/config/pdf
-@dirrm %%WWWDIR%%/config
-@dirrm %%WWWDIR%%
+@dirrmtry %%WWWDIR%%/config
+@dirrmtry %%WWWDIR%%