3 files changed, 37 insertions, 23 deletions

diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index 6ebe0bd6ba0a..84af5bbdb4f5 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sanduhr
-PORTVERSION=	0.3.52
+PORTVERSION=	1.0
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://www.mathematik.uni-kl.de/~wwwstoch/voss/
 
@@ -15,6 +15,7 @@ MAINTAINER=	sobomax@FreeBSD.org
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -23,10 +24,10 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 MAN1=		sanduhr.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/sanduhr/distinfo b/x11-clocks/sanduhr/distinfo
index 43bf69f10ab1..cb79f6341f92 100644
--- a/x11-clocks/sanduhr/distinfo
+++ b/x11-clocks/sanduhr/distinfo
@@ -1 +1 @@
-MD5 (sanduhr-0.3.52.tar.gz) = d0d79240509986371e4d4182ad342db1
+MD5 (sanduhr-1.0.tar.gz) = 87746631a820029501a50b4cf0d0a6ec
diff --git a/x11-clocks/sanduhr/pkg-plist b/x11-clocks/sanduhr/pkg-plist
index 19917718c6fc..a2146bd0623c 100644
--- a/x11-clocks/sanduhr/pkg-plist
+++ b/x11-clocks/sanduhr/pkg-plist
@@ -1,25 +1,39 @@
 bin/sanduhr
-etc/CORBA/servers/sanduhr.gnorba
 share/gnome/apps/Utilities/sanduhr.desktop
-share/gnome/help/sanduhr/C/docbook.css
+share/gnome/help/sanduhr/C/alarmref.html
+share/gnome/help/sanduhr/C/alarmref.sgml
+share/gnome/help/sanduhr/C/authors.html
+share/gnome/help/sanduhr/C/corba.html
+share/gnome/help/sanduhr/C/factoryref.html
+share/gnome/help/sanduhr/C/factoryref.sgml
+share/gnome/help/sanduhr/C/idl.html
 share/gnome/help/sanduhr/C/index.html
-share/gnome/help/sanduhr/C/intro.html
-share/gnome/help/sanduhr/C/invocation.html
-share/gnome/help/sanduhr/C/ln14.html
-share/gnome/help/sanduhr/C/preferences.html
-share/gnome/help/sanduhr/C/sanduhr.html
-share/gnome/help/sanduhr/C/timespec.html
+share/gnome/help/sanduhr/C/license.html
+share/gnome/help/sanduhr/C/prefs.html
+share/gnome/help/sanduhr/C/sanduhr.sgml
+share/gnome/help/sanduhr/C/timerref.html
+share/gnome/help/sanduhr/C/timerref.sgml
 share/gnome/help/sanduhr/C/topic.dat
-share/gnome/help/sanduhr/de/docbook.css
+share/gnome/help/sanduhr/C/usage.html
+share/gnome/help/sanduhr/de/alarmref.html
+share/gnome/help/sanduhr/de/alarmref.sgml
+share/gnome/help/sanduhr/de/authors.html
+share/gnome/help/sanduhr/de/corba.html
+share/gnome/help/sanduhr/de/factoryref.html
+share/gnome/help/sanduhr/de/factoryref.sgml
+share/gnome/help/sanduhr/de/idl.html
 share/gnome/help/sanduhr/de/index.html
-share/gnome/help/sanduhr/de/intro.html
-share/gnome/help/sanduhr/de/invocation.html
-share/gnome/help/sanduhr/de/ln14.html
-share/gnome/help/sanduhr/de/preferences.html
-share/gnome/help/sanduhr/de/sanduhr.html
-share/gnome/help/sanduhr/de/timespec.html
+share/gnome/help/sanduhr/de/license.html
+share/gnome/help/sanduhr/de/prefs.html
+share/gnome/help/sanduhr/de/sanduhr.sgml
+share/gnome/help/sanduhr/de/timerref.html
+share/gnome/help/sanduhr/de/timerref.sgml
 share/gnome/help/sanduhr/de/topic.dat
+share/gnome/help/sanduhr/de/usage.html
 share/gnome/idl/sanduhr.idl
+share/gnome/oaf/sanduhr.oaf
+share/gnome/omf/sanduhr/sanduhr-C.omf
+share/gnome/omf/sanduhr/sanduhr-de.omf
 share/gnome/pixmaps/sanduhr/about.png
 share/gnome/pixmaps/sanduhr/back.png
 share/gnome/pixmaps/sanduhr/front.png
@@ -30,8 +44,7 @@ share/gnome/sounds/sanduhr/bell.wav
 share/locale/de/LC_MESSAGES/sanduhr.mo
 @dirrm share/gnome/sounds/sanduhr
 @dirrm share/gnome/pixmaps/sanduhr
-@dirrm share/gnome/help/sanduhr/de/images
+@dirrm share/gnome/omf/sanduhr
 @dirrm share/gnome/help/sanduhr/de
-@dirrm share/gnome/help/sanduhr/C/images
 @dirrm share/gnome/help/sanduhr/C
 @dirrm share/gnome/help/sanduhr