- 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.

30 files changed, 156 insertions, 90 deletions

diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index fe2d86b..32bae02 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -25,14 +25,14 @@ COMMENT=	Kronolith is the Horde calendar application
 #----------------------------------------------------------------------------
 # You may define this option:
 #
-# - WITHOUT_MCAL:	you won't use the MCAL driver but a database backend
-#			(only for PHP4).
+# - WITH_MCAL:	you want to use the MCAL driver (deprecated, and only for PHP4).
 #
 #----------------------------------------------------------------------------
 
 RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_PHP=	yes	# modules set by Horde, but needed to get PHP_VER
 USE_REINPLACE=	yes
 
@@ -46,18 +46,23 @@ LHORDEDIR?=	www/horde
 LKRONOLITHDIR?=	${LHORDEDIR}/kronolith
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	KRONOLITHDIR=${KRONOLITHDIR}
-PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR}
+PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 
 KRONOLITHDIR=	${PREFIX}/${LKRONOLITHDIR}
 CONFDIR=	${KRONOLITHDIR}/config
 VAR_CAL=	/var/calendar
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 .include <bsd.port.pre.mk>
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 .if exists(${LOCALBASE}/sbin/htpasswd)
 HTPASSWD=	${LOCALBASE}/sbin/htpasswd
 .else
