Update to 855

* File format is changed. You can find converter
  at http://www.duke.edu/~dgraham/ETM/

Changelog:
855    2011-08-05
	Modified old2new.py to avoid overwritting existing files.
854    2011-08-05
	Fixed erratic action timer behavior. Removed an unused entry from
	etmrc and corrected the documentation for 'increment' to indicate
	that it only applies to actions created with the action timer.
853    2011-08-03
	Added checks to prevent the automatic update for previous users of
	etm from overwriting either *.txt or *.text files in the (new)
	etmdata directory.
852    2011-08-02
	Fixed bug in command line help display for outline view.
851    2011-08-02
	Added n (newer) and w (start gui) to the command line options for
	e.py.
850    2011-07-31
	Restored 'A' command to create an action with a specified extent
	without starting timer. When opening project file in external
	editor, reload if modification time has changed. Store timer details
	in a hash to avoid string manipulations and dropped fields.
849    2011-07-31
	etmRC tweaks.
848    2011-07-28
	Fixed bug in converting weekday abbreviations to 2-letter, uppercase
	ones in @w entries. Added old2new.txt to the basic upload. Removed
	redundant 'extent' entry from etmrc.
847    2011-07-28
	Fixed error in showing ending date in datebar. Used end_date but
	should be end_date - oneday. Allow relative date in setting
	begin_date as well as end_date, e.g., -e '-21'.
846    2011-07-27
	No more rotating files. Instead create, e.g, 2011/07_actns.text in
	the etmActions directory in July 2011 and similarly events, notes
	and tasks and for other months and years.
845    2011-07-23
	Added tag new for changeset 36046d531589
844    2011-07-22
	Added starting time option for actions.
843    2011-07-20
	More etmRC tweaks. This seems to work on all platforms.
842    2011-07-20
	Windoz weak - use r'''var''' to prevent expansions of \n, \t and so
	forth in paths.
841    2011-07-20
	Replaced open with codecs.open in etmRC and etmData.
840    2011-07-20
	For Windoz, write new etmrc using default file encoding.
839    2011-07-20
	More etmRC tweaks. Check for modification of etmrc after external
	edit before warning about restart.
838    2011-07-20
	More etmRC tweaks.
837    2011-07-18
	Tweaks for etmRC paths. wxpython 2.8.12.
836    2011-07-18
	Added check_rotating to etmRC to create appropriate archive files
	before migrating old data files.
835    2011-07-18
	Added .text extension to rotating archive and backup files.
834    2011-07-17
	Added check_newinstall, make_examples and make_holidays to etmRC.
833    2011-07-17
	Removed len(v)>2 test in etmData.getLeaf.
832    2011-07-16
	Use extension 'text' instead of 'txt' for new format data files.
	Automatically copy old files to ~./etm/etmdata, make format changes
	and change the extentsion.
831    2011-07-16
	Hack to make locale work for 12-month calendar in both os x and
	linux. Corrected bug in rc in which a new rc file would not be
	created. Added print statements to trace rc.
830    2011-07-14
	Fixed wrong indent in etmData. Fixed old2new to replace '@p #' with
	'@e +#'.
829    2011-07-13
	Make search involve all tuples, regardless of date.
828    2011-07-13
	Help improvements.
827    2011-07-11
	Save error messages when loading data and report in both CLI and
	GUI.
826    2011-07-10
	Reorganized Item Options help tab and added Examples tab.
825    2011-07-10
	Fixed bug in showing week with no items.
824    2011-07-09
	Colors output from the command line. Added Cmd loop to cli.
823    2011-07-08
	Ctrl-F now exports selection in vCal format to 'export.ics' in
	export directory.
822    2011-07-08
	Details support. With a leaf selected, Ctrl-P shows both the item
	and its details nicely formatted. Ctrl-Y works similarly. When
	adding '-d' to outline display options, using '-d len' would show
	both the times and their locations, extents and notes. Using '-d *'
	would show all details.
821    2011-07-07
	Prerequisites with finish dates and with or without repetitions are
	now handled correctly.
820    2011-06-30
	Changed str() to unicode() in etmData
819    2011-06-30
	Enabled action timer to be restarted after stopping.
818    2011-06-30
	Busy/Free now works from gui and cli. Modified prep_dist to confirm
	if hg stat is non-null.
817    2011-06-29
	Export to vcal (-v store_true) and export to CSV (-x string) where
	string is composed of single character tuple labels, e.g., -x ymdp
	for year, month, day, priority.
816    2011-06-28
	Fixed bug in char2PageMode involving 'action' v 'actions'.
815    2011-06-28
	Added priority.
814    2011-06-24
	First pass at Ctrl-Tab completion.
813    2011-06-24
	Add missing fields to hash and then use hash2Str instead of
	appending field to existing string.
812    2011-06-22
	Changed etm info to show common prefix and relative paths for data
	files.
811    2011-06-22
	Added export to vCal/iCal bound to v parser in cli and ^V in the
	gui.
810    2011-06-19
	'A' with timer stopped now creates a new action without using the
	timer.
809    2011-06-17
	Added tags with possibly mulitple switches similar to nts.
808    2011-06-17
	Preserve options including groupby cols when selecting dates in
	calendar.
807    2011-06-15
	Fixed bug in sunmoon error reporting for timeout.
806    2011-06-15
	Get dates as 1/1 of current year minus 1 year and 12/31 of current
	year plus 5 years with integer defaults for years set in etm rc.
	Work on colors and attributes. Don't hide notes by default in
	standard view.
