3 files changed, 110 insertions, 33 deletions

diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index d9b8bc696f1d..ecb151c2e47a 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -6,28 +6,26 @@
 #
 
 PORTNAME=	timer-applet
-PORTVERSION=	1.3.1
-PORTREVISION=	5
+PORTVERSION=	2.0.1
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	timerapplet
+MASTER_SITES=	SFE/timerapplet
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A timer applet for the GNOME panel
 
-LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	${LOCALBASE}/share/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio
+RUN_DEPENDS=	${LOCALBASE}/share/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio \
+		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
+		${LOCALBASE}/libdata/pkgconfig/notify-python.pc:${PORTSDIR}/devel/py-notify
 
-USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack pygnomedesktop
+USE_PYTHON=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GCONF_SCHEMAS=	timer-applet.schemas
-INSTALLS_OMF=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|/usr/share/pixmaps/|${PREFIX}/share/pixmaps/|' \
-		${WRKSRC}/GNOME_TimerApplet.server.in.in
+GCONF_SCHEMAS=	timer-applet.schemas
 
 .include <bsd.port.mk>
diff --git a/deskutils/timer-applet/distinfo b/deskutils/timer-applet/distinfo
index 90657f60df17..cf6ea47bc5ce 100644
--- a/deskutils/timer-applet/distinfo
+++ b/deskutils/timer-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (timer-applet-1.3.1.tar.gz) = 6c7f36c41bd8d7a86c055bfdf42f1493
-SHA256 (timer-applet-1.3.1.tar.gz) = c0ad517f6b9ef42d19c0a493ff75f2f0c9f8442d8616a945b6bf5abdb7595f26
-SIZE (timer-applet-1.3.1.tar.gz) = 213048
+MD5 (timer-applet-2.0.1.tar.gz) = c56e5ec73ece83389e05a51aa38e0d59
+SHA256 (timer-applet-2.0.1.tar.gz) = bee206b0bbc73d0751793c8a79e5bb234285013dee12573c11f3131898785ac2
+SIZE (timer-applet-2.0.1.tar.gz) = 213044
diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist
index b21133427ce6..4479fb5f2031 100644
--- a/deskutils/timer-applet/pkg-plist
+++ b/deskutils/timer-applet/pkg-plist
@@ -1,26 +1,105 @@
-libdata/bonobo/servers/GNOME_TimerApplet.server
-libexec/timer-applet
-share/gnome-2.0/ui/GNOME_TimerApplet.xml
-share/gnome/help/timer-applet/C/legal.xml
-share/gnome/help/timer-applet/C/timer-applet.xml
-share/gnome/help/timer-applet/fr/legal.xml
-share/gnome/help/timer-applet/fr/timer-applet.xml
-share/omf/timer-applet/timer-applet-C.omf
-share/omf/timer-applet/timer-applet-fr.omf
-share/pixmaps/timer-applet/timer-applet-icon.png
+%%PYTHON_SITELIBDIR%%/timerapplet/__init__.py
+%%PYTHON_SITELIBDIR%%/timerapplet/__init__.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/__init__.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/config.py
+%%PYTHON_SITELIBDIR%%/timerapplet/config.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/config.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/GlobalController.py
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/GlobalController.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/GlobalController.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerApplet.py
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerApplet.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerApplet.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerManagerService.py
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerManagerService.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerManagerService.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerService.py
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerService.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/TimerService.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/__init__.py
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/controllers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/core/AppletGConfWrapper.py
+%%PYTHON_SITELIBDIR%%/timerapplet/core/AppletGConfWrapper.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/core/AppletGConfWrapper.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/core/PresetsStore.py
+%%PYTHON_SITELIBDIR%%/timerapplet/core/PresetsStore.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/core/PresetsStore.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/core/Timer.py
+%%PYTHON_SITELIBDIR%%/timerapplet/core/Timer.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/core/Timer.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/core/__init__.py
+%%PYTHON_SITELIBDIR%%/timerapplet/core/__init__.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/defs.py
+%%PYTHON_SITELIBDIR%%/timerapplet/defs.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/defs.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/AddEditPresetDialog.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/AddEditPresetDialog.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/AddEditPresetDialog.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ContinueTimerDialog.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ContinueTimerDialog.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ContinueTimerDialog.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/DurationChooser.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/DurationChooser.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/DurationChooser.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ManagePresetsDialog.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ManagePresetsDialog.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ManagePresetsDialog.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/Notifier.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/Notifier.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/Notifier.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PieMeter.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PieMeter.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PieMeter.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PreferencesDialog.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PreferencesDialog.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PreferencesDialog.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PulseButton.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PulseButton.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/PulseButton.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ScrollableButtonList.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ScrollableButtonList.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/ScrollableButtonList.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/StartTimerDialog.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/StartTimerDialog.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/StartTimerDialog.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/StatusButton.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/StatusButton.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/StatusButton.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/timerapplet/utils.py
+%%PYTHON_SITELIBDIR%%/timerapplet/utils.pyc
+%%PYTHON_SITELIBDIR%%/timerapplet/utils.pyo
+libdata/bonobo/servers/TimerApplet.server
+libexec/timer-applet/timer-applet
+share/locale/bn/LC_MESSAGES/timer-applet.mo
+share/locale/ca/LC_MESSAGES/timer-applet.mo
+share/locale/da/LC_MESSAGES/timer-applet.mo
 share/locale/de/LC_MESSAGES/timer-applet.mo
+share/locale/el/LC_MESSAGES/timer-applet.mo
+share/locale/en_GB/LC_MESSAGES/timer-applet.mo
 share/locale/eo/LC_MESSAGES/timer-applet.mo
 share/locale/es/LC_MESSAGES/timer-applet.mo
 share/locale/eu/LC_MESSAGES/timer-applet.mo
 share/locale/fi/LC_MESSAGES/timer-applet.mo
 share/locale/fr/LC_MESSAGES/timer-applet.mo
+share/locale/ga/LC_MESSAGES/timer-applet.mo
 share/locale/it/LC_MESSAGES/timer-applet.mo
 share/locale/ko/LC_MESSAGES/timer-applet.mo
+share/locale/oc/LC_MESSAGES/timer-applet.mo
 share/locale/pl/LC_MESSAGES/timer-applet.mo
 share/locale/sv/LC_MESSAGES/timer-applet.mo
 share/locale/tr/LC_MESSAGES/timer-applet.mo
-@dirrm share/gnome/help/timer-applet/C
-@dirrm share/gnome/help/timer-applet/fr
-@dirrm share/gnome/help/timer-applet
-@dirrm share/omf/timer-applet
-@dirrm share/pixmaps/timer-applet
+share/locale/zh_CN/LC_MESSAGES/timer-applet.mo
+share/pixmaps/timer-applet.png
+%%DATADIR%%/TimerApplet.xml
+%%DATADIR%%/timer-applet.glade
+@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/timerapplet/ui
+@dirrm %%PYTHON_SITELIBDIR%%/timerapplet/core
+@dirrm %%PYTHON_SITELIBDIR%%/timerapplet/controllers
+@dirrm %%PYTHON_SITELIBDIR%%/timerapplet
+@dirrm libexec/timer-applet