1 files changed, 18 insertions, 19 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}