- Update horde ports to latest versions:

- imp to 4.1.4
- mimp to 1.0.1
- turba to 2.1.4
- ingo to 1.1.3
- nag to 2.1.3
- minor tweaks

PR:		ports/110783, ports/110785, ports/110786, ports/110787,
		ports/110792
Submitted by:	Beech Rintoul <beech@alaskaparadise.com> (maintainer)

3 files changed, 20 insertions, 32 deletions

diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index d0f90441684d..a75f3f6b2e6e 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.1.3
-PORTREVISION=	2
+PORTVERSION=	4.1.4
+DISTVERSIONPREFIX=	h3-
 CATEGORIES=	mail www
 MASTER_SITES=	HORDE
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	beech@alaskaparadise.com
-COMMENT=	A webmail system which accesses mail over IMAP
+COMMENT=	Webmail system for IMAP/POP3 mailboxes
 
 #-----------------------------------------------------------------------
 # You may define these options:
@@ -103,8 +102,8 @@ USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_GETTEXT=	yes
 REINPLACE_ARGS=	-i.beforeIMP
 
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES  docs/TODO  docs/UPGRADING
+PORTDOCS=	README CHANGES CREDITS INSTALL	\
+		RELEASE_NOTES  TODO  UPGRADING
 CONFFILE=	filter.txt header.php menu.php mime_drivers.php motd.php \
 		prefs.php servers.php trailer.txt
 SUB_DIRS=	config js lib locale po scripts templates themes
@@ -166,6 +165,9 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 
+post-extract:
+	@${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
 pre-configure:
 	@${REINPLACE_CMD} -e "s:/usr/local:${LOCALBASE}:" ${WRKSRC}/config/conf.xml
 .if !defined(WITHOUT_ASPELL)
@@ -217,21 +219,16 @@ pre-install:
 .endif
 
 do-install:
-	@${MKDIR}  ${IMPDIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${IMPDIR}
-
-	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
+	@${INSTALL} -d ${IMPDIR}/
+	@${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${IMPDIR}/
+	@${CP} -p ${WRKSRC}/*.php ${IMPDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+	@${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}/
+	@${CHMOD} -R o-rwx ${CONFDIR}/
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
+	@${INSTALL} -d ${DOCSDIR}/
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index 4bd6831618db..e54ec912d6f3 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.1.3.tar.gz) = 91fb63a44805bdff178c39c9bd1c73c5
-SHA256 (imp-h3-4.1.3.tar.gz) = e1c9f9230243dc4bde7fc6c4f6279c24ba354b26f8a10ffe4aa771817ce784dc
-SIZE (imp-h3-4.1.3.tar.gz) = 4178089
+MD5 (imp-h3-4.1.4.tar.gz) = dd2fd1c5a2a4b9fae75dd1bc5751f25d
+SHA256 (imp-h3-4.1.4.tar.gz) = 8d06d87dbf681d74280b14f79dac9d09aa7fdba0f98d4895148bff6059fddd1a
+SIZE (imp-h3-4.1.4.tar.gz) = 4204260
diff --git a/mail/imp/pkg-plist b/mail/imp/pkg-plist
index c1d38b517ffa..7ad86f23f91d 100644
--- a/mail/imp/pkg-plist
+++ b/mail/imp/pkg-plist
@@ -1,11 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%IMPDIR%%/acl.php
 %%IMPDIR%%/attachment.php
 %%IMPDIR%%/compose.php
@@ -359,7 +351,6 @@
 %%IMPDIR%%/themes/sun/screen.css
 %%IMPDIR%%/thread.php
 %%IMPDIR%%/view.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%HORDE_INC%%httpd-imp.conf
 @dirrm %%IMPDIR%%/themes/sun
 @dirrm %%IMPDIR%%/themes/simplex