4 files changed, 40 insertions, 20 deletions

diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index f5eb81b4f06f..49d2d64139bb 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -6,31 +6,42 @@
 #
 
 PORTNAME=	timer-applet
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	timerapplet
 
 MAINTAINER=	jylefort@brutele.be
-COMMENT=	Timer applet for the Gnome panel
+COMMENT=	A timer applet for the GNOME panel
 
 RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnomeaudio2
 
-USE_GNOME=	gnomehack gnomeprefix gnomepanel
+USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--bindir=${PREFIX}/libexec	# applets belong to libexec
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GCONF_SCHEMAS=	timer-applet.schemas
+INSTALLS_OMF=	yes
+OMFDIR=		${PREFIX}/share/gnome/omf/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/usr/share/pixmaps/||; \
+		's|/usr/share/pixmaps/|${PREFIX}/share/gnome/pixmaps/|; \
 		 s|location="timer-applet"|location="${PREFIX}/libexec/timer-applet"|' \
-		${WRKSRC}/timer-applet.server
+		${WRKSRC}/GNOME_TimerApplet.server.in
 	@${REINPLACE_CMD} -e \
 		's|$$(datadir)/sounds|${X11BASE}/share/gnome/sounds|' \
 		${WRKSRC}/src/Makefile.in
+	@${MKDIR} ${WRKSRC}/omf-install
+
+post-install:
+	${MKDIR} ${OMFDIR}
+.for lang in C fr
+	${INSTALL_DATA} ${WRKSRC}/omf-install/${PORTNAME}-${lang}.omf ${OMFDIR}
+	-scrollkeeper-install -q ${OMFDIR}/${PORTNAME}-${lang}.omf
+.endfor
 
 .include <bsd.port.mk>
diff --git a/deskutils/timer-applet/distinfo b/deskutils/timer-applet/distinfo
index fd65c99fd556..f52616e0901c 100644
--- a/deskutils/timer-applet/distinfo
+++ b/deskutils/timer-applet/distinfo
@@ -1,2 +1,2 @@
-MD5 (timer-applet-0.5.1.tar.gz) = b28aa896e79e86fdb431af5dc1b23b4e
-SIZE (timer-applet-0.5.1.tar.gz) = 130053
+MD5 (timer-applet-1.0.tar.gz) = 63b40b8ae59e12d2f7068ebf64fffd86
+SIZE (timer-applet-1.0.tar.gz) = 170234
diff --git a/deskutils/timer-applet/pkg-descr b/deskutils/timer-applet/pkg-descr
index e5d63b17cc9c..226053c766c8 100644
--- a/deskutils/timer-applet/pkg-descr
+++ b/deskutils/timer-applet/pkg-descr
@@ -2,16 +2,12 @@ Timer Applet is a countdown timer applet for the GNOME panel.
 
 Highlights:
 
-	* 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
+    * Quickly set a timer and the applet will notify you when time is up
+    * Add multiple Timer Applets to the panel to have different timers
+      running simultaneously
+    * Create presets for quick access to frequently-used times
+    * Each applet remembers your last-used timer, even after you log out
+    * User interface follows the GNOME Human Interface Guidelines
 
 WWW: http://timerapplet.sourceforge.net/
 
diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist
index 54e6a69993fb..b6649ba06eb4 100644
--- a/deskutils/timer-applet/pkg-plist
+++ b/deskutils/timer-applet/pkg-plist
@@ -1,9 +1,22 @@
-libdata/bonobo/servers/timer-applet.server
+libdata/bonobo/servers/GNOME_TimerApplet.server
 libexec/timer-applet
-share/gnome/gnome-2.0/ui/timer-applet.xml
+share/gnome/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/gnome/omf/timer-applet/timer-applet-C.omf
+share/gnome/omf/timer-applet/timer-applet-fr.omf
 share/gnome/pixmaps/timer-applet/timer-applet-icon.png
 share/locale/de/LC_MESSAGES/timer-applet.mo
+share/locale/es/LC_MESSAGES/timer-applet.mo
 share/locale/eu/LC_MESSAGES/timer-applet.mo
 share/locale/fr/LC_MESSAGES/timer-applet.mo
 share/locale/sv/LC_MESSAGES/timer-applet.mo
+@dirrm share/gnome/help/timer-applet/C/figures
+@dirrm share/gnome/help/timer-applet/C
+@dirrm share/gnome/help/timer-applet/fr/figures
+@dirrm share/gnome/help/timer-applet/fr
+@dirrm share/gnome/help/timer-applet
+@dirrm share/gnome/omf/timer-applet
 @dirrm share/gnome/pixmaps/timer-applet