- Remove apache cruft

- Assorted tweaks and updates
- Bump portrevisions

Submitted by:	Beech Rintoul <beech@alaskaparadise.com> (maintainer)

4 files changed, 20 insertions, 67 deletions

diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index f2ffc1826ba1..d23e7549c9f1 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -7,23 +7,23 @@
 
 PORTNAME=	kronolith
 PORTVERSION=	2.1.4
+DISTVERSIONPREFIX=	h3-
+PORTREVISION=	1
 CATEGORIES=	deskutils www
 MASTER_SITES=	HORDE
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	beech@alaskaparadise.com
 COMMENT=	Kronolith is the Horde calendar application
 
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base
+RUN_DEPENDS=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base
 
 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_GETTEXT=	yes
 
 REINPLACE_ARGS=	-i ""
-DOCS=		README docs/CHANGES docs/CREDITS docs/INSTALL	\
-		docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+PORTDOCS=	README CHANGES CREDITS INSTALL	\
+		RELEASE_NOTES TODO UPGRADING
 CONFFILE=	keywords.php menu.php prefs.php
 SUB_DIRS=	config js lib locale po scripts templates themes
 
@@ -34,41 +34,35 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
 SUB_LIST=	KRONOLITHDIR=${KRONOLITHDIR}
-PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
+PLIST_SUB=	KRONOLITHDIR=${LKRONOLITHDIR}
 
 KRONOLITHDIR=	${PREFIX}/${LKRONOLITHDIR}
 CONFDIR=	${KRONOLITHDIR}/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
+post-extract:
+	@${MV} ${WRKSRC}/README ${WRKSRC}/docs/
 
 pre-configure:
 	@(cd ${WRKSRC}/scripts &&	\
 		${FIND} . -name "*.php" -exec	\
 		${REINPLACE_CMD} -e "s:/usr/local/bin/php: ${LOCALBASE}/bin/php:;s:/usr/bin/php: ${LOCALBASE}/bin/php:" {} \; )
-	@${SED} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:"	\
-		${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf
 
 do-install:
-	@${MKDIR}  ${KRONOLITHDIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${KRONOLITHDIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${KRONOLITHDIR}
-
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC}
+	@${INSTALL} -d ${KRONOLITHDIR}/
+	@${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${KRONOLITHDIR}/
+	@${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}/
+	@${CHMOD} -R o-rwx ${KRONOLITHDIR}/
+	${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP}\
+		%D/${KRONOLITHDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST}
+	${ECHO_CMD} @exec ${CHMOD} -R o-rwx\
+		%D/${KRONOLITHDIR:S|^${PREFIX}/||}/ >> ${TMPPLIST}
 .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/deskutils/horde4-kronolith/files/httpd.conf.kronolith b/deskutils/horde4-kronolith/files/httpd.conf.kronolith
deleted file mode 100644
index a3748ea4e996..000000000000
--- a/deskutils/horde4-kronolith/files/httpd.conf.kronolith
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for Kronolith
-#
-# For security, don't serve pages from the Kronolith configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/kronolith/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/kronolith/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/kronolith/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/kronolith/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/kronolith/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/kronolith/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of Kronolith configuration ================
-
diff --git a/deskutils/horde4-kronolith/files/pkg-message.in b/deskutils/horde4-kronolith/files/pkg-message.in
index 540684cc4d22..8d1569fe4107 100644
--- a/deskutils/horde4-kronolith/files/pkg-message.in
+++ b/deskutils/horde4-kronolith/files/pkg-message.in
@@ -15,5 +15,4 @@ WARNING! Please note that the MCAL back-end has been deprecated!
 Finally, you must login to Horde as a Horde Administrator to finish the
 configuration.
 
-To protect your configuration files, you have to restart Apache.
 **************************************************************************
diff --git a/deskutils/horde4-kronolith/pkg-plist b/deskutils/horde4-kronolith/pkg-plist
index 2b25570f1873..3ee56c7dd0b1 100644
--- a/deskutils/horde4-kronolith/pkg-plist
+++ b/deskutils/horde4-kronolith/pkg-plist
@@ -1,10 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%KRONOLITHDIR%%/addevent.php
 %%KRONOLITHDIR%%/addeventaction.php
 %%KRONOLITHDIR%%/attend.php
@@ -215,8 +208,6 @@
 %%KRONOLITHDIR%%/week.php
 %%KRONOLITHDIR%%/workweek.php
 %%KRONOLITHDIR%%/year.php
-%%HORDE_INC%%/httpd-kronolith.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%KRONOLITHDIR%%/themes/simplex
 @dirrm %%KRONOLITHDIR%%/themes/print
 @dirrm %%KRONOLITHDIR%%/themes/mozilla