- Update to 2.2

PR:		115083
Submitted by:	Thomas Abthorpe <thomas@goodking.ca> (maintainer)

4 files changed, 61 insertions, 48 deletions

diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index 72b3d7dd99ba..29cf7d885961 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	change_ldappass
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
 PKGNAMEPREFIX=	squirrelmail-
diff --git a/mail/squirrelmail-change_ldappass-plugin/distinfo b/mail/squirrelmail-change_ldappass-plugin/distinfo
index 2ea9f18fbd4f..30caf15e231a 100644
--- a/mail/squirrelmail-change_ldappass-plugin/distinfo
+++ b/mail/squirrelmail-change_ldappass-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/change_ldappass-2.1-1.4.0.tar.gz) = 56ea1d51f4381e423f72639f40665599
-SHA256 (squirrelmail/change_ldappass-2.1-1.4.0.tar.gz) = 6a47368d14093b4c5f7864515d525337dd0d8cfef8783db4a92fdb7115adbe91
-SIZE (squirrelmail/change_ldappass-2.1-1.4.0.tar.gz) = 31388
+MD5 (squirrelmail/change_ldappass-2.2-1.4.0.tar.gz) = 1e2eb4da90297e451447e08b05853695
+SHA256 (squirrelmail/change_ldappass-2.2-1.4.0.tar.gz) = efe26ddfb2689fa7914b25581606e68c91e5795a4838bd2c27f89172a48ac974
+SIZE (squirrelmail/change_ldappass-2.2-1.4.0.tar.gz) = 54534
diff --git a/mail/squirrelmail-change_ldappass-plugin/files/pkg-message.in b/mail/squirrelmail-change_ldappass-plugin/files/pkg-message.in
index f163e72fe7ab..9806275ff224 100644
--- a/mail/squirrelmail-change_ldappass-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-change_ldappass-plugin/files/pkg-message.in
@@ -1,5 +1,5 @@
 For the port to work properly you must copy the file 
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/change_ldappass/config.php.sample
+%%PREFIX%%/%%SQUIRRELDIR%%/plugins/change_ldappass/config_sample.php
 to
 %%PREFIX%%/%%SQUIRRELDIR%%/plugins/change_ldappass/config.php
 and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-change_ldappass-plugin/pkg-plist b/mail/squirrelmail-change_ldappass-plugin/pkg-plist
index 5d54177fc061..6eabdbb69b42 100644
--- a/mail/squirrelmail-change_ldappass-plugin/pkg-plist
+++ b/mail/squirrelmail-change_ldappass-plugin/pkg-plist
@@ -1,60 +1,74 @@
 @unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr_FR/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr_FR/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pt_BR/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pt_BR/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/no_NO/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/no_NO/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/de_DE/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/mkntpwd/md4.c
+%%SQUIRRELDIR%%/plugins/change_ldappass/mkntpwd/smbdes.c
+%%SQUIRRELDIR%%/plugins/change_ldappass/mkntpwd/mkntpwd.h
+%%SQUIRRELDIR%%/plugins/change_ldappass/mkntpwd/mkntpwd.c
+%%SQUIRRELDIR%%/plugins/change_ldappass/mkntpwd/getopt.h
+%%SQUIRRELDIR%%/plugins/change_ldappass/mkntpwd/Makefile
+%%SQUIRRELDIR%%/plugins/change_ldappass/mkntpwd/getopt.c
+%%SQUIRRELDIR%%/plugins/change_ldappass/load_config.php
+%%SQUIRRELDIR%%/plugins/change_ldappass/change_ldappass.pot
+%%SQUIRRELDIR%%/plugins/change_ldappass/ReleaseNotes.txt
+%%SQUIRRELDIR%%/plugins/change_ldappass/functions.php
+%%SQUIRRELDIR%%/plugins/change_ldappass/COPYING
+%%SQUIRRELDIR%%/plugins/change_ldappass/options.php
+%%SQUIRRELDIR%%/plugins/change_ldappass/.cvsignore
 %%SQUIRRELDIR%%/plugins/change_ldappass/locale/de_DE/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/de_DE/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL/LC_MESSAGES/change_ldappass.po
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr_FR/LC_MESSAGES/change_ldappass.po
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr_FR/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/nn_NO/LC_MESSAGES/change_ldappass.po
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/nn_NO/LC_MESSAGES/change_ldappass.mo
 %%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR/LC_MESSAGES/change_ldappass.mo
 %%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/es_ES/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/es_ES/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/nn_NO/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/nn_NO/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/sv_SE/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ/LC_MESSAGES/change_ldappass.mo
 %%SQUIRRELDIR%%/plugins/change_ldappass/locale/sv_SE/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/.cvsignore
-%%SQUIRRELDIR%%/plugins/change_ldappass/change_ldappass.pot
-%%SQUIRRELDIR%%/plugins/change_ldappass/config.php.sample
-%%SQUIRRELDIR%%/plugins/change_ldappass/COPYING
-%%SQUIRRELDIR%%/plugins/change_ldappass/functions.php
-%%SQUIRRELDIR%%/plugins/change_ldappass/index.php
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/sv_SE/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/no_NO/LC_MESSAGES/change_ldappass.po
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/no_NO/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pt_BR/LC_MESSAGES/change_ldappass.po
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pt_BR/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT/LC_MESSAGES/change_ldappass.po
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/es_ES/LC_MESSAGES/change_ldappass.po
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/es_ES/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/nl_NL/LC_MESSAGES/change_ldappass.po
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/nl_NL/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/config_sample.php
 %%SQUIRRELDIR%%/plugins/change_ldappass/INSTALL
-%%SQUIRRELDIR%%/plugins/change_ldappass/options.php
+%%SQUIRRELDIR%%/plugins/change_ldappass/index.php
 %%SQUIRRELDIR%%/plugins/change_ldappass/README
-%%SQUIRRELDIR%%/plugins/change_ldappass/setup.php
 %%SQUIRRELDIR%%/plugins/change_ldappass/version
+%%SQUIRRELDIR%%/plugins/change_ldappass/setup.php
 %%SQUIRRELDIR%%/plugins/change_ldappass/xgetpot
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ/LC_MESSAGES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/mkntpwd
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/de_DE/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/es_ES/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr_FR/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/nn_NO/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/no_NO/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pt_BR/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/sv_SE/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/de_DE
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/es_ES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL/LC_MESSAGES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr_FR/LC_MESSAGES
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr_FR
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/nn_NO/LC_MESSAGES
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/nn_NO
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR/LC_MESSAGES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ/LC_MESSAGES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/sv_SE/LC_MESSAGES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/sv_SE
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/no_NO/LC_MESSAGES
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/no_NO
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pt_BR/LC_MESSAGES
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pt_BR
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/sv_SE
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT/LC_MESSAGES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/es_ES/LC_MESSAGES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/es_ES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/nl_NL/LC_MESSAGES
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/nl_NL
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi