4 files changed, 43 insertions, 15 deletions

diff --git a/deskutils/plans/Makefile b/deskutils/plans/Makefile
index 5000d4d7c3c0..ba2798439758 100644
--- a/deskutils/plans/Makefile
+++ b/deskutils/plans/Makefile
@@ -7,12 +7,19 @@
 #
 
 PORTNAME=	plans
-PORTVERSION=	7.5.3
+PORTVERSION=	7.5.4
 CATEGORIES=	deskutils www
 MASTER_SITES=	http://www.planscalendar.com/release/:plans \
+		http://www.planscalendar.com/addons/:addons \
 		http://www.freebsd.org/gifs/:logo
 DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}:plans \
+		danish.pl:addons \
+		nl_dutch.pl:addons \
+		fr_french.pl:addons \
+		de_german.pl:addons \
+		zh_tw.pl:addons \
 		powerani.gif:logo
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	infofarmer@gmail.com
@@ -31,17 +38,19 @@ PLIST_SUB+=	DIR=${PLANSDIR}
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 DIR=		${PREFIX}/${PLANSDIR}
+SUB_LIST+=	DIR=${DIR}
 
 post-extract:
-	${CP} ${DISTDIR}/powerani.gif ${WRKSRC}/theme/graphics/freebsd.gif
+	${CP} ${_DISTDIR}/powerani.gif ${WRKSRC}/theme/graphics/freebsd.gif
+	${CP} ${_DISTDIR}/*.pl ${WRKSRC}/
 
 post-patch:
 	@${RM} -f ${WRKSRC}/theme/plans.template.orig
 
 do-install:
 	@${INSTALL} -d ${DIR}
-	@${CP} -nR ${WRKSRC}/ ${DIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DIR}
+	@${CP} -nR ${WRKSRC}/ ${DIR}/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DIR}/
 	@${FIND} ${DIR} -type f -exec ${CHMOD} 644 {} \;
 	@${FIND} ${DIR} -name '*.cgi' -exec ${CHMOD} 755 {} \;
 	@${FIND} ${DIR} -name '*.xml' -exec ${CHMOD} 664 {} \;
diff --git a/deskutils/plans/distinfo b/deskutils/plans/distinfo
index 969720fbbe71..6f087c937cee 100644
--- a/deskutils/plans/distinfo
+++ b/deskutils/plans/distinfo
@@ -1,6 +1,21 @@
-MD5 (plans_7.5.3.zip) = 9bcbef087f5085e3fcfcd31820f5d7f8
-SHA256 (plans_7.5.3.zip) = 16da4aab3ccad299917a1e7c97db6066ec6c4dec41e65d3417cca40e42496aa1
-SIZE (plans_7.5.3.zip) = 588143
-MD5 (powerani.gif) = b0f85a6c41817a2dcad0ffe6f0729fa8
-SHA256 (powerani.gif) = d01c1c8299aa6c0eda0cd7c202bdf5a4ad49400377596fc2e114db6591c66d97
-SIZE (powerani.gif) = 7203
+MD5 (plans/plans_7.5.4.zip) = 962aad814de92aee41ae0e05c8563eff
+SHA256 (plans/plans_7.5.4.zip) = 11a34d6b5feea87afcf7a6ca1b73919fdae17641aca60d727ef68484c2742bcd
+SIZE (plans/plans_7.5.4.zip) = 588422
+MD5 (plans/danish.pl) = a2c4021f15ea0696de3b131133264f2a
+SHA256 (plans/danish.pl) = caed01510af6d0f49a409b8b2467ddaa2f095462374ab388806cab230134cf19
+SIZE (plans/danish.pl) = 36419
+MD5 (plans/nl_dutch.pl) = f5bb10a37a17ff65546f634cea3345bd
+SHA256 (plans/nl_dutch.pl) = 848f2a137369f29ca7c07ce9f2b47339d5b62be582ca5e690b7dbd514adc77d8
+SIZE (plans/nl_dutch.pl) = 39228
+MD5 (plans/fr_french.pl) = e47e3d4e399b86276994ef4725f28ea1
+SHA256 (plans/fr_french.pl) = 791b2a343273fc375044ef5c5eec48e7995cc3e6d42771e29686e740e8a68624
+SIZE (plans/fr_french.pl) = 44001
+MD5 (plans/de_german.pl) = d70ab71b0fb17a8419804b6b2f997b0a
+SHA256 (plans/de_german.pl) = 24c0fa9359151c39b26c21b504712d1ad60319be5903e51865b851de34bd51b7
+SIZE (plans/de_german.pl) = 29592
+MD5 (plans/zh_tw.pl) = 6fd0e7168115df9befd1a6f7f4258ede
+SHA256 (plans/zh_tw.pl) = f7671cb14435dc9c0e3a562efd3c91627324e10ff76cbdbd90dfcfda873c0967
+SIZE (plans/zh_tw.pl) = 38047
+MD5 (plans/powerani.gif) = b0f85a6c41817a2dcad0ffe6f0729fa8
+SHA256 (plans/powerani.gif) = d01c1c8299aa6c0eda0cd7c202bdf5a4ad49400377596fc2e114db6591c66d97
+SIZE (plans/powerani.gif) = 7203
diff --git a/deskutils/plans/files/pkg-message.in b/deskutils/plans/files/pkg-message.in
index 530c69835a8d..680c16176bff 100644
--- a/deskutils/plans/files/pkg-message.in
+++ b/deskutils/plans/files/pkg-message.in
@@ -1,5 +1,4 @@
-Plans is available via http://localhost/plans/.
-Please make sure that your webserver is configured to accept .cgi
-scripts.
-Please check %%PREFIX%%/www/data/plans/plans_config.pl for the
-configuration file.
+Plans is now available via http://localhost/plans/
+Please make sure that your webserver is configured to accept
+CGI scripts in %%DIR%%
+Plans can be configured by editing %%DIR%%/plans_config.pl
diff --git a/deskutils/plans/pkg-plist b/deskutils/plans/pkg-plist
index 261522d42139..427c1e3f6680 100644
--- a/deskutils/plans/pkg-plist
+++ b/deskutils/plans/pkg-plist
@@ -323,6 +323,11 @@
 %%DIR%%/theme/upcoming_events.css
 %%DIR%%/theme/upcoming_events.js
 %%DIR%%/us_english.pl
+%%DIR%%/danish.pl
+%%DIR%%/de_german.pl
+%%DIR%%/fr_french.pl
+%%DIR%%/nl_dutch.pl
+%%DIR%%/zh_tw.pl
 @dirrm %%DIR%%/theme/icons
 @dirrm %%DIR%%/theme/graphics
 @unexec rmdir %D/%%DIR%%/theme 2>/dev/null || true