3 files changed, 266 insertions, 9 deletions

diff --git a/deskutils/phpicalendar/Makefile b/deskutils/phpicalendar/Makefile
index 9548e16bea8e..cc5fd65be5fc 100644
--- a/deskutils/phpicalendar/Makefile
+++ b/deskutils/phpicalendar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpicalendar
-PORTVERSION=	2.21
+PORTVERSION=	2.22
 CATEGORIES=	deskutils www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,24 +20,28 @@ PHPICALENDAR=	www/phpicalendar
 WWWDIR=		${PREFIX}/${PHPICALENDAR}
 PLIST_SUB+=	PHPICALENDAR=${PHPICALENDAR}
 USE_PHP=	yes
-NO_WORKSUBDIR=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	WWWDIR=${WWWDIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}/
+
+post-extract:
+	${RM} -r ${WRKSRC}/templates/default/images/CVS
+	${FIND} ${WRKDIR} -name .DS_Store -delete
 
 do-install:
 .if !exists(${WWWDIR})
 	${MKDIR} ${WWWDIR}
 .endif
 .for dir in admin calendars functions images includes languages rss templates
-	@${CP} -Rv ${WRKDIR}/${dir} ${WWWDIR}
+	@${CP} -Rv ${WRKSRC}/${dir} ${WWWDIR}
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/${dir}
 .endfor
 .for f in index.php TIMEZONES error.php day.php preferences.php print.php search.php week.php month.php year.php README COPYING AUTHORS
