- Update to 0.4.3

3 files changed, 80 insertions, 76 deletions

diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 59516edb24e1..8ed161a18df3 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	LDAP-Account-Manager
-PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTVERSION=	0.4.3
 CATEGORIES=	sysutils www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lam
@@ -43,10 +42,10 @@ 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
+#CVS_DIRS=	${WRKSRC}/lib/font/CVS ${WRKSRC}/lib/font/makefont/CVS
 
-post-extract:
-	@${RM} -fr ${CVS_DIRS}
+#post-extract:
+#	@${RM} -fr ${CVS_DIRS}
 
 do-install:
 	@${MKDIR} ${PREFIX}/${WWW_ROOT}
diff --git a/sysutils/ldap-account-manager/distinfo b/sysutils/ldap-account-manager/distinfo
index 9ea7fb65a9f7..b96e4003b858 100644
--- a/sysutils/ldap-account-manager/distinfo
+++ b/sysutils/ldap-account-manager/distinfo
@@ -1,2 +1,2 @@
-MD5 (ldap-account-manager_0.4.1.tar.gz) = d57d434aeb20a80a46d5f1f3448cb1a9
-SIZE (ldap-account-manager_0.4.1.tar.gz) = 277269
+MD5 (ldap-account-manager_0.4.3.tar.gz) = 054ec5cf3ab25c22d68f723f2aaf3bbb
+SIZE (ldap-account-manager_0.4.3.tar.gz) = 369494
diff --git a/sysutils/ldap-account-manager/pkg-plist b/sysutils/ldap-account-manager/pkg-plist
index 05e513acb8ca..f249a4106d3a 100644
--- a/sysutils/ldap-account-manager/pkg-plist
+++ b/sysutils/ldap-account-manager/pkg-plist
@@ -1,27 +1,36 @@
 @comment $FreeBSD$
-%%WWWROOT%%/index.html
-%%WWWROOT%%/config/profiles/groups/default.prg
-%%WWWROOT%%/config/profiles/hosts/default.prh
-%%WWWROOT%%/config/profiles/users/default.pru
 %%WWWROOT%%/config/.htaccess
+@unexec if cmp -s %D/%%WWWROOT%%/config/config.cfg %D/%%WWWROOT%%/config/config.cfg_sample; then rm -f %D/%%WWWROOT%%/config/config.cfg ; fi
+%%WWWROOT%%/config/config.cfg_sample
+@exec [ -f %B/config.cfg ] || cp %B/%f %B/config.cfg
 @unexec if cmp -s %D/%%WWWROOT%%/config/lam.conf %D/%%WWWROOT%%/config/lam.conf_sample; then rm -f %D/%%WWWROOT%%/config/lam.conf; fi
 %%WWWROOT%%/config/lam.conf_sample
 @exec [ -f %B/lam.conf ] || cp %B/%f %B/lam.conf
 %%WWWROOT%%/config/language
-@unexec if cmp -s %D/%%WWWROOT%%/config/config.cfg %D/%%WWWROOT%%/config/config.cfg_sample; then rm -f %D/%%WWWROOT%%/config/config.cfg ; fi
-%%WWWROOT%%/config/config.cfg_sample
-@exec [ -f %B/config.cfg ] || cp %B/%f %B/config.cfg
+%%WWWROOT%%/config/profiles/groups/default.prg
+%%WWWROOT%%/config/profiles/hosts/default.prh
+%%WWWROOT%%/config/profiles/users/default.pru
 %%WWWROOT%%/config/shells
-%%WWWROOT%%/config/pdf/lam.txt
 %%WWWROOT%%/graphics/banner.jpg
-%%WWWROOT%%/graphics/printLogo.jpg
-%%WWWROOT%%/graphics/select.png
 %%WWWROOT%%/graphics/error.png
 %%WWWROOT%%/graphics/info.png
+%%WWWROOT%%/graphics/lam.png
+%%WWWROOT%%/graphics/printLogo.jpg
+%%WWWROOT%%/graphics/select.png
 %%WWWROOT%%/graphics/warn.png
 %%WWWROOT%%/help/extFileExample.php
