From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 24 18:30:07 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C6FC16A420 for ; Tue, 24 Jan 2006 18:30:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0643843D45 for ; Tue, 24 Jan 2006 18:30:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0OIU6dV092520 for ; Tue, 24 Jan 2006 18:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0OIU6o3092518; Tue, 24 Jan 2006 18:30:06 GMT (envelope-from gnats) Resent-Date: Tue, 24 Jan 2006 18:30:06 GMT Resent-Message-Id: <200601241830.k0OIU6o3092518@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, infofarmer@gmail.com Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8D8A16A42A for ; Tue, 24 Jan 2006 18:26:57 +0000 (GMT) (envelope-from infofarmer@gmail.com) Received: from uproxy.gmail.com (uproxy.gmail.com [66.249.92.203]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BFD143D48 for ; Tue, 24 Jan 2006 18:26:55 +0000 (GMT) (envelope-from infofarmer@gmail.com) Received: by uproxy.gmail.com with SMTP id j3so43653ugf for ; Tue, 24 Jan 2006 10:26:54 -0800 (PST) Received: by 10.66.234.14 with SMTP id g14mr3037895ugh; Tue, 24 Jan 2006 10:01:09 -0800 (PST) Received: from localhost ( [83.237.106.50]) by mx.gmail.com with ESMTP id e1sm2862852ugf.2006.01.24.10.01.07; Tue, 24 Jan 2006 10:01:08 -0800 (PST) Message-Id: <43d66b64.624b1d32.67ad.ffffecd9@mx.gmail.com> Date: Tue, 24 Jan 2006 10:01:08 -0800 (PST) From: infofarmer@gmail.com To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/92280: maintainer-update deskutils/plans X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 18:30:07 -0000 >Number: 92280 >Category: ports >Synopsis: maintainer-update deskutils/plans >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 24 18:30:06 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Andrew Pantyukhin >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD sat64.net17 6.0-STABLE FreeBSD 6.0-STABLE #4: Fri Jan 20 02:24:10 MSK 2006 sat@sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386 >Description: o At last - take care of config and data files. They are not deleted whether you 'pkg_delete' or 'make deinstall'. o I have adopted the ideology of installing web ports into /usr/local/www >How-To-Repeat: >Fix: --- plans.diff begins here --- diff -urN /usr/ports/deskutils/plans/Makefile plans/Makefile --- /usr/ports/deskutils/plans/Makefile Fri Jan 13 13:12:44 2006 +++ plans/Makefile Tue Jan 24 20:53:24 2006 @@ -8,6 +8,7 @@ PORTNAME= plans PORTVERSION= 7.5.4 +PORTREVISION= 1 CATEGORIES= deskutils www MASTER_SITES= http://www.planscalendar.com/release/:plans \ http://www.planscalendar.com/addons/:addons \ @@ -31,7 +32,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} -WWWDOCROOT?= www/data +WWWDOCROOT?= www PLANSSUBDIR?= plans PLANSDIR?= ${WWWDOCROOT}/${PLANSSUBDIR} PLIST_SUB+= DIR=${PLANSDIR} @@ -43,6 +44,10 @@ post-extract: ${CP} ${_DISTDIR}/powerani.gif ${WRKSRC}/theme/graphics/freebsd.gif ${CP} ${_DISTDIR}/*.pl ${WRKSRC}/ + for i in ${WRKSRC}/data/*xml ${WRKSRC}/*config.pl; \ + do ${MV} $$i $$i.default; done + cd ${WRKSRC} && \ + ${SED} -e 's/iso-8859-1/utf-8/' us_english.pl > us_english_utf8.pl post-patch: @${RM} -f ${WRKSRC}/theme/plans.template.orig @@ -56,6 +61,8 @@ @${FIND} ${DIR} -name '*.xml' -exec ${CHMOD} 664 {} \; post-install: + for i in ${DIR}/data/*default ${DIR}/*default; \ + do cp -np $$i $${i%.default}; done; @${CAT} ${PKGMESSAGE} .include diff -urN /usr/ports/deskutils/plans/files/pkg-message.in plans/files/pkg-message.in --- /usr/ports/deskutils/plans/files/pkg-message.in Fri Jan 13 13:12:44 2006 +++ plans/files/pkg-message.in Tue Jan 24 17:11:55 2006 @@ -1,4 +1,6 @@ -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 +=========================================================== +Plans is now installed at %%DIR%% +You'll need to configure your server to accept CGI scripts +in the directory. Plans can be configured by editing +%%DIR%%/plans_config.pl +=========================================================== diff -urN /usr/ports/deskutils/plans/pkg-plist plans/pkg-plist --- /usr/ports/deskutils/plans/pkg-plist Sun Jan 22 04:29:44 2006 +++ plans/pkg-plist Tue Jan 24 20:45:10 2006 @@ -1,13 +1,27 @@ -%%DIR%%/data/calendars.xml -%%DIR%%/data/email_reminders.xml -%%DIR%%/data/events.xml -%%DIR%%/data/new_calendars.xml -%%DIR%%/data/pending_actions.xml -%%DIR%%/data/users.xml +@unexec if cmp -s %D/%%DIR%%/data/calendars.xml.default %D/%%DIR%%/data/calendars.xml; then rm -f %D/%%DIR%%/data/calendars.xml; fi +%%DIR%%/data/calendars.xml.default +@exec if [ ! -f %D/%%DIR%%/data/calendars.xml ] ; then cp -p %D/%F %B/calendars.xml; fi +@unexec if cmp -s %D/%%DIR%%/data/email_reminders.xml.default %D/%%DIR%%/data/email_reminders.xml; then rm -f %D/%%DIR%%/data/email_reminders.xml; fi +%%DIR%%/data/email_reminders.xml.default +@exec if [ ! -f %D/%%DIR%%/data/email_reminders.xml ] ; then cp -p %D/%F %B/email_reminders.xml; fi +@unexec if cmp -s %D/%%DIR%%/data/events.xml.default %D/%%DIR%%/data/events.xml; then rm -f %D/%%DIR%%/data/events.xml; fi +%%DIR%%/data/events.xml.default +@exec if [ ! -f %D/%%DIR%%/data/events.xml ] ; then cp -p %D/%F %B/events.xml; fi +@unexec if cmp -s %D/%%DIR%%/data/new_calendars.xml.default %D/%%DIR%%/data/new_calendars.xml; then rm -f %D/%%DIR%%/data/new_calendars.xml; fi +%%DIR%%/data/new_calendars.xml.default +@exec if [ ! -f %D/%%DIR%%/data/new_calendars.xml ] ; then cp -p %D/%F %B/new_calendars.xml; fi +@unexec if cmp -s %D/%%DIR%%/data/pending_actions.xml.default %D/%%DIR%%/data/pending_actions.xml; then rm -f %D/%%DIR%%/data/pending_actions.xml; fi +%%DIR%%/data/pending_actions.xml.default +@exec if [ ! -f %D/%%DIR%%/data/pending_actions.xml ] ; then cp -p %D/%F %B/pending_actions.xml; fi +@unexec if cmp -s %D/%%DIR%%/data/users.xml.default %D/%%DIR%%/data/users.xml; then rm -f %D/%%DIR%%/data/users.xml; fi +%%DIR%%/data/users.xml.default +@exec if [ ! -f %D/%%DIR%%/data/users.xml ] ; then cp -p %D/%F %B/users.xml; fi +@unexec if cmp -s %D/%%DIR%%/plans_config.pl.default %D/%%DIR%%/plans_config.pl; then rm -f %D/%%DIR%%/plans_config.pl; fi +%%DIR%%/plans_config.pl.default +@exec if [ ! -f %D/%%DIR%%/plans_config.pl ] ; then cp -p %D/%F %B/plans_config.pl; fi %%DIR%%/email_reminders.cgi %%DIR%%/gpl.txt %%DIR%%/plans.cgi -%%DIR%%/plans_config.pl %%DIR%%/plans_lib.pl %%DIR%%/theme/color_select.css %%DIR%%/theme/color_select.js @@ -323,6 +337,7 @@ %%DIR%%/theme/upcoming_events.css %%DIR%%/theme/upcoming_events.js %%DIR%%/us_english.pl +%%DIR%%/us_english_utf8.pl %%DIR%%/danish.pl %%DIR%%/de_german.pl %%DIR%%/fr_french.pl --- plans.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: