4 files changed, 42 insertions, 62 deletions

diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index 49c380f833f8..6115f762a40f 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	glunarclock
-PORTVERSION=	0.30.3
-PORTREVISION=	5
-CATEGORIES=	astro
+PORTVERSION=	0.32.1
+CATEGORIES=	astro gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
@@ -16,9 +15,20 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME applet that displays the current phase of the Moon
 
 USE_X_PREFIX=	yes
+USE_GNOME=	gail gnomehack gnomepanel gnomeprefix gnometarget
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomepanel gail gnomehack gnomeprefix
-USE_LIBTOOL_VER=	13
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
+USE_LIBTOOL_VER=	15
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+INSTALLS_OMF=	yes
+
+PLIST_SUB=	VERSION="${PORTVERSION:R}"
+
+GCONF_SCHEMAS=	glunarclock.schemas
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${prefix}/share|$${datadir}|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/astro/glunarclock/distinfo b/astro/glunarclock/distinfo
index 65a4bd5a1829..090033196566 100644
--- a/astro/glunarclock/distinfo
+++ b/astro/glunarclock/distinfo
@@ -1,2 +1,2 @@
-MD5 (glunarclock-0.30.3.tar.gz) = 91d40bab7a11c905d968abd16d8752ea
-SIZE (glunarclock-0.30.3.tar.gz) = 493077
+MD5 (glunarclock-0.32.1.tar.gz) = 599dbc6074982456ec68d20ca8ff9069
+SIZE (glunarclock-0.32.1.tar.gz) = 519869
diff --git a/astro/glunarclock/files/patch-configure b/astro/glunarclock/files/patch-configure
deleted file mode 100644
index fade6423f26b..000000000000
--- a/astro/glunarclock/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	Tue Dec  2 15:31:05 2003
-+++ configure	Mon Dec 22 01:56:33 2003
-@@ -18919,6 +18919,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -22257,14 +22258,14 @@
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
- 
- 
- #defined the below to enable help to work for applets
- 
- cat >>confdefs.h <<_ACEOF
--#define DATADIR "${prefix}/share"
-+#define DATADIR "${datadir}"
- _ACEOF
- 
- cat >>confdefs.h <<_ACEOF
diff --git a/astro/glunarclock/pkg-plist b/astro/glunarclock/pkg-plist
index 4b6c0fdc521f..fd8ebc0d6013 100644
--- a/astro/glunarclock/pkg-plist
+++ b/astro/glunarclock/pkg-plist
@@ -1,6 +1,3 @@
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/glunarclock.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/glunarclock.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/glunarclock.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_GLunarclockApplet_Factory.server
 libexec/glunarclock-applet-2
 share/gnome/glunarclock/glunarclock.glade
@@ -8,35 +5,35 @@ share/gnome/gnome-2.0/ui/GNOME_GLunarclockApplet.xml
 share/gnome/help/glunarclock-applet-2/C/figures/glunarclock_applet.png
 share/gnome/help/glunarclock-applet-2/C/glunarclock-applet-2.xml
 share/gnome/help/glunarclock-applet-2/C/legal.xml
-share/gnome/omf/gnome-applets/glunarclock-applet-2-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/glunarclock-applet-2-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/glunarclock/glunarclock-applet-2-C.omf
 share/gnome/pixmaps/glunarclock-logo.png
 share/gnome/pixmaps/glunarclock/cartoonmoon_12frames.png
 share/gnome/pixmaps/glunarclock/moon_56frames.png
-share/locale/ast_ES/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/az/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/da/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/de/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/es/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/fi/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/fr/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/gl/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/hu/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/ja/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/ms/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/nl/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/no/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/ro/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/ru/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/sr/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/sv/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/vi/LC_MESSAGES/glunarclock-0.30.mo
-share/locale/wa/LC_MESSAGES/glunarclock-0.30.mo
-@unexec rmdir %D/share/locale/ast_ES/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ast_ES 2> /dev/null || true
+share/locale/ast_ES/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/glunarclock-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/glunarclock-%%VERSION%%.mo
 @dirrm share/gnome/pixmaps/glunarclock
+@dirrm share/gnome/omf/glunarclock
 @dirrm share/gnome/help/glunarclock-applet-2/C/figures
 @dirrm share/gnome/help/glunarclock-applet-2/C
 @dirrm share/gnome/help/glunarclock-applet-2
 @dirrm share/gnome/glunarclock
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/glunarclock-applet-2-C.omf 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/share/locale/ast_ES/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ast_ES 2> /dev/null || true