o Deal correctly with gnome: use proper paths if it is not

  installed but benefit from it otherwise
o Fix PLIST due to aforementioned
o Bump PORTREVISION

Submitted by:	HIYAMA Takeshi <cbc06942@pop06.odn.ne.jp>
Prompted by:	jedgar,
		Øyvind Kolbu <oyvind@kebab.gaffel.nu>

2 files changed, 47 insertions, 34 deletions

diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index d0ea715..1afa59c 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
@@ -24,6 +25,7 @@ RUN_DEPENDS=	ogle:${PORTSDIR}/graphics/ogle
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 USE_XPM=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
@@ -35,16 +37,27 @@ CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
 		--with-libglade-config=${X11BASE}/bin/libglade-config \
 		--with-xml-prefix=${LOCALBASE}
 
+.include <bsd.port.pre.mk>
+
+.ifdef(HAVE_GNOME)
+USE_GNOME=	yes
+SHARE_DATADIR=	share/gnome
+.else
+SHARE_DATADIR=	share
+.endif
+
+PLIST_SUB=	SHARE_DATADIR="${SHARE_DATADIR}"
+
 post-patch:
 	@${PERL} -pi -e "s|(libglade\.so)\.0|\1.4|; \
-		s|(PACKAGE_PIXMAPS_DIR=\"$${prefix}/share/)(ogle_gui/\")|\1gnome/\2|; \
+		s|(PACKAGE_PIXMAPS_DIR=\"$${prefix}/)share(/ogle_gui/\")|\1${SHARE_DATADIR}\2|; \
 		s!(CONFIG_FILE(\s|=)\")[^/]+?/!\1${LOCALBASE}/!; \
 		s|(CONFIG_FILE_DTD=\")[^/]+?/|\1${LOCALBASE}/|g; \
-		s|(PACKAGE_PIXMAPS_DIR=\").+\"|\1${PREFIX}/share/gnome/ogle_gui/\"|; \
+		s|(PACKAGE_PIXMAPS_DIR=\").+\"|\1${PREFIX}/${SHARE_DATADIR}/ogle_gui/\"|; \
 		s|%%LOCALBASE%%|${LOCALBASE}|" \
 			${CONFIGURE_WRKSRC}/configure
 
 post-configure:
 	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 6de96cb..90f9e73 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -1,33 +1,33 @@
 lib/ogle/ogle_gui
-share/gnome/locale/de/LC_MESSAGES/ogle_gui.mo
-share/gnome/locale/sv/LC_MESSAGES/ogle_gui.mo
-share/gnome/ogle_gui/angle.xpm
-share/gnome/ogle_gui/enter.xpm
-share/gnome/ogle_gui/fastforward.xpm
-share/gnome/ogle_gui/go_up.xpm
-share/gnome/ogle_gui/menus.xpm
-share/gnome/ogle_gui/ogle.xpm
-share/gnome/ogle_gui/ogle_gui.glade
-share/gnome/ogle_gui/rewind.xpm
-share/gnome/ogle_gui/skip_backwards.xpm
-share/gnome/ogle_gui/skip_forwards.xpm
-share/gnome/ogle_gui/stock_down_arrow.xpm
-share/gnome/ogle_gui/stock_first.xpm
-share/gnome/ogle_gui/stock_last.xpm
-share/gnome/ogle_gui/stock_left_arrow.xpm
-share/gnome/ogle_gui/stock_pause.xpm
-share/gnome/ogle_gui/stock_right_arrow.xpm
-share/gnome/ogle_gui/stock_stop.xpm
-share/gnome/ogle_gui/stock_timer.xpm
-share/gnome/ogle_gui/stock_timer_stopped.xpm
-share/gnome/ogle_gui/stock_up_arrow.xpm
-share/gnome/ogle_gui/stock_volume.xpm
-share/gnome/ogle_gui/subpicture.xpm
-@dirrm share/gnome/ogle_gui
-@unexec rmdir %D/share/gnome/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/gnome/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/gnome/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/gnome/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/gnome/locale 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+%%SHARE_DATADIR%%/locale/de/LC_MESSAGES/ogle_gui.mo
+%%SHARE_DATADIR%%/locale/sv/LC_MESSAGES/ogle_gui.mo
+%%SHARE_DATADIR%%/ogle_gui/angle.xpm
+%%SHARE_DATADIR%%/ogle_gui/enter.xpm
+%%SHARE_DATADIR%%/ogle_gui/fastforward.xpm
+%%SHARE_DATADIR%%/ogle_gui/go_up.xpm
+%%SHARE_DATADIR%%/ogle_gui/menus.xpm
+%%SHARE_DATADIR%%/ogle_gui/ogle.xpm
+%%SHARE_DATADIR%%/ogle_gui/ogle_gui.glade
+%%SHARE_DATADIR%%/ogle_gui/rewind.xpm
+%%SHARE_DATADIR%%/ogle_gui/skip_backwards.xpm
+%%SHARE_DATADIR%%/ogle_gui/skip_forwards.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_down_arrow.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_first.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_last.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_left_arrow.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_pause.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_right_arrow.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_stop.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_timer.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_timer_stopped.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_up_arrow.xpm
+%%SHARE_DATADIR%%/ogle_gui/stock_volume.xpm
+%%SHARE_DATADIR%%/ogle_gui/subpicture.xpm
+@dirrm %%SHARE_DATADIR%%/ogle_gui
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale/sv 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale/de 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%%/locale 2>/dev/null || true
+@unexec rmdir %D/%%SHARE_DATADIR%% 2>/dev/null || true
 @dirrm lib/ogle