4 files changed, 28 insertions, 34 deletions

diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 9eefc5fa9829..ab01ddc29e9b 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -6,33 +6,30 @@
 #
 
 PORTNAME=	LDAP-Account-Manager
-PORTVERSION=	0.4.4
+PORTVERSION=	0.4.5
 CATEGORIES=	sysutils www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://osdn.dl.sourceforge.net/sourceforge/lam/
 MASTER_SITE_SUBDIR=	lam
 DISTNAME=	${PORTNAME:L}_${PORTVERSION}
 
 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 \
-		${SITE_PERL}/${PERL_ARCH}/Quota.pm:${PORTSDIR}/sysutils/p5-Quota\
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Quota.pm:${PORTSDIR}/sysutils/p5-Quota\
 		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 
+USE_PHP=	yes
+WANT_PHP_WEB=	yes
+PHP_PORT=	${PORTSDIR}/lang/php${PHP_VER}-horde
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
 
-.if defined(WITH_APACHE2)
-MOD_DIR=	libexec/apache2
-.else
-MOD_DIR=	libexec/apache
-.endif
-
 WWW_ROOT?=	www/lam
 PLIST_SUB+=	WWWROOT=${WWW_ROOT}
-WWW_DIR=	config graphics help lib locale sess style templates
-MYPORTDOCS=	HISTORY README TODO docs/README.fpdf.htm docs/README.openldap.txt \
-		docs/README.hosts.txt docs/README.security.txt docs/README.lamdaemon.txt
+WWW_DIR=	config graphics help lib locale sess style templates tmp
+MYPORTDOCS=	HISTORY README TODO docs/*
+PORTDOCS=	*
 WWW_OWNED=	sess tmp config config config/profiles config/profiles/groups \
 		config/profiles/groups/default.prg config/profiles/hosts \
 		config/profiles/hosts/default.prh config/profiles/users \
@@ -41,11 +38,6 @@ WWW_OWNED=	sess tmp config config config/profiles config/profiles/groups \
 
 LAM_SCRIPTS=	lib/createntlm.pl lib/lamdaemon.pl
 
-#CVS_DIRS=	${WRKSRC}/lib/font/CVS ${WRKSRC}/lib/font/makefont/CVS
-
-#post-extract:
-#	@${RM} -fr ${CVS_DIRS}
-
 do-install:
 	@${MKDIR} ${PREFIX}/${WWW_ROOT}
 	@${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/${WWW_ROOT}
diff --git a/sysutils/ldap-account-manager/distinfo b/sysutils/ldap-account-manager/distinfo
index a415831f88a6..46bcc5041200 100644
--- a/sysutils/ldap-account-manager/distinfo
+++ b/sysutils/ldap-account-manager/distinfo
@@ -1,2 +1,2 @@
-MD5 (ldap-account-manager_0.4.4.tar.gz) = 2338e5275fab0cd555ef0038f1d5503f
-SIZE (ldap-account-manager_0.4.4.tar.gz) = 367095
+MD5 (ldap-account-manager_0.4.5.tar.gz) = 96c7da5589af0529507b77853057786a
+SIZE (ldap-account-manager_0.4.5.tar.gz) = 419753
diff --git a/sysutils/ldap-account-manager/pkg-descr b/sysutils/ldap-account-manager/pkg-descr
index 77e05e04d305..0730509a94d6 100644
--- a/sysutils/ldap-account-manager/pkg-descr
+++ b/sysutils/ldap-account-manager/pkg-descr
@@ -3,10 +3,17 @@ in an openLDAP server.
 
 Features:
 - management of Unix user and group accounts (posixAccount/posixGroup)
-- management of Samba 2.x user and host accounts (sambaAccount)
-- automatic creation/deletion of home directories (experimental)
-- setting quotas (experimental)
+- management of Samba 2.x/3 user and host accounts
+- profiles for account creation
+- editor for organizational units (OU)
+- account creation via file upload
+- automatic creation/deletion of home directories
+- setting quotas
 - support for LDAP+SSL
-- multi-language support (default language: English, German only partial)
+- multi-language support (English, French, German, Hungarian, Japanese)
+- multiple configuration files
+- PDF output for user/group/host accounts
+- additional text for user PDFs
+- supports multiple password hashes
 
 WWW: http://lam.sf.net/
diff --git a/sysutils/ldap-account-manager/pkg-plist b/sysutils/ldap-account-manager/pkg-plist
index 82c65afca0c7..218296eca5a3 100644
--- a/sysutils/ldap-account-manager/pkg-plist
+++ b/sysutils/ldap-account-manager/pkg-plist
@@ -18,7 +18,6 @@
 %%WWWROOT%%/graphics/printLogo.jpg
 %%WWWROOT%%/graphics/select.png
 %%WWWROOT%%/graphics/warn.png
-%%WWWROOT%%/help/help_numbers.assign
 %%WWWROOT%%/help/help.inc
 %%WWWROOT%%/index.html
 %%WWWROOT%%/lib/.htaccess
@@ -46,6 +45,8 @@
 %%WWWROOT%%/lib/status.inc
 %%WWWROOT%%/locale/de_DE/LC_MESSAGES/messages.mo
 %%WWWROOT%%/locale/de_DE/LC_MESSAGES/messages.po
+%%WWWROOT%%/locale/fr_FR/LC_MESSAGES/messages.mo
+%%WWWROOT%%/locale/fr_FR/LC_MESSAGES/messages.po
 %%WWWROOT%%/locale/hu_HU/LC_MESSAGES/messages.mo
 %%WWWROOT%%/locale/hu_HU/LC_MESSAGES/messages.po
 %%WWWROOT%%/locale/ja_JP/LC_MESSAGES/messages.mo
@@ -91,15 +92,7 @@
 %%WWWROOT%%/templates/profedit/profilehost.php
 %%WWWROOT%%/templates/profedit/profilemain.php
 %%WWWROOT%%/templates/profedit/profileuser.php
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.fpdf.htm
-%%PORTDOCS%%%%DOCSDIR%%/README.hosts.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.lamdaemon.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.openldap.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.security.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%WWWROOT%%/tmp/.htaccess
 @dirrm %%WWWROOT%%/config/pdf
 @dirrm %%WWWROOT%%/config/profiles/groups
 @dirrm %%WWWROOT%%/config/profiles/hosts
@@ -112,6 +105,8 @@
 @dirrm %%WWWROOT%%/lib
 @dirrm %%WWWROOT%%/locale/de_DE/LC_MESSAGES
 @dirrm %%WWWROOT%%/locale/de_DE
+@dirrm %%WWWROOT%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%WWWROOT%%/locale/fr_FR
 @dirrm %%WWWROOT%%/locale/hu_HU/LC_MESSAGES
 @dirrm %%WWWROOT%%/locale/hu_HU
 @dirrm %%WWWROOT%%/locale/ja_JP/LC_MESSAGES