4 files changed, 48 insertions, 28 deletions

diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index fded8ed777de..165e4a390f66 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	taskcoach
-PORTVERSION=	1.2.27
+PORTVERSION=	1.2.28
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Release-${PORTVERSION}
 DISTNAME=	TaskCoach-${PORTVERSION}
diff --git a/deskutils/taskcoach/distinfo b/deskutils/taskcoach/distinfo
index 1a9d92911ff6..92d08b434f52 100644
--- a/deskutils/taskcoach/distinfo
+++ b/deskutils/taskcoach/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TaskCoach-1.2.27.tar.gz) = bb1bf4de160e31ea557f8585f8160590a9feca66319546f0023faf8d8f8e27fe
-SIZE (TaskCoach-1.2.27.tar.gz) = 2264467
+SHA256 (TaskCoach-1.2.28.tar.gz) = dd0519701acff91dbb9a5476f7172c6a35f6bdb97716e835de6e797c8cdc5a65
+SIZE (TaskCoach-1.2.28.tar.gz) = 2284696
diff --git a/deskutils/taskcoach/files/patch-setup.py b/deskutils/taskcoach/files/patch-setup.py
index 04066453938a..574c0db83c2e 100644
--- a/deskutils/taskcoach/files/patch-setup.py
+++ b/deskutils/taskcoach/files/patch-setup.py
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
      'license': meta.license,
      'download_url': meta.download,
      'packages': findPackages('taskcoachlib') + findPackages('buildlib'),
@@ -8,19 +8,3 @@
      'classifiers': [\
          'Development Status :: 5 - Production/Stable',
          'Intended Audience :: End Users/Desktop',
-@@ -76,14 +75,8 @@
-     setupOptions['classifiers'].append('Natural Language :: %s'%language)
- 
- 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 77a6ed1149b1..11f98ded6872 100644
--- a/deskutils/taskcoach/pkg-plist
+++ b/deskutils/taskcoach/pkg-plist
@@ -581,6 +581,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/notify/snarl.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/notify/snarl.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/notify/snarl.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/operating_system.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/operating_system.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/operating_system.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/patterns/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/patterns/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/patterns/__init__.pyo
@@ -674,9 +677,6 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/persistence/xml/writer.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/persistence/xml/writer.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/persistence/xml/writer.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/platform.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/platform.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/platform.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/powermgt/__init__.pyo
@@ -908,6 +908,39 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/hypertreelist.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/hypertreelist.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/hypertreelist.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/__init__.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/__init__.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/__init__.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backend.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backend.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backend.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/__init__.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/__init__.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/__init__.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/osx_keychain.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/osx_keychain.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/osx_keychain.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/win32_crypto.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/win32_crypto.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends/win32_crypto.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/cli.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/cli.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/cli.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/core.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/core.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/core.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/getpassbackend.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/getpassbackend.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/getpassbackend.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/http.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/http.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/http.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/util/__init__.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/util/escape.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/util/escape.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/util/escape.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/lockfile/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/lockfile/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/lockfile/__init__.pyo
@@ -983,9 +1016,6 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/autowidth.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/autowidth.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/autowidth.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/buttonbox.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/buttonbox.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/buttonbox.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarconfig.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarconfig.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/calendarconfig.pyo
@@ -1028,6 +1058,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/panel.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/panel.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/panel.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/password.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/password.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/password.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/searchctrl.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/searchctrl.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/widgets/searchctrl.pyo
@@ -1071,6 +1104,9 @@ share/pixmaps/taskcoach.png
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/timeline
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/squaremap
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/lockfile
+@dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/util
+@dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring/backends
+@dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/keyring
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/desktop
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/dateutil/zoneinfo
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/dateutil