Upgrade to 3.0, now compatible with Horde 3.

5 files changed, 91 insertions, 94 deletions

diff --git a/www/horde-passwd/Makefile b/www/horde-passwd/Makefile
index f47ff726877b..874f9c154bc7 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde-passwd/Makefile
@@ -6,31 +6,36 @@
 #
 
 PORTNAME=	horde-passwd
-PORTVERSION=	2.2.1
+PORTVERSION=	3.0
 CATEGORIES=	www mail
 MASTER_SITES=	ftp://ftp.horde.org/pub/passwd/				\
+		ftp://ftp.planetmirror.com/pub/horde/passwd/		\
 		ftp://ftp.au.horde.org/pub/horde/passwd/		\
+		ftp://ftp.be.horde.org/passwd/				\
 		ftp://ftp.es.horde.org/pub/passwd/			\
 		ftp://ftp.it.horde.org/pub/mirror/horde.org/passwd/	\
 		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/passwd/	\
-		ftp://ftp.pt.horde.org/pub/horde-ftp/passwd/
-DISTNAME=	passwd-${PORTVERSION}
+		http://ftp.horde.org/pub/passwd/			\
+		ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/passwd/
+DISTNAME=	passwd-h3-${PORTVERSION}
 DIST_SUBDIR=	horde
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A password changing module for Horde
 
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde
+RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
-USE_REINPLACE=	yes
 
-REINPLACE_ARGS=	-i.beforePWD
+PLIST_SUB=	LPWDDIR=${LPWDDIR} PWDDIR=${PWDDIR}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	PWDDIR=${PWDDIR} CONFDIR=${CONFDIR} HORDEDIR=${HORDEDIR}
 
 DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES
-SUB_DIRS=	config graphics lib locale po scripts templates
-CONFFILE=	conf.php backends.php
+		docs/RELEASE_NOTES docs/TODO
+SUB_DIRS=	config lib locale po scripts templates themes
+CONFFILE=	backends.php
 
 LHORDEDIR?=	www/horde
 LPWDDIR?=	${LHORDEDIR}/passwd
@@ -38,12 +43,12 @@ LPWDDIR?=	${LHORDEDIR}/passwd
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 PWDDIR=		${PREFIX}/${LPWDDIR}
 CONFDIR=	${PWDDIR}/config
-HCONFDIR=	${HORDEDIR}/config
 
-PLIST_SUB=	LPWDDIR=${LPWDDIR} PWDDIR=${PWDDIR}
-PKGMESSAGE=	${WRKDIR}/pkg-message
+HORDE_INC=	${LOCALBASE}/etc/horde
 
-HORDE_INC=	${PREFIX}/etc/horde
+pre-configure:
+	@${SED} -e "s:/home/httpd/html/horde/passwd:${PWDDIR}:g"	\
+		${FILESDIR}/httpd.conf.pwd > ${WRKDIR}/httpd.conf.pwd
 
 do-install:
 	@${MKDIR}  ${PWDDIR}
