- Replace WITH_APACHE2 by USE_APACHE, rename httpd.conf.xxx to

  httpd-xxx.conf and fix configuration if APACHE_VERSION > 20.

- Don't use the MCAL back-end by default for Kronolith, it is
  deprecated.

- Deinstall bug reported by John Nielsen <john (at) jnielsen.net>:
  respect LHORDEDIR.

- Fix horde-passwd installation / deinstallation.

- Don't bump PORTREVISION, because running installations are not
  concerned.

33 files changed, 144 insertions, 84 deletions

diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 3e5ccc623cf5..54440c11568a 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -104,6 +104,7 @@ RUN_DEPENDS+=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 .endif
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i.beforeIMP
 
@@ -117,17 +118,15 @@ LHORDEDIR?=	www/horde
 LIMPDIR=	${LHORDEDIR}/imp
 PEARDIR?=	${LOCALBASE}/share/pear
 
-PLIST_SUB=	IMPDIR=${LIMPDIR}
-SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
-
+PLIST_SUB=	IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
 
 IMPDIR=		${PREFIX}/${LIMPDIR}
 CONFDIR=	${IMPDIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 HOSTNAME?=	`/bin/hostname`
 SERVOS?=	${OPSYS}-${OSREL}
 
@@ -158,6 +157,12 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
 . endif
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-everything::
 .if !defined(WITHOUT_IMAPSERVER)
 	@${ECHO_MSG} ""
@@ -200,7 +205,7 @@ pre-configure:
 . endif
 .endif
 	@${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:"		\
-		${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd.conf.imp
+		${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd-imp.conf
 .for fc in ${PATCH2RM}
 	@${RM} ${WRKSRC}/config/${fc}
 .endfor
@@ -228,7 +233,7 @@ do-install:
 	fi
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.imp ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
 .if !defined(NOPORTDOCS)
diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo
index 06a2bb31b08b..22d57099697c 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde-imp/distinfo
@@ -1,2 +1,3 @@
 MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
+SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1
 SIZE (imp-h3-4.0.4.tar.gz) = 3349908
diff --git a/mail/horde-imp/pkg-deinstall b/mail/horde-imp/files/pkg-deinstall.in
index cd0aa1e6c6c5..13bb805c47d5 100644
--- a/mail/horde-imp/pkg-deinstall
+++ b/mail/horde-imp/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/imp/config/*php ${PKG_PREFIX}/www/horde/imp/config/*txt`; do
+  for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
index cc4300f87ce6..4aed11a161f8 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde-imp/pkg-plist
@@ -361,7 +361,7 @@
 %%IMPDIR%%/thread.php
 %%IMPDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-etc/horde/httpd.conf.imp
+%%HORDE_INC%%/httpd-imp.conf
 @dirrm %%IMPDIR%%/themes/sun
 @dirrm %%IMPDIR%%/themes/simplex
 @dirrm %%IMPDIR%%/themes/postnuke
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index df75e4b751e7..da02cc019ff6 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -33,10 +33,13 @@ RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
 USE_PHP=	imap
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	INGODIR=${LINGODIR}
+PLIST_SUB=	INGODIR=${LINGODIR}  HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	INGODIR=${INGODIR}
 
 DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO
@@ -50,17 +53,21 @@ PEARDIR?=	${LOCALBASE}/share/pear
 INGODIR=	${PREFIX}/${LINGODIR}
 CONFDIR=	${INGODIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved)
 RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-configure:
 	@${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g"		\
-		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd.conf.ingo
+		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf
 
 do-install:
 	@${MKDIR}  ${INGODIR}
@@ -75,7 +82,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.ingo ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -85,8 +92,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%INGODIR%%:${INGODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/mail/horde-ingo/distinfo b/mail/horde-ingo/distinfo
index 00afb90f937c..1957b3b5ced9 100644
--- a/mail/horde-ingo/distinfo
+++ b/mail/horde-ingo/distinfo
@@ -1,2 +1,3 @@
 MD5 (ingo-h3-1.0.2.tar.gz) = 6bc7addfdd3bc18e4d6af5c1d57b7b89
+SHA256 (ingo-h3-1.0.2.tar.gz) = 6bd8d05f986c5b3d58065f7409b9df0912ace8968ed427798497bfd376bb1d29
 SIZE (ingo-h3-1.0.2.tar.gz) = 853202
diff --git a/mail/horde4-ingo/pkg-deinstall b/mail/horde-ingo/files/pkg-deinstall.in
index a3a597d448a6..2289e8963491 100644
--- a/mail/horde4-ingo/pkg-deinstall
+++ b/mail/horde-ingo/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/ingo/config/*php`; do
+  for cf in `ls %%INGODIR%%/config/*php`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist
index b288edddd002..697fac19d784 100644
--- a/mail/horde-ingo/pkg-plist
+++ b/mail/horde-ingo/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.ingo
+%%HORDE_INC%%/httpd-ingo.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 0b2ca270102e..81bfb5cbe144 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -38,6 +38,7 @@ USE_PHP=	ldap
 .endif
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_REINPLACE=	yes
 
 REINPLACE_ARGS=	-i ""
@@ -49,15 +50,16 @@ SUB_DIRS=	config lib locale po scripts templates themes
 LHORDEDIR?=	www/horde
 LTURBADIR?=	${LHORDEDIR}/turba
 
-PLIST_SUB=	TURBADIR=${LTURBADIR}
+PLIST_SUB=	TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	TURBADIR=${TURBADIR} CONFDIR=${CONFDIR}
 
 TURBADIR=	${PREFIX}/${LTURBADIR}
 CONFDIR=	${TURBADIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
+.include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/sbin/imspd)
 WITH_IMSP=	yes
@@ -66,10 +68,16 @@ WITH_IMSP=	yes
 RUN_DEPENDS+=	imspd:${PORTSDIR}/databases/cyrus-imspd
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-configure:
 	@${RM} ${WRKSRC}/config/sources.php.dist.orig
 	@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g"	\
-		${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd.conf.turba
+		${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd-turba.conf
 	@${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:"	\
 		${WRKSRC}/scripts/ldap/addou.pl
 .if defined(WITH_IMSP)
@@ -89,7 +97,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -103,4 +111,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/turba/pkg-deinstall b/mail/horde-turba/files/pkg-deinstall.in
index b0a141eef091..afe8f9215da2 100644
--- a/mail/turba/pkg-deinstall
+++ b/mail/horde-turba/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do
+  for cf in `ls %%TURBADIR%%/config/*php`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index 48455454ad34..fdb89c479187 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -167,7 +167,7 @@
 %%TURBADIR%%/themes/graphics/turba.png
 %%TURBADIR%%/themes/screen.css
 %%TURBADIR%%/vcard.php
-etc/horde/httpd.conf.turba
+%%HORDE_INC%%/httpd-turba.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%TURBADIR%%/lib/Block
 @dirrm %%TURBADIR%%/lib/Driver
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 3e5ccc623cf5..54440c11568a 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -104,6 +104,7 @@ RUN_DEPENDS+=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 .endif
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i.beforeIMP
 
@@ -117,17 +118,15 @@ LHORDEDIR?=	www/horde
 LIMPDIR=	${LHORDEDIR}/imp
 PEARDIR?=	${LOCALBASE}/share/pear
 
-PLIST_SUB=	IMPDIR=${LIMPDIR}
-SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
-
+PLIST_SUB=	IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
 
 IMPDIR=		${PREFIX}/${LIMPDIR}
 CONFDIR=	${IMPDIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 HOSTNAME?=	`/bin/hostname`
 SERVOS?=	${OPSYS}-${OSREL}
 
@@ -158,6 +157,12 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
 . endif
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-everything::
 .if !defined(WITHOUT_IMAPSERVER)
 	@${ECHO_MSG} ""
@@ -200,7 +205,7 @@ pre-configure:
 . endif
 .endif
 	@${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:"		\
-		${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd.conf.imp
+		${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd-imp.conf
 .for fc in ${PATCH2RM}
 	@${RM} ${WRKSRC}/config/${fc}
 .endfor
@@ -228,7 +233,7 @@ do-install:
 	fi
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.imp ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
 .if !defined(NOPORTDOCS)
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index 06a2bb31b08b..22d57099697c 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-imp/distinfo
@@ -1,2 +1,3 @@
 MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
+SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1
 SIZE (imp-h3-4.0.4.tar.gz) = 3349908
diff --git a/mail/imp/pkg-deinstall b/mail/horde4-imp/files/pkg-deinstall.in
index cd0aa1e6c6c5..13bb805c47d5 100644
--- a/mail/imp/pkg-deinstall
+++ b/mail/horde4-imp/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/imp/config/*php ${PKG_PREFIX}/www/horde/imp/config/*txt`; do
+  for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
index cc4300f87ce6..4aed11a161f8 100644
--- a/mail/horde4-imp/pkg-plist
+++ b/mail/horde4-imp/pkg-plist
@@ -361,7 +361,7 @@
 %%IMPDIR%%/thread.php
 %%IMPDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-etc/horde/httpd.conf.imp
+%%HORDE_INC%%/httpd-imp.conf
 @dirrm %%IMPDIR%%/themes/sun
 @dirrm %%IMPDIR%%/themes/simplex
 @dirrm %%IMPDIR%%/themes/postnuke
diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
index df75e4b751e7..da02cc019ff6 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde4-ingo/Makefile
@@ -33,10 +33,13 @@ RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
 USE_PHP=	imap
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	INGODIR=${LINGODIR}
+PLIST_SUB=	INGODIR=${LINGODIR}  HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	INGODIR=${INGODIR}
 
 DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO
@@ -50,17 +53,21 @@ PEARDIR?=	${LOCALBASE}/share/pear
 INGODIR=	${PREFIX}/${LINGODIR}
 CONFDIR=	${INGODIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved)
 RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-configure:
 	@${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g"		\
-		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd.conf.ingo
+		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf
 
 do-install:
 	@${MKDIR}  ${INGODIR}
@@ -75,7 +82,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.ingo ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -85,8 +92,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%INGODIR%%:${INGODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/mail/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo
index 00afb90f937c..1957b3b5ced9 100644
--- a/mail/horde4-ingo/distinfo
+++ b/mail/horde4-ingo/distinfo
@@ -1,2 +1,3 @@
 MD5 (ingo-h3-1.0.2.tar.gz) = 6bc7addfdd3bc18e4d6af5c1d57b7b89
+SHA256 (ingo-h3-1.0.2.tar.gz) = 6bd8d05f986c5b3d58065f7409b9df0912ace8968ed427798497bfd376bb1d29
 SIZE (ingo-h3-1.0.2.tar.gz) = 853202
diff --git a/mail/horde-ingo/pkg-deinstall b/mail/horde4-ingo/files/pkg-deinstall.in
index a3a597d448a6..2289e8963491 100644
--- a/mail/horde-ingo/pkg-deinstall
+++ b/mail/horde4-ingo/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/ingo/config/*php`; do
+  for cf in `ls %%INGODIR%%/config/*php`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist
index b288edddd002..697fac19d784 100644
--- a/mail/horde4-ingo/pkg-plist
+++ b/mail/horde4-ingo/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.ingo
+%%HORDE_INC%%/httpd-ingo.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 0b2ca270102e..81bfb5cbe144 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -38,6 +38,7 @@ USE_PHP=	ldap
 .endif
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_REINPLACE=	yes
 
 REINPLACE_ARGS=	-i ""
@@ -49,15 +50,16 @@ SUB_DIRS=	config lib locale po scripts templates themes
 LHORDEDIR?=	www/horde
 LTURBADIR?=	${LHORDEDIR}/turba
 
-PLIST_SUB=	TURBADIR=${LTURBADIR}
+PLIST_SUB=	TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	TURBADIR=${TURBADIR} CONFDIR=${CONFDIR}
 
 TURBADIR=	${PREFIX}/${LTURBADIR}
 CONFDIR=	${TURBADIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
+.include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/sbin/imspd)
 WITH_IMSP=	yes
@@ -66,10 +68,16 @@ WITH_IMSP=	yes
 RUN_DEPENDS+=	imspd:${PORTSDIR}/databases/cyrus-imspd
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-configure:
 	@${RM} ${WRKSRC}/config/sources.php.dist.orig
 	@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g"	\
-		${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd.conf.turba
+		${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd-turba.conf
 	@${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:"	\
 		${WRKSRC}/scripts/ldap/addou.pl
 .if defined(WITH_IMSP)
@@ -89,7 +97,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -103,4 +111,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/horde-turba/pkg-deinstall b/mail/horde4-turba/files/pkg-deinstall.in
index b0a141eef091..afe8f9215da2 100644
--- a/mail/horde-turba/pkg-deinstall
+++ b/mail/horde4-turba/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do
+  for cf in `ls %%TURBADIR%%/config/*php`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
index 48455454ad34..fdb89c479187 100644
--- a/mail/horde4-turba/pkg-plist
+++ b/mail/horde4-turba/pkg-plist
@@ -167,7 +167,7 @@
 %%TURBADIR%%/themes/graphics/turba.png
 %%TURBADIR%%/themes/screen.css
 %%TURBADIR%%/vcard.php
-etc/horde/httpd.conf.turba
+%%HORDE_INC%%/httpd-turba.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%TURBADIR%%/lib/Block
 @dirrm %%TURBADIR%%/lib/Driver
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 3e5ccc623cf5..54440c11568a 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -104,6 +104,7 @@ RUN_DEPENDS+=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 .endif
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i.beforeIMP
 
@@ -117,17 +118,15 @@ LHORDEDIR?=	www/horde
 LIMPDIR=	${LHORDEDIR}/imp
 PEARDIR?=	${LOCALBASE}/share/pear
 
-PLIST_SUB=	IMPDIR=${LIMPDIR}
-SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
-
+PLIST_SUB=	IMPDIR=${LIMPDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
 
 IMPDIR=		${PREFIX}/${LIMPDIR}
 CONFDIR=	${IMPDIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 HOSTNAME?=	`/bin/hostname`
 SERVOS?=	${OPSYS}-${OSREL}
 
@@ -158,6 +157,12 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
 . endif
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-everything::
 .if !defined(WITHOUT_IMAPSERVER)
 	@${ECHO_MSG} ""
@@ -200,7 +205,7 @@ pre-configure:
 . endif
 .endif
 	@${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:"		\
-		${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd.conf.imp
+		${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd-imp.conf
 .for fc in ${PATCH2RM}
 	@${RM} ${WRKSRC}/config/${fc}
 .endfor
@@ -228,7 +233,7 @@ do-install:
 	fi
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.imp ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
 .if !defined(NOPORTDOCS)
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index 06a2bb31b08b..22d57099697c 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,2 +1,3 @@
 MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
+SHA256 (imp-h3-4.0.4.tar.gz) = aa814f8f2bee0912a50df6220c77a60b43d83a52b0bc49dffbd30b63845c08d1
 SIZE (imp-h3-4.0.4.tar.gz) = 3349908
diff --git a/mail/horde4-imp/pkg-deinstall b/mail/imp/files/pkg-deinstall.in
index cd0aa1e6c6c5..13bb805c47d5 100644
--- a/mail/horde4-imp/pkg-deinstall
+++ b/mail/imp/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/imp/config/*php ${PKG_PREFIX}/www/horde/imp/config/*txt`; do
+  for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/imp/pkg-plist b/mail/imp/pkg-plist
index cc4300f87ce6..4aed11a161f8 100644
--- a/mail/imp/pkg-plist
+++ b/mail/imp/pkg-plist
@@ -361,7 +361,7 @@
 %%IMPDIR%%/thread.php
 %%IMPDIR%%/view.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-etc/horde/httpd.conf.imp
+%%HORDE_INC%%/httpd-imp.conf
 @dirrm %%IMPDIR%%/themes/sun
 @dirrm %%IMPDIR%%/themes/simplex
 @dirrm %%IMPDIR%%/themes/postnuke
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index df75e4b751e7..da02cc019ff6 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -33,10 +33,13 @@ RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
 USE_PHP=	imap
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	INGODIR=${LINGODIR}
+PLIST_SUB=	INGODIR=${LINGODIR}  HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	INGODIR=${INGODIR}
 
 DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES docs/TODO
@@ -50,17 +53,21 @@ PEARDIR?=	${LOCALBASE}/share/pear
 INGODIR=	${PREFIX}/${LINGODIR}
 CONFDIR=	${INGODIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved)
 RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-configure:
 	@${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g"		\
-		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd.conf.ingo
+		${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd-ingo.conf
 
 do-install:
 	@${MKDIR}  ${INGODIR}
@@ -75,7 +82,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.ingo ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -85,8 +92,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%INGODIR%%:${INGODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/mail/ingo/distinfo b/mail/ingo/distinfo
index 00afb90f937c..1957b3b5ced9 100644
--- a/mail/ingo/distinfo
+++ b/mail/ingo/distinfo
@@ -1,2 +1,3 @@
 MD5 (ingo-h3-1.0.2.tar.gz) = 6bc7addfdd3bc18e4d6af5c1d57b7b89
+SHA256 (ingo-h3-1.0.2.tar.gz) = 6bd8d05f986c5b3d58065f7409b9df0912ace8968ed427798497bfd376bb1d29
 SIZE (ingo-h3-1.0.2.tar.gz) = 853202
diff --git a/mail/ingo/pkg-deinstall b/mail/ingo/files/pkg-deinstall.in
index a3a597d448a6..2289e8963491 100644
--- a/mail/ingo/pkg-deinstall
+++ b/mail/ingo/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/ingo/config/*php`; do
+  for cf in `ls %%INGODIR%%/config/*php`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/ingo/pkg-plist b/mail/ingo/pkg-plist
index b288edddd002..697fac19d784 100644
--- a/mail/ingo/pkg-plist
+++ b/mail/ingo/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.ingo
+%%HORDE_INC%%/httpd-ingo.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 0b2ca270102e..81bfb5cbe144 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -38,6 +38,7 @@ USE_PHP=	ldap
 .endif
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_REINPLACE=	yes
 
 REINPLACE_ARGS=	-i ""
@@ -49,15 +50,16 @@ SUB_DIRS=	config lib locale po scripts templates themes
 LHORDEDIR?=	www/horde
 LTURBADIR?=	${LHORDEDIR}/turba
 
-PLIST_SUB=	TURBADIR=${LTURBADIR}
+PLIST_SUB=	TURBADIR=${LTURBADIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	TURBADIR=${TURBADIR} CONFDIR=${CONFDIR}
 
 TURBADIR=	${PREFIX}/${LTURBADIR}
 CONFDIR=	${TURBADIR}/config
 
-HORDE_INC=	${LOCALBASE}/etc/horde
+.include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/sbin/imspd)
 WITH_IMSP=	yes
@@ -66,10 +68,16 @@ WITH_IMSP=	yes
 RUN_DEPENDS+=	imspd:${PORTSDIR}/databases/cyrus-imspd
 .endif
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 pre-configure:
 	@${RM} ${WRKSRC}/config/sources.php.dist.orig
 	@${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g"	\
-		${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd.conf.turba
+		${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd-turba.conf
 	@${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:"	\
 		${WRKSRC}/scripts/ldap/addou.pl
 .if defined(WITH_IMSP)
@@ -89,7 +97,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-turba.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -103,4 +111,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/horde4-turba/pkg-deinstall b/mail/turba/files/pkg-deinstall.in
index b0a141eef091..afe8f9215da2 100644
--- a/mail/horde4-turba/pkg-deinstall
+++ b/mail/turba/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
 fi
 
 if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do
+  for cf in `ls %%TURBADIR%%/config/*php`; do
     diff -bBqw $cf $cf.dist >/dev/null 2>&1
     case $? in
       0)  # original config file, will be deleted by pkg-plist
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index 48455454ad34..fdb89c479187 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -167,7 +167,7 @@
 %%TURBADIR%%/themes/graphics/turba.png
 %%TURBADIR%%/themes/screen.css
 %%TURBADIR%%/vcard.php
-etc/horde/httpd.conf.turba
+%%HORDE_INC%%/httpd-turba.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%TURBADIR%%/lib/Block
 @dirrm %%TURBADIR%%/lib/Driver