-	@${CP} -v ${WRKDIR}/${f} ${WWWDIR}
+	@${CP} -v ${WRKSRC}/${f} ${WWWDIR}
 	${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/${f}
 .endfor
-	@${CP} -v ${WRKDIR}/config.inc.php ${WWWDIR}/config.inc.php-default
+	@${CP} -v ${WRKSRC}/config.inc.php ${WWWDIR}/config.inc.php-default
 	${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/config.inc.php-default
 
 post-install:
diff --git a/deskutils/phpicalendar/distinfo b/deskutils/phpicalendar/distinfo
index e5811ea29663..54f61773a9e5 100644
--- a/deskutils/phpicalendar/distinfo
+++ b/deskutils/phpicalendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpicalendar-2.21.tgz) = 297e3a869f53bc0aa62653ed4d3b495d
-SHA256 (phpicalendar-2.21.tgz) = 45e8bc8417762eb7779877a7abc4f7afe9e12a9f51b304f9c02dfdfaecd9add5
-SIZE (phpicalendar-2.21.tgz) = 149004
+MD5 (phpicalendar-2.22.tgz) = dfa340e2c3038172b15244bab4b885aa
+SHA256 (phpicalendar-2.22.tgz) = 7c749bb6813b73c9eaabd3187b25114985484460466c670ddd3f8993a90bb8f0
+SIZE (phpicalendar-2.22.tgz) = 346184
diff --git a/deskutils/phpicalendar/pkg-plist b/deskutils/phpicalendar/pkg-plist
index 394157de6873..2cf4b9103207 100644
--- a/deskutils/phpicalendar/pkg-plist
+++ b/deskutils/phpicalendar/pkg-plist
@@ -63,6 +63,9 @@
 %%PHPICALENDAR%%/print.php
 %%PHPICALENDAR%%/rss/index.php
 %%PHPICALENDAR%%/rss/rss.php
+%%PHPICALENDAR%%/rss/rss1.0.php
+%%PHPICALENDAR%%/rss/rss2.0.php
+%%PHPICALENDAR%%/rss/xml.gif
 %%PHPICALENDAR%%/search.php
 %%PHPICALENDAR%%/templates/default/admin.tpl
 %%PHPICALENDAR%%/templates/default/calendar_nav.tpl
@@ -119,11 +122,261 @@
 %%PHPICALENDAR%%/templates/default/search.tpl
 %%PHPICALENDAR%%/templates/default/search_box.tpl
 %%PHPICALENDAR%%/templates/default/sidebar.tpl
+%%PHPICALENDAR%%/templates/default/sidebar_year.tpl
 %%PHPICALENDAR%%/templates/default/todo.tpl
 %%PHPICALENDAR%%/templates/default/week.tpl
 %%PHPICALENDAR%%/templates/default/year.tpl
+%%PHPICALENDAR%%/templates/green/admin.tpl
+%%PHPICALENDAR%%/templates/green/calendar_nav.tpl
+%%PHPICALENDAR%%/templates/green/day.tpl
+%%PHPICALENDAR%%/templates/green/default.css
+%%PHPICALENDAR%%/templates/green/error.tpl
+%%PHPICALENDAR%%/templates/green/event.tpl
+%%PHPICALENDAR%%/templates/green/footer.tpl
+%%PHPICALENDAR%%/templates/green/header.tpl
+%%PHPICALENDAR%%/templates/green/images/allday_1.gif
+%%PHPICALENDAR%%/templates/green/images/allday_2.gif
+%%PHPICALENDAR%%/templates/green/images/allday_3.gif
+%%PHPICALENDAR%%/templates/green/images/allday_4.gif
+%%PHPICALENDAR%%/templates/green/images/allday_5.gif
+%%PHPICALENDAR%%/templates/green/images/allday_6.gif
+%%PHPICALENDAR%%/templates/green/images/allday_7.gif
+%%PHPICALENDAR%%/templates/green/images/allday_bg.gif
+%%PHPICALENDAR%%/templates/green/images/allday_dot.gif
+%%PHPICALENDAR%%/templates/green/images/back.gif
+%%PHPICALENDAR%%/templates/green/images/background.gif
+%%PHPICALENDAR%%/templates/green/images/day_on.gif
+%%PHPICALENDAR%%/templates/green/images/day_title.gif
+%%PHPICALENDAR%%/templates/green/images/download_arrow.gif
+%%PHPICALENDAR%%/templates/green/images/event_dot.gif
+%%PHPICALENDAR%%/templates/green/images/left_arrows.gif
+%%PHPICALENDAR%%/templates/green/images/left_day.gif
+%%PHPICALENDAR%%/templates/green/images/month_on.gif
+%%PHPICALENDAR%%/templates/green/images/monthdot_1.gif
+%%PHPICALENDAR%%/templates/green/images/monthdot_2.gif
+%%PHPICALENDAR%%/templates/green/images/monthdot_3.gif
+%%PHPICALENDAR%%/templates/green/images/monthdot_4.gif
+%%PHPICALENDAR%%/templates/green/images/monthdot_5.gif
+%%PHPICALENDAR%%/templates/green/images/monthdot_6.gif
+%%PHPICALENDAR%%/templates/green/images/monthdot_7.gif
+%%PHPICALENDAR%%/templates/green/images/printer.gif
+%%PHPICALENDAR%%/templates/green/images/right_arrows.gif
+%%PHPICALENDAR%%/templates/green/images/right_day.gif
+%%PHPICALENDAR%%/templates/green/images/search.gif
+%%PHPICALENDAR%%/templates/green/images/shadow_l.gif
+%%PHPICALENDAR%%/templates/green/images/shadow_m.gif
+%%PHPICALENDAR%%/templates/green/images/shadow_r.gif
+%%PHPICALENDAR%%/templates/green/images/side_bg.gif
+%%PHPICALENDAR%%/templates/green/images/smallicon.gif
+%%PHPICALENDAR%%/templates/green/images/spacer.gif
+%%PHPICALENDAR%%/templates/green/images/time_bg.gif
+%%PHPICALENDAR%%/templates/green/images/week_on.gif
+%%PHPICALENDAR%%/templates/green/images/year_on.gif
+%%PHPICALENDAR%%/templates/green/month.tpl
+%%PHPICALENDAR%%/templates/green/month_large.tpl
+%%PHPICALENDAR%%/templates/green/month_medium.tpl
+%%PHPICALENDAR%%/templates/green/month_small.tpl
+%%PHPICALENDAR%%/templates/green/preferences.tpl
+%%PHPICALENDAR%%/templates/green/print.tpl
+%%PHPICALENDAR%%/templates/green/rss_index.tpl
+%%PHPICALENDAR%%/templates/green/search.tpl
+%%PHPICALENDAR%%/templates/green/search_box.tpl
+%%PHPICALENDAR%%/templates/green/seminar.tpl
+%%PHPICALENDAR%%/templates/green/sidebar.tpl
+%%PHPICALENDAR%%/templates/green/todo.tpl
+%%PHPICALENDAR%%/templates/green/week.tpl
+%%PHPICALENDAR%%/templates/green/year.tpl
+%%PHPICALENDAR%%/templates/grey/admin.tpl
+%%PHPICALENDAR%%/templates/grey/calendar_nav.tpl
+%%PHPICALENDAR%%/templates/grey/day.tpl
+%%PHPICALENDAR%%/templates/grey/default.css
+%%PHPICALENDAR%%/templates/grey/error.tpl
+%%PHPICALENDAR%%/templates/grey/event.tpl
+%%PHPICALENDAR%%/templates/grey/footer.tpl
+%%PHPICALENDAR%%/templates/grey/header.tpl
+%%PHPICALENDAR%%/templates/grey/images/allday_1.gif
+%%PHPICALENDAR%%/templates/grey/images/allday_2.gif
+%%PHPICALENDAR%%/templates/grey/images/allday_3.gif
+%%PHPICALENDAR%%/templates/grey/images/allday_4.gif
+%%PHPICALENDAR%%/templates/grey/images/allday_5.gif
+%%PHPICALENDAR%%/templates/grey/images/allday_6.gif
+%%PHPICALENDAR%%/templates/grey/images/allday_7.gif
+%%PHPICALENDAR%%/templates/grey/images/allday_bg.gif
+%%PHPICALENDAR%%/templates/grey/images/allday_dot.gif
+%%PHPICALENDAR%%/templates/grey/images/back.gif
+%%PHPICALENDAR%%/templates/grey/images/background.gif
+%%PHPICALENDAR%%/templates/grey/images/day_on.gif
+%%PHPICALENDAR%%/templates/grey/images/day_title.gif
+%%PHPICALENDAR%%/templates/grey/images/download_arrow.gif
+%%PHPICALENDAR%%/templates/grey/images/event_dot.gif
+%%PHPICALENDAR%%/templates/grey/images/left_arrows.gif
+%%PHPICALENDAR%%/templates/grey/images/left_day.gif
+%%PHPICALENDAR%%/templates/grey/images/month_on.gif
+%%PHPICALENDAR%%/templates/grey/images/monthdot_1.gif
+%%PHPICALENDAR%%/templates/grey/images/monthdot_2.gif
+%%PHPICALENDAR%%/templates/grey/images/monthdot_3.gif
+%%PHPICALENDAR%%/templates/grey/images/monthdot_4.gif
+%%PHPICALENDAR%%/templates/grey/images/monthdot_5.gif
+%%PHPICALENDAR%%/templates/grey/images/monthdot_6.gif
+%%PHPICALENDAR%%/templates/grey/images/monthdot_7.gif
+%%PHPICALENDAR%%/templates/grey/images/printer.gif
+%%PHPICALENDAR%%/templates/grey/images/right_arrows.gif
+%%PHPICALENDAR%%/templates/grey/images/right_day.gif
+%%PHPICALENDAR%%/templates/grey/images/search.gif
+%%PHPICALENDAR%%/templates/grey/images/shadow_l.gif
+%%PHPICALENDAR%%/templates/grey/images/shadow_m.gif
+%%PHPICALENDAR%%/templates/grey/images/shadow_r.gif
+%%PHPICALENDAR%%/templates/grey/images/side_bg.gif
+%%PHPICALENDAR%%/templates/grey/images/smallicon.gif
+%%PHPICALENDAR%%/templates/grey/images/spacer.gif
+%%PHPICALENDAR%%/templates/grey/images/time_bg.gif
+%%PHPICALENDAR%%/templates/grey/images/week_on.gif
+%%PHPICALENDAR%%/templates/grey/images/year_on.gif
+%%PHPICALENDAR%%/templates/grey/month.tpl
+%%PHPICALENDAR%%/templates/grey/month_large.tpl
+%%PHPICALENDAR%%/templates/grey/month_medium.tpl
+%%PHPICALENDAR%%/templates/grey/month_small.tpl
+%%PHPICALENDAR%%/templates/grey/preferences.tpl
+%%PHPICALENDAR%%/templates/grey/print.tpl
+%%PHPICALENDAR%%/templates/grey/rss_index.tpl
+%%PHPICALENDAR%%/templates/grey/search.tpl
+%%PHPICALENDAR%%/templates/grey/search_box.tpl
+%%PHPICALENDAR%%/templates/grey/seminar.tpl
+%%PHPICALENDAR%%/templates/grey/sidebar.tpl
+%%PHPICALENDAR%%/templates/grey/todo.tpl
+%%PHPICALENDAR%%/templates/grey/week.tpl
+%%PHPICALENDAR%%/templates/grey/year.tpl
+%%PHPICALENDAR%%/templates/red/admin.tpl
+%%PHPICALENDAR%%/templates/red/calendar_nav.tpl
+%%PHPICALENDAR%%/templates/red/day.tpl
+%%PHPICALENDAR%%/templates/red/default.css
+%%PHPICALENDAR%%/templates/red/error.tpl
+%%PHPICALENDAR%%/templates/red/event.tpl
+%%PHPICALENDAR%%/templates/red/footer.tpl
+%%PHPICALENDAR%%/templates/red/header.tpl
+%%PHPICALENDAR%%/templates/red/images/allday_1.gif
+%%PHPICALENDAR%%/templates/red/images/allday_2.gif
+%%PHPICALENDAR%%/templates/red/images/allday_3.gif
+%%PHPICALENDAR%%/templates/red/images/allday_4.gif
+%%PHPICALENDAR%%/templates/red/images/allday_5.gif
+%%PHPICALENDAR%%/templates/red/images/allday_6.gif
+%%PHPICALENDAR%%/templates/red/images/allday_7.gif
+%%PHPICALENDAR%%/templates/red/images/allday_bg.gif
+%%PHPICALENDAR%%/templates/red/images/allday_dot.gif
+%%PHPICALENDAR%%/templates/red/images/back.gif
+%%PHPICALENDAR%%/templates/red/images/day_on.gif
+%%PHPICALENDAR%%/templates/red/images/day_title.gif
+%%PHPICALENDAR%%/templates/red/images/download_arrow.gif
+%%PHPICALENDAR%%/templates/red/images/event_dot.gif
+%%PHPICALENDAR%%/templates/red/images/left_arrows.gif
+%%PHPICALENDAR%%/templates/red/images/left_day.gif
+%%PHPICALENDAR%%/templates/red/images/month_on.gif
+%%PHPICALENDAR%%/templates/red/images/monthdot_1.gif
+%%PHPICALENDAR%%/templates/red/images/monthdot_2.gif
+%%PHPICALENDAR%%/templates/red/images/monthdot_3.gif
+%%PHPICALENDAR%%/templates/red/images/monthdot_4.gif
+%%PHPICALENDAR%%/templates/red/images/monthdot_5.gif
+%%PHPICALENDAR%%/templates/red/images/monthdot_6.gif
+%%PHPICALENDAR%%/templates/red/images/monthdot_7.gif
+%%PHPICALENDAR%%/templates/red/images/printer.gif
+%%PHPICALENDAR%%/templates/red/images/right_arrows.gif
+%%PHPICALENDAR%%/templates/red/images/right_day.gif
+%%PHPICALENDAR%%/templates/red/images/search.gif
+%%PHPICALENDAR%%/templates/red/images/shadow_l.gif
+%%PHPICALENDAR%%/templates/red/images/shadow_m.gif
+%%PHPICALENDAR%%/templates/red/images/shadow_r.gif
+%%PHPICALENDAR%%/templates/red/images/side_bg.gif
+%%PHPICALENDAR%%/templates/red/images/smallicon.gif
+%%PHPICALENDAR%%/templates/red/images/spacer.gif
+%%PHPICALENDAR%%/templates/red/images/time_bg.gif
+%%PHPICALENDAR%%/templates/red/images/week_on.gif
+%%PHPICALENDAR%%/templates/red/images/year_on.gif
+%%PHPICALENDAR%%/templates/red/month.tpl
+%%PHPICALENDAR%%/templates/red/month_large.tpl
+%%PHPICALENDAR%%/templates/red/month_medium.tpl
+%%PHPICALENDAR%%/templates/red/month_small.tpl
+%%PHPICALENDAR%%/templates/red/preferences.tpl
+%%PHPICALENDAR%%/templates/red/print.tpl
+%%PHPICALENDAR%%/templates/red/rss_index.tpl
+%%PHPICALENDAR%%/templates/red/search.tpl
+%%PHPICALENDAR%%/templates/red/search_box.tpl
+%%PHPICALENDAR%%/templates/red/sidebar.tpl
+%%PHPICALENDAR%%/templates/red/sidebar_year.tpl
+%%PHPICALENDAR%%/templates/red/todo.tpl
+%%PHPICALENDAR%%/templates/red/week.tpl
+%%PHPICALENDAR%%/templates/red/year.tpl
+%%PHPICALENDAR%%/templates/tan/admin.tpl
+%%PHPICALENDAR%%/templates/tan/calendar_nav.tpl
+%%PHPICALENDAR%%/templates/tan/day.tpl
+%%PHPICALENDAR%%/templates/tan/default.css
+%%PHPICALENDAR%%/templates/tan/error.tpl
+%%PHPICALENDAR%%/templates/tan/event.tpl
+%%PHPICALENDAR%%/templates/tan/footer.tpl
+%%PHPICALENDAR%%/templates/tan/header.tpl
+%%PHPICALENDAR%%/templates/tan/images/allday_1.gif
+%%PHPICALENDAR%%/templates/tan/images/allday_2.gif
+%%PHPICALENDAR%%/templates/tan/images/allday_3.gif
+%%PHPICALENDAR%%/templates/tan/images/allday_4.gif
+%%PHPICALENDAR%%/templates/tan/images/allday_5.gif
+%%PHPICALENDAR%%/templates/tan/images/allday_6.gif
+%%PHPICALENDAR%%/templates/tan/images/allday_7.gif
+%%PHPICALENDAR%%/templates/tan/images/allday_bg.gif
+%%PHPICALENDAR%%/templates/tan/images/allday_dot.gif
+%%PHPICALENDAR%%/templates/tan/images/back.gif
+%%PHPICALENDAR%%/templates/tan/images/background.gif
+%%PHPICALENDAR%%/templates/tan/images/day_on.gif
+%%PHPICALENDAR%%/templates/tan/images/day_title.gif
+%%PHPICALENDAR%%/templates/tan/images/default.css
+%%PHPICALENDAR%%/templates/tan/images/download_arrow.gif
+%%PHPICALENDAR%%/templates/tan/images/event_dot.gif
+%%PHPICALENDAR%%/templates/tan/images/left_arrows.gif
+%%PHPICALENDAR%%/templates/tan/images/left_day.gif
+%%PHPICALENDAR%%/templates/tan/images/month_on.gif
+%%PHPICALENDAR%%/templates/tan/images/monthdot_1.gif
+%%PHPICALENDAR%%/templates/tan/images/monthdot_2.gif
+%%PHPICALENDAR%%/templates/tan/images/monthdot_3.gif
+%%PHPICALENDAR%%/templates/tan/images/monthdot_4.gif
+%%PHPICALENDAR%%/templates/tan/images/monthdot_5.gif
+%%PHPICALENDAR%%/templates/tan/images/monthdot_6.gif
+%%PHPICALENDAR%%/templates/tan/images/monthdot_7.gif
+%%PHPICALENDAR%%/templates/tan/images/printer.gif
+%%PHPICALENDAR%%/templates/tan/images/right_arrows.gif
+%%PHPICALENDAR%%/templates/tan/images/right_day.gif
+%%PHPICALENDAR%%/templates/tan/images/search.gif
+%%PHPICALENDAR%%/templates/tan/images/shadow_l.gif
+%%PHPICALENDAR%%/templates/tan/images/shadow_m.gif
+%%PHPICALENDAR%%/templates/tan/images/shadow_r.gif
+%%PHPICALENDAR%%/templates/tan/images/side_bg.gif
+%%PHPICALENDAR%%/templates/tan/images/smallicon.gif
+%%PHPICALENDAR%%/templates/tan/images/spacer.gif
+%%PHPICALENDAR%%/templates/tan/images/time_bg.gif
+%%PHPICALENDAR%%/templates/tan/images/week_on.gif
+%%PHPICALENDAR%%/templates/tan/images/year_on.gif
+%%PHPICALENDAR%%/templates/tan/month.tpl
+%%PHPICALENDAR%%/templates/tan/month_large.tpl
+%%PHPICALENDAR%%/templates/tan/month_medium.tpl
+%%PHPICALENDAR%%/templates/tan/month_small.tpl
+%%PHPICALENDAR%%/templates/tan/preferences.tpl
+%%PHPICALENDAR%%/templates/tan/print.tpl
+%%PHPICALENDAR%%/templates/tan/rss_index.tpl
+%%PHPICALENDAR%%/templates/tan/search.tpl
+%%PHPICALENDAR%%/templates/tan/search_box.tpl
+%%PHPICALENDAR%%/templates/tan/seminar.tpl
+%%PHPICALENDAR%%/templates/tan/sidebar.tpl
+%%PHPICALENDAR%%/templates/tan/todo.tpl
+%%PHPICALENDAR%%/templates/tan/week.tpl
+%%PHPICALENDAR%%/templates/tan/year.tpl
 %%PHPICALENDAR%%/week.php
 %%PHPICALENDAR%%/year.php
+
+@dirrm %%PHPICALENDAR%%/templates/tan/images
+@dirrm %%PHPICALENDAR%%/templates/tan
+@dirrm %%PHPICALENDAR%%/templates/red/images
+@dirrm %%PHPICALENDAR%%/templates/red
+@dirrm %%PHPICALENDAR%%/templates/grey/images
+@dirrm %%PHPICALENDAR%%/templates/grey
+@dirrm %%PHPICALENDAR%%/templates/green/images
+@dirrm %%PHPICALENDAR%%/templates/green
 @dirrm %%PHPICALENDAR%%/templates/default/images
 @dirrm %%PHPICALENDAR%%/templates/default
 @dirrm %%PHPICALENDAR%%/templates
@@ -134,4 +387,4 @@
 @dirrm %%PHPICALENDAR%%/functions
 @dirrm %%PHPICALENDAR%%/calendars
 @dirrm %%PHPICALENDAR%%/admin
-@dirrm %%PHPICALENDAR%%
+@dirrmtry %%PHPICALENDAR%%