- Update to 0.10.0-rc4

- Unbreak (fix pkg-plist)

5 files changed, 63 insertions, 49 deletions

diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 3c5e951b0788..a8c30b5c2db1 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ogmrip
-PORTVERSION=	0.9.0
-PORTREVISION=	3
+DISTVERSION=	0.10.0-rc4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +18,8 @@ BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
 		lame:${PORTSDIR}/audio/lame \
-		gocr:${PORTSDIR}/graphics/gocr
+		gocr:${PORTSDIR}/graphics/gocr \
+		gsed:${PORTSDIR}/textproc/gsed
 RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
@@ -29,16 +29,16 @@ LIB_DEPENDS=	xvidcore:${PORTSDIR}/multimedia/xvid \
 		dvdread:${PORTSDIR}/multimedia/libdvdread \
 		enchant:${PORTSDIR}/textproc/enchant
 
-BROKEN=		Incomplete pkg-plist
-
-USE_GNOME=	gtk20 glib20 gconf2 libglade2
+USE_LDCONFIG=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	gtk20 glib20 gconf2 libglade2 intlhack
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
 GCONF_SCHEMAS=	ogmrip.schemas
 
 CONFIGURE_ARGS=	--sharedstatedir=${PREFIX}/libdata
+GMAKE_ENV+=	GMSGFMT=${localbase}/bin/msgfmt
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-maintainer-mode --enable-devel-mode
diff --git a/multimedia/ogmrip/distinfo b/multimedia/ogmrip/distinfo
index 406b2833aeab..689eb37061cd 100644
--- a/multimedia/ogmrip/distinfo
+++ b/multimedia/ogmrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogmrip-0.9.0.tar.gz) = 4884da2f0011c9da86306b19b2d7d310
-SHA256 (ogmrip-0.9.0.tar.gz) = 2c6a39c4a54cf8c3cdb8b31df8efa002b2e955efb1890608d25b980af86d378a
-SIZE (ogmrip-0.9.0.tar.gz) = 565778
+MD5 (ogmrip-0.10.0-rc4.tar.gz) = d0d78301644e996b40d782702d413d7a
+SHA256 (ogmrip-0.10.0-rc4.tar.gz) = 4bc6b04a59463a1c8fd99ed42aead4600b1b9c05f785c3e9afcd9b64e948ed17
+SIZE (ogmrip-0.10.0-rc4.tar.gz) = 622444
diff --git a/multimedia/ogmrip/files/patch-configure b/multimedia/ogmrip/files/patch-configure
deleted file mode 100644
index ed0e32311e56..000000000000
--- a/multimedia/ogmrip/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.orig	Tue Jun 28 08:16:09 2005
-+++ configure	Sun May 21 14:20:18 2006
-@@ -20713,11 +20713,6 @@
- fi
- 
- fi
--if ! "$SED_PROG" --version 2> /dev/null | head -n 1 | grep -q "GNU sed"; then
--  { { echo "$as_me:$LINENO: error: Unable to GNU sed in the PATH. You need GNU sed to configure OGMRip. Find it on ftp://ftp.gnu.org/gnu/sed" >&5
--echo "$as_me: error: Unable to GNU sed in the PATH. You need GNU sed to configure OGMRip. Find it on ftp://ftp.gnu.org/gnu/sed" >&2;}
--   { (exit 1); exit 1; }; }
--fi
- 
- 
- GTK_REQUIRED=2.6.0
-@@ -21304,7 +21299,7 @@
- 
- 
- if $MPLAYER_PROG | grep -q "MPlayer [0-1]\.[0-9]\+pre[0-9]\+.*"; then
--  MPLAYER_PRE=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer [0-1]\.[0-9]\+pre\([0-9]\+\).*%\1%'`
-+  MPLAYER_PRE=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer [0-1]\.[0-9]pre\([0-9]\).*%\1%'`
- 
- cat >>confdefs.h <<_ACEOF
- #define MPLAYER_PRE $MPLAYER_PRE
diff --git a/multimedia/ogmrip/files/patch-gmsgfmt b/multimedia/ogmrip/files/patch-gmsgfmt
new file mode 100644
index 000000000000..8c4a56e44b83
--- /dev/null
+++ b/multimedia/ogmrip/files/patch-gmsgfmt
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Mon Oct  9 23:40:17 2006
++++ po/Makefile.in.in	Mon Oct  9 23:40:31 2006
+@@ -44,7 +44,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+-GMSGFMT = @GMSGFMT@
++GMSGFMT = @INTLTOOL_MSGFMT@
+ MSGFMT = @MSGFMT@
+ XGETTEXT = @XGETTEXT@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index e9623ccb0315..dfad22f465ff 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -3,7 +3,14 @@ bin/dvdcpy
 bin/ogmrip
 bin/srttool
 bin/subp2pgm
