Update to 1.3.33

3 files changed, 18 insertions, 38 deletions

diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index b42a406934fb..b6d164af5212 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	taskcoach
-PORTVERSION=	1.3.31
-PORTREVISION=	1
+PORTVERSION=	1.3.33
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Release-${PORTVERSION}
 DISTNAME=	TaskCoach-${PORTVERSION}
@@ -21,15 +20,15 @@ USE_WX=		2.8
 WX_COMPS=	python:lib
 WX_UNICODE=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|taskcoach.py|taskcoach|' \
-		${WRKSRC}/build.in/fedora/taskcoach.desktop
+		${WRKSRC}/build.in/linux_common/taskcoach.desktop
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/taskcoach.py ${PREFIX}/bin/taskcoach
-	@${INSTALL_DATA} ${WRKSRC}/build.in/fedora/taskcoach.desktop \
-		${PREFIX}/share/applications/
+	${INSTALL_SCRIPT} ${WRKSRC}/taskcoach.py \
+		${STAGEDIR}${PREFIX}/bin/taskcoach
+	@${INSTALL_DATA} ${WRKSRC}/build.in/linux_common/taskcoach.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/
 	@${INSTALL_DATA} ${WRKSRC}/icons.in/taskcoach.png \
-		${PREFIX}/share/pixmaps
+		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/deskutils/taskcoach/distinfo b/deskutils/taskcoach/distinfo
index 6f29dcbf2279..9366ae6f0f25 100644
--- a/deskutils/taskcoach/distinfo
+++ b/deskutils/taskcoach/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TaskCoach-1.3.31.tar.gz) = e6698d8bb8686448f3a7271a1a2c054fe0df6e36dd9115ccac83b966bf9bf85d
-SIZE (TaskCoach-1.3.31.tar.gz) = 2788818
+SHA256 (TaskCoach-1.3.33.tar.gz) = fc2654408511378c324db2c66ea43e98aba6938221f01fa167776c8d0be49000
+SIZE (TaskCoach-1.3.33.tar.gz) = 2791341
diff --git a/deskutils/taskcoach/pkg-plist b/deskutils/taskcoach/pkg-plist
index ca1c025c0ade..e78d7f75c188 100644
--- a/deskutils/taskcoach/pkg-plist
+++ b/deskutils/taskcoach/pkg-plist
@@ -248,12 +248,12 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/toolbar.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/toolbar.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/toolbar.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/xfce4warning.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/xfce4warning.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/xfce4warning.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/version.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/version.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/version.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/xfce4warning.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/xfce4warning.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/gui/dialog/xfce4warning.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/icons.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/icons.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/gui/icons.pyo
@@ -1097,9 +1097,6 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/__init__.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/_autosetuppubsubv1.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/_autosetuppubsubv1.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/_autosetuppubsubv1.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/__init__.pyo
@@ -1130,6 +1127,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/imp2.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/imp2.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/imp2.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/itopicdefnprovider.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/itopicdefnprovider.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/itopicdefnprovider.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/kwargs/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/kwargs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/kwargs/__init__.pyo
@@ -1196,33 +1196,12 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pub.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pub.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pub.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/__init__.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/__init__.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/__init__.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/pub.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/pub.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/pub.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/sphinx.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/sphinx.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/sphinx.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/utils.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/utils.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1/utils.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsubconf.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsubconf.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsubconf.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setuparg1.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setuparg1.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setuparg1.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupkwargs.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupkwargs.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupkwargs.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupv1.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupv1.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupv1.pyo
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupv2.py
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupv2.pyc
-%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/setupv2.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/__init__.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/__init__.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/__init__.pyo
@@ -1241,6 +1220,9 @@ bin/taskcoach
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/topictreeprinter.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/topictreeprinter.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/topictreeprinter.pyo
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/xmltopicdefnprovider.py
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/xmltopicdefnprovider.pyc
+%%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils/xmltopicdefnprovider.pyo
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pybonjour.py
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pybonjour.pyc
 %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pybonjour.pyo
@@ -1446,7 +1428,6 @@ share/pixmaps/taskcoach.png
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/timeline
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/squaremap
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/utils
-@dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/pubsub1
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/kwargs
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core/arg1
 @dirrm %%PYTHON_SITELIBDIR%%/taskcoachlib/thirdparty/pubsub/core