- Update to 0.10.3

- Unbreak (fix pkg-plist)

Submitted by:	Olivier Rolland <billl@users.sourceforge.net> (author)

4 files changed, 38 insertions, 10 deletions

diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index aa1b4f926de9..c62f3990f773 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ogmrip
-DISTVERSION=	0.10.2
+DISTVERSION=	0.10.3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,8 +26,6 @@ RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer \
 LIB_DEPENDS=	dvdread:${PORTSDIR}/multimedia/libdvdread \
 		x264:${PORTSDIR}/multimedia/x264
 
-BROKEN=		Incorrect pkg-plist
-
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	glib20 libxml2 gnomehack
@@ -123,6 +121,16 @@ CONFIGURE_ARGS+=	--disable-enchant-support
 PLIST_SUB+=		ENCHANT_SUPPORT="@comment "
 .endif
 
+X264_SUPPORT!=		${LOCALBASE}/bin/mencoder -ovc help 2> /dev/null | \
+				${GREP} -q '^ *x264 *- .*$$' && \
+	  			${ECHO_CMD} "" || ${ECHO_CMD} "@comment "
+PLIST_SUB+=		X264_SUPPORT="${X264_SUPPORT}"
+
+LAVF_SUPPORT!=		${LOCALBASE}/bin/mencoder -of help 2> /dev/null | \
+				${GREP} -q '^ *lavf *- .*$$' && \
+	  			${ECHO_CMD} "" || ${ECHO_CMD} "@comment "
+PLIST_SUB+=		LAVF_SUPPORT="${LAVF_SUPPORT}"
+
 pre-configure:
 	@if ${LOCALBASE}/mencoder -ovc help 2> /dev/null | ${GREP} -q "^ *xvid *- .*" ; then \
 	  ${ECHO_MSG} "" ; \
diff --git a/multimedia/ogmrip/distinfo b/multimedia/ogmrip/distinfo
index 11b99bfe040e..61960ea2239a 100644
--- a/multimedia/ogmrip/distinfo
+++ b/multimedia/ogmrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogmrip-0.10.2.tar.gz) = cffcff0746e745605d30e7978ad0deb5
-SHA256 (ogmrip-0.10.2.tar.gz) = 3e0d0c39bedff4ab9b9a48f687f1bce91fa19a36a6ba11d6f509d4765dcb4da3
-SIZE (ogmrip-0.10.2.tar.gz) = 627638
+MD5 (ogmrip-0.10.3.tar.gz) = 7a287d3ecf49c88e5a6fd78206427455
+SHA256 (ogmrip-0.10.3.tar.gz) = b72ce8f41f7692d3704dccf9e6cf0fff19853b4b98281c5892f3387ec84fd517
+SIZE (ogmrip-0.10.3.tar.gz) = 627658
diff --git a/multimedia/ogmrip/files/patch-dvdread b/multimedia/ogmrip/files/patch-dvdread
new file mode 100644
index 000000000000..921ae5710772
--- /dev/null
+++ b/multimedia/ogmrip/files/patch-dvdread
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- configure.orig	2007-03-13 20:23:26.000000000 +0100
++++ configure	2007-03-13 20:23:45.000000000 +0100
+@@ -21031,7 +21031,7 @@
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/nav_read.h>
+-int main(void) { if (DVDREAD_VERSION < 907) return 1; return 0; }
++int main(void) { if (DVDREAD_VERSION == 906) return 1; return 0; }
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index 6cd43d87d63e..18f14e68cde3 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -1,6 +1,6 @@
 bin/dvdcpy
 %%GUI_SUPPORT%%bin/ogmrip
-%%SRT_SUPPORT%%bin/srttool
+%%SRT_SUPPORT%%bin/srtutil
 %%SRT_SUPPORT%%bin/subp2pgm
 %%THEORA_SUPPORT%%bin/theoraenc
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-audio-chooser.h
@@ -34,7 +34,7 @@ include/ogmrip/ogmrip-init.h
 include/ogmrip/ogmrip-lavc.h
 %%MATROSKA_SUPPORT%%include/ogmrip/ogmrip-mkv.h
 include/ogmrip/ogmrip-mp3.h
-include/ogmrip/ogmrip-mp4.h
+%%LAVF_SUPPORT%%include/ogmrip/ogmrip-mp4.h
 include/ogmrip/ogmrip-ogg.h
 %%SRT_SUPPORT%%include/ogmrip/ogmrip-srt.h
 include/ogmrip/ogmrip-subp.h
@@ -44,7 +44,7 @@ include/ogmrip/ogmrip-video.h
 include/ogmrip/ogmrip-vobsub.h
 include/ogmrip/ogmrip-vorbis.h
 include/ogmrip/ogmrip-wav.h
-include/ogmrip/ogmrip-x264.h
+%%X264_SUPPORT%%include/ogmrip/ogmrip-x264.h
 include/ogmrip/ogmrip-xvid.h
 include/ogmrip/ogmrip.h
 %%GUI_SUPPORT%%lib/libogmdvd-gtk.a
@@ -68,7 +68,6 @@ libdata/pkgconfig/ogmjob.pc
 libdata/pkgconfig/ogmrip.pc
 locale/cs/LC_MESSAGES/ogmrip.mo
 locale/de/LC_MESSAGES/ogmrip.mo
-locale/en/LC_MESSAGES/ogmrip.mo
 locale/fr/LC_MESSAGES/ogmrip.mo
 locale/pl/LC_MESSAGES/ogmrip.mo
 %%GUI_SUPPORT%%share/applications/ogmrip.desktop
@@ -87,3 +86,11 @@ locale/pl/LC_MESSAGES/ogmrip.mo
 @dirrm include/ogmrip
 @dirrm include/ogmjob
 @dirrm include/ogmdvd
+@dirrmtry locale/cs/LC_MESSAGES
+@dirrmtry locale/cs
+@dirrmtry locale/de/LC_MESSAGES
+@dirrmtry locale/de
+@dirrmtry locale/fr/LC_MESSAGES
+@dirrmtry locale/fr
+@dirrmtry locale/pl/LC_MESSAGES
+@dirrmtry locale/pl