From 37ee3f48cd853f99f859b6ff4ee6c79b064116ca Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 16 Feb 2011 13:29:37 +0000 Subject: Update to 702. Upstream's changelog is incomplete. Changelog: 702 2011-02-07 Added enc_print to print strings in the CLI using enc which is file_encoding if the -F is passed and otherwise is term_encoding. Restored term_encoding to etmRC. Changed status_fmt for event from 's' to 'tmp_s' to display zone-adjusted times. Changed 'S' and 'E' to sort by and display zone-adjusted times and busy/free periods. 701 2011-02-06 Removed 'term_encoding' from etmRC and etmData. 700 2011-02-03 Use item['tmp_s'] for time zone adjusted times and leave item['s'] alone. Changing item['s'] could lead to applying time zone adjustment to an already adjusted time. 699 2011-02-02 Fixed missing icon in the app build for os x. Increased min size slightly to remove horizontal scroll bar in itemlist on startup. 698 2011-01-27 Removed import wx from etmData to allow running on systems without wx. Added tzlocal() to refreshprompt in etmWX to keep etm time and local time zone in sync. 697 2011-01-24 Fixed encoding bug in 12-month calendar. 696 2011-01-16 Added 'term_encoding' to rc file for output to the terminal/console window. Various updates for python 3 compatability. (Dateutil 1.5 now supports python3 but wxpython does not.) 695 2011-01-10 Declare strings to be unicode in etmData.py OL. 694 2011-01-10 Replaced encoding in the rc file with gui_encoding (for the wxpython gui) and file_encoding (for reading and writing files). 693 2011-01-04 Add 's' to required keys for reminder. 692 2011-01-03 Removed try block from etmRC.py which forced the use of sys.stdout.encoding. Removed a couple of erroneous 'utf-8'. Now works with Russian under Windows! 691 2011-01-03 Show more diagnostic information if OnInit in etmWX.py fails. 690 2011-01-01 Fixed bug in date_calculator. 689 2010-12-29 Fixed bug in exporting to ics. Improved documentation for weekday (thanks Adam). 688 2010-12-22 Added settings for the colors for the command line interface to the rc file. 687 2010-12-21 Don't check for local time zone unless auto_set_timezone is True. Fixed undefined 'tmp_d' error in select_items. 686 2010-12-14 Removed the 'm' from the time of the next alert when use_ampm is True. Tweaks for dealing with a missing local time zone. 685 2010-12-11 Added the ability to specify an alternative command using @A COMMAND to run instead of the default for an event or reminder. 684 2010-12-10 Possible fix for windows registry issue with timezones. 683 2010-12-10 Added settings for first and second column widths in the gui item list to the rc file. --- time/etm/Makefile | 29 ++++++++++++++--------------- time/etm/PLIST | 24 +++++++++--------------- time/etm/distinfo | 8 ++++---- 3 files changed, 27 insertions(+), 34 deletions(-) (limited to 'time') diff --git a/time/etm/Makefile b/time/etm/Makefile index 10ca130e9e4..a15821aa4a9 100644 --- a/time/etm/Makefile +++ b/time/etm/Makefile @@ -1,31 +1,30 @@ -# $NetBSD: Makefile,v 1.20 2010/06/15 13:22:59 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2011/02/16 13:29:37 ryoon Exp $ # -DISTNAME= etm-622 +DISTNAME= etm-702 CATEGORIES= time MASTER_SITES= http://www.duke.edu/~dgraham/ETM/ -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= ryoon@NetBSD.org HOMEPAGE= http://www.duke.edu/~dgraham/ETM/ -COMMENT= Event and Task Manager +COMMENT= events and tasks manager using simple text files LICENSE= gnu-gpl-v3 -DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4:../../time/py-dateutil -DEPENDS+= ${PYPKGPREFIX}-icalendar-[0-9]*:../../time/py-icalendar -DEPENDS+= ${PYPKGPREFIX}-wxWidgets-[0-9]*:../../x11/py-wxWidgets - PKG_DESTDIR_SUPPORT= user-destdir +DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.8.7:../../x11/py-wxWidgets +DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools +DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil +DEPENDS+= ${PYPKGPREFIX}-icalendar>=2.0.1:../../time/py-icalendar + USE_LANGUAGES= # none -SUBST_CLASSES+= python -SUBST_SED.python+= -e 's,\(\#! *\)python,\1${PYTHONBIN},' -SUBST_FILES.python= ez_setup.py -SUBST_STAGE.python= pre-build -SUBST_MESSAGE.python= Replacing python interpreter. +PYDISTUTILSPKG= yes -REPLACE_PYTHON= e.py etm/etmBusyFree.py +# Delete an unnecessary file +post-configure: + ${RM} ${WRKSRC}/etm.egg-info/.SOURCES.txt~ .include "../../lang/python/application.mk" -.include "../../lang/python/egg.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/etm/PLIST b/time/etm/PLIST index d4d26ff1a56..12ca172ce84 100644 --- a/time/etm/PLIST +++ b/time/etm/PLIST @@ -1,17 +1,14 @@ -@comment $NetBSD: PLIST,v 1.6 2010/06/15 13:22:59 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2011/02/16 13:29:37 ryoon Exp $ bin/e.py bin/e.pyw -${PYSITELIB}/${EGG_INFODIR}/PKG-INFO -${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt -${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt -${PYSITELIB}/${EGG_INFODIR}/requires.txt -${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/${PKGNAME}-py2.6.egg-info/PKG-INFO +${PYSITELIB}/${PKGNAME}-py2.6.egg-info/SOURCES.txt +${PYSITELIB}/${PKGNAME}-py2.6.egg-info/dependency_links.txt +${PYSITELIB}/${PKGNAME}-py2.6.egg-info/requires.txt +${PYSITELIB}/${PKGNAME}-py2.6.egg-info/top_level.txt ${PYSITELIB}/etm/__init__.py ${PYSITELIB}/etm/__init__.pyc ${PYSITELIB}/etm/__init__.pyo -${PYSITELIB}/etm/etmAbout.py -${PYSITELIB}/etm/etmAbout.pyc -${PYSITELIB}/etm/etmAbout.pyo ${PYSITELIB}/etm/etmBusyFree.py ${PYSITELIB}/etm/etmBusyFree.pyc ${PYSITELIB}/etm/etmBusyFree.pyo @@ -21,12 +18,12 @@ ${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/etmITEM.py -${PYSITELIB}/etm/etmITEM.pyc -${PYSITELIB}/etm/etmITEM.pyo ${PYSITELIB}/etm/etmParsers.py ${PYSITELIB}/etm/etmParsers.pyc ${PYSITELIB}/etm/etmParsers.pyo @@ -50,6 +47,3 @@ ${PYSITELIB}/etm/etmlogo.ico ${PYSITELIB}/etm/etmlogo_128x128x32.png ${PYSITELIB}/etm/etmlogo_16x16x32.png ${PYSITELIB}/etm/etmlogo_32x32x32.png -${PYSITELIB}/ez_setup.py -${PYSITELIB}/ez_setup.pyc -${PYSITELIB}/ez_setup.pyo diff --git a/time/etm/distinfo b/time/etm/distinfo index d0428281b71..b9bb5c6f69d 100644 --- a/time/etm/distinfo +++ b/time/etm/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.17 2010/06/15 13:22:59 wiz Exp $ +$NetBSD: distinfo,v 1.18 2011/02/16 13:29:37 ryoon Exp $ -SHA1 (etm-622.tar.gz) = ea7d747e18b7f572c8d2074243d4dd02ced6f818 -RMD160 (etm-622.tar.gz) = 7379bf56d86140114c8ef61d5073f48f695ac96b -Size (etm-622.tar.gz) = 157139 bytes +SHA1 (etm-702.tar.gz) = 57e3a4b851b7499d5e6f7490c0448ebd648f8224 +RMD160 (etm-702.tar.gz) = 385d35d1e7a16c77802343418aba6159b8922f8d +Size (etm-702.tar.gz) = 163369 bytes -- cgit v1.2.3