3 files changed, 48 insertions, 34 deletions

diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index a5f46f8f82e4..b9b14100ac61 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -5,17 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		1.8
+PORTVERSION=		2.0
 CATEGORIES=		mail www
 MASTER_SITES=		http://www.squirrelmail.org/plugins/
-DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
+DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0
 DIST_SUBDIR=		squirrelmail
 
 MAINTAINER=		alexander@wittig.name
 COMMENT=		Allows users to change their passwords stored in LDAP Tree
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-			${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
 
 SQUIRREL_PLUGIN_NAME=	change_ldappass
 
@@ -41,6 +40,7 @@ NO_WRKSUBDIR=		yes
 USE_PERL5_BUILD=	yes
 USE_PHP=		ldap
 WANT_PHP_WEB=		yes
+USE_GETTEXT=		yes
 
 pre-everything::
 	@${ECHO} ""
@@ -57,7 +57,6 @@ pre-everything::
 
 do-install:
 	${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME}
 
 post-install:
 .ifndef WITHOUT_ACTIVATE
diff --git a/mail/squirrelmail-change_ldappass-plugin/distinfo b/mail/squirrelmail-change_ldappass-plugin/distinfo
index 8d2f7f0b0b01..d4ca926eb2b1 100644
--- a/mail/squirrelmail-change_ldappass-plugin/distinfo
+++ b/mail/squirrelmail-change_ldappass-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/change_ldappass-1.8.tar.gz) = 63970d47d3d9a20c8732a76a673e012f
-SHA256 (squirrelmail/change_ldappass-1.8.tar.gz) = 975874a242a3c223ef3233a9395818e7b6e771d8c46edc15b131dc49b564fe7b
-SIZE (squirrelmail/change_ldappass-1.8.tar.gz) = 17275
+MD5 (squirrelmail/change_ldappass-2.0-1.4.0.tar.gz) = 336c266b5194c3cb274a9c37b62ee335
+SHA256 (squirrelmail/change_ldappass-2.0-1.4.0.tar.gz) = 5aeb7a7cc5839b87c17318da078ba4b77a2cf0d0ae9db0ca5149b21239cb1ddf
+SIZE (squirrelmail/change_ldappass-2.0-1.4.0.tar.gz) = 31234
diff --git a/mail/squirrelmail-change_ldappass-plugin/pkg-plist b/mail/squirrelmail-change_ldappass-plugin/pkg-plist
index 222197d619f5..5c5080e790c7 100644
--- a/mail/squirrelmail-change_ldappass-plugin/pkg-plist
+++ b/mail/squirrelmail-change_ldappass-plugin/pkg-plist
@@ -1,45 +1,60 @@
 @unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin change_ldappass; 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/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl/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/PL_pl/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/PL_pl/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/de/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr/LC_MESSAGES/change_ldappass.mo
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/es/LC_MESSAGES/change_ldappass.mo
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/de_DE/LC_MESSAGES/change_ldappass.mo
+%%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/el_GR/LC_MESSAGES/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/locale/change_ldappass.po
-%%SQUIRRELDIR%%/plugins/change_ldappass/README
+%%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ/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/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/version
-%%SQUIRRELDIR%%/plugins/change_ldappass/setup.php
+%%SQUIRRELDIR%%/plugins/change_ldappass/COPYING
+%%SQUIRRELDIR%%/plugins/change_ldappass/functions.php
+%%SQUIRRELDIR%%/plugins/change_ldappass/index.php
 %%SQUIRRELDIR%%/plugins/change_ldappass/INSTALL
 %%SQUIRRELDIR%%/plugins/change_ldappass/options.php
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/de/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/PL_pl/LC_MESSAGES
+%%SQUIRRELDIR%%/plugins/change_ldappass/README
+%%SQUIRRELDIR%%/plugins/change_ldappass/setup.php
+%%SQUIRRELDIR%%/plugins/change_ldappass/version
+%%SQUIRRELDIR%%/plugins/change_ldappass/xgetpot
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/cs_CZ/LC_MESSAGES
+@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/fr_FR/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/es/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl/LC_MESSAGES
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/de
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/es
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/PL_pl
+@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/fr_FR
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/lt_LT
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/nn_NO
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/no_NO
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl_PL
 @dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pt_BR
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/pl
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/fr_FR
-@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/el_GR
+@dirrm %%SQUIRRELDIR%%/plugins/change_ldappass/locale/sv_SE
 @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 change_ldappass; fi