-%%WWWROOT%%/help/help_numbers.assign
 %%WWWROOT%%/help/help.inc
+%%WWWROOT%%/index.html
+%%WWWROOT%%/lib/.htaccess
+%%WWWROOT%%/lib/account.inc
+%%WWWROOT%%/lib/blowfish.inc
+%%WWWROOT%%/lib/config.inc
+%%WWWROOT%%/lib/createntlm.pl
+%%WWWROOT%%/lib/font/courier.php
+%%WWWROOT%%/lib/font/helvetica.php
+%%WWWROOT%%/lib/font/helveticab.php
+%%WWWROOT%%/lib/font/helveticabi.php
+%%WWWROOT%%/lib/font/helveticai.php
 %%WWWROOT%%/lib/font/makefont/cp1250.map
 %%WWWROOT%%/lib/font/makefont/cp1251.map
 %%WWWROOT%%/lib/font/makefont/cp1252.map
@@ -38,105 +47,101 @@
 %%WWWROOT%%/lib/font/makefont/iso-8859-9.map
 %%WWWROOT%%/lib/font/makefont/koi8-r.map
 %%WWWROOT%%/lib/font/makefont/makefont.php
-%%WWWROOT%%/lib/font/courier.php
-%%WWWROOT%%/lib/font/helveticab.php
-%%WWWROOT%%/lib/font/helveticabi.php
-%%WWWROOT%%/lib/font/helveticai.php
 %%WWWROOT%%/lib/font/symbol.php
 %%WWWROOT%%/lib/font/times.php
 %%WWWROOT%%/lib/font/timesb.php
 %%WWWROOT%%/lib/font/timesbi.php
 %%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
 %%WWWROOT%%/lib/fpdf.php
 %%WWWROOT%%/lib/functions.js
 %%WWWROOT%%/lib/lamdaemon.pl
-%%WWWROOT%%/lib/profiles.inc
-%%WWWROOT%%/lib/status.inc
 %%WWWROOT%%/lib/ldap.inc
-%%WWWROOT%%/lib/.htaccess
 %%WWWROOT%%/lib/pdf.inc
+%%WWWROOT%%/lib/profiles.inc
+%%WWWROOT%%/lib/status.inc
 %%WWWROOT%%/locale/de_DE/LC_MESSAGES/messages.mo
 %%WWWROOT%%/locale/de_DE/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
+%%WWWROOT%%/locale/ja_JP/LC_MESSAGES/messages.po
 %%WWWROOT%%/sess/.htaccess
 %%WWWROOT%%/style/layout.css
-%%WWWROOT%%/templates/lists/listgroups.php
-%%WWWROOT%%/templates/lists/listhosts.php
-%%WWWROOT%%/templates/lists/listusers.php
-%%WWWROOT%%/templates/lists/userlink.php
-%%WWWROOT%%/templates/lists/listdomains.php
-%%WWWROOT%%/templates/profedit/profilecreate.php
-%%WWWROOT%%/templates/profedit/profiledelete.php
-%%WWWROOT%%/templates/profedit/profilehost.php
-%%WWWROOT%%/templates/profedit/profilemain.php
-%%WWWROOT%%/templates/profedit/profileuser.php
-%%WWWROOT%%/templates/profedit/profilegroup.php
+%%WWWROOT%%/templates/account/groupedit.php
+%%WWWROOT%%/templates/account/hostedit.php
+%%WWWROOT%%/templates/account/useredit.php
 %%WWWROOT%%/templates/config/conflogin.php
 %%WWWROOT%%/templates/config/confmain.php
 %%WWWROOT%%/templates/config/confsave.php
 %%WWWROOT%%/templates/config/profmanage.php
+%%WWWROOT%%/templates/confwiz/final.php
+%%WWWROOT%%/templates/confwiz/ldaptest.php
+%%WWWROOT%%/templates/confwiz/o_daemon.php
+%%WWWROOT%%/templates/confwiz/o_lang.php
+%%WWWROOT%%/templates/confwiz/o_lists.php
+%%WWWROOT%%/templates/confwiz/o_ranges.php
+%%WWWROOT%%/templates/confwiz/optional.php
+%%WWWROOT%%/templates/confwiz/server.php
+%%WWWROOT%%/templates/confwiz/server2.php
+%%WWWROOT%%/templates/confwiz/start.php
+%%WWWROOT%%/templates/delete.php
+%%WWWROOT%%/templates/domain.php
+%%WWWROOT%%/templates/help.php
+%%WWWROOT%%/templates/initsuff.php
+%%WWWROOT%%/templates/lists/listdomains.php
+%%WWWROOT%%/templates/lists/listgroups.php
+%%WWWROOT%%/templates/lists/listhosts.php
+%%WWWROOT%%/templates/lists/listusers.php
+%%WWWROOT%%/templates/lists/userlink.php
 %%WWWROOT%%/templates/login.php
 %%WWWROOT%%/templates/logout.php
 %%WWWROOT%%/templates/main.php
 %%WWWROOT%%/templates/main_header.php
-%%WWWROOT%%/templates/ou_edit.php
-%%WWWROOT%%/templates/massdetail.php
-%%WWWROOT%%/templates/domain.php
-%%WWWROOT%%/templates/initsuff.php
 %%WWWROOT%%/templates/masscreate.php
-%%WWWROOT%%/templates/delete.php
-%%WWWROOT%%/templates/help.php
-%%WWWROOT%%/templates/account/hostedit.php
-%%WWWROOT%%/templates/account/hostedit.php.new 
-%%WWWROOT%%/templates/account/groupedit.php
-%%WWWROOT%%/templates/account/groupedit.php.new
-%%WWWROOT%%/templates/account/useredit.php
-%%WWWROOT%%/templates/account/useredit.php.new
+%%WWWROOT%%/templates/massdetail.php
+%%WWWROOT%%/templates/ou_edit.php
+%%WWWROOT%%/templates/profedit/profilecreate.php
+%%WWWROOT%%/templates/profedit/profiledelete.php
+%%WWWROOT%%/templates/profedit/profilegroup.php
+%%WWWROOT%%/templates/profedit/profilehost.php
+%%WWWROOT%%/templates/profedit/profilemain.php
+%%WWWROOT%%/templates/profedit/profileuser.php
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/README.fpdf
+%%PORTDOCS%%%%DOCSDIR%%/README.hosts
 %%PORTDOCS%%%%DOCSDIR%%/README.lamdaemon.pl
 %%PORTDOCS%%%%DOCSDIR%%/README.openldap
-%%PORTDOCS%%%%DOCSDIR%%/README.shells
-%%PORTDOCS%%%%DOCSDIR%%/README.hosts
 %%PORTDOCS%%%%DOCSDIR%%/README.security
+%%PORTDOCS%%%%DOCSDIR%%/README.shells
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%WWWROOT%%/config/pdf
+@dirrm %%WWWROOT%%/config/profiles/groups
+@dirrm %%WWWROOT%%/config/profiles/hosts
+@dirrm %%WWWROOT%%/config/profiles/users
+@dirrm %%WWWROOT%%/config/profiles
 @dirrm %%WWWROOT%%/graphics
+@dirrm %%WWWROOT%%/config
 @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
+@dirrm %%WWWROOT%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%WWWROOT%%/locale/hu_HU
+@dirrm %%WWWROOT%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%WWWROOT%%/locale/ja_JP
 @dirrm %%WWWROOT%%/locale
+@dirrm %%WWWROOT%%/sess
 @dirrm %%WWWROOT%%/style
 @dirrm %%WWWROOT%%/templates/account
+@dirrm %%WWWROOT%%/templates/config
+@dirrm %%WWWROOT%%/templates/confwiz
 @dirrm %%WWWROOT%%/templates/lists
 @dirrm %%WWWROOT%%/templates/profedit
-@dirrm %%WWWROOT%%/templates/config
 @dirrm %%WWWROOT%%/templates
-@unexec rmdir %D/%%WWWROOT%%/config/profiles/groups 2>/dev/null || true
-@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
-@unexec rmdir %D/%%WWWROOT%% 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf %D/%%WWWROOT%%`` to remove any files left." | fmt
+@dirrm %%WWWROOT%%/tmp
+@dirrm %%WWWROOT%%