3 files changed, 22 insertions, 29 deletions

diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
index 08de62fda557..6c8f42c0c967 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde4-ingo/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ingo
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
+DISTVERSIONPREFIX=	h3-
 CATEGORIES=	mail www
 MASTER_SITES=	HORDE
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	beech@alaskaparadise.com
 COMMENT=	Horde's email-filter management application
@@ -34,8 +34,8 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
 SUB_LIST=	INGODIR=${INGODIR}
 
-DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES docs/TODO
+PORTDOCS=	README CHANGES CREDITS INSTALL	\
+		RELEASE_NOTES TODO
 CONFFILE=	backends.php fields.php prefs.php
 SUB_DIRS=	config lib locale po scripts templates themes js
 
@@ -61,25 +61,24 @@ HORDE_INC=	${LOCALBASE}/etc/horde
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
+post-extract:
+	@${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
 pre-configure:
 	@${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g"		\
 		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf
 
 do-install:
-	@${MKDIR}  ${INGODIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${INGODIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${INGODIR}
-
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
+	@${INSTALL} -d ${INGODIR}/
+	@${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${INGODIR}/
+	@${CP} -p ${WRKSRC}/*.php ${INGODIR}/
+	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+	@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}/
+	@${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/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo
index 79878571a5d7..0b01277d580e 100644
--- a/mail/horde4-ingo/distinfo
+++ b/mail/horde4-ingo/distinfo
@@ -1,3 +1,3 @@
-MD5 (ingo-h3-1.1.2.tar.gz) = dc9dbfe52df5b922ec852b1267df5130
-SHA256 (ingo-h3-1.1.2.tar.gz) = 94a6514ade16eb527885ccc9e0f92c653795383efb51aca1a8186a9d53866390
-SIZE (ingo-h3-1.1.2.tar.gz) = 1342239
+MD5 (ingo-h3-1.1.3.tar.gz) = 0cd5325966cc29928f80910b8ad93bec
+SHA256 (ingo-h3-1.1.3.tar.gz) = d4a5db3b7a1340be0f18f10df8affc8631cf5345a49862bf89c3a1d20769a846
+SIZE (ingo-h3-1.1.3.tar.gz) = 1356658
diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist
index 2ccdadb02414..9827aa60883b 100644
--- a/mail/horde4-ingo/pkg-plist
+++ b/mail/horde4-ingo/pkg-plist
@@ -1,11 +1,3 @@
-%%HORDE_INC%%/httpd-ingo.conf
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%INGODIR%%/blacklist.php
 %%INGODIR%%/config/.htaccess
 %%INGODIR%%/config/backends.php.dist
@@ -36,6 +28,7 @@
 %%INGODIR%%/lib/base.php
 %%INGODIR%%/lib/version.php
 %%INGODIR%%/locale/ca_ES/LC_MESSAGES/ingo.mo
+%%INGODIR%%/locale/ca_ES/help.xml
 %%INGODIR%%/locale/cs_CZ/LC_MESSAGES/ingo.mo
 %%INGODIR%%/locale/da_DK/LC_MESSAGES/ingo.mo
 %%INGODIR%%/locale/de_DE/LC_MESSAGES/ingo.mo
@@ -48,6 +41,7 @@
 %%INGODIR%%/locale/fi_FI/LC_MESSAGES/ingo.mo
 %%INGODIR%%/locale/fi_FI/help.xml
 %%INGODIR%%/locale/fr_FR/LC_MESSAGES/ingo.mo
+%%INGODIR%%/locale/fr_FR/help.xml
 %%INGODIR%%/locale/hu_HU/LC_MESSAGES/ingo.mo
 %%INGODIR%%/locale/it_IT/LC_MESSAGES/ingo.mo
 %%INGODIR%%/locale/ko_KR/LC_MESSAGES/ingo.mo
@@ -127,7 +121,7 @@
 %%INGODIR%%/themes/screen.css
 %%INGODIR%%/vacation.php
 %%INGODIR%%/whitelist.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%HORDE_INC%%/httpd-ingo.conf
 @dirrm %%INGODIR%%/themes/graphics
 @dirrm %%INGODIR%%/themes
 @dirrm %%INGODIR%%/templates/whitelist