805    2011-06-08
	Added create project. Fixed bug in calling textwrap instead of
	text_wrap.
804    2011-06-07
	Fixed bug in assigning action to beginby. Handle non-tuple groupby.
	Work on help.
803    2011-06-07
	Fixed yank and print in html windows.
802    2011-06-07
	Clear outline and busy options with shift-enter but save them to use
	as defaults for later usage.
801    2011-06-06
	Combined 'view' and 'item' into 'options'. Don't show null options
	in the status bar. Hide details now seems to work with various
	groupby settings.
800    2011-06-06
	Basic command line parsing and output now works.

3 files changed, 16 insertions, 22 deletions

diff --git a/time/etm/Makefile b/time/etm/Makefile
index f403e19e3ed..106b491da72 100644
--- a/time/etm/Makefile
+++ b/time/etm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2011/04/29 17:25:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2011/08/06 23:22:14 ryoon Exp $
 #
 
-DISTNAME=	etm-707
+DISTNAME=	etm-855
 CATEGORIES=	time
 MASTER_SITES=	http://www.duke.edu/~dgraham/ETM/
 
@@ -18,6 +18,9 @@ DEPENDS+=	${PYPKGPREFIX}-icalendar>=2.0.1:../../time/py-icalendar
 
 USE_LANGUAGES=	# none
 
+REPLACE_PYTHON+=	etm/etmWX.py
+REPLACE_PYTHON+=	etm/etmData.py
+
 # Delete an unnecessary file
 post-configure:
 	${RM} ${WRKSRC}/etm.egg-info/.SOURCES.txt~
diff --git a/time/etm/PLIST b/time/etm/PLIST
index 830e0227ccd..317e197a2fb 100644
--- a/time/etm/PLIST
+++ b/time/etm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2011/04/02 14:11:26 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/08/06 23:22:15 ryoon Exp $
 bin/e.py
 bin/e.pyw
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
@@ -9,39 +9,30 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/etm/__init__.py
 ${PYSITELIB}/etm/__init__.pyc
 ${PYSITELIB}/etm/__init__.pyo
-${PYSITELIB}/etm/etmBusyFree.py
-${PYSITELIB}/etm/etmBusyFree.pyc
-${PYSITELIB}/etm/etmBusyFree.pyo
-${PYSITELIB}/etm/etmCAL.py
-${PYSITELIB}/etm/etmCAL.pyc
-${PYSITELIB}/etm/etmCAL.pyo
 ${PYSITELIB}/etm/etmData.py
 ${PYSITELIB}/etm/etmData.pyc
 ${PYSITELIB}/etm/etmData.pyo
-${PYSITELIB}/etm/etmDialog.py
-${PYSITELIB}/etm/etmDialog.pyc
-${PYSITELIB}/etm/etmDialog.pyo
 ${PYSITELIB}/etm/etmHTML.py
 ${PYSITELIB}/etm/etmHTML.pyc
 ${PYSITELIB}/etm/etmHTML.pyo
+${PYSITELIB}/etm/etmHelp.py
+${PYSITELIB}/etm/etmHelp.pyc
+${PYSITELIB}/etm/etmHelp.pyo
+${PYSITELIB}/etm/etmInfo.py
+${PYSITELIB}/etm/etmInfo.pyc
+${PYSITELIB}/etm/etmInfo.pyo
 ${PYSITELIB}/etm/etmParsers.py
 ${PYSITELIB}/etm/etmParsers.pyc
 ${PYSITELIB}/etm/etmParsers.pyo
 ${PYSITELIB}/etm/etmRC.py
 ${PYSITELIB}/etm/etmRC.pyc
 ${PYSITELIB}/etm/etmRC.pyo
-${PYSITELIB}/etm/etmSunMoon.py
-${PYSITELIB}/etm/etmSunMoon.pyc
-${PYSITELIB}/etm/etmSunMoon.pyo
 ${PYSITELIB}/etm/etmVersion.py
 ${PYSITELIB}/etm/etmVersion.pyc
 ${PYSITELIB}/etm/etmVersion.pyo
 ${PYSITELIB}/etm/etmWX.py
 ${PYSITELIB}/etm/etmWX.pyc
 ${PYSITELIB}/etm/etmWX.pyo
-${PYSITELIB}/etm/etmWeather.py
-${PYSITELIB}/etm/etmWeather.pyc
-${PYSITELIB}/etm/etmWeather.pyo
 ${PYSITELIB}/etm/etm_alert.wav
 ${PYSITELIB}/etm/etmlogo.ico
 ${PYSITELIB}/etm/etmlogo_128x128x32.png
diff --git a/time/etm/distinfo b/time/etm/distinfo
index 905cd4fd688..71e9863cb15 100644
--- a/time/etm/distinfo
+++ b/time/etm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2011/04/29 17:25:02 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2011/08/06 23:22:15 ryoon Exp $
 
-SHA1 (etm-707.tar.gz) = 012c9243832a1beb3837d8929aac2a25163561ee
-RMD160 (etm-707.tar.gz) = a0c3ba6801c1fd641f8af133ebc216fe1b4145e6
-Size (etm-707.tar.gz) = 165404 bytes
+SHA1 (etm-855.tar.gz) = adde343642a93a8eaecc6feda247b070e1904ae9
+RMD160 (etm-855.tar.gz) = da3113b9ddb96914bb333db6a6074c69e7a3dbdb
+Size (etm-855.tar.gz) = 182280 bytes