Upgrade to 4.0.3.

Changelog available at:
<http://cvs.horde.org/diff.php/imp/docs/CHANGES?r1=1.699.2.30&r2=1.699.2.62&ty=h>.

9 files changed, 18 insertions, 57 deletions

diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 5037567e8de5..62de9a6325a7 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.0.2
-PORTREVISION=	1
+PORTVERSION=	4.0.3
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
@@ -118,8 +117,10 @@ LIMPDIR=	${LHORDEDIR}/imp
 PEARDIR?=	${LOCALBASE}/share/pear
 
 PLIST_SUB=	IMPDIR=${LIMPDIR}
+SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
 IMPDIR=		${PREFIX}/${LIMPDIR}
 CONFDIR=	${IMPDIR}/config
@@ -202,7 +203,7 @@ pre-configure:
 .for fc in ${PATCH2RM}
 	@${RM} ${WRKSRC}/config/${fc}
 .endfor
-	@${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP ${WRKSRC}/lib/IMP.php.orig
+	@${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP
 
 pre-install:
 .if !defined(BATCH) && !defined(WITHOUT_SSL)
@@ -238,9 +239,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%IMPDIR%%:${IMPDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;"	\
-		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo
index b604a6d9900f..f02a82afb2d8 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde-imp/distinfo
@@ -1,2 +1,2 @@
-MD5 (imp-h3-4.0.2.tar.gz) = a676aa84a9722b4107f557a124cb48a6
-SIZE (imp-h3-4.0.2.tar.gz) = 2960421
+MD5 (imp-h3-4.0.3.tar.gz) = 42e7232663f65c2edf5e5bb8c85e84f9
+SIZE (imp-h3-4.0.3.tar.gz) = 3060914
diff --git a/mail/horde-imp/files/patch-bug1367 b/mail/horde-imp/files/patch-bug1367
deleted file mode 100644
index 83db997b1782..000000000000
--- a/mail/horde-imp/files/patch-bug1367
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/IMP.php.orig	Wed Jan 26 10:23:02 2005
-+++ lib/IMP.php	Mon Feb 14 21:14:11 2005
-@@ -582,7 +582,7 @@
- 
-         /* Add the list of mailboxes to the lists. */
-         $showmbox = false;
--        if (is_null($filter[0])) {
-+        if (count($filter) && is_null($filter[0])) {
-             $showmbox = true;
-             array_shift($filter);
-         }
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 5037567e8de5..62de9a6325a7 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.0.2
-PORTREVISION=	1
+PORTVERSION=	4.0.3
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
@@ -118,8 +117,10 @@ LIMPDIR=	${LHORDEDIR}/imp
 PEARDIR?=	${LOCALBASE}/share/pear
 
 PLIST_SUB=	IMPDIR=${LIMPDIR}
+SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
 IMPDIR=		${PREFIX}/${LIMPDIR}
 CONFDIR=	${IMPDIR}/config
@@ -202,7 +203,7 @@ pre-configure:
 .for fc in ${PATCH2RM}
 	@${RM} ${WRKSRC}/config/${fc}
 .endfor
-	@${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP ${WRKSRC}/lib/IMP.php.orig
+	@${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP
 
 pre-install:
 .if !defined(BATCH) && !defined(WITHOUT_SSL)
@@ -238,9 +239,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%IMPDIR%%:${IMPDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;"	\
-		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index b604a6d9900f..f02a82afb2d8 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-imp/distinfo
@@ -1,2 +1,2 @@
-MD5 (imp-h3-4.0.2.tar.gz) = a676aa84a9722b4107f557a124cb48a6
-SIZE (imp-h3-4.0.2.tar.gz) = 2960421
+MD5 (imp-h3-4.0.3.tar.gz) = 42e7232663f65c2edf5e5bb8c85e84f9
+SIZE (imp-h3-4.0.3.tar.gz) = 3060914
diff --git a/mail/horde4-imp/files/patch-bug1367 b/mail/horde4-imp/files/patch-bug1367
deleted file mode 100644
index 83db997b1782..000000000000
--- a/mail/horde4-imp/files/patch-bug1367
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/IMP.php.orig	Wed Jan 26 10:23:02 2005
-+++ lib/IMP.php	Mon Feb 14 21:14:11 2005
-@@ -582,7 +582,7 @@
- 
-         /* Add the list of mailboxes to the lists. */
-         $showmbox = false;
--        if (is_null($filter[0])) {
-+        if (count($filter) && is_null($filter[0])) {
-             $showmbox = true;
-             array_shift($filter);
-         }
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 5037567e8de5..62de9a6325a7 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.0.2
-PORTREVISION=	1
+PORTVERSION=	4.0.3
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
@@ -118,8 +117,10 @@ LIMPDIR=	${LHORDEDIR}/imp
 PEARDIR?=	${LOCALBASE}/share/pear
 
 PLIST_SUB=	IMPDIR=${LIMPDIR}
+SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 
 IMPDIR=		${PREFIX}/${LIMPDIR}
 CONFDIR=	${IMPDIR}/config
@@ -202,7 +203,7 @@ pre-configure:
 .for fc in ${PATCH2RM}
 	@${RM} ${WRKSRC}/config/${fc}
 .endfor
-	@${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP ${WRKSRC}/lib/IMP.php.orig
+	@${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP
 
 pre-install:
 .if !defined(BATCH) && !defined(WITHOUT_SSL)
@@ -238,9 +239,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%IMPDIR%%:${IMPDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;"	\
-		-e "s:%%CONFDIR%%:${CONFDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index b604a6d9900f..f02a82afb2d8 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,2 +1,2 @@
-MD5 (imp-h3-4.0.2.tar.gz) = a676aa84a9722b4107f557a124cb48a6
-SIZE (imp-h3-4.0.2.tar.gz) = 2960421
+MD5 (imp-h3-4.0.3.tar.gz) = 42e7232663f65c2edf5e5bb8c85e84f9
+SIZE (imp-h3-4.0.3.tar.gz) = 3060914
diff --git a/mail/imp/files/patch-bug1367 b/mail/imp/files/patch-bug1367
deleted file mode 100644
index 83db997b1782..000000000000
--- a/mail/imp/files/patch-bug1367
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/IMP.php.orig	Wed Jan 26 10:23:02 2005
-+++ lib/IMP.php	Mon Feb 14 21:14:11 2005
-@@ -582,7 +582,7 @@
- 
-         /* Add the list of mailboxes to the lists. */
-         $showmbox = false;
--        if (is_null($filter[0])) {
-+        if (count($filter) && is_null($filter[0])) {
-             $showmbox = true;
-             array_shift($filter);
-         }