4 files changed, 85 insertions, 54 deletions

diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index 22e56176da1f..3b57c270b5f9 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	taskcoach
-PORTVERSION=	1.2.12
+PORTVERSION=	1.2.22
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Release-${PORTVERSION}
 DISTNAME=	TaskCoach-${PORTVERSION}
@@ -25,7 +25,16 @@ USE_WX=		2.8
 WX_COMPS=	python:lib
 WX_UNICODE=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|taskcoach.py|taskcoach|' \
+		${WRKSRC}/build.in/fedora/taskcoach.desktop
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/taskcoach.py ${PREFIX}/bin/taskcoach
+	@${MKDIR} ${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKSRC}/build.in/fedora/taskcoach.desktop \
+		${PREFIX}/share/applications/
+	@${MKDIR} ${PREFIX}/share/pixmaps
+	@${INSTALL_DATA} ${WRKSRC}/icons.in/taskcoach.png \
+		${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/deskutils/taskcoach/distinfo b/deskutils/taskcoach/distinfo
index 89da70a6430b..1ac05c642046 100644
--- a/deskutils/taskcoach/distinfo
+++ b/deskutils/taskcoach/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TaskCoach-1.2.12.tar.gz) = d88fe2b1fccdb14ca3c0adc3522a69c69d9d4d0d969df45bed68e9b7d517edba
-SIZE (TaskCoach-1.2.12.tar.gz) = 2031521
+SHA256 (TaskCoach-1.2.22.tar.gz) = 9b4e8dd64d6806494668f46eeef47a04a976c32c872a263002538cb495ca82cc
+SIZE (TaskCoach-1.2.22.tar.gz) = 2231570
diff --git a/deskutils/taskcoach/files/patch-setup.py b/deskutils/taskcoach/files/patch-setup.py
index e830feedc2c8..04066453938a 100644
--- a/deskutils/taskcoach/files/patch-setup.py
+++ b/deskutils/taskcoach/files/patch-setup.py
@@ -1,29 +1,26 @@
---- setup.py.orig	2011-02-06 01:18:05.000000000 +0800
-+++ setup.py	2011-03-04 16:47:57.000000000 +0800
+--- setup.py.orig	2011-06-11 03:03:09.000000000 +0800
++++ setup.py	2011-07-06 16:26:53.000000000 +0800
 @@ -54,7 +54,6 @@
      'license': meta.license,
      'download_url': meta.download,
      'packages': findPackages('taskcoachlib') + findPackages('buildlib'),
 -    'scripts': ['taskcoach.py'],
      'classifiers': [\
-         'Development Status :: 3 - Alpha',
+         'Development Status :: 5 - Production/Stable',
          'Intended Audience :: End Users/Desktop',
-@@ -73,14 +72,12 @@
+@@ -76,14 +75,8 @@
      setupOptions['classifiers'].append('Natural Language :: %s'%language)
  
- # Add data files for Debian-based systems:
--current_dist = [dist.lower() for dist in platform.dist()]
--if 'debian' in current_dist or 'ubuntu' in current_dist:
--    setupOptions['data_files'] = [\
--        ('share/applications', ['build.in/fedora/taskcoach.desktop']), 
--        ('share/pixmaps', ['icons.in/taskcoach.png'])]
-+setupOptions['data_files'] = [\
-+    ('share/applications', ['build.in/fedora/taskcoach.desktop']), 
-+    ('share/pixmaps', ['icons.in/taskcoach.png'])]
- 
  system = platform.system()
 -if system == 'Linux':
 +if (system == 'Linux') or (system == 'FreeBSD'):
      setupOptions['package_data'] = {'taskcoachlib': ['bin.in/linux/_pysyncml.so']}
+-    # Add data files for Debian-based systems:
+-    current_dist = [dist.lower() for dist in platform.dist()]
+-    if 'debian' in current_dist or 'ubuntu' in current_dist:
+-        setupOptions['data_files'] = [\
+-	    ('share/applications', ['build.in/fedora/taskcoach.desktop']), 
+-	    ('share/pixmaps', ['icons.in/taskcoach.png'])]
  elif system == 'Windows':
      setupOptions['scripts'].append('taskcoach.pyw')
+ elif system == 'Darwin':
diff --git a/deskutils/taskcoach/pkg-plist b/deskutils/taskcoach/pkg-plist
index b125e5302dcf..114cca4f8655 100644
--- a/deskutils/taskcoach/pkg-plist
+++ b/deskutils/taskcoach/pkg-plist
@@ -245,6 +245,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/entry.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/entry.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/entry.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/export.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/export.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/export.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/iphone.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/iphone.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/iphone.pyo
@@ -326,6 +329,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/factory.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/factory.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/factory.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/inplace_editor.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/inplace_editor.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/inplace_editor.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/mixin.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/mixin.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/mixin.pyo
@@ -338,6 +344,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/task.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/task.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/viewer/task.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/windowdimensionstracker.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/windowdimensionstracker.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/windowdimensionstracker.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/wizard/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/wizard/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/wizard/__init__.pyo
@@ -668,6 +677,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/win32.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/win32.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/win32.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/xsm.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/xsm.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/xsm.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/syncml/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/syncml/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/syncml/__init__.pyo
@@ -725,36 +737,6 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/aui/tabmdi.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/aui/tabmdi.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/aui/tabmdi.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/__init__.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/__init__.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/__init__.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxDrawer.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxDrawer.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxDrawer.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxReportScheduler.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxReportScheduler.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxReportScheduler.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedule.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedule.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedule.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxScheduleUtils.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxScheduleUtils.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxScheduleUtils.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxScheduler.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxScheduler.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxScheduler.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerConstants.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerConstants.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerConstants.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerCore.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerCore.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerCore.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerPaint.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerPaint.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerPaint.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerPrint.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerPrint.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar/wxSchedulerPrint.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/chardet/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/chardet/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/chardet/__init__.pyo
@@ -890,6 +872,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/dateutil/zoneinfo/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/dateutil/zoneinfo/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/dateutil/zoneinfo/__init__.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/deltaTime.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/deltaTime.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/deltaTime.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/desktop/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/desktop/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/desktop/__init__.pyo
@@ -920,6 +905,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pybonjour.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pybonjour.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pybonjour.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pyparsing.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pyparsing.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pyparsing.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/sized_controls.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/sized_controls.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/sized_controls.pyo
@@ -938,6 +926,36 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wmi.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wmi.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wmi.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/__init__.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/__init__.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/__init__.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxDrawer.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxDrawer.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxDrawer.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxReportScheduler.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxReportScheduler.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxReportScheduler.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedule.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedule.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedule.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxScheduleUtils.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxScheduleUtils.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxScheduleUtils.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxScheduler.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxScheduler.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxScheduler.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerConstants.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerConstants.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerConstants.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerCore.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerCore.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerCore.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerPaint.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerPaint.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerPaint.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerPrint.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerPrint.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler/wxSchedulerPrint.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/__init__.pyo
@@ -947,18 +965,15 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/buttonbox.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/buttonbox.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/buttonbox.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendar.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendar.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendar.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarconfig.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarconfig.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarconfig.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarwidget.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarwidget.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarwidget.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/colorselect.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/colorselect.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/colorselect.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/combo.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/combo.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/combo.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/conflict.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/conflict.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/conflict.pyo
@@ -1022,10 +1037,21 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/ultimatetreectrl.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/ultimatetreectrl.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/ultimatetreectrl.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/__init__.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/__init__.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/__init__.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/display.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/display.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/display.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/font.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/font.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds/font.pyo
 share/applications/taskcoach.desktop
 share/pixmaps/taskcoach.png
 @dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/workarounds
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets
+@dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/wxScheduler
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/timeline
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/squaremap
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/lockfile
@@ -1033,7 +1059,6 @@ share/pixmaps/taskcoach.png
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/dateutil/zoneinfo
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/dateutil
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/chardet
-@dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/calendar
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/aui
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/syncml