diff -ur /tmp/horde-vacation/Makefile horde-vacation/Makefile
--- /tmp/horde-vacation/Makefile	Sat Mar 10 19:21:09 2007
+++ horde-vacation/Makefile	Sat Mar 10 19:20:53 2007
@@ -7,13 +7,13 @@
 
 PORTNAME=	vacation
 PORTVERSION=	3.0
+DISTVERSIONPREFIX=	h3-
 CATEGORIES=	mail www
 MASTER_SITES=	HORDE
 PKGNAMEPREFIX=	horde-
-DISTNAME=	${PORTNAME}-h3-${PORTVERSION}
 
 MAINTAINER=	beech@alaskaparadise.com
-COMMENT=	Horde module for  "vacation notices" or "auto-responders"
+COMMENT=	E-mail auto-responder
 
 #-----------------------------------------------------------------------
 # You may define these options:
@@ -41,7 +41,7 @@
 REINPLACE_ARGS=	-i ""
 
 PORTDOCS=	CHANGES CREDITS INSTALL RELEASE_NOTES TODO
-CONFFILE=	 conf.xml .htaccess
+CONFFILE=	conf.xml .htaccess
 SUB_DIRS=	config files lib locale po scripts templates themes
 
 LHORDEDIR?=	www/horde
@@ -54,7 +54,7 @@
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
 SUB_LIST=	VACDIR=${VACDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR}
 
-VACDIR=	${PREFIX}/${LVACDIR}
+VACDIR=		${PREFIX}/${LVACDIR}
 CONFDIR=	${VACDIR}/config
 
 HOSTNAME?=	`/bin/hostname`
@@ -78,20 +78,14 @@
 	@${SED} -e "s:/home/httpd/html/horde/vacation:${VACDIR}:" \
 		${FILESDIR}/httpd.conf.vacation > ${WRKDIR}/httpd-vacation.conf
 
-pre-install:
-
 do-install:
 	@${INSTALL} -d ${VACDIR}/
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${VACDIR}/
-.endfor
-
-	@${CP} -p  ${WRKSRC}/*.php ${VACDIR}/
+	@${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${VACDIR}/
+	@${CP} -p ${WRKSRC}/*.php ${VACDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
 	@${INSTALL_DATA} ${WRKDIR}/httpd-vacation.conf ${VAC_INC}/
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${VACDIR}/
 	@${CHMOD} -R o-rwx ${CONFDIR}/
-
 .if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${DOCSDIR}/
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/