3 files changed, 146 insertions, 205 deletions

diff --git a/deskutils/phpicalendar/Makefile b/deskutils/phpicalendar/Makefile
index 16feb9bac88d..065db7df1825 100644
--- a/deskutils/phpicalendar/Makefile
+++ b/deskutils/phpicalendar/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	phpicalendar
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	deskutils www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,17 +16,19 @@ MAINTAINER=	edwin@mavetju.org
 COMMENT=	Webbased calendar with iCal support
 
 NO_BUILD=	yes
-WWWDIR=		${PREFIX}/www/phpicalendar
+PHPICALENDAR=	www/phpicalendar
+WWWDIR=		${PREFIX}/${PHPICALENDAR}
+PLIST_SUB+=	PHPICALENDAR=${PHPICALENDAR}
 
 do-install:
 .if !exists(${WWWDIR})
 	${MKDIR} ${WWWDIR}
 .endif
-.for dir in calendars functions images includes languages rss styles
+.for dir in admin calendars functions images includes languages rss templates
 	@${CP} -R ${WRKSRC}/${dir} ${WWWDIR}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/${dir}
 .endfor
-.for f in index.php TIMEZONES admin.php day.php preferences.php print.php search.php week.php month.php year.php README COPYING AUTHORS
+.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} ${WRKSRC}/${f} ${WWWDIR}
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/${f}
 .endfor
