Update 0.9.0

3 files changed, 34 insertions, 37 deletions

diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 23cda8ec1d89..faff3f0e5f86 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ogle
-PORTVERSION=	0.8.5
+PORTVERSION=	0.9.0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}_gui-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	An add-on graphical user interface for Ogle
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.8:${PORTSDIR}/multimedia/ogle
+BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.9:${PORTSDIR}/multimedia/ogle
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 		glade.4:${PORTSDIR}/devel/libglade \
 		xml2.5:${PORTSDIR}/textproc/libxml2
@@ -23,7 +23,10 @@ RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gnomehack \
+		gnomehier \
+		gnomeprefix \
+		gtk12
 WANT_GNOME=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
@@ -43,9 +46,6 @@ CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
 .if ${HAVE_GNOME:Mlibcapplet}!=""
 USE_GNOME+=	libcapplet
 PKGNAMESUFFIX=	-gnome
-SHARE_DATADIR=	share/gnome
-.else
-SHARE_DATADIR=	share
 .endif
 
 PLIST_SUB=	SHARE_DATADIR="${SHARE_DATADIR}"
@@ -57,13 +57,8 @@ post-patch:
 			${CONFIGURE_WRKSRC}/configure
 # correct path for program data files
 	@${REINPLACE_CMD} -E -e \
-		's!(LOCALEDIR[[:space:]]*=[^"]+\")[^/]+/!\1${PREFIX}/share/!; \
-		s!(CONFIG_FILE[[:space:]]*=[^"]+\")[^/]+/!\1${LOCALBASE}/share/!; \
+		's!(CONFIG_FILE[[:space:]]*=[^"]+\")[^/]+/!\1${LOCALBASE}/share/!; \
 		s!(CONFIG_FILE_DTD[[:space:]]*=[^"]+\")[^/]+/!\1${LOCALBASE}/share/!' \
 			${WRKSRC}/src/Makefile.in
-# install locale correctly
-	@${REINPLACE_CMD} -E -e \
-		's!(datadir[[:space:]]*=).*$$!\1${PREFIX}/share!' \
-		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/ogle-gui/distinfo b/multimedia/ogle-gui/distinfo
index 12b916f9a3d1..72c72ec76a63 100644
--- a/multimedia/ogle-gui/distinfo
+++ b/multimedia/ogle-gui/distinfo
@@ -1 +1 @@
-MD5 (ogle_gui-0.8.5.tar.gz) = 92319326640a91a55b3219864710bb50
+MD5 (ogle_gui-0.9.0.tar.gz) = d8d25e0cc995706aa833e8fbbb5048f9
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 1b54e8614d64..40aef4fc0f2c 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -1,33 +1,36 @@
 lib/ogle/ogle_gui
-%%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
+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
 share/locale/da/LC_MESSAGES/ogle_gui.mo
 share/locale/de/LC_MESSAGES/ogle_gui.mo
 share/locale/fr/LC_MESSAGES/ogle_gui.mo
 share/locale/nl/LC_MESSAGES/ogle_gui.mo
+share/locale/pt/LC_MESSAGES/ogle_gui.mo
 share/locale/sv/LC_MESSAGES/ogle_gui.mo
 @unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
@@ -37,6 +40,5 @@ share/locale/sv/LC_MESSAGES/ogle_gui.mo
 @unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/da 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
-@dirrm %%SHARE_DATADIR%%/ogle_gui
-@unexec rmdir %D/%%SHARE_DATADIR%% 2>/dev/null || true
+@dirrm share/gnome/ogle_gui
 @dirrm lib/ogle