5 files changed, 41 insertions, 32 deletions

diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index 38036cb176cc..af4e7cc68e1a 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	taskcoach
-PORTVERSION=	1.2.30
+PORTVERSION=	1.3.4
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Release-${PORTVERSION}
 DISTNAME=	TaskCoach-${PORTVERSION}
diff --git a/deskutils/taskcoach/distinfo b/deskutils/taskcoach/distinfo
index 18a1e3c32853..4fdd1e2765f8 100644
--- a/deskutils/taskcoach/distinfo
+++ b/deskutils/taskcoach/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TaskCoach-1.2.30.tar.gz) = bb74c86c289bee61ed1ff03e098b8b83108b3b55e59d6137aba7b3fa69cad616
-SIZE (TaskCoach-1.2.30.tar.gz) = 2303069
+SHA256 (TaskCoach-1.3.4.tar.gz) = 93de09455b7b7371cfb03fc15e0319ccf1ed0eab6b978ff1765b86187bda43ac
+SIZE (TaskCoach-1.3.4.tar.gz) = 2373095
diff --git a/deskutils/taskcoach/files/patch-setup.py b/deskutils/taskcoach/files/patch-setup.py
index 574c0db83c2e..01c987c29ced 100644
--- a/deskutils/taskcoach/files/patch-setup.py
+++ b/deskutils/taskcoach/files/patch-setup.py
@@ -1,10 +1,12 @@
---- setup.py.orig	2011-09-19 03:48:34.000000000 +0800
-+++ setup.py	2011-09-30 12:47:45.000000000 +0800
-@@ -46,7 +46,6 @@
+--- setup.py.orig	2011-12-14 04:24:18.000000000 +0800
++++ setup.py	2012-01-05 17:57:29.000000000 +0800
+@@ -52,8 +52,7 @@
+     'url': meta.url,
      'license': meta.license,
      'download_url': meta.download,
-     'packages': findPackages('taskcoachlib') + findPackages('buildlib'),
+-    'packages': findPackages('taskcoachlib') + findPackages('buildlib'),
 -    'scripts': ['taskcoach.py'],
++    'packages': findPackages('taskcoachlib'),
      'classifiers': [\
          'Development Status :: 5 - Production/Stable',
          'Intended Audience :: End Users/Desktop',
diff --git a/deskutils/taskcoach/files/patch-taskcoachlib-powermgt_idle.py b/deskutils/taskcoach/files/patch-taskcoachlib-powermgt_idle.py
new file mode 100644
index 000000000000..8daf1861e735
--- /dev/null
+++ b/deskutils/taskcoach/files/patch-taskcoachlib-powermgt_idle.py
@@ -0,0 +1,14 @@
+--- taskcoachlib/powermgt/idle.py.orig	2011-11-27 18:30:04.000000000 +0800
++++ taskcoachlib/powermgt/idle.py	2012-01-06 10:26:51.000000000 +0800
+@@ -21,9 +21,9 @@
+ 
+ 
+ #==============================================================================
+-# Linux
++# Linux / FreeBSD
+ 
+-if sys.platform == 'linux2':
++if (sys.platform == 'linux2') or (sys.platform.startswith('freebsd')):
+     class XScreenSaverInfo(Structure):
+         _fields_ = [('window', c_ulong),
+                     ('state', c_int),
diff --git a/deskutils/taskcoach/pkg-plist b/deskutils/taskcoach/pkg-plist
index 11f98ded6872..57616922950a 100644
--- a/deskutils/taskcoach/pkg-plist
+++ b/deskutils/taskcoach/pkg-plist
@@ -1,28 +1,4 @@
 bin/taskcoach
-%%PYTHON_SITELIBDIR%%/buildlib/__init__.py
-%%PYTHON_SITELIBDIR%%/buildlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/buildlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_deb.py
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_deb.pyc
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_deb.pyo
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_portable_base.py
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_portable_base.pyc
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_portable_base.pyo
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_portableapps.py
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_portableapps.pyc
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_portableapps.pyo
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_rpm_fedora.py
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_rpm_fedora.pyc
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_rpm_fedora.pyo
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_rpm_opensuse.py
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_rpm_opensuse.pyc
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_rpm_opensuse.pyo
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_winpenpack.py
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_winpenpack.pyc
-%%PYTHON_SITELIBDIR%%/buildlib/bdist_winpenpack.pyo
-%%PYTHON_SITELIBDIR%%/buildlib/clean.py
-%%PYTHON_SITELIBDIR%%/buildlib/clean.pyc
-%%PYTHON_SITELIBDIR%%/buildlib/clean.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/__init__.pyo
@@ -239,6 +215,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/__init__.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/attributesync.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/attributesync.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/attributesync.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/editor.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/editor.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/editor.pyo
@@ -269,6 +248,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/icons.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/icons.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/icons.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/idlecontroller.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/idlecontroller.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/idlecontroller.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/iocontroller.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/iocontroller.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/iocontroller.pyo
@@ -683,6 +665,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/base.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/base.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/base.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/idle.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/idle.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/idle.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/macos.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/macos.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/macos.pyo
@@ -719,9 +704,15 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/Growl.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/Growl.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/Growl.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/SendKeys.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/SendKeys.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/SendKeys.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/__init__.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/_sendkeys.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/_sendkeys.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/_sendkeys.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/aui/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/aui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/aui/__init__.pyo
@@ -1022,6 +1013,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarwidget.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarwidget.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarwidget.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/checklistbox.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/checklistbox.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/checklistbox.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/conflict.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/conflict.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/conflict.pyo
@@ -1149,4 +1143,3 @@ share/pixmaps/taskcoach.png
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/command
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/application
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib
-@dirrm %%PYTHON_SITELIBDIR%%/buildlib