-include/ogmdvd.h
+include/ogmdvd/ogmdvd.h
+include/ogmdvd/ogmdvd-audio-chooser.h
+include/ogmdvd/ogmdvd-chapter-list.h
+include/ogmdvd/ogmdvd-drive-chooser.h
+include/ogmdvd/ogmdvd-drive-dialog.h
+include/ogmdvd/ogmdvd-gtk.h
+include/ogmdvd/ogmdvd-subtitle-chooser.h
+include/ogmdvd/ogmdvd-title-chooser.h
 include/ogmrip/ogmrip-acopy.h
 include/ogmrip/ogmrip-audio.h
 include/ogmrip/ogmrip-avi.h
@@ -12,11 +19,15 @@ include/ogmrip/ogmrip-container.h
 include/ogmrip/ogmrip-dvdcpy.h
 include/ogmrip/ogmrip-lavc.h
 %%MKV_SUPPORT%%include/ogmrip/ogmrip-mkv.h
+include/ogmrip/ogmrip-chapters.h
+include/ogmrip/ogmrip-fs.h
+include/ogmrip/ogmrip-init.h
 include/ogmrip/ogmrip-mp3.h
+include/ogmrip/ogmrip-mp4.h
+include/ogmrip/ogmrip-theora.h
 include/ogmrip/ogmrip-ogg.h
 include/ogmrip/ogmrip-srt.h
 include/ogmrip/ogmrip-subp.h
-include/ogmrip/ogmrip-tools.h
 include/ogmrip/ogmrip-video.h
 include/ogmrip/ogmrip-vobsub.h
 include/ogmrip/ogmrip-vorbis.h
@@ -24,25 +35,35 @@ include/ogmrip/ogmrip-wav.h
 %%X264_SUPPORT%%include/ogmrip/ogmrip-x264.h
 include/ogmrip/ogmrip-xvid.h
 include/ogmrip/ogmrip.h
-include/ogmspawn/ogmsp-bin.h
-include/ogmspawn/ogmsp-container.h
-include/ogmspawn/ogmsp-enums.h
-include/ogmspawn/ogmsp-exec.h
-include/ogmspawn/ogmsp-list.h
-include/ogmspawn/ogmsp-marshal.h
-include/ogmspawn/ogmsp-pipeline.h
-include/ogmspawn/ogmsp-queue.h
-include/ogmspawn/ogmsp-spawn.h
-include/ogmspawn/ogmspawn.h
+include/ogmjob/ogmjob-bin.h
+include/ogmjob/ogmjob-container.h
+include/ogmjob/ogmjob-enums.h
+include/ogmjob/ogmjob-exec.h
+include/ogmjob/ogmjob-list.h
+include/ogmjob/ogmjob-marshal.h
+include/ogmjob/ogmjob-pipeline.h
+include/ogmjob/ogmjob-queue.h
+include/ogmjob/ogmjob-spawn.h
+include/ogmjob/ogmjob.h
 lib/libogmdvd.a
+lib/libogmdvd.la
+lib/libogmdvd.so
 lib/libogmdvd.so.0
+lib/libogmdvd-gtk.a
+lib/libogmdvd-gtk.la
+lib/libogmdvd-gtk.so
+lib/libogmdvd-gtk.so.0
 lib/libogmrip.a
+lib/libogmrip.la
+lib/libogmrip.so
 lib/libogmrip.so.0
-lib/libogmspawn.a
-lib/libogmspawn.so.0
+lib/libogmjob.a
+lib/libogmjob.la
+lib/libogmjob.so
+lib/libogmjob.so.0
 libdata/pkgconfig/ogmdvd.pc
 libdata/pkgconfig/ogmrip.pc
-libdata/pkgconfig/ogmspawn.pc
+libdata/pkgconfig/ogmjob.pc
 share/applications/ogmrip.desktop
 %%DATADIR%%/ogmrip-crop.glade
 %%DATADIR%%/ogmrip-main.glade
@@ -51,7 +72,12 @@ share/applications/ogmrip.desktop
 %%DATADIR%%/ogmrip-progress.glade
 %%DATADIR%%/ogmrip-spell.glade
 %%DATADIR%%/ogmrip-ui.xml
+%%DATADIR%%/ogmrip.xml
+%%DATADIR%%/ogmrip.xsd
+%%DATADIR%%/xml.xsd
 share/pixmaps/ogmrip.png
 @dirrm include/ogmrip
-@dirrm include/ogmspawn
+@dirrm include/ogmjob
+@dirrm include/ogmdvd
 @dirrm %%DATADIR%%
+@dirrmtry share/applications