@@ -59,9 +64,6 @@ do-install:
 	@${CHOWN} -R www:www ${PWDDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
 	@${CP} -p ${FILESDIR}/httpd.conf.pwd ${HORDE_INC}/httpd.conf.pwd
-	@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/passwd:${PWDDIR}:g"	\
-		${HORDE_INC}/httpd.conf.pwd
-	@${RM} ${HORDE_INC}/httpd.conf.pwd.beforePWD
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -72,9 +74,6 @@ do-install:
 
 post-install:
 	@${ECHO_MSG}
-	@${SED} -e "s:%%PWDDIR%%:${PWDDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;"	\
-		-e "s:%%HCONFDIR%%:${HCONFDIR}:g" ${FILESDIR}/pkg-message.in	\
-		> ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
diff --git a/www/horde-passwd/distinfo b/www/horde-passwd/distinfo
index 5b13f5d7b3df..fd5b565ace33 100644
--- a/www/horde-passwd/distinfo
+++ b/www/horde-passwd/distinfo
@@ -1,2 +1,2 @@
-MD5 (horde/passwd-2.2.1.tar.gz) = 8b17c4d1a9c75ebd0200075fd32f76bf
-SIZE (horde/passwd-2.2.1.tar.gz) = 226874
+MD5 (horde/passwd-h3-3.0.tar.gz) = ca5612500c91c4ef3c838e8e94376332
+SIZE (horde/passwd-h3-3.0.tar.gz) = 966096
diff --git a/www/horde-passwd/files/pkg-message.in b/www/horde-passwd/files/pkg-message.in
index edec2aef9ac5..2fd4be7eb1ad 100644
--- a/www/horde-passwd/files/pkg-message.in
+++ b/www/horde-passwd/files/pkg-message.in
@@ -1,33 +1,20 @@
 ************************************************************************
-horde-passwd has been installed in %%PWDDIR%% with your blank
-configuration files.
+horde-passwd has been installed in %%PWDDIR%%
+with your blank configuration files.
 
-horde-passwd requires a password changing mechanism.  Probably the
-easier one is the port mail/poppassd.  Choose one and change the
-configuration files conf.php and backend.php, located in
-%%CONFDIR%%/
+Horde must be configured; if not, see `pkg_info -D -x horde'.
 
-To enable horde-passwd at your horde installation, add the following
-lines to your horde registry file, at
-%%HCONFDIR%%/registry.php
+horde-passwd requires a password changing mechanism. Probably the easier
+one is the port mail/poppassd, but it uses clear text password
+transmissions! Choose one and change the configuration file backends.php
+located in %%CONFDIR%%/
 
-----8<--------8<--------8<--------8<--------8<--------8<--------8<----
-$this->applications['passwd'] = array(
-    'fileroot' => dirname(__FILE__) . '/../passwd',
-    'webroot' => $this->applications['horde']['webroot'] . '/passwd',
-    'icon' => $this->applications['horde']['webroot'] . '/passwd/graphics/lock.gif',
-    'name' => _("Password"),
-    'allow_guests' => false,
-    'show' => true,
-    'status' => 'active'
-);
-----8<--------8<--------8<--------8<--------8<--------8<--------8<----
+To enable horde-passwd at your Horde installation, replace its status
+from 'inactive' to 'active' in the Horde registry file, at
+%%HORDEDIR%%/config/registry.php
 
-To integrate horde-passwd and IMP, edit the file
-horde/imp/config/conf.php and include 'passwd' in the list of menu
-apps, for example, it might look like the following:
-
-$conf['menu']['apps'] = array('turba','passwd');
+Finally, you must login to Horde as a Horde Administrator to finish the
+configuration.
 
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/www/horde-passwd/pkg-descr b/www/horde-passwd/pkg-descr
index 9de57e8768ac..878a0f3613ea 100644
--- a/www/horde-passwd/pkg-descr
+++ b/www/horde-passwd/pkg-descr
@@ -1,10 +1,7 @@
-Passwd is the Horde password changing application. While it has been
-released and is in production use at many sites, it is also under
-heavy development in an effort to expand and improve the module.
+Passwd is the Horde password changing application.
 
-Right now, Passwd provides fairly complete support for changing
-passwords via poppassd, ldap, unix expect scripts, the unix smbpasswd
-command for smb/cifs password support, servuftp, vmailmgr, vpopmail,
-and sql passwords.
+Right now, Passwd provides fairly complete support for changing passwords via
+Poppassd, LDAP, Unix expect scripts, the Unix smbpasswd command for SMB/CIFS
+passwords, Kolab, ADSI, Pine, Serv-U FTP, VMailMgr, vpopmail, and SQL passwords.
 
 WWW: http://www.horde.org/passwd/
diff --git a/www/horde-passwd/pkg-plist b/www/horde-passwd/pkg-plist
index 52805c9ba4ca..cfc3e65733b2 100644
--- a/www/horde-passwd/pkg-plist
+++ b/www/horde-passwd/pkg-plist
@@ -1,65 +1,80 @@
 @unexec /usr/bin/cmp %%PWDDIR%%/config/backends.php %%PWDDIR%%/config/backends.php.dist && /bin/rm -f %%PWDDIR%%/config/backends.php || ${TRUE}
-@unexec /usr/bin/cmp %%PWDDIR%%/config/conf.php %%PWDDIR%%/config/conf.php.dist && /bin/rm -f %%PWDDIR%%/config/conf.php || ${TRUE}
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%LPWDDIR%%/config/.htaccess
 %%LPWDDIR%%/config/backends.php.dist
-%%LPWDDIR%%/config/conf.php.dist
-%%LPWDDIR%%/graphics/lock.gif
-%%LPWDDIR%%/lib/Driver/vpopmail.php
+%%LPWDDIR%%/config/conf.xml
+%%LPWDDIR%%/index.php
+%%LPWDDIR%%/lib/.htaccess
+%%LPWDDIR%%/lib/Driver.php
+%%LPWDDIR%%/lib/Driver/adsi.php
+%%LPWDDIR%%/lib/Driver/composite.php
+%%LPWDDIR%%/lib/Driver/expect.php
+%%LPWDDIR%%/lib/Driver/kolab.php
 %%LPWDDIR%%/lib/Driver/ldap.php
+%%LPWDDIR%%/lib/Driver/pine.php
 %%LPWDDIR%%/lib/Driver/poppassd.php
+%%LPWDDIR%%/lib/Driver/procopen.php
+%%LPWDDIR%%/lib/Driver/pspasswd.php
 %%LPWDDIR%%/lib/Driver/servuftp.php
+%%LPWDDIR%%/lib/Driver/smbldap.php
 %%LPWDDIR%%/lib/Driver/smbpasswd.php
 %%LPWDDIR%%/lib/Driver/sql.php
 %%LPWDDIR%%/lib/Driver/vmailmgr.php
-%%LPWDDIR%%/lib/Driver/expect.php
-%%LPWDDIR%%/lib/.htaccess
-%%LPWDDIR%%/lib/Driver.php
+%%LPWDDIR%%/lib/Driver/vpopmail.php
 %%LPWDDIR%%/lib/Passwd.php
 %%LPWDDIR%%/lib/base.php
 %%LPWDDIR%%/lib/version.php
 %%LPWDDIR%%/locale/ar_SY/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/da_DK/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/gl_ES/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/id_ID/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/hu_HU/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/hu_HU/help.xml
-%%LPWDDIR%%/locale/lt_LT/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/ro_RO/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/zh_CN/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/nl_NL/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/nl_NL/help.xml
+%%LPWDDIR%%/locale/bg_BG/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/ca_ES/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/cs_CZ/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/da_DK/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/de_DE/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/de_DE/help.xml
 %%LPWDDIR%%/locale/en_US/help.xml
 %%LPWDDIR%%/locale/es_ES/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/et_EE/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/fa_IR/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/fa_IR/help.xml
 %%LPWDDIR%%/locale/fi_FI/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/fi_FI/help.xml
 %%LPWDDIR%%/locale/fr_FR/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/gl_ES/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/hu_HU/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/hu_HU/help.xml
+%%LPWDDIR%%/locale/id_ID/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/it_IT/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/bg_BG/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/lt_LT/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/nl_NL/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/nl_NL/help.xml
 %%LPWDDIR%%/locale/nn_NO/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/pl_PL/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/pt_BR/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/ro_RO/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/ru_RU/LC_MESSAGES/passwd.mo
-%%LPWDDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/ru_RU/help.xml
+%%LPWDDIR%%/locale/sk_SK/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/sv_SE/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/locale/zh_CN/LC_MESSAGES/passwd.mo
 %%LPWDDIR%%/locale/zh_TW/LC_MESSAGES/passwd.mo
+%%LPWDDIR%%/main.php
 %%LPWDDIR%%/po/.htaccess
-%%LPWDDIR%%/po/Makefile
 %%LPWDDIR%%/po/README
 %%LPWDDIR%%/po/ar_SY.po
 %%LPWDDIR%%/po/bg_BG.po
+%%LPWDDIR%%/po/ca_ES.po
 %%LPWDDIR%%/po/cs_CZ.po
 %%LPWDDIR%%/po/da_DK.po
 %%LPWDDIR%%/po/de_DE.po
 %%LPWDDIR%%/po/es_ES.po
-%%LPWDDIR%%/po/extract.pl
+%%LPWDDIR%%/po/et_EE.po
+%%LPWDDIR%%/po/fa_IR.po
 %%LPWDDIR%%/po/fi_FI.po
 %%LPWDDIR%%/po/fr_FR.po
 %%LPWDDIR%%/po/gl_ES.po
@@ -67,37 +82,31 @@
 %%LPWDDIR%%/po/id_ID.po
 %%LPWDDIR%%/po/it_IT.po
 %%LPWDDIR%%/po/lt_LT.po
-%%LPWDDIR%%/po/messages.po
 %%LPWDDIR%%/po/nl_NL.po
 %%LPWDDIR%%/po/nn_NO.po
 %%LPWDDIR%%/po/passwd.pot
 %%LPWDDIR%%/po/pl_PL.po
 %%LPWDDIR%%/po/pt_BR.po
 %%LPWDDIR%%/po/ro_RO.po
-%%LPWDDIR%%/po/ru_RU.KOI8-R.po
 %%LPWDDIR%%/po/ru_RU.po
-%%LPWDDIR%%/po/shtool
+%%LPWDDIR%%/po/sk_SK.po
 %%LPWDDIR%%/po/sv_SE.po
-%%LPWDDIR%%/po/xgettext.sh
 %%LPWDDIR%%/po/zh_CN.po
 %%LPWDDIR%%/po/zh_TW.po
+%%LPWDDIR%%/scripts/.htaccess
+%%LPWDDIR%%/scripts/kpasswd_expect
 %%LPWDDIR%%/scripts/passwd_expect
-%%LPWDDIR%%/templates/index/notconfigured.inc
-%%LPWDDIR%%/templates/main/javascript.inc
-%%LPWDDIR%%/templates/main/main.inc
-%%LPWDDIR%%/templates/menu/menu.inc
 %%LPWDDIR%%/templates/.htaccess
-%%LPWDDIR%%/templates/common-footer.inc
 %%LPWDDIR%%/templates/common-header.inc
-%%LPWDDIR%%/status.php
-%%LPWDDIR%%/menu.php
-%%LPWDDIR%%/main.php
-%%LPWDDIR%%/index.php
+%%LPWDDIR%%/templates/main/main.inc
+%%LPWDDIR%%/test.php
+%%LPWDDIR%%/themes/graphics/favicon.ico
+%%LPWDDIR%%/themes/graphics/passwd.png
 etc/horde/httpd.conf.pwd
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%LPWDDIR%%/templates/menu
+@dirrm %%LPWDDIR%%/themes/graphics
+@dirrm %%LPWDDIR%%/themes
 @dirrm %%LPWDDIR%%/templates/main
-@dirrm %%LPWDDIR%%/templates/index
 @dirrm %%LPWDDIR%%/templates
 @dirrm %%LPWDDIR%%/scripts
 @dirrm %%LPWDDIR%%/po
@@ -107,9 +116,9 @@ etc/horde/httpd.conf.pwd
 @dirrm %%LPWDDIR%%/locale/zh_CN
 @dirrm %%LPWDDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%LPWDDIR%%/locale/sv_SE
+@dirrm %%LPWDDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%LPWDDIR%%/locale/sk_SK
 @dirrm %%LPWDDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%LPWDDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES
-@dirrm %%LPWDDIR%%/locale/ru_RU.KOI8-R
 @dirrm %%LPWDDIR%%/locale/ru_RU
 @dirrm %%LPWDDIR%%/locale/ro_RO/LC_MESSAGES
 @dirrm %%LPWDDIR%%/locale/ro_RO
@@ -135,6 +144,10 @@ etc/horde/httpd.conf.pwd
 @dirrm %%LPWDDIR%%/locale/fr_FR
 @dirrm %%LPWDDIR%%/locale/fi_FI/LC_MESSAGES
 @dirrm %%LPWDDIR%%/locale/fi_FI
+@dirrm %%LPWDDIR%%/locale/fa_IR/LC_MESSAGES
+@dirrm %%LPWDDIR%%/locale/fa_IR
+@dirrm %%LPWDDIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%LPWDDIR%%/locale/et_EE
 @dirrm %%LPWDDIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%LPWDDIR%%/locale/es_ES
 @dirrm %%LPWDDIR%%/locale/en_US
@@ -144,6 +157,8 @@ etc/horde/httpd.conf.pwd
 @dirrm %%LPWDDIR%%/locale/da_DK
 @dirrm %%LPWDDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%LPWDDIR%%/locale/cs_CZ
+@dirrm %%LPWDDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%LPWDDIR%%/locale/ca_ES
 @dirrm %%LPWDDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%LPWDDIR%%/locale/bg_BG
 @dirrm %%LPWDDIR%%/locale/ar_SY/LC_MESSAGES
@@ -151,6 +166,5 @@ etc/horde/httpd.conf.pwd
 @dirrm %%LPWDDIR%%/locale
 @dirrm %%LPWDDIR%%/lib/Driver
 @dirrm %%LPWDDIR%%/lib
-@dirrm %%LPWDDIR%%/graphics
-@dirrm %%LPWDDIR%%/config
-@dirrm %%LPWDDIR%%
+@unexec rmdir %D/%%LPWDDIR%%/config 2>/dev/null || true
+@unexec rmdir %D/%%LPWDDIR%% 2>/dev/null || true