- Update to 0.9.33

- Depend on libgnome only if scrollkeeper is installed

PR:		ports/86836
Submitted by:	Stefan Walter <sw@gegenunendlich.de> (maintainer)

3 files changed, 54 insertions, 44 deletions

diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index c0d6bfe6abbe..db28e83963bd 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pioneers
-PORTVERSION=	0.9.23
+PORTVERSION=	0.9.33
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pio
@@ -16,13 +16,22 @@ COMMENT=	An Internet playable version of the Settlers of Catan for GNOME/GTK
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gtk20 libgnome
+USE_GNOME=	gnomehack gnomeprefix gtk20
 USE_LIBTOOL_VER=15
-INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN6=		pioneers.6 pioneers-server-gtk.6 pioneers-server-console.6 \
 		pioneersai.6 pioneers-meta-server.6
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${X11BASE}/bin/scrollkeeper-config)
+USE_GNOME+=	libgnome
+INSTALLS_OMF=	yes
+PLIST_SUB+=	LIBGNOME=""
+.else
+PLIST_SUB+=	LIBGNOME="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/games/pioneers/distinfo b/games/pioneers/distinfo
index 009f38b2dd36..b27aec996b99 100644
--- a/games/pioneers/distinfo
+++ b/games/pioneers/distinfo
@@ -1,2 +1,2 @@
-MD5 (pioneers-0.9.23.tar.gz) = 8d759c962cce7ccc998e9f732ed32725
-SIZE (pioneers-0.9.23.tar.gz) = 2087235
+MD5 (pioneers-0.9.33.tar.gz) = 02b44c636f5c95ddc49004fd49efadd9
+SIZE (pioneers-0.9.33.tar.gz) = 2117400
diff --git a/games/pioneers/pkg-plist b/games/pioneers/pkg-plist
index 541a1b0abeba..f9c416f4a08d 100644
--- a/games/pioneers/pkg-plist
+++ b/games/pioneers/pkg-plist
@@ -75,40 +75,40 @@ share/gnome/games/pioneers/themes/plain.png
 share/gnome/games/pioneers/themes/sea.png
 share/gnome/games/pioneers/themes/tick.png
 share/gnome/games/pioneers/x.game
-share/gnome/help/pioneers/C/images/actions.png
-share/gnome/help/pioneers/C/images/chat.png
-share/gnome/help/pioneers/C/images/client.png
-share/gnome/help/pioneers/C/images/connect-dialog.png
-share/gnome/help/pioneers/C/images/desert.png
-share/gnome/help/pioneers/C/images/develop-cards.png
-share/gnome/help/pioneers/C/images/discard-dialog.png
-share/gnome/help/pioneers/C/images/discards.png
-share/gnome/help/pioneers/C/images/field.png
-share/gnome/help/pioneers/C/images/forest.png
-share/gnome/help/pioneers/C/images/gameover-dialog.png
-share/gnome/help/pioneers/C/images/hill.png
-share/gnome/help/pioneers/C/images/identity.png
-share/gnome/help/pioneers/C/images/join-private-dialog.png
-share/gnome/help/pioneers/C/images/legend-dialog.png
-share/gnome/help/pioneers/C/images/map.png
-share/gnome/help/pioneers/C/images/messages.png
-share/gnome/help/pioneers/C/images/monopoly-dialog.png
-share/gnome/help/pioneers/C/images/mountain.png
-share/gnome/help/pioneers/C/images/pasture.png
-share/gnome/help/pioneers/C/images/place-robber.png
-share/gnome/help/pioneers/C/images/player-summary.png
-share/gnome/help/pioneers/C/images/plenty-dialog.png
-share/gnome/help/pioneers/C/images/quote.png
-share/gnome/help/pioneers/C/images/resources.png
-share/gnome/help/pioneers/C/images/sea.png
-share/gnome/help/pioneers/C/images/server-create.png
-share/gnome/help/pioneers/C/images/servers-dialog.png
-share/gnome/help/pioneers/C/images/status.png
-share/gnome/help/pioneers/C/images/steal-from.png
-share/gnome/help/pioneers/C/images/trade.png
-share/gnome/help/pioneers/C/legal.xml
-share/gnome/help/pioneers/C/pioneers.xml
-share/gnome/omf/pioneers/pioneers-C.omf
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/actions.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/chat.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/client.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/connect-dialog.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/desert.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/develop-cards.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/discard-dialog.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/discards.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/field.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/forest.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/gameover-dialog.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/hill.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/identity.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/join-private-dialog.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/legend-dialog.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/map.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/messages.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/monopoly-dialog.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/mountain.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/pasture.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/place-robber.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/player-summary.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/plenty-dialog.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/quote.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/resources.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/sea.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/server-create.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/servers-dialog.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/status.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/steal-from.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/images/trade.png
+%%LIBGNOME%%share/gnome/help/pioneers/C/legal.xml
+%%LIBGNOME%%share/gnome/help/pioneers/C/pioneers.xml
+%%LIBGNOME%%share/gnome/omf/pioneers/pioneers-C.omf
 share/gnome/pixmaps/gnome-pioneers.png
 share/gnome/pixmaps/pioneers/bridge.png
 share/gnome/pixmaps/pioneers/city.png
@@ -124,6 +124,7 @@ share/gnome/pixmaps/pioneers/trade.png
 share/locale/de/LC_MESSAGES/pioneers.mo
 share/locale/es/LC_MESSAGES/pioneers.mo
 share/locale/fr/LC_MESSAGES/pioneers.mo
+share/locale/hu/LC_MESSAGES/pioneers.mo
 share/locale/it/LC_MESSAGES/pioneers.mo
 share/locale/nl/LC_MESSAGES/pioneers.mo
 @dirrm share/gnome/games/pioneers/themes/FreeCIV-like
@@ -131,8 +132,8 @@ share/locale/nl/LC_MESSAGES/pioneers.mo
 @dirrm share/gnome/games/pioneers/themes/Tiny
 @dirrm share/gnome/games/pioneers/themes
 @dirrm share/gnome/games/pioneers
-@dirrm share/gnome/help/pioneers/C/images
-@dirrm share/gnome/help/pioneers/C
-@dirrm share/gnome/help/pioneers
-@dirrm share/gnome/omf/pioneers
+%%LIBGNOME%%@dirrm share/gnome/help/pioneers/C/images
+%%LIBGNOME%%@dirrm share/gnome/help/pioneers/C
+%%LIBGNOME%%@dirrm share/gnome/help/pioneers
+%%LIBGNOME%%@dirrm share/gnome/omf/pioneers
 @dirrm share/gnome/pixmaps/pioneers