@@ -67,7 +72,7 @@ HTPASSWD=	${LOCALBASE}/bin/htpasswd
 pre-configure:
 	@${RM} ${WRKSRC}/config/conf.xml.orig
 	@${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:"	\
-		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd.conf.kronolith
+		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf
 
 do-install:
 	@${MKDIR}  ${KRONOLITHDIR}
@@ -82,7 +87,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.kronolith ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -92,13 +97,13 @@ do-install:
 .endif
 
 post-install:
-.if !defined(WITHOUT_MCAL) && (${PHP_VER} == 4)
+.if defined(WITH_MCAL) && (${PHP_VER} == 4)
 	@if [ ! -d ${VAR_CAL} ]; then \
 	  ${ECHO_MSG} "===> Creating ${VAR_CAL}" ; \
 	  ${MKDIR} ${VAR_CAL} ; \
 	  ${CHMOD} 1777 ${VAR_CAL} ; \
 	fi
-.if !defined(BATCH)
+. if !defined(BATCH)
 	@if [ ! -f ${LOCALBASE}/etc/mpasswd ] ; then \
 	  ${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \
 	  ${ECHO} -n "Please enter a password for www's calendar: " ; \
diff --git a/deskutils/horde-kronolith/pkg-deinstall b/deskutils/horde-kronolith/files/pkg-deinstall.in
index 4578da3..896c740 100644
--- a/deskutils/horde-kronolith/pkg-deinstall
+++ b/deskutils/horde-kronolith/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/kronolith/config/*php`; do
+  for cf in `ls %%KRONOLITHDIR%%/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/deskutils/horde-kronolith/files/pkg-message.in b/deskutils/horde-kronolith/files/pkg-message.in
index e7f0e34..54946bd 100644
--- a/deskutils/horde-kronolith/files/pkg-message.in
+++ b/deskutils/horde-kronolith/files/pkg-message.in
@@ -5,7 +5,7 @@ blank configuration files.
 Horde must be configured; if not, see `pkg_info -D -x horde'.
 
 With PHP4:
-If you choose the mcal backend, libmcal must be configured with the driver
+If you choosed the mcal backend, libmcal must be configured with the driver
 mstore for the user www:
 
 - mkdir /var/calendar
@@ -21,6 +21,9 @@ SQL scripts in %%KRONOLITHDIR%%/scripts/sql.
 WARNING! if you are upgrading from Kronolith v. 1.1.x, you have to alter
 ******** your schemas.
          Please read the doc %%DOCSDIR%%/UPGRADING.
+         Please note that the MCAL back-end is deprecated!
+         To migrate from MCAL to SQL, you can use the provided script
+         %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php
 
 Finally, you must login to Horde as a Horde Administrator to finish the
 configuration.
diff --git a/deskutils/horde-kronolith/pkg-plist b/deskutils/horde-kronolith/pkg-plist
index 46df1c3..bfee675 100644
--- a/deskutils/horde-kronolith/pkg-plist
+++ b/deskutils/horde-kronolith/pkg-plist
@@ -195,7 +195,7 @@
 %%KRONOLITHDIR%%/viewevent.php
 %%KRONOLITHDIR%%/week.php
 %%KRONOLITHDIR%%/workweek.php
-etc/horde/httpd.conf.kronolith
+%%HORDE_INC%%/httpd-kronolith.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%KRONOLITHDIR%%/themes/simplex
 @dirrm %%KRONOLITHDIR%%/themes/print
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index 61dc04e..e5e46cd 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -24,10 +24,13 @@ COMMENT=	Mnemo is the Horde notes and memos application
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	MNEMODIR=${LMNEMODIR}
+PLIST_SUB=	MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	MNEMODIR=${MNEMODIR}
 
 DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES  docs/TODO docs/UPGRADING
@@ -40,11 +43,17 @@ LMNEMODIR?=	${LHORDEDIR}/mnemo
 MNEMODIR=	${PREFIX}/${LMNEMODIR}
 CONFDIR=	${MNEMODIR}/config
 
+.include <bsd.port.pre.mk>
+
+.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/mnemo:${MNEMODIR}:g"	\
-		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo
+		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf
 
 do-install:
 	@${MKDIR}  ${MNEMODIR}
@@ -59,7 +68,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -69,10 +78,8 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/horde4-mnemo/pkg-deinstall b/deskutils/horde-mnemo/files/pkg-deinstall.in
index b329889..0a40a68 100644
--- a/deskutils/horde4-mnemo/pkg-deinstall
+++ b/deskutils/horde-mnemo/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/mnemo/config/*php`; do
+  for cf in `ls %%MNEMODIR%%/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/deskutils/horde-mnemo/pkg-plist b/deskutils/horde-mnemo/pkg-plist
index cc60dcb..816549d 100644
--- a/deskutils/horde-mnemo/pkg-plist
+++ b/deskutils/horde-mnemo/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.mnemo
+%%HORDE_INC%%/httpd-mnemo.conf
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index 5928f93..378160e5 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -25,11 +25,12 @@ COMMENT=	Nag is a simple, multiuser task list manager
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	NAGDIR=${LNAGDIR}
+PLIST_SUB=	NAGDIR=${LNAGDIR} 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=	NAGDIR=${NAGDIR}
 
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
@@ -43,11 +44,17 @@ LNAGDIR?=	${LHORDEDIR}/nag
 NAGDIR=		${PREFIX}/${LNAGDIR}
 CONFDIR=	${NAGDIR}/config
 
+.include <bsd.port.pre.mk>
+
+.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/nag:${NAGDIR}:g"		\
-		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd.conf.nag
+		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf
 
 do-install:
 	@${MKDIR}  ${NAGDIR}
@@ -62,7 +69,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.nag ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -76,4 +83,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/nag/pkg-deinstall b/deskutils/horde-nag/files/pkg-deinstall.in
index 266600f..8f85e54 100644
--- a/deskutils/nag/pkg-deinstall
+++ b/deskutils/horde-nag/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/nag/config/*php`; do
+  for cf in `ls %%NAGDIR%%/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/deskutils/horde-nag/pkg-plist b/deskutils/horde-nag/pkg-plist
index 14695a5..f8516bc 100644
--- a/deskutils/horde-nag/pkg-plist
+++ b/deskutils/horde-nag/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.nag
+%%HORDE_INC%%/httpd-nag.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index fe2d86b..32bae02 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -25,14 +25,14 @@ COMMENT=	Kronolith is the Horde calendar application
 #----------------------------------------------------------------------------
 # You may define this option:
 #
-# - WITHOUT_MCAL:	you won't use the MCAL driver but a database backend
-#			(only for PHP4).
+# - WITH_MCAL:	you want to use the MCAL driver (deprecated, and only for PHP4).
 #
 #----------------------------------------------------------------------------
 
 RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_PHP=	yes	# modules set by Horde, but needed to get PHP_VER
 USE_REINPLACE=	yes
 
@@ -46,18 +46,23 @@ LHORDEDIR?=	www/horde
 LKRONOLITHDIR?=	${LHORDEDIR}/kronolith
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	KRONOLITHDIR=${KRONOLITHDIR}
-PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR}
+PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 
 KRONOLITHDIR=	${PREFIX}/${LKRONOLITHDIR}
 CONFDIR=	${KRONOLITHDIR}/config
 VAR_CAL=	/var/calendar
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 .include <bsd.port.pre.mk>
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 .if exists(${LOCALBASE}/sbin/htpasswd)
 HTPASSWD=	${LOCALBASE}/sbin/htpasswd
 .else
@@ -67,7 +72,7 @@ HTPASSWD=	${LOCALBASE}/bin/htpasswd
 pre-configure:
 	@${RM} ${WRKSRC}/config/conf.xml.orig
 	@${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:"	\
-		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd.conf.kronolith
+		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf
 
 do-install:
 	@${MKDIR}  ${KRONOLITHDIR}
@@ -82,7 +87,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.kronolith ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -92,13 +97,13 @@ do-install:
 .endif
 
 post-install:
-.if !defined(WITHOUT_MCAL) && (${PHP_VER} == 4)
+.if defined(WITH_MCAL) && (${PHP_VER} == 4)
 	@if [ ! -d ${VAR_CAL} ]; then \
 	  ${ECHO_MSG} "===> Creating ${VAR_CAL}" ; \
 	  ${MKDIR} ${VAR_CAL} ; \
 	  ${CHMOD} 1777 ${VAR_CAL} ; \
 	fi
-.if !defined(BATCH)
+. if !defined(BATCH)
 	@if [ ! -f ${LOCALBASE}/etc/mpasswd ] ; then \
 	  ${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \
 	  ${ECHO} -n "Please enter a password for www's calendar: " ; \
diff --git a/deskutils/kronolith/pkg-deinstall b/deskutils/horde4-kronolith/files/pkg-deinstall.in
index 4578da3..896c740 100644
--- a/deskutils/kronolith/pkg-deinstall
+++ b/deskutils/horde4-kronolith/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/kronolith/config/*php`; do
+  for cf in `ls %%KRONOLITHDIR%%/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/deskutils/horde4-kronolith/files/pkg-message.in b/deskutils/horde4-kronolith/files/pkg-message.in
index e7f0e34..54946bd 100644
--- a/deskutils/horde4-kronolith/files/pkg-message.in
+++ b/deskutils/horde4-kronolith/files/pkg-message.in
@@ -5,7 +5,7 @@ blank configuration files.
 Horde must be configured; if not, see `pkg_info -D -x horde'.
 
 With PHP4:
-If you choose the mcal backend, libmcal must be configured with the driver
+If you choosed the mcal backend, libmcal must be configured with the driver
 mstore for the user www:
 
 - mkdir /var/calendar
@@ -21,6 +21,9 @@ SQL scripts in %%KRONOLITHDIR%%/scripts/sql.
 WARNING! if you are upgrading from Kronolith v. 1.1.x, you have to alter
 ******** your schemas.
          Please read the doc %%DOCSDIR%%/UPGRADING.
+         Please note that the MCAL back-end is deprecated!
+         To migrate from MCAL to SQL, you can use the provided script
+         %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php
 
 Finally, you must login to Horde as a Horde Administrator to finish the
 configuration.
diff --git a/deskutils/horde4-kronolith/pkg-plist b/deskutils/horde4-kronolith/pkg-plist
index 46df1c3..bfee675 100644
--- a/deskutils/horde4-kronolith/pkg-plist
+++ b/deskutils/horde4-kronolith/pkg-plist
@@ -195,7 +195,7 @@
 %%KRONOLITHDIR%%/viewevent.php
 %%KRONOLITHDIR%%/week.php
 %%KRONOLITHDIR%%/workweek.php
-etc/horde/httpd.conf.kronolith
+%%HORDE_INC%%/httpd-kronolith.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%KRONOLITHDIR%%/themes/simplex
 @dirrm %%KRONOLITHDIR%%/themes/print
diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile
index 61dc04e..e5e46cd 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde4-mnemo/Makefile
@@ -24,10 +24,13 @@ COMMENT=	Mnemo is the Horde notes and memos application
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	MNEMODIR=${LMNEMODIR}
+PLIST_SUB=	MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	MNEMODIR=${MNEMODIR}
 
 DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES  docs/TODO docs/UPGRADING
@@ -40,11 +43,17 @@ LMNEMODIR?=	${LHORDEDIR}/mnemo
 MNEMODIR=	${PREFIX}/${LMNEMODIR}
 CONFDIR=	${MNEMODIR}/config
 
+.include <bsd.port.pre.mk>
+
+.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/mnemo:${MNEMODIR}:g"	\
-		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo
+		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf
 
 do-install:
 	@${MKDIR}  ${MNEMODIR}
@@ -59,7 +68,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -69,10 +78,8 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/horde-mnemo/pkg-deinstall b/deskutils/horde4-mnemo/files/pkg-deinstall.in
index b329889..0a40a68 100644
--- a/deskutils/horde-mnemo/pkg-deinstall
+++ b/deskutils/horde4-mnemo/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/mnemo/config/*php`; do
+  for cf in `ls %%MNEMODIR%%/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/deskutils/horde4-mnemo/pkg-plist b/deskutils/horde4-mnemo/pkg-plist
index cc60dcb..816549d 100644
--- a/deskutils/horde4-mnemo/pkg-plist
+++ b/deskutils/horde4-mnemo/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.mnemo
+%%HORDE_INC%%/httpd-mnemo.conf
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index 5928f93..378160e5 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -25,11 +25,12 @@ COMMENT=	Nag is a simple, multiuser task list manager
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	NAGDIR=${LNAGDIR}
+PLIST_SUB=	NAGDIR=${LNAGDIR} 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=	NAGDIR=${NAGDIR}
 
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
@@ -43,11 +44,17 @@ LNAGDIR?=	${LHORDEDIR}/nag
 NAGDIR=		${PREFIX}/${LNAGDIR}
 CONFDIR=	${NAGDIR}/config
 
+.include <bsd.port.pre.mk>
+
+.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/nag:${NAGDIR}:g"		\
-		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd.conf.nag
+		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf
 
 do-install:
 	@${MKDIR}  ${NAGDIR}
@@ -62,7 +69,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.nag ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -76,4 +83,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/horde-nag/pkg-deinstall b/deskutils/horde4-nag/files/pkg-deinstall.in
index 266600f..8f85e54 100644
--- a/deskutils/horde-nag/pkg-deinstall
+++ b/deskutils/horde4-nag/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/nag/config/*php`; do
+  for cf in `ls %%NAGDIR%%/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/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist
index 14695a5..f8516bc 100644
--- a/deskutils/horde4-nag/pkg-plist
+++ b/deskutils/horde4-nag/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.nag
+%%HORDE_INC%%/httpd-nag.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile
index fe2d86b..32bae02 100644
--- a/deskutils/kronolith/Makefile
+++ b/deskutils/kronolith/Makefile
@@ -25,14 +25,14 @@ COMMENT=	Kronolith is the Horde calendar application
 #----------------------------------------------------------------------------
 # You may define this option:
 #
-# - WITHOUT_MCAL:	you won't use the MCAL driver but a database backend
-#			(only for PHP4).
+# - WITH_MCAL:	you want to use the MCAL driver (deprecated, and only for PHP4).
 #
 #----------------------------------------------------------------------------
 
 RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 USE_PHP=	yes	# modules set by Horde, but needed to get PHP_VER
 USE_REINPLACE=	yes
 
@@ -46,18 +46,23 @@ LHORDEDIR?=	www/horde
 LKRONOLITHDIR?=	${LHORDEDIR}/kronolith
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	KRONOLITHDIR=${KRONOLITHDIR}
-PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR}
+PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 
 KRONOLITHDIR=	${PREFIX}/${LKRONOLITHDIR}
 CONFDIR=	${KRONOLITHDIR}/config
 VAR_CAL=	/var/calendar
 
-HORDE_INC=	${LOCALBASE}/etc/horde
-
 .include <bsd.port.pre.mk>
 
+.if ${APACHE_VERSION} >= 20
+HORDE_INC=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
+HORDE_INC=	${LOCALBASE}/etc/horde
+.endif
+
 .if exists(${LOCALBASE}/sbin/htpasswd)
 HTPASSWD=	${LOCALBASE}/sbin/htpasswd
 .else
@@ -67,7 +72,7 @@ HTPASSWD=	${LOCALBASE}/bin/htpasswd
 pre-configure:
 	@${RM} ${WRKSRC}/config/conf.xml.orig
 	@${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:"	\
-		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd.conf.kronolith
+		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf
 
 do-install:
 	@${MKDIR}  ${KRONOLITHDIR}
@@ -82,7 +87,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.kronolith ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -92,13 +97,13 @@ do-install:
 .endif
 
 post-install:
-.if !defined(WITHOUT_MCAL) && (${PHP_VER} == 4)
+.if defined(WITH_MCAL) && (${PHP_VER} == 4)
 	@if [ ! -d ${VAR_CAL} ]; then \
 	  ${ECHO_MSG} "===> Creating ${VAR_CAL}" ; \
 	  ${MKDIR} ${VAR_CAL} ; \
 	  ${CHMOD} 1777 ${VAR_CAL} ; \
 	fi
-.if !defined(BATCH)
+. if !defined(BATCH)
 	@if [ ! -f ${LOCALBASE}/etc/mpasswd ] ; then \
 	  ${ECHO_MSG} "===> Creating ${LOCALBASE}/etc/mpasswd" ; \
 	  ${ECHO} -n "Please enter a password for www's calendar: " ; \
diff --git a/deskutils/horde4-kronolith/pkg-deinstall b/deskutils/kronolith/files/pkg-deinstall.in
index 4578da3..896c740 100644
--- a/deskutils/horde4-kronolith/pkg-deinstall
+++ b/deskutils/kronolith/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/kronolith/config/*php`; do
+  for cf in `ls %%KRONOLITHDIR%%/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/deskutils/kronolith/files/pkg-message.in b/deskutils/kronolith/files/pkg-message.in
index e7f0e34..54946bd 100644
--- a/deskutils/kronolith/files/pkg-message.in
+++ b/deskutils/kronolith/files/pkg-message.in
@@ -5,7 +5,7 @@ blank configuration files.
 Horde must be configured; if not, see `pkg_info -D -x horde'.
 
 With PHP4:
-If you choose the mcal backend, libmcal must be configured with the driver
+If you choosed the mcal backend, libmcal must be configured with the driver
 mstore for the user www:
 
 - mkdir /var/calendar
@@ -21,6 +21,9 @@ SQL scripts in %%KRONOLITHDIR%%/scripts/sql.
 WARNING! if you are upgrading from Kronolith v. 1.1.x, you have to alter
 ******** your schemas.
          Please read the doc %%DOCSDIR%%/UPGRADING.
+         Please note that the MCAL back-end is deprecated!
+         To migrate from MCAL to SQL, you can use the provided script
+         %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php
 
 Finally, you must login to Horde as a Horde Administrator to finish the
 configuration.
diff --git a/deskutils/kronolith/pkg-plist b/deskutils/kronolith/pkg-plist
index 46df1c3..bfee675 100644
--- a/deskutils/kronolith/pkg-plist
+++ b/deskutils/kronolith/pkg-plist
@@ -195,7 +195,7 @@
 %%KRONOLITHDIR%%/viewevent.php
 %%KRONOLITHDIR%%/week.php
 %%KRONOLITHDIR%%/workweek.php
-etc/horde/httpd.conf.kronolith
+%%HORDE_INC%%/httpd-kronolith.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%KRONOLITHDIR%%/themes/simplex
 @dirrm %%KRONOLITHDIR%%/themes/print
diff --git a/deskutils/mnemo/Makefile b/deskutils/mnemo/Makefile
index 61dc04e..e5e46cd 100644
--- a/deskutils/mnemo/Makefile
+++ b/deskutils/mnemo/Makefile
@@ -24,10 +24,13 @@ COMMENT=	Mnemo is the Horde notes and memos application
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	MNEMODIR=${LMNEMODIR}
+PLIST_SUB=	MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST=	MNEMODIR=${MNEMODIR}
 
 DOCS=		LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL	\
 		docs/RELEASE_NOTES  docs/TODO docs/UPGRADING
@@ -40,11 +43,17 @@ LMNEMODIR?=	${LHORDEDIR}/mnemo
 MNEMODIR=	${PREFIX}/${LMNEMODIR}
 CONFDIR=	${MNEMODIR}/config
 
+.include <bsd.port.pre.mk>
+
+.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/mnemo:${MNEMODIR}:g"	\
-		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo
+		${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf
 
 do-install:
 	@${MKDIR}  ${MNEMODIR}
@@ -59,7 +68,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -69,10 +78,8 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"	\
-		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/mnemo/pkg-deinstall b/deskutils/mnemo/files/pkg-deinstall.in
index b329889..0a40a68 100644
--- a/deskutils/mnemo/pkg-deinstall
+++ b/deskutils/mnemo/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/mnemo/config/*php`; do
+  for cf in `ls %%MNEMODIR%%/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/deskutils/mnemo/pkg-plist b/deskutils/mnemo/pkg-plist
index cc60dcb..816549d 100644
--- a/deskutils/mnemo/pkg-plist
+++ b/deskutils/mnemo/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.mnemo
+%%HORDE_INC%%/httpd-mnemo.conf
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile
index 5928f93..378160e5 100644
--- a/deskutils/nag/Makefile
+++ b/deskutils/nag/Makefile
@@ -25,11 +25,12 @@ COMMENT=	Nag is a simple, multiuser task list manager
 RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
 
 NO_BUILD=	yes
-USE_REINPLACE=	yes
+USE_APACHE=	1.3+	# needed to test APACHE_VERSION
 
-PLIST_SUB=	NAGDIR=${LNAGDIR}
+PLIST_SUB=	NAGDIR=${LNAGDIR} 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=	NAGDIR=${NAGDIR}
 
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL	\
@@ -43,11 +44,17 @@ LNAGDIR?=	${LHORDEDIR}/nag
 NAGDIR=		${PREFIX}/${LNAGDIR}
 CONFDIR=	${NAGDIR}/config
 
+.include <bsd.port.pre.mk>
+
+.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/nag:${NAGDIR}:g"		\
-		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd.conf.nag
+		${FILESDIR}/httpd.conf.nag > ${WRKDIR}/httpd-nag.conf
 
 do-install:
 	@${MKDIR}  ${NAGDIR}
@@ -62,7 +69,7 @@ do-install:
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${NAGDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd.conf.nag ${HORDE_INC}
+	@${INSTALL_DATA} ${WRKDIR}/httpd-nag.conf ${HORDE_INC}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -76,4 +83,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/horde4-nag/pkg-deinstall b/deskutils/nag/files/pkg-deinstall.in
index 266600f..8f85e54 100644
--- a/deskutils/horde4-nag/pkg-deinstall
+++ b/deskutils/nag/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/nag/config/*php`; do
+  for cf in `ls %%NAGDIR%%/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/deskutils/nag/pkg-plist b/deskutils/nag/pkg-plist
index 14695a5..f8516bc 100644
--- a/deskutils/nag/pkg-plist
+++ b/deskutils/nag/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.nag
+%%HORDE_INC%%/httpd-nag.conf
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS