4 files changed, 26 insertions, 17 deletions

diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 1fac4131b63f..91897ae2b6f6 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	timer-applet
-PORTVERSION=	0.3
-PORTREVISION=	1
+PORTVERSION=	0.4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	timerapplet
@@ -17,12 +16,17 @@ COMMENT=	Timer applet for the Gnome panel
 
 RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnomeaudio2
 
-USE_GNOME=	gnomehack gnomeprefix gnometarget gnomepanel
+USE_GNOME=	gnomehack gnomeprefix gnomepanel
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--bindir=${PREFIX}/libexec	# applets belong to libexec
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
 post-patch:
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/pixmaps/||; \
+		 s|location="timer-applet"|location="${PREFIX}/libexec/timer-applet"|' \
+		${WRKSRC}/timer-applet.server
 	@${REINPLACE_CMD} -e 's|/usr/share/sounds|${X11BASE}/share/gnome/sounds|' \
 		${WRKSRC}/src/timer-applet.c
 
diff --git a/deskutils/timer-applet/distinfo b/deskutils/timer-applet/distinfo
index b549589f3473..c0cb7d65cd95 100644
--- a/deskutils/timer-applet/distinfo
+++ b/deskutils/timer-applet/distinfo
@@ -1,2 +1,2 @@
-MD5 (timer-applet-0.3.tar.gz) = 43415a819440df85cecf0c971ab3a48a
-SIZE (timer-applet-0.3.tar.gz) = 122601
+MD5 (timer-applet-0.4.tar.gz) = 199caad577d5f4af9295b411af54d964
+SIZE (timer-applet-0.4.tar.gz) = 124903
diff --git a/deskutils/timer-applet/pkg-descr b/deskutils/timer-applet/pkg-descr
index 2d092ccf908a..e5d63b17cc9c 100644
--- a/deskutils/timer-applet/pkg-descr
+++ b/deskutils/timer-applet/pkg-descr
@@ -1,14 +1,19 @@
-[From WebPage]
-
 Timer Applet is a countdown timer applet for the GNOME panel.
 
 Highlights:
- * Quickly set a time and the applet will notify you when time's up
- * Create presets for quick access to frequently-used times
- * Small and unobtrusive. Choose to either view the remaining time right in
-   the panel or hide it so you don't get distracted by the countdown.
-   You can still view the remaining time by hovering your mouse over the
-   timer icon
- * User interface follows the GNOME Human Interface Guidelines
-
-WWW:	http://timerapplet.sourceforge.net/
+
+	* Add multiple Timer Applets to the panel to have different
+	  timers running simultaneously
+	* Quickly set a time and the applet will notify you when
+	  time's up
+	* Create presets for quick access to frequently-used times
+	* Small and unobtrusive. Choose to either view the remaining
+	  time right in the panel or hide it so you don't get
+	  distracted by the countdown. You can still view the
+	  remaining time by hovering your mouse over the timer icon
+	* User interface follows the GNOME Human Interface Guidelines
+
+WWW: http://timerapplet.sourceforge.net/
+
+- Jean-Yves Lefort
+jylefort@brutele.be
diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist
index 2d47c64e343b..a9e9615a7cdc 100644
--- a/deskutils/timer-applet/pkg-plist
+++ b/deskutils/timer-applet/pkg-plist
@@ -1,5 +1,5 @@
-bin/timer-applet
 libdata/bonobo/servers/timer-applet.server
+libexec/timer-applet
 share/gnome/gnome-2.0/ui/timer-applet.xml
 share/gnome/pixmaps/timer-applet/timer-applet-icon.png
 @dirrm share/gnome/pixmaps/timer-applet