3 files changed, 22 insertions, 7 deletions

diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 2e9ade9230fe..4411f120a8c2 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	LDAP-Account-Manager
-PORTVERSION=	0.4
+PORTVERSION=	0.4.1
 CATEGORIES=	sysutils www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lam
-DISTNAME=	${PORTNAME}-${PORTVERSION}-0
+DISTNAME=	${PORTNAME:L}_${PORTVERSION}
 
-MAINTAINER=	sheepkiller@cultdeadsheep.org
+MAINTAINER=	clement@FreeBSD.org
 COMMENT=	Webfrontend for managing accounts stored in an OpenLDAP server
 
 RUN_DEPENDS=	${LOCALBASE}/${MOD_DIR}/libphp4.so:${PORTSDIR}/lang/php4-horde \
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/${MOD_DIR}/libphp4.so:${PORTSDIR}/lang/php4-horde \
 		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 
 NO_BUILD=	YES
-WRKSRC=		${WRKDIR}/lam
+WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
 
 .if defined(WITH_APACHE2)
 MOD_DIR=	libexec/apache2
diff --git a/sysutils/ldap-account-manager/distinfo b/sysutils/ldap-account-manager/distinfo
index 68b091ae95ca..9d78022561be 100644
--- a/sysutils/ldap-account-manager/distinfo
+++ b/sysutils/ldap-account-manager/distinfo
@@ -1 +1 @@
-MD5 (LDAP-Account-Manager-0.4-0.tar.gz) = 6d2a5320f493350ce2bdf078e9f6cdb6
+MD5 (ldap-account-manager_0.4.1.tar.gz) = d57d434aeb20a80a46d5f1f3448cb1a9
diff --git a/sysutils/ldap-account-manager/pkg-plist b/sysutils/ldap-account-manager/pkg-plist
index 1ecbebf99c11..05e513acb8ca 100644
--- a/sysutils/ldap-account-manager/pkg-plist
+++ b/sysutils/ldap-account-manager/pkg-plist
@@ -12,6 +12,7 @@
 %%WWWROOT%%/config/config.cfg_sample
 @exec [ -f %B/config.cfg ] || cp %B/%f %B/config.cfg
 %%WWWROOT%%/config/shells
+%%WWWROOT%%/config/pdf/lam.txt
 %%WWWROOT%%/graphics/banner.jpg
 %%WWWROOT%%/graphics/printLogo.jpg
 %%WWWROOT%%/graphics/select.png
@@ -48,6 +49,16 @@
 %%WWWROOT%%/lib/font/timesi.php
 %%WWWROOT%%/lib/font/zapfdingbats.php
 %%WWWROOT%%/lib/font/helvetica.php
+%%WWWROOT%%/lib/modules/quota.inc
+%%WWWROOT%%/lib/modules/inetOrgPerson.inc
+%%WWWROOT%%/lib/modules/shadowAccount.inc
+%%WWWROOT%%/lib/modules/sambaAccount.inc
+%%WWWROOT%%/lib/modules/sambaSamAccount.inc
+%%WWWROOT%%/lib/modules/account.inc
+%%WWWROOT%%/lib/modules/posixGroup.inc
+%%WWWROOT%%/lib/modules/sambaGroupMapping.inc 
+%%WWWROOT%%/lib/modules/main.inc
+%%WWWROOT%%/lib/modules/posixAccount.inc
 %%WWWROOT%%/lib/account.inc
 %%WWWROOT%%/lib/config.inc
 %%WWWROOT%%/lib/createntlm.pl
@@ -90,9 +101,11 @@
 %%WWWROOT%%/templates/delete.php
 %%WWWROOT%%/templates/help.php
 %%WWWROOT%%/templates/account/hostedit.php
-%%WWWROOT%%/templates/account/useredit.php
+%%WWWROOT%%/templates/account/hostedit.php.new 
 %%WWWROOT%%/templates/account/groupedit.php
-%%WWWROOT%%/templates/getpdf.php
+%%WWWROOT%%/templates/account/groupedit.php.new
+%%WWWROOT%%/templates/account/useredit.php
+%%WWWROOT%%/templates/account/useredit.php.new
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -107,6 +120,7 @@
 @dirrm %%WWWROOT%%/help
 @dirrm %%WWWROOT%%/lib/font/makefont
 @dirrm %%WWWROOT%%/lib/font
+@dirrm %%WWWROOT%%/lib/modules
 @dirrm %%WWWROOT%%/lib
 @dirrm %%WWWROOT%%/locale/de_DE/LC_MESSAGES
 @dirrm %%WWWROOT%%/locale/de_DE
@@ -121,6 +135,7 @@
 @unexec rmdir %D/%%WWWROOT%%/config/profiles/hosts 2>/dev/null || true
 @unexec rmdir %D/%%WWWROOT%%/config/profiles/users 2>/dev/null || true
 @unexec rmdir %D/%%WWWROOT%%/config/profiles 2>/dev/null || true
+@unexec rmdir %D/%%WWWROOT%%/config/pdf 2>/dev/null || true
 @unexec rmdir %D/%%WWWROOT%%/config 2>/dev/null || true
 @unexec rmdir %D/%%WWWROOT%%/sess || true
 @unexec rmdir %D/%%WWWROOT%%/tmp || true