diff --git a/deskutils/phpicalendar/distinfo b/deskutils/phpicalendar/distinfo
index b735bc47af5b..299f1d99815b 100644
--- a/deskutils/phpicalendar/distinfo
+++ b/deskutils/phpicalendar/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpicalendar-1.1.tgz) = 7af8a4f96499dfe072d552b17d873cc6
-SHA256 (phpicalendar-1.1.tgz) = d05f4e4742d59399215c3d63ca0351609c439a4f8de5474692f5fa9489202abd
-SIZE (phpicalendar-1.1.tgz) = 163934
+MD5 (phpicalendar-2.1.tgz) = c0b3fb13136f53ce60a53b3781a2d895
+SHA256 (phpicalendar-2.1.tgz) = 3ca96aac0491f26f607f15cd869836adddfc22e1e4e9b388a1ff2bbba7371167
+SIZE (phpicalendar-2.1.tgz) = 146748
diff --git a/deskutils/phpicalendar/pkg-plist b/deskutils/phpicalendar/pkg-plist
index 707f430625b6..394157de6873 100644
--- a/deskutils/phpicalendar/pkg-plist
+++ b/deskutils/phpicalendar/pkg-plist
@@ -1,197 +1,137 @@
-www/phpicalendar/index.php
-www/phpicalendar/year.php
-www/phpicalendar/month.php
-www/phpicalendar/week.php
-www/phpicalendar/styles/tan/year_on.gif
-www/phpicalendar/styles/tan/week_on.gif
-www/phpicalendar/styles/tan/time_bg.gif
-www/phpicalendar/styles/tan/spacer.gif
-www/phpicalendar/styles/tan/smallicon.gif
-www/phpicalendar/styles/tan/side_bg.gif
-www/phpicalendar/styles/tan/search.gif
-www/phpicalendar/styles/tan/right_day.gif
-www/phpicalendar/styles/tan/right_arrows.gif
-www/phpicalendar/styles/tan/month_on.gif
-www/phpicalendar/styles/tan/left_day.gif
-www/phpicalendar/styles/tan/left_arrows.gif
-www/phpicalendar/styles/tan/event_dot.gif
-www/phpicalendar/styles/tan/download_arrow.gif
-www/phpicalendar/styles/tan/default.css
-www/phpicalendar/styles/tan/day_on.gif
-www/phpicalendar/styles/tan/background.gif
-www/phpicalendar/styles/tan/back.gif
-www/phpicalendar/styles/tan/allday_dot.gif
-@dirrm www/phpicalendar/styles/tan
-www/phpicalendar/styles/silver/year_on.gif
-www/phpicalendar/styles/silver/week_on.gif
-www/phpicalendar/styles/silver/time_bg.gif
-www/phpicalendar/styles/silver/spacer.gif
-www/phpicalendar/styles/silver/smallicon.gif
-www/phpicalendar/styles/silver/side_bg.gif
-www/phpicalendar/styles/silver/search.gif
-www/phpicalendar/styles/silver/right_day.gif
-www/phpicalendar/styles/silver/right_arrows.gif
-www/phpicalendar/styles/silver/printer.gif
-www/phpicalendar/styles/silver/month_on.gif
-www/phpicalendar/styles/silver/left_day.gif
-www/phpicalendar/styles/silver/left_arrows.gif
-www/phpicalendar/styles/silver/event_dot.gif
-www/phpicalendar/styles/silver/download_arrow.gif
-www/phpicalendar/styles/silver/default.css
-www/phpicalendar/styles/silver/day_title.gif
-www/phpicalendar/styles/silver/day_on.gif
-www/phpicalendar/styles/silver/back.gif
-www/phpicalendar/styles/silver/allday_dot.gif
-www/phpicalendar/styles/silver/allday_bg.gif
-@dirrm www/phpicalendar/styles/silver
-www/phpicalendar/styles/red/year_on.gif
-www/phpicalendar/styles/red/week_on.gif
-www/phpicalendar/styles/red/time_bg.gif
-www/phpicalendar/styles/red/smallicon.gif
-www/phpicalendar/styles/red/side_bg.gif
-www/phpicalendar/styles/red/search.gif
-www/phpicalendar/styles/red/right_day.gif
-www/phpicalendar/styles/red/right_arrows.gif
-www/phpicalendar/styles/red/month_on.gif
-www/phpicalendar/styles/red/left_day.gif
-www/phpicalendar/styles/red/left_arrows.gif
-www/phpicalendar/styles/red/event_dot.gif
-www/phpicalendar/styles/red/download_arrow.gif
-www/phpicalendar/styles/red/default.css
-www/phpicalendar/styles/red/day_on.gif
-www/phpicalendar/styles/red/back.gif
-www/phpicalendar/styles/red/allday_dot.gif
-@dirrm www/phpicalendar/styles/red
-www/phpicalendar/styles/orange/year_on.gif
-www/phpicalendar/styles/orange/week_on.gif
-www/phpicalendar/styles/orange/time_bg.gif
-www/phpicalendar/styles/orange/smallicon.gif
-www/phpicalendar/styles/orange/side_bg.gif
-www/phpicalendar/styles/orange/search.gif
-www/phpicalendar/styles/orange/right_day.gif
-www/phpicalendar/styles/orange/right_arrows.gif
-www/phpicalendar/styles/orange/month_on.gif
-www/phpicalendar/styles/orange/left_day.gif
-www/phpicalendar/styles/orange/left_arrows.gif
-www/phpicalendar/styles/orange/event_dot.gif
-www/phpicalendar/styles/orange/download_arrow.gif
-www/phpicalendar/styles/orange/default.css
-www/phpicalendar/styles/orange/day_on.gif
-www/phpicalendar/styles/orange/back.gif
-www/phpicalendar/styles/orange/allday_dot.gif
-@dirrm www/phpicalendar/styles/orange
-www/phpicalendar/styles/grey/year_on.gif
-www/phpicalendar/styles/grey/week_on.gif
-www/phpicalendar/styles/grey/time_bg.gif
-www/phpicalendar/styles/grey/smallicon.gif
-www/phpicalendar/styles/grey/side_bg.gif
-www/phpicalendar/styles/grey/search.gif
-www/phpicalendar/styles/grey/right_day.gif
-www/phpicalendar/styles/grey/right_arrows.gif
-www/phpicalendar/styles/grey/month_on.gif
-www/phpicalendar/styles/grey/left_day.gif
-www/phpicalendar/styles/grey/left_arrows.gif
-www/phpicalendar/styles/grey/event_dot.gif
-www/phpicalendar/styles/grey/download_arrow.gif
-www/phpicalendar/styles/grey/default.css
-www/phpicalendar/styles/grey/day_on.gif
-www/phpicalendar/styles/grey/background.gif
-www/phpicalendar/styles/grey/back.gif
-www/phpicalendar/styles/grey/allday_dot.gif
-@dirrm www/phpicalendar/styles/grey
-www/phpicalendar/styles/green/year_on.gif
-www/phpicalendar/styles/green/week_on.gif
-www/phpicalendar/styles/green/time_bg.gif
-www/phpicalendar/styles/green/spacer.gif
-www/phpicalendar/styles/green/smallicon.gif
-www/phpicalendar/styles/green/side_bg.gif
-www/phpicalendar/styles/green/search.gif
-www/phpicalendar/styles/green/right_day.gif
-www/phpicalendar/styles/green/right_arrows.gif
-www/phpicalendar/styles/green/month_on.gif
-www/phpicalendar/styles/green/left_day.gif
-www/phpicalendar/styles/green/left_arrows.gif
-www/phpicalendar/styles/green/event_dot.gif
-www/phpicalendar/styles/green/download_arrow.gif
-www/phpicalendar/styles/green/default.css
-www/phpicalendar/styles/green/day_on.gif
-www/phpicalendar/styles/green/background.gif
-www/phpicalendar/styles/green/back.gif
-www/phpicalendar/styles/green/allday_dot.gif
-@dirrm www/phpicalendar/styles/green
-@dirrm www/phpicalendar/styles
-www/phpicalendar/search.php
-www/phpicalendar/rss/rss.php
-www/phpicalendar/rss/index.php
-@dirrm www/phpicalendar/rss
-www/phpicalendar/print.php
-www/phpicalendar/preferences.php
-www/phpicalendar/languages/traditional_chinese.inc.php
-www/phpicalendar/languages/swedish.inc.php
-www/phpicalendar/languages/spanish.inc.php
-www/phpicalendar/languages/portuguese.inc.php
-www/phpicalendar/languages/polish.inc.php
-www/phpicalendar/languages/norwegian.inc.php
-www/phpicalendar/languages/korean.inc.php
-www/phpicalendar/languages/japanese.inc.php
-www/phpicalendar/languages/italian.inc.php
-www/phpicalendar/languages/german.inc.php
-www/phpicalendar/languages/french.inc.php
-www/phpicalendar/languages/finnish.inc.php
-www/phpicalendar/languages/esperanto.inc.php
-www/phpicalendar/languages/english.inc.php
-www/phpicalendar/languages/dutch.inc.php
-www/phpicalendar/languages/danish.inc.php
-www/phpicalendar/languages/czech.inc.php
-www/phpicalendar/languages/catalan.inc.php
-www/phpicalendar/languages/brazilian.inc.php
-@dirrm www/phpicalendar/languages
-www/phpicalendar/includes/todo.php
-www/phpicalendar/includes/sidebar.php
-www/phpicalendar/includes/login.php
-www/phpicalendar/includes/header.inc.php
-www/phpicalendar/includes/footer.inc.php
-www/phpicalendar/includes/event.php
-www/phpicalendar/includes/calendar_nav.php
-@dirrm www/phpicalendar/includes
-www/phpicalendar/images/valid-rss.png
-www/phpicalendar/images/tentative.gif
-www/phpicalendar/images/spacer.gif
-www/phpicalendar/images/phpical-logo.gif
-www/phpicalendar/images/not_completed.gif
-www/phpicalendar/images/important.gif
-www/phpicalendar/images/confirmed.gif
-www/phpicalendar/images/completed.gif
-www/phpicalendar/images/cancelled.gif
-@dirrm www/phpicalendar/images
-www/phpicalendar/functions/upload_functions.php
-www/phpicalendar/functions/todo.js
-www/phpicalendar/functions/timezones.php
-www/phpicalendar/functions/overlapping_events.php
-www/phpicalendar/functions/list_years.php
-www/phpicalendar/functions/list_weeks.php
-www/phpicalendar/functions/list_months.php
-www/phpicalendar/functions/list_languages.php
-www/phpicalendar/functions/list_icals.php
-www/phpicalendar/functions/init.inc.php
-www/phpicalendar/functions/ical_parser.php
-www/phpicalendar/functions/event.js
-www/phpicalendar/functions/error.php
-www/phpicalendar/functions/draw_functions.php
-www/phpicalendar/functions/date_functions.php
-www/phpicalendar/functions/calendar_functions.php
-www/phpicalendar/functions/admin_functions.php
-@dirrm www/phpicalendar/functions
-www/phpicalendar/day.php
-www/phpicalendar/config.inc.php-default
-www/phpicalendar/calendars/publish.php
-www/phpicalendar/calendars/Work.ics
-www/phpicalendar/calendars/US Holidays.ics
-www/phpicalendar/calendars/Home.ics
-@dirrm www/phpicalendar/calendars
-www/phpicalendar/admin.php
-www/phpicalendar/TIMEZONES
-www/phpicalendar/README
-www/phpicalendar/COPYING
-www/phpicalendar/AUTHORS
-@dirrm www/phpicalendar
+%%PHPICALENDAR%%/AUTHORS
+%%PHPICALENDAR%%/COPYING
+%%PHPICALENDAR%%/README
+%%PHPICALENDAR%%/TIMEZONES
+%%PHPICALENDAR%%/admin/index.php
+%%PHPICALENDAR%%/calendars/Home.ics
+%%PHPICALENDAR%%/calendars/US Holidays.ics
+%%PHPICALENDAR%%/calendars/Work.ics
+%%PHPICALENDAR%%/calendars/publish.ical.php
+%%PHPICALENDAR%%/calendars/publish.mozilla.php
+%%PHPICALENDAR%%/config.inc.php-default
+%%PHPICALENDAR%%/day.php
+%%PHPICALENDAR%%/error.php
+%%PHPICALENDAR%%/functions/admin_functions.php
+%%PHPICALENDAR%%/functions/calendar_functions.php
+%%PHPICALENDAR%%/functions/date_functions.php
+%%PHPICALENDAR%%/functions/draw_functions.php
+%%PHPICALENDAR%%/functions/event.js
+%%PHPICALENDAR%%/functions/ical_parser.php
+%%PHPICALENDAR%%/functions/init.inc.php
+%%PHPICALENDAR%%/functions/list_functions.php
+%%PHPICALENDAR%%/functions/overlapping_events.php
+%%PHPICALENDAR%%/functions/template.php
+%%PHPICALENDAR%%/functions/timezones.php
+%%PHPICALENDAR%%/functions/userauth_functions.php
+%%PHPICALENDAR%%/images/cancelled.gif
+%%PHPICALENDAR%%/images/completed.gif
+%%PHPICALENDAR%%/images/confirmed.gif
+%%PHPICALENDAR%%/images/important.gif
+%%PHPICALENDAR%%/images/not_completed.gif
+%%PHPICALENDAR%%/images/phpical-logo.gif
+%%PHPICALENDAR%%/images/recurring.gif
+%%PHPICALENDAR%%/images/spacer.gif
+%%PHPICALENDAR%%/images/tentative.gif
+%%PHPICALENDAR%%/images/valid-rss.png
+%%PHPICALENDAR%%/includes/event.php
+%%PHPICALENDAR%%/includes/login.php
+%%PHPICALENDAR%%/includes/todo.php
+%%PHPICALENDAR%%/index.php
+%%PHPICALENDAR%%/languages/afrikaans.inc.php
+%%PHPICALENDAR%%/languages/brazilian.inc.php
+%%PHPICALENDAR%%/languages/catalan.inc.php
+%%PHPICALENDAR%%/languages/czech.inc.php
+%%PHPICALENDAR%%/languages/danish.inc.php
+%%PHPICALENDAR%%/languages/dutch.inc.php
+%%PHPICALENDAR%%/languages/english.inc.php
+%%PHPICALENDAR%%/languages/esperanto.inc.php
+%%PHPICALENDAR%%/languages/finnish.inc.php
+%%PHPICALENDAR%%/languages/french.inc.php
+%%PHPICALENDAR%%/languages/german.inc.php
+%%PHPICALENDAR%%/languages/italian.inc.php
+%%PHPICALENDAR%%/languages/japanese.inc.php
+%%PHPICALENDAR%%/languages/korean.inc.php
+%%PHPICALENDAR%%/languages/lithuanian.inc.php
+%%PHPICALENDAR%%/languages/norwegian.inc.php
+%%PHPICALENDAR%%/languages/polish.inc.php
+%%PHPICALENDAR%%/languages/portuguese.inc.php
+%%PHPICALENDAR%%/languages/spanish.inc.php
+%%PHPICALENDAR%%/languages/swedish.inc.php
+%%PHPICALENDAR%%/languages/traditional_chinese.inc.php
+%%PHPICALENDAR%%/month.php
+%%PHPICALENDAR%%/preferences.php
+%%PHPICALENDAR%%/print.php
+%%PHPICALENDAR%%/rss/index.php
+%%PHPICALENDAR%%/rss/rss.php
+%%PHPICALENDAR%%/search.php
+%%PHPICALENDAR%%/templates/default/admin.tpl
+%%PHPICALENDAR%%/templates/default/calendar_nav.tpl
+%%PHPICALENDAR%%/templates/default/day.tpl
+%%PHPICALENDAR%%/templates/default/default.css
+%%PHPICALENDAR%%/templates/default/error.tpl
+%%PHPICALENDAR%%/templates/default/event.tpl
+%%PHPICALENDAR%%/templates/default/footer.tpl
+%%PHPICALENDAR%%/templates/default/header.tpl
+%%PHPICALENDAR%%/templates/default/images/allday_1.gif
+%%PHPICALENDAR%%/templates/default/images/allday_2.gif
+%%PHPICALENDAR%%/templates/default/images/allday_3.gif
+%%PHPICALENDAR%%/templates/default/images/allday_4.gif
+%%PHPICALENDAR%%/templates/default/images/allday_5.gif
+%%PHPICALENDAR%%/templates/default/images/allday_6.gif
+%%PHPICALENDAR%%/templates/default/images/allday_7.gif
+%%PHPICALENDAR%%/templates/default/images/allday_bg.gif
+%%PHPICALENDAR%%/templates/default/images/allday_dot.gif
+%%PHPICALENDAR%%/templates/default/images/back.gif
+%%PHPICALENDAR%%/templates/default/images/day_on.gif
+%%PHPICALENDAR%%/templates/default/images/day_title.gif
+%%PHPICALENDAR%%/templates/default/images/download_arrow.gif
+%%PHPICALENDAR%%/templates/default/images/event_dot.gif
+%%PHPICALENDAR%%/templates/default/images/left_arrows.gif
+%%PHPICALENDAR%%/templates/default/images/left_day.gif
+%%PHPICALENDAR%%/templates/default/images/month_on.gif
+%%PHPICALENDAR%%/templates/default/images/monthdot_1.gif
+%%PHPICALENDAR%%/templates/default/images/monthdot_2.gif
+%%PHPICALENDAR%%/templates/default/images/monthdot_3.gif
+%%PHPICALENDAR%%/templates/default/images/monthdot_4.gif
+%%PHPICALENDAR%%/templates/default/images/monthdot_5.gif
+%%PHPICALENDAR%%/templates/default/images/monthdot_6.gif
+%%PHPICALENDAR%%/templates/default/images/monthdot_7.gif
+%%PHPICALENDAR%%/templates/default/images/printer.gif
+%%PHPICALENDAR%%/templates/default/images/right_arrows.gif
+%%PHPICALENDAR%%/templates/default/images/right_day.gif
+%%PHPICALENDAR%%/templates/default/images/search.gif
+%%PHPICALENDAR%%/templates/default/images/shadow_l.gif
+%%PHPICALENDAR%%/templates/default/images/shadow_m.gif
+%%PHPICALENDAR%%/templates/default/images/shadow_r.gif
+%%PHPICALENDAR%%/templates/default/images/side_bg.gif
+%%PHPICALENDAR%%/templates/default/images/smallicon.gif
+%%PHPICALENDAR%%/templates/default/images/spacer.gif
+%%PHPICALENDAR%%/templates/default/images/time_bg.gif
+%%PHPICALENDAR%%/templates/default/images/week_on.gif
+%%PHPICALENDAR%%/templates/default/images/year_on.gif
+%%PHPICALENDAR%%/templates/default/month.tpl
+%%PHPICALENDAR%%/templates/default/month_large.tpl
+%%PHPICALENDAR%%/templates/default/month_medium.tpl
+%%PHPICALENDAR%%/templates/default/month_small.tpl
+%%PHPICALENDAR%%/templates/default/preferences.tpl
+%%PHPICALENDAR%%/templates/default/print.tpl
+%%PHPICALENDAR%%/templates/default/rss_index.tpl
+%%PHPICALENDAR%%/templates/default/search.tpl
+%%PHPICALENDAR%%/templates/default/search_box.tpl
+%%PHPICALENDAR%%/templates/default/sidebar.tpl
+%%PHPICALENDAR%%/templates/default/todo.tpl
+%%PHPICALENDAR%%/templates/default/week.tpl
+%%PHPICALENDAR%%/templates/default/year.tpl
+%%PHPICALENDAR%%/week.php
+%%PHPICALENDAR%%/year.php
+@dirrm %%PHPICALENDAR%%/templates/default/images
+@dirrm %%PHPICALENDAR%%/templates/default
+@dirrm %%PHPICALENDAR%%/templates
+@dirrm %%PHPICALENDAR%%/rss
+@dirrm %%PHPICALENDAR%%/languages
+@dirrm %%PHPICALENDAR%%/includes
+@dirrm %%PHPICALENDAR%%/images
+@dirrm %%PHPICALENDAR%%/functions
+@dirrm %%PHPICALENDAR%%/calendars
+@dirrm %%PHPICALENDAR%%/admin
+@dirrm %%PHPICALENDAR%%