- Update to 0.11.0

PR:		116928
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 116 insertions, 46 deletions

diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 874b64b218a6..fc8e503f28fc 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -6,39 +6,37 @@
 #
 
 PORTNAME=	ogmrip
-DISTVERSION=	0.10.3
-PORTREVISION=	2
+PORTVERSION=	0.11.0
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application and libraries for encoding DVDs into DivX/OGM files
 
-BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
+BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
+		mencoder:${PORTSDIR}/multimedia/mencoder \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
-		lame:${PORTSDIR}/audio/lame \
+		${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \
 		gsed:${PORTSDIR}/textproc/gsed
-RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
+LIB_DEPENDS=	enca.5:${PORTSDIR}/converters/enca \
+		dvdread.5:${PORTSDIR}/multimedia/libdvdread \
+		x264:${PORTSDIR}/multimedia/x264
+RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
+		mencoder:${PORTSDIR}/multimedia/mencoder \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
-		lame:${PORTSDIR}/audio/lame
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread \
-		x264:${PORTSDIR}/multimedia/x264
+		${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject
 
-USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	glib20 libxml2 gnomehack
-GNU_CONFIGURE=	yes
-USE_XLIB=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GSED=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--sharedstatedir=${PREFIX}/libdata
-GMAKE_ENV+=	GMSGFMT=${localbase}/bin/msgfmt
+MAN1=		dvdcpy.1
 
 OPTIONS=	GUI		"Build the GTK+ GUI"				on  \
 		HAL		"Enable Hardware Abstract Layer (HAL) support"	off \
@@ -132,6 +130,12 @@ LAVF_SUPPORT!=		${LOCALBASE}/bin/mencoder -of help 2> /dev/null | \
 	  			${ECHO_CMD} "" || ${ECHO_CMD} "@comment "
 PLIST_SUB+=		LAVF_SUPPORT="${LAVF_SUPPORT}"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-I/usr/local/include||g ; \
+		 s|-L/usr/local/lib||g ; \
+		 s|-L/usr/pkg/lib||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^SUBDIRS|#SUBDIRS|g' ${WRKSRC}/docs/Makefile.in
+
 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 61960ea2239a..2979c6790ca2 100644
--- a/multimedia/ogmrip/distinfo
+++ b/multimedia/ogmrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogmrip-0.10.3.tar.gz) = 7a287d3ecf49c88e5a6fd78206427455
-SHA256 (ogmrip-0.10.3.tar.gz) = b72ce8f41f7692d3704dccf9e6cf0fff19853b4b98281c5892f3387ec84fd517
-SIZE (ogmrip-0.10.3.tar.gz) = 627658
+MD5 (ogmrip-0.11.0.tar.gz) = 928531e90ed85046544312d86e161357
+SHA256 (ogmrip-0.11.0.tar.gz) = 8f93111e8895cc51cef88caa9744dacf3ecc095c9d23049a8936ac2877a9d2cd
+SIZE (ogmrip-0.11.0.tar.gz) = 1892940
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index 6c41682652de..fea20d59f30e 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -3,49 +3,54 @@ bin/dvdcpy
 %%SRT_SUPPORT%%bin/srtutil
 %%SRT_SUPPORT%%bin/subp2pgm
 %%THEORA_SUPPORT%%bin/theoraenc
-%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-audio-chooser.h
+include/ogmdvd/ogmdvd-audio.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-chapter-list.h
+include/ogmdvd/ogmdvd-disc.h
+%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-chooser-dialog.h
+%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-chooser-widget.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-chooser.h
-%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-dialog.h
+include/ogmdvd/ogmdvd-enums.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-gtk.h
-%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-subtitle-chooser.h
+include/ogmdvd/ogmdvd-labels.h
+include/ogmdvd/ogmdvd-stream.h
+include/ogmdvd/ogmdvd-subp.h
+%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-title-chooser-widget.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-title-chooser.h
+include/ogmdvd/ogmdvd-title.h
+include/ogmdvd/ogmdvd-types.h
 include/ogmdvd/ogmdvd.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-log.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
-%%FAAC_SUPPORT%%include/ogmrip/ogmrip-aac.h
-include/ogmrip/ogmrip-acopy.h
 include/ogmrip/ogmrip-audio.h
-include/ogmrip/ogmrip-avi.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-chapter-list.h
 include/ogmrip/ogmrip-chapters.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-chooser-list.h
 include/ogmrip/ogmrip-codec.h
 include/ogmrip/ogmrip-container.h
 include/ogmrip/ogmrip-dvdcpy.h
+include/ogmrip/ogmrip-edl.h
+include/ogmrip/ogmrip-enums.h
+include/ogmrip/ogmrip-file.h
 include/ogmrip/ogmrip-fs.h
-include/ogmrip/ogmrip-init.h
-include/ogmrip/ogmrip-lavc.h
-%%MATROSKA_SUPPORT%%include/ogmrip/ogmrip-mkv.h
-include/ogmrip/ogmrip-mp3.h
-%%LAVF_SUPPORT%%include/ogmrip/ogmrip-mp4.h
-include/ogmrip/ogmrip-ogg.h
-%%SRT_SUPPORT%%include/ogmrip/ogmrip-srt.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-gtk.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-helper.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-marshal.h
+include/ogmrip/ogmrip-mplayer.h
+include/ogmrip/ogmrip-plugin.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-preferences.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-source-chooser-widget.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-source-chooser.h
 include/ogmrip/ogmrip-subp.h
-%%THEORA_SUPPORT%%include/ogmrip/ogmrip-theora.h
 include/ogmrip/ogmrip-version.h
 include/ogmrip/ogmrip-video.h
-include/ogmrip/ogmrip-vobsub.h
-include/ogmrip/ogmrip-vorbis.h
-include/ogmrip/ogmrip-wav.h
-%%X264_SUPPORT%%include/ogmrip/ogmrip-x264.h
-include/ogmrip/ogmrip-xvid.h
 include/ogmrip/ogmrip.h
 %%GUI_SUPPORT%%lib/libogmdvd-gtk.a
 %%GUI_SUPPORT%%lib/libogmdvd-gtk.la
@@ -59,14 +64,73 @@ lib/libogmjob.a
 lib/libogmjob.la
 lib/libogmjob.so
 lib/libogmjob.so.0
+%%GUI_SUPPORT%%lib/libogmrip-gtk.a
+%%GUI_SUPPORT%%lib/libogmrip-gtk.la
+%%GUI_SUPPORT%%lib/libogmrip-gtk.so
+%%GUI_SUPPORT%%lib/libogmrip-gtk.so.0
+lib/libogmrip-mplayer.a
+lib/libogmrip-mplayer.la
+lib/libogmrip-mplayer.so
+lib/libogmrip-mplayer.so.0
 lib/libogmrip.a
 lib/libogmrip.la
 lib/libogmrip.so
 lib/libogmrip.so.0
+%%FAAC_SUPPORT%%lib/ogmrip/audio-codecs/libogmrip-aac.a
+%%FAAC_SUPPORT%%lib/ogmrip/audio-codecs/libogmrip-aac.la
+%%FAAC_SUPPORT%%lib/ogmrip/audio-codecs/libogmrip-aac.so
+lib/ogmrip/audio-codecs/libogmrip-acopy.a
+lib/ogmrip/audio-codecs/libogmrip-acopy.la
+lib/ogmrip/audio-codecs/libogmrip-acopy.so
+lib/ogmrip/audio-codecs/libogmrip-mp3.a
+lib/ogmrip/audio-codecs/libogmrip-mp3.la
+lib/ogmrip/audio-codecs/libogmrip-mp3.so
+lib/ogmrip/audio-codecs/libogmrip-vorbis.a
+lib/ogmrip/audio-codecs/libogmrip-vorbis.la
+lib/ogmrip/audio-codecs/libogmrip-vorbis.so
+lib/ogmrip/audio-codecs/libogmrip-wav.a
+lib/ogmrip/audio-codecs/libogmrip-wav.la
+lib/ogmrip/audio-codecs/libogmrip-wav.so
+lib/ogmrip/containers/libogmrip-avi.a
+lib/ogmrip/containers/libogmrip-avi.la
+lib/ogmrip/containers/libogmrip-avi.so
+%%MATROSKA_SUPPORT%%lib/ogmrip/containers/libogmrip-mkv.a
+%%MATROSKA_SUPPORT%%lib/ogmrip/containers/libogmrip-mkv.la
+%%MATROSKA_SUPPORT%%lib/ogmrip/containers/libogmrip-mkv.so
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mov.a
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mov.la
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mov.so
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mp4.a
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mp4.la
+%%LAVF_SUPPORT%%lib/ogmrip/containers/libogmrip-mp4.so
+lib/ogmrip/containers/libogmrip-ogg.a
+lib/ogmrip/containers/libogmrip-ogg.la
+lib/ogmrip/containers/libogmrip-ogg.so
+%%SRT_SUPPORT%%lib/ogmrip/subp-codecs/libogmrip-srt.a
+%%SRT_SUPPORT%%lib/ogmrip/subp-codecs/libogmrip-srt.la
+%%SRT_SUPPORT%%lib/ogmrip/subp-codecs/libogmrip-srt.so
+lib/ogmrip/subp-codecs/libogmrip-vobsub.a
+lib/ogmrip/subp-codecs/libogmrip-vobsub.la
+lib/ogmrip/subp-codecs/libogmrip-vobsub.so
+lib/ogmrip/video-codecs/libogmrip-lavc.a
+lib/ogmrip/video-codecs/libogmrip-lavc.la
+lib/ogmrip/video-codecs/libogmrip-lavc.so
+%%THEORA_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-theora.a
+%%THEORA_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-theora.la
+%%THEORA_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-theora.so
+%%X264_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-x264.a
+%%X264_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-x264.la
+%%X264_SUPPORT%%lib/ogmrip/video-codecs/libogmrip-x264.so
+lib/ogmrip/video-codecs/libogmrip-xvid.a
+lib/ogmrip/video-codecs/libogmrip-xvid.la
+lib/ogmrip/video-codecs/libogmrip-xvid.so
+libdata/pkgconfig/ogmdvd-gtk.pc
 libdata/pkgconfig/ogmdvd.pc
 libdata/pkgconfig/ogmjob.pc
+libdata/pkgconfig/ogmrip-gtk.pc
 libdata/pkgconfig/ogmrip.pc
 %%GUI_SUPPORT%%share/applications/ogmrip.desktop
+share/locale/ca/LC_MESSAGES/ogmrip.mo
 share/locale/cs/LC_MESSAGES/ogmrip.mo
 share/locale/de/LC_MESSAGES/ogmrip.mo
 share/locale/fr/LC_MESSAGES/ogmrip.mo
@@ -78,12 +142,14 @@ share/locale/pl/LC_MESSAGES/ogmrip.mo
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-progress.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-spell.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-ui.xml
-%%DATADIR%%/ogmrip.xml
-%%DATADIR%%/ogmrip.xsd
-%%DATADIR%%/xml.xsd
 %%GUI_SUPPORT%%share/pixmaps/ogmrip.png
-@dirrm %%DATADIR%%
+%%GUI_SUPPORT%%@dirrm %%DATADIR%%
 %%GUI_SUPPORT%%@dirrmtry share/applications
+@dirrm lib/ogmrip/video-codecs
+@dirrm lib/ogmrip/subp-codecs
+@dirrm lib/ogmrip/containers
+@dirrm lib/ogmrip/audio-codecs
+@dirrm lib/ogmrip
 @dirrm include/ogmrip
 @dirrm include/ogmjob
 @dirrm include/ogmdvd