aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorsat <sat@FreeBSD.org>2007-03-25 20:41:30 +0800
committersat <sat@FreeBSD.org>2007-03-25 20:41:30 +0800
commit4de5e31fd0ec86ae236fc53b8f61b649851751f7 (patch)
tree5387e99eb9d904f3dd03b7b1cb8afae1af3040f6 /mail
parenta88c5d29d42d2d2647b9b966472edb7f25f76808 (diff)
downloadfreebsd-ports-gnome-4de5e31fd0ec86ae236fc53b8f61b649851751f7.tar.gz
freebsd-ports-gnome-4de5e31fd0ec86ae236fc53b8f61b649851751f7.tar.zst
freebsd-ports-gnome-4de5e31fd0ec86ae236fc53b8f61b649851751f7.zip
- 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)
Diffstat (limited to 'mail')
-rw-r--r--mail/horde-imp/Makefile37
-rw-r--r--mail/horde-imp/distinfo6
-rw-r--r--mail/horde-imp/pkg-plist9
-rw-r--r--mail/horde-ingo/Makefile33
-rw-r--r--mail/horde-ingo/distinfo6
-rw-r--r--mail/horde-ingo/pkg-plist12
-rw-r--r--mail/horde-mimp/Makefile13
-rw-r--r--mail/horde-mimp/distinfo6
-rw-r--r--mail/horde-mimp/pkg-plist12
-rw-r--r--mail/horde-turba/Makefile33
-rw-r--r--mail/horde-turba/distinfo6
-rw-r--r--mail/horde-turba/pkg-plist13
-rw-r--r--mail/horde4-imp/Makefile37
-rw-r--r--mail/horde4-imp/distinfo6
-rw-r--r--mail/horde4-imp/pkg-plist9
-rw-r--r--mail/horde4-ingo/Makefile33
-rw-r--r--mail/horde4-ingo/distinfo6
-rw-r--r--mail/horde4-ingo/pkg-plist12
-rw-r--r--mail/horde4-turba/Makefile33
-rw-r--r--mail/horde4-turba/distinfo6
-rw-r--r--mail/horde4-turba/pkg-plist13
-rw-r--r--mail/imp/Makefile37
-rw-r--r--mail/imp/distinfo6
-rw-r--r--mail/imp/pkg-plist9
-rw-r--r--mail/ingo/Makefile33
-rw-r--r--mail/ingo/distinfo6
-rw-r--r--mail/ingo/pkg-plist12
-rw-r--r--mail/mimp/Makefile13
-rw-r--r--mail/mimp/distinfo6
-rw-r--r--mail/mimp/pkg-plist12
-rw-r--r--mail/turba/Makefile33
-rw-r--r--mail/turba/distinfo6
-rw-r--r--mail/turba/pkg-plist13
33 files changed, 235 insertions, 292 deletions
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index d0f90441684d..a75f3f6b2e6e 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-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/horde-imp/distinfo b/mail/horde-imp/distinfo
index 4bd6831618db..e54ec912d6f3 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde-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/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
index c1d38b517ffa..7ad86f23f91d 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde-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
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 08de62fda557..6c8f42c0c967 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-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/horde-ingo/distinfo b/mail/horde-ingo/distinfo
index 79878571a5d7..0b01277d580e 100644
--- a/mail/horde-ingo/distinfo
+++ b/mail/horde-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/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist
index 2ccdadb02414..9827aa60883b 100644
--- a/mail/horde-ingo/pkg-plist
+++ b/mail/horde-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
diff --git a/mail/horde-mimp/Makefile b/mail/horde-mimp/Makefile
index c363ec1536a3..017f37710359 100644
--- a/mail/horde-mimp/Makefile
+++ b/mail/horde-mimp/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= mimp
-PORTVERSION= 1.0
+PORTVERSION= 1.0.1
+DISTVERSIONPREFIX= h3-
CATEGORIES= mail www
MASTER_SITES= HORDE
-DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= beech@alaskaparadise.com
-COMMENT= A mobile webmail system which uses the horde framework
+COMMENT= Mobile webmail system
#-----------------------------------------------------------------------
# You may define these options:
@@ -160,15 +160,12 @@ pre-install:
do-install:
@${INSTALL} -d ${MIMPDIR}/
-.for REP in ${SUB_DIRS}
- @${CP} -Rp ${WRKSRC}/${REP} ${MIMPDIR}/
-.endfor
- @${CP} -p ${WRKSRC}/*.php ${MIMPDIR}/
+ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${MIMPDIR}/
+ @${CP} -p ${WRKSRC}/*.php ${MIMPDIR}/
@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
@${INSTALL_DATA} ${WRKDIR}/httpd-mimp.conf ${HORDE_INC}/
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MIMPDIR}/
@${CHMOD} -R o-rwx ${CONFDIR}/
-
.if !defined(NOPORTDOCS)
@${INSTALL} -d ${DOCSDIR}/
@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/
diff --git a/mail/horde-mimp/distinfo b/mail/horde-mimp/distinfo
index 72fc5a3205b5..2c2467c5033e 100644
--- a/mail/horde-mimp/distinfo
+++ b/mail/horde-mimp/distinfo
@@ -1,3 +1,3 @@
-MD5 (mimp-h3-1.0.tar.gz) = 5fd92232cbc7008563c7200c72a7a6e7
-SHA256 (mimp-h3-1.0.tar.gz) = c71b3e9af46bbd1ad1caf54cf02ce99e01d5e762b982c6f0ac218e684fc94757
-SIZE (mimp-h3-1.0.tar.gz) = 491972
+MD5 (mimp-h3-1.0.1.tar.gz) = 588c5b162165ccf838f5db8d45cda0d7
+SHA256 (mimp-h3-1.0.1.tar.gz) = cef9c9b06d384bc2d25ed300f9d750cfdc5db347628039580180f06000a68f4c
+SIZE (mimp-h3-1.0.1.tar.gz) = 677800
diff --git a/mail/horde-mimp/pkg-plist b/mail/horde-mimp/pkg-plist
index 34a3e3fc320c..9009f3448350 100644
--- a/mail/horde-mimp/pkg-plist
+++ b/mail/horde-mimp/pkg-plist
@@ -37,6 +37,7 @@
%%MIMPDIR%%/lib/api.php
%%MIMPDIR%%/lib/prefs.php
%%MIMPDIR%%/lib/version.php
+%%MIMPDIR%%/locale/ca_ES/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/de_DE/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/es_ES/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/fi_FI/LC_MESSAGES/mimp.mo
@@ -44,12 +45,15 @@
%%MIMPDIR%%/locale/hu_HU/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/it_IT/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/lt_LT/LC_MESSAGES/mimp.mo
+%%MIMPDIR%%/locale/nl_NL/LC_MESSAGES/mimp.mo
+%%MIMPDIR%%/locale/pt_PT/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/ro_RO/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/login.php
%%MIMPDIR%%/mailbox.php
%%MIMPDIR%%/message.php
%%MIMPDIR%%/po/README
%%MIMPDIR%%/po/mimp.pot
+%%MIMPDIR%%/po/ca_ES.po
%%MIMPDIR%%/po/de_DE.po
%%MIMPDIR%%/po/es_ES.po
%%MIMPDIR%%/po/fi_FI.po
@@ -57,6 +61,8 @@
%%MIMPDIR%%/po/hu_HU.po
%%MIMPDIR%%/po/it_IT.po
%%MIMPDIR%%/po/lt_LT.po
+%%MIMPDIR%%/po/nl_NL.po
+%%MIMPDIR%%/po/pt_PT.po
%%MIMPDIR%%/po/ro_RO.po
%%MIMPDIR%%/redirect.php
%%MIMPDIR%%/templates/common-header.inc
@@ -83,6 +89,10 @@
@dirrm %%MIMPDIR%%/po
@dirrm %%MIMPDIR%%/locale/ro_RO/LC_MESSAGES
@dirrm %%MIMPDIR%%/locale/ro_RO
+@dirrm %%MIMPDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%MIMPDIR%%/locale/pt_PT
+@dirrm %%MIMPDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%MIMPDIR%%/locale/nl_NL
@dirrm %%MIMPDIR%%/locale/lt_LT/LC_MESSAGES
@dirrm %%MIMPDIR%%/locale/lt_LT
@dirrm %%MIMPDIR%%/locale/it_IT/LC_MESSAGES
@@ -97,6 +107,8 @@
@dirrm %%MIMPDIR%%/locale/es_ES
@dirrm %%MIMPDIR%%/locale/de_DE/LC_MESSAGES
@dirrm %%MIMPDIR%%/locale/de_DE
+@dirrm %%MIMPDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%MIMPDIR%%/locale/ca_ES
@dirrm %%MIMPDIR%%/locale
@dirrm %%MIMPDIR%%/lib/MIME/Viewer
@dirrm %%MIMPDIR%%/lib/MIME
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 20d103b1647c..88d50b10a023 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= turba
-PORTVERSION= 2.1.3
+PORTVERSION= 2.1.4
+DISTVERSIONPREFIX= h3-
CATEGORIES= mail www
MASTER_SITES= HORDE
-DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= beech@alaskaparadise.com
COMMENT= The Horde contact management application
@@ -34,8 +34,8 @@ USE_APACHE= 1.3+ # needed to test APACHE_VERSION
USE_GETTEXT= yes
REINPLACE_ARGS= -i ""
-DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \
- docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+PORTDOCS= README CHANGES CREDITS INSTALL LDAP \
+ RELEASE_NOTES TODO UPGRADING
CONFFILE= attributes.php menu.php mime_drivers.php prefs.php sources.php
SUB_DIRS= config lib locale po scripts templates themes
@@ -66,6 +66,9 @@ HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
HORDE_INC= ${LOCALBASE}/etc/horde
.endif
+post-extract:
+ @${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
pre-configure:
@${RM} ${WRKSRC}/config/sources.php.dist.orig
@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
@@ -77,20 +80,16 @@ pre-configure:
.endif
do-install:
- @${MKDIR} ${TURBADIR}
-.for REP in ${SUB_DIRS}
- @${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
-.endfor
- @${CP} -p ${WRKSRC}/*.php ${TURBADIR}
-
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
- @${CHMOD} -R o-rwx ${CONFDIR}
- @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
+ @${INSTALL} -d ${TURBADIR}/
+ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${TURBADIR}/
+ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}/
+ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+ @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}/
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}/
+ @${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/horde-turba/distinfo b/mail/horde-turba/distinfo
index f5775c3913c3..5d6fd4dde5ca 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.1.3.tar.gz) = a0407717f3f64fb33f6a57e2244a12b4
-SHA256 (turba-h3-2.1.3.tar.gz) = d12032c43e488fd5a4fe4e3bf30e95394136db04cedde9a865a4fb806b8c6367
-SIZE (turba-h3-2.1.3.tar.gz) = 1790717
+MD5 (turba-h3-2.1.4.tar.gz) = 950b5645ee75ed0df7a0f594c5e7d285
+SHA256 (turba-h3-2.1.4.tar.gz) = 46d31dd0f5e0e55ad78f82de1b001e4d8ba82a3294bd4205012e0680a62dda8a
+SIZE (turba-h3-2.1.4.tar.gz) = 1809857
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index c1129e5cc26d..325d862232a5 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -1,11 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LDAP
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%TURBADIR%%/add.php
%%TURBADIR%%/addressbooks.php
%%TURBADIR%%/browse.php
@@ -38,6 +30,7 @@
%%TURBADIR%%/lib/Object/Group.php
%%TURBADIR%%/lib/ObjectView.php
%%TURBADIR%%/lib/Renderer.php
+%%TURBADIR%%/lib/tests/tovcard.phpt
%%TURBADIR%%/lib/Turba.php
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
@@ -47,6 +40,7 @@
%%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/ca_ES/help.xml
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
@@ -61,6 +55,7 @@
%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fi_FI/help.xml
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fr_FR/help.xml
%%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/is_IS/LC_MESSAGES/turba.mo
@@ -183,7 +178,6 @@
%%TURBADIR%%/vcard.php
%%TURBADIR%%/view.php
%%HORDE_INC%%/httpd-turba.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%TURBADIR%%/themes/ideas
@dirrm %%TURBADIR%%/themes/graphics/menu
@dirrm %%TURBADIR%%/themes/graphics
@@ -272,6 +266,7 @@
@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/ar_SY
@dirrm %%TURBADIR%%/locale
+@dirrm %%TURBADIR%%/lib/tests
@dirrm %%TURBADIR%%/lib/Object
@dirrm %%TURBADIR%%/lib/Driver
@dirrm %%TURBADIR%%/lib/Block
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index d0f90441684d..a75f3f6b2e6e 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-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/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index 4bd6831618db..e54ec912d6f3 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-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/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
index c1d38b517ffa..7ad86f23f91d 100644
--- a/mail/horde4-imp/pkg-plist
+++ b/mail/horde4-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
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
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 20d103b1647c..88d50b10a023 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= turba
-PORTVERSION= 2.1.3
+PORTVERSION= 2.1.4
+DISTVERSIONPREFIX= h3-
CATEGORIES= mail www
MASTER_SITES= HORDE
-DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= beech@alaskaparadise.com
COMMENT= The Horde contact management application
@@ -34,8 +34,8 @@ USE_APACHE= 1.3+ # needed to test APACHE_VERSION
USE_GETTEXT= yes
REINPLACE_ARGS= -i ""
-DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \
- docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+PORTDOCS= README CHANGES CREDITS INSTALL LDAP \
+ RELEASE_NOTES TODO UPGRADING
CONFFILE= attributes.php menu.php mime_drivers.php prefs.php sources.php
SUB_DIRS= config lib locale po scripts templates themes
@@ -66,6 +66,9 @@ HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
HORDE_INC= ${LOCALBASE}/etc/horde
.endif
+post-extract:
+ @${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
pre-configure:
@${RM} ${WRKSRC}/config/sources.php.dist.orig
@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
@@ -77,20 +80,16 @@ pre-configure:
.endif
do-install:
- @${MKDIR} ${TURBADIR}
-.for REP in ${SUB_DIRS}
- @${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
-.endfor
- @${CP} -p ${WRKSRC}/*.php ${TURBADIR}
-
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
- @${CHMOD} -R o-rwx ${CONFDIR}
- @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
+ @${INSTALL} -d ${TURBADIR}/
+ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${TURBADIR}/
+ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}/
+ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+ @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}/
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}/
+ @${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-turba/distinfo b/mail/horde4-turba/distinfo
index f5775c3913c3..5d6fd4dde5ca 100644
--- a/mail/horde4-turba/distinfo
+++ b/mail/horde4-turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.1.3.tar.gz) = a0407717f3f64fb33f6a57e2244a12b4
-SHA256 (turba-h3-2.1.3.tar.gz) = d12032c43e488fd5a4fe4e3bf30e95394136db04cedde9a865a4fb806b8c6367
-SIZE (turba-h3-2.1.3.tar.gz) = 1790717
+MD5 (turba-h3-2.1.4.tar.gz) = 950b5645ee75ed0df7a0f594c5e7d285
+SHA256 (turba-h3-2.1.4.tar.gz) = 46d31dd0f5e0e55ad78f82de1b001e4d8ba82a3294bd4205012e0680a62dda8a
+SIZE (turba-h3-2.1.4.tar.gz) = 1809857
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
index c1129e5cc26d..325d862232a5 100644
--- a/mail/horde4-turba/pkg-plist
+++ b/mail/horde4-turba/pkg-plist
@@ -1,11 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LDAP
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%TURBADIR%%/add.php
%%TURBADIR%%/addressbooks.php
%%TURBADIR%%/browse.php
@@ -38,6 +30,7 @@
%%TURBADIR%%/lib/Object/Group.php
%%TURBADIR%%/lib/ObjectView.php
%%TURBADIR%%/lib/Renderer.php
+%%TURBADIR%%/lib/tests/tovcard.phpt
%%TURBADIR%%/lib/Turba.php
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
@@ -47,6 +40,7 @@
%%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/ca_ES/help.xml
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
@@ -61,6 +55,7 @@
%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fi_FI/help.xml
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fr_FR/help.xml
%%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/is_IS/LC_MESSAGES/turba.mo
@@ -183,7 +178,6 @@
%%TURBADIR%%/vcard.php
%%TURBADIR%%/view.php
%%HORDE_INC%%/httpd-turba.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%TURBADIR%%/themes/ideas
@dirrm %%TURBADIR%%/themes/graphics/menu
@dirrm %%TURBADIR%%/themes/graphics
@@ -272,6 +266,7 @@
@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/ar_SY
@dirrm %%TURBADIR%%/locale
+@dirrm %%TURBADIR%%/lib/tests
@dirrm %%TURBADIR%%/lib/Object
@dirrm %%TURBADIR%%/lib/Driver
@dirrm %%TURBADIR%%/lib/Block
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
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index 08de62fda557..6c8f42c0c967 100644
--- a/mail/ingo/Makefile
+++ b/mail/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/ingo/distinfo b/mail/ingo/distinfo
index 79878571a5d7..0b01277d580e 100644
--- a/mail/ingo/distinfo
+++ b/mail/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/ingo/pkg-plist b/mail/ingo/pkg-plist
index 2ccdadb02414..9827aa60883b 100644
--- a/mail/ingo/pkg-plist
+++ b/mail/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
diff --git a/mail/mimp/Makefile b/mail/mimp/Makefile
index c363ec1536a3..017f37710359 100644
--- a/mail/mimp/Makefile
+++ b/mail/mimp/Makefile
@@ -6,13 +6,13 @@
#
PORTNAME= mimp
-PORTVERSION= 1.0
+PORTVERSION= 1.0.1
+DISTVERSIONPREFIX= h3-
CATEGORIES= mail www
MASTER_SITES= HORDE
-DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= beech@alaskaparadise.com
-COMMENT= A mobile webmail system which uses the horde framework
+COMMENT= Mobile webmail system
#-----------------------------------------------------------------------
# You may define these options:
@@ -160,15 +160,12 @@ pre-install:
do-install:
@${INSTALL} -d ${MIMPDIR}/
-.for REP in ${SUB_DIRS}
- @${CP} -Rp ${WRKSRC}/${REP} ${MIMPDIR}/
-.endfor
- @${CP} -p ${WRKSRC}/*.php ${MIMPDIR}/
+ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${MIMPDIR}/
+ @${CP} -p ${WRKSRC}/*.php ${MIMPDIR}/
@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
@${INSTALL_DATA} ${WRKDIR}/httpd-mimp.conf ${HORDE_INC}/
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MIMPDIR}/
@${CHMOD} -R o-rwx ${CONFDIR}/
-
.if !defined(NOPORTDOCS)
@${INSTALL} -d ${DOCSDIR}/
@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/
diff --git a/mail/mimp/distinfo b/mail/mimp/distinfo
index 72fc5a3205b5..2c2467c5033e 100644
--- a/mail/mimp/distinfo
+++ b/mail/mimp/distinfo
@@ -1,3 +1,3 @@
-MD5 (mimp-h3-1.0.tar.gz) = 5fd92232cbc7008563c7200c72a7a6e7
-SHA256 (mimp-h3-1.0.tar.gz) = c71b3e9af46bbd1ad1caf54cf02ce99e01d5e762b982c6f0ac218e684fc94757
-SIZE (mimp-h3-1.0.tar.gz) = 491972
+MD5 (mimp-h3-1.0.1.tar.gz) = 588c5b162165ccf838f5db8d45cda0d7
+SHA256 (mimp-h3-1.0.1.tar.gz) = cef9c9b06d384bc2d25ed300f9d750cfdc5db347628039580180f06000a68f4c
+SIZE (mimp-h3-1.0.1.tar.gz) = 677800
diff --git a/mail/mimp/pkg-plist b/mail/mimp/pkg-plist
index 34a3e3fc320c..9009f3448350 100644
--- a/mail/mimp/pkg-plist
+++ b/mail/mimp/pkg-plist
@@ -37,6 +37,7 @@
%%MIMPDIR%%/lib/api.php
%%MIMPDIR%%/lib/prefs.php
%%MIMPDIR%%/lib/version.php
+%%MIMPDIR%%/locale/ca_ES/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/de_DE/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/es_ES/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/fi_FI/LC_MESSAGES/mimp.mo
@@ -44,12 +45,15 @@
%%MIMPDIR%%/locale/hu_HU/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/it_IT/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/lt_LT/LC_MESSAGES/mimp.mo
+%%MIMPDIR%%/locale/nl_NL/LC_MESSAGES/mimp.mo
+%%MIMPDIR%%/locale/pt_PT/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/locale/ro_RO/LC_MESSAGES/mimp.mo
%%MIMPDIR%%/login.php
%%MIMPDIR%%/mailbox.php
%%MIMPDIR%%/message.php
%%MIMPDIR%%/po/README
%%MIMPDIR%%/po/mimp.pot
+%%MIMPDIR%%/po/ca_ES.po
%%MIMPDIR%%/po/de_DE.po
%%MIMPDIR%%/po/es_ES.po
%%MIMPDIR%%/po/fi_FI.po
@@ -57,6 +61,8 @@
%%MIMPDIR%%/po/hu_HU.po
%%MIMPDIR%%/po/it_IT.po
%%MIMPDIR%%/po/lt_LT.po
+%%MIMPDIR%%/po/nl_NL.po
+%%MIMPDIR%%/po/pt_PT.po
%%MIMPDIR%%/po/ro_RO.po
%%MIMPDIR%%/redirect.php
%%MIMPDIR%%/templates/common-header.inc
@@ -83,6 +89,10 @@
@dirrm %%MIMPDIR%%/po
@dirrm %%MIMPDIR%%/locale/ro_RO/LC_MESSAGES
@dirrm %%MIMPDIR%%/locale/ro_RO
+@dirrm %%MIMPDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%MIMPDIR%%/locale/pt_PT
+@dirrm %%MIMPDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%MIMPDIR%%/locale/nl_NL
@dirrm %%MIMPDIR%%/locale/lt_LT/LC_MESSAGES
@dirrm %%MIMPDIR%%/locale/lt_LT
@dirrm %%MIMPDIR%%/locale/it_IT/LC_MESSAGES
@@ -97,6 +107,8 @@
@dirrm %%MIMPDIR%%/locale/es_ES
@dirrm %%MIMPDIR%%/locale/de_DE/LC_MESSAGES
@dirrm %%MIMPDIR%%/locale/de_DE
+@dirrm %%MIMPDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%MIMPDIR%%/locale/ca_ES
@dirrm %%MIMPDIR%%/locale
@dirrm %%MIMPDIR%%/lib/MIME/Viewer
@dirrm %%MIMPDIR%%/lib/MIME
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 20d103b1647c..88d50b10a023 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= turba
-PORTVERSION= 2.1.3
+PORTVERSION= 2.1.4
+DISTVERSIONPREFIX= h3-
CATEGORIES= mail www
MASTER_SITES= HORDE
-DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= beech@alaskaparadise.com
COMMENT= The Horde contact management application
@@ -34,8 +34,8 @@ USE_APACHE= 1.3+ # needed to test APACHE_VERSION
USE_GETTEXT= yes
REINPLACE_ARGS= -i ""
-DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \
- docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+PORTDOCS= README CHANGES CREDITS INSTALL LDAP \
+ RELEASE_NOTES TODO UPGRADING
CONFFILE= attributes.php menu.php mime_drivers.php prefs.php sources.php
SUB_DIRS= config lib locale po scripts templates themes
@@ -66,6 +66,9 @@ HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
HORDE_INC= ${LOCALBASE}/etc/horde
.endif
+post-extract:
+ @${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
pre-configure:
@${RM} ${WRKSRC}/config/sources.php.dist.orig
@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
@@ -77,20 +80,16 @@ pre-configure:
.endif
do-install:
- @${MKDIR} ${TURBADIR}
-.for REP in ${SUB_DIRS}
- @${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
-.endfor
- @${CP} -p ${WRKSRC}/*.php ${TURBADIR}
-
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
- @${CHMOD} -R o-rwx ${CONFDIR}
- @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
+ @${INSTALL} -d ${TURBADIR}/
+ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${TURBADIR}/
+ @${CP} -p ${WRKSRC}/*.php ${TURBADIR}/
+ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+ @${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}/
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}/
+ @${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/turba/distinfo b/mail/turba/distinfo
index f5775c3913c3..5d6fd4dde5ca 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.1.3.tar.gz) = a0407717f3f64fb33f6a57e2244a12b4
-SHA256 (turba-h3-2.1.3.tar.gz) = d12032c43e488fd5a4fe4e3bf30e95394136db04cedde9a865a4fb806b8c6367
-SIZE (turba-h3-2.1.3.tar.gz) = 1790717
+MD5 (turba-h3-2.1.4.tar.gz) = 950b5645ee75ed0df7a0f594c5e7d285
+SHA256 (turba-h3-2.1.4.tar.gz) = 46d31dd0f5e0e55ad78f82de1b001e4d8ba82a3294bd4205012e0680a62dda8a
+SIZE (turba-h3-2.1.4.tar.gz) = 1809857
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index c1129e5cc26d..325d862232a5 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -1,11 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LDAP
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%TURBADIR%%/add.php
%%TURBADIR%%/addressbooks.php
%%TURBADIR%%/browse.php
@@ -38,6 +30,7 @@
%%TURBADIR%%/lib/Object/Group.php
%%TURBADIR%%/lib/ObjectView.php
%%TURBADIR%%/lib/Renderer.php
+%%TURBADIR%%/lib/tests/tovcard.phpt
%%TURBADIR%%/lib/Turba.php
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
@@ -47,6 +40,7 @@
%%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/ca_ES/help.xml
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
@@ -61,6 +55,7 @@
%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fi_FI/help.xml
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fr_FR/help.xml
%%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/is_IS/LC_MESSAGES/turba.mo
@@ -183,7 +178,6 @@
%%TURBADIR%%/vcard.php
%%TURBADIR%%/view.php
%%HORDE_INC%%/httpd-turba.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%TURBADIR%%/themes/ideas
@dirrm %%TURBADIR%%/themes/graphics/menu
@dirrm %%TURBADIR%%/themes/graphics
@@ -272,6 +266,7 @@
@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/ar_SY
@dirrm %%TURBADIR%%/locale
+@dirrm %%TURBADIR%%/lib/tests
@dirrm %%TURBADIR%%/lib/Object
@dirrm %%TURBADIR%%/lib/Driver
@dirrm %%TURBADIR%%/lib/Block