6 files changed, 64 insertions, 48 deletions

diff --git a/graphics/ogle-gui/Makefile b/graphics/ogle-gui/Makefile
index d8139a6985e1..a604ed7101b6 100644
--- a/graphics/ogle-gui/Makefile
+++ b/graphics/ogle-gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ogle
-PORTVERSION=	0.8.4
+PORTVERSION=	0.8.5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_gui-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.7:${PORTSDIR}/graphics/ogle
+BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.8:${PORTSDIR}/graphics/ogle
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 		glade.4:${PORTSDIR}/devel/libglade \
 		xml2.5:${PORTSDIR}/textproc/libxml2
@@ -23,6 +23,7 @@ RUN_DEPENDS=	ogle:${PORTSDIR}/graphics/ogle
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 USE_XPM=	yes
+USE_REINPLACE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
@@ -47,12 +48,19 @@ SHARE_DATADIR=	share
 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/\")|\1${SHARE_DATADIR}\2|; \
-		s!(CONFIG_FILE(\s|=)\")[^/]+?/!\1${LOCALBASE}/!; \
-		s|(CONFIG_FILE_DTD=\")[^/]+?/|\1${LOCALBASE}/|g; \
-		s|(PACKAGE_PIXMAPS_DIR=\").+\"|\1${PREFIX}/${SHARE_DATADIR}/ogle_gui/\"|; \
+# fix library version
+	@${REINPLACE_CMD} -E -e "s|(libglade\.so)\.0|\1.4|; \
 		s|%%LOCALBASE%%|${LOCALBASE}|" \
 			${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_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/graphics/ogle-gui/distinfo b/graphics/ogle-gui/distinfo
index 4adefbd66d6c..12b916f9a3d1 100644
--- a/graphics/ogle-gui/distinfo
+++ b/graphics/ogle-gui/distinfo
@@ -1 +1 @@
-MD5 (ogle_gui-0.8.4.tar.gz) = b5725d65d7b291b4219e76fda6aaf3b3
+MD5 (ogle_gui-0.8.5.tar.gz) = 92319326640a91a55b3219864710bb50
diff --git a/graphics/ogle-gui/pkg-plist b/graphics/ogle-gui/pkg-plist
index d51dfea1e9ba..1b54e8614d64 100644
--- a/graphics/ogle-gui/pkg-plist
+++ b/graphics/ogle-gui/pkg-plist
@@ -1,9 +1,4 @@
 lib/ogle/ogle_gui
-%%SHARE_DATADIR%%/locale/da/LC_MESSAGES/ogle_gui.mo
-%%SHARE_DATADIR%%/locale/de/LC_MESSAGES/ogle_gui.mo
-%%SHARE_DATADIR%%/locale/fr/LC_MESSAGES/ogle_gui.mo
-%%SHARE_DATADIR%%/locale/nl/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
@@ -26,17 +21,22 @@ lib/ogle/ogle_gui
 %%SHARE_DATADIR%%/ogle_gui/stock_up_arrow.xpm
 %%SHARE_DATADIR%%/ogle_gui/stock_volume.xpm
 %%SHARE_DATADIR%%/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/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/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
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@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%%/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/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SHARE_DATADIR%%/locale/fr 2>/dev/null || true
-@unexec rmdir %D/%%SHARE_DATADIR%%/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SHARE_DATADIR%%/locale/nl 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/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SHARE_DATADIR%%/locale/da 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
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index d8139a6985e1..a604ed7101b6 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ogle
-PORTVERSION=	0.8.4
+PORTVERSION=	0.8.5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_gui-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.7:${PORTSDIR}/graphics/ogle
+BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.8:${PORTSDIR}/graphics/ogle
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 		glade.4:${PORTSDIR}/devel/libglade \
 		xml2.5:${PORTSDIR}/textproc/libxml2
@@ -23,6 +23,7 @@ RUN_DEPENDS=	ogle:${PORTSDIR}/graphics/ogle
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 USE_XPM=	yes
+USE_REINPLACE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
@@ -47,12 +48,19 @@ SHARE_DATADIR=	share
 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/\")|\1${SHARE_DATADIR}\2|; \
-		s!(CONFIG_FILE(\s|=)\")[^/]+?/!\1${LOCALBASE}/!; \
-		s|(CONFIG_FILE_DTD=\")[^/]+?/|\1${LOCALBASE}/|g; \
-		s|(PACKAGE_PIXMAPS_DIR=\").+\"|\1${PREFIX}/${SHARE_DATADIR}/ogle_gui/\"|; \
+# fix library version
+	@${REINPLACE_CMD} -E -e "s|(libglade\.so)\.0|\1.4|; \
 		s|%%LOCALBASE%%|${LOCALBASE}|" \
 			${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_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 4adefbd66d6c..12b916f9a3d1 100644
--- a/multimedia/ogle-gui/distinfo
+++ b/multimedia/ogle-gui/distinfo
@@ -1 +1 @@
-MD5 (ogle_gui-0.8.4.tar.gz) = b5725d65d7b291b4219e76fda6aaf3b3
+MD5 (ogle_gui-0.8.5.tar.gz) = 92319326640a91a55b3219864710bb50
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index d51dfea1e9ba..1b54e8614d64 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -1,9 +1,4 @@
 lib/ogle/ogle_gui
-%%SHARE_DATADIR%%/locale/da/LC_MESSAGES/ogle_gui.mo
-%%SHARE_DATADIR%%/locale/de/LC_MESSAGES/ogle_gui.mo
-%%SHARE_DATADIR%%/locale/fr/LC_MESSAGES/ogle_gui.mo
-%%SHARE_DATADIR%%/locale/nl/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
@@ -26,17 +21,22 @@ lib/ogle/ogle_gui
 %%SHARE_DATADIR%%/ogle_gui/stock_up_arrow.xpm
 %%SHARE_DATADIR%%/ogle_gui/stock_volume.xpm
 %%SHARE_DATADIR%%/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/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/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
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@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%%/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/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SHARE_DATADIR%%/locale/fr 2>/dev/null || true
-@unexec rmdir %D/%%SHARE_DATADIR%%/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SHARE_DATADIR%%/locale/nl 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/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SHARE_DATADIR%%/locale/da 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