- Update to version 0.12.0

PR:		ports/124588
Submitted by:	KATO Tsuguru <tkato432 AT yahoo.com>

3 files changed, 138 insertions, 124 deletions

diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index ae143e9..12cf85f 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -6,28 +6,32 @@
 #
 
 PORTNAME=	ogmrip
-PORTVERSION=	0.11.2
-PORTREVISION=	1
+PORTVERSION=	0.12.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application and libraries for encoding DVDs into DivX/OGM files
 
-BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
-		ogmmerge:${PORTSDIR}/multimedia/ogmtools \
+BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
 		gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS=	enca.5:${PORTSDIR}/converters/enca \
-		notify.1:${PORTSDIR}/devel/libnotify \
-		dvdread.5:${PORTSDIR}/multimedia/libdvdread \
-		x264:${PORTSDIR}/multimedia/x264
+		dvdread.5:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		mencoder:${PORTSDIR}/multimedia/mencoder \
 		ogmmerge:${PORTSDIR}/multimedia/ogmtools
 
+OPTIONS=	GUI      "Build the GTK+ GUI"                           on  \
+		HAL      "Enable Hardware Abstract Layer (HAL) support" off \
+		ENCHANT  "Enable spell checking for text subtitles"     off \
+		MATROSKA "Enable Matroska container support"            off \
+		MP4      "Enable Mpeg-4 container support"              off \
+		THEORA   "Enable Ogg Theora video codec support"        off \
+		FAAC     "Enable Advance Audio Coding (AAC) support"    off \
+		SRT      "Enable SRT text subtitles support"            off \
+		DEBUG    "Enable debug"                                 off
+
 USE_GNOME=	glib20 gnomehack libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -39,29 +43,17 @@ USE_LDCONFIG=	yes
 
 MAN1=		dvdcpy.1
 
-OPTIONS=	GUI		"Build the GTK+ GUI"				on  \
-		HAL		"Enable Hardware Abstract Layer (HAL) support"	off \
-		FAAC		"Enable Advance Audio Coding (AAC) support"	off \
-		SRT		"Enable SRT text subtitles support"		off \
-		ENCHANT		"Enable spell checking for text subtitles"	off \
-		THEORA		"Enable Ogg Theora video codec support"		off \
-		MATROSKA	"Enable Matroska container support"		off \
-		DEBUG		"Enable debug"					off
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-maintainer-mode --enable-devel-mode
-.endif
-
 .if defined(WITHOUT_GUI)
-CONFIGURE_ARGS+=	--disable-gtk-support
+CONFIGURE_ARGS+=	--disable-gtk-support --disable-libnotify-support
 PLIST_SUB+=		GUI_SUPPORT="@comment "
 .else
-CONFIGURE_ARGS+=	--enable-gtk-support
-PLIST_SUB+=		GUI_SUPPORT=""
-USE_GNOME+=		libglade2 gconf2 intlhack
+CONFIGURE_ARGS+=	--enable-gtk-support --enable-libnotify-support
+LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+USE_GNOME+=		gconf2 intlhack libglade2
 GCONF_SCHEMAS=		ogmrip.schemas
+PLIST_SUB+=		GUI_SUPPORT=""
 .endif
 
 .if defined(WITH_HAL)
@@ -73,19 +65,44 @@ CONFIGURE_ARGS+=	--disable-hal-support
 PLIST_SUB+=		HAL_SUPPORT="@comment "
 .endif
 
+.if defined(WITH_ENCHANT)
+CONFIGURE_ARGS+=	--enable-enchant-support
+LIB_DEPENDS+=		enchant:${PORTSDIR}/textproc/enchant
+PLIST_SUB+=		ENCHANT_SUPPORT=""
+.else
+CONFIGURE_ARGS+=	--disable-enchant-support
+PLIST_SUB+=		ENCHANT_SUPPORT="@comment "
+.endif
+
 .if defined(WITH_MATROSKA)
-CONFIGURE_ARGS+=	--enable-matroska-support
-BUILD_DEPENDS+=		mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix
+CONFIGURE_ARGS+=	--enable-mkv-support
 RUN_DEPENDS+=		mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix
 PLIST_SUB+=		MATROSKA_SUPPORT=""
 .else
-CONFIGURE_ARGS+=	--disable-matroska-support
+CONFIGURE_ARGS+=	--disable-mkv-support
 PLIST_SUB+=		MATROSKA_SUPPORT="@comment "
 .endif
 
+.if defined(WITH_MP4)
+CONFIGURE_ARGS+=	--enable-mp4-support
+RUN_DEPENDS+=		mp4box:${PORTSDIR}/multimedia/gpac-mp4box
+PLIST_SUB+=		MP4_SUPPORT=""
+.else
+CONFIGURE_ARGS+=	--disable-mp4-support
+PLIST_SUB+=		MP4_SUPPORT="@comment "
+.endif
+
+.if defined(WITH_THEORA)
+CONFIGURE_ARGS+=	--enable-theora-support
+LIB_DEPENDS+=		theora:${PORTSDIR}/multimedia/libtheora
+PLIST_SUB+=		THEORA_SUPPORT=""
+.else
+CONFIGURE_ARGS+=	--disable-theora-support
+PLIST_SUB+=		THEORA_SUPPORT="@comment "
+.endif
+
 .if defined(WITH_FAAC)
 CONFIGURE_ARGS+=	--enable-aac-support
-BUILD_DEPENDS+=		faac:${PORTSDIR}/audio/faac
 RUN_DEPENDS+=		faac:${PORTSDIR}/audio/faac
 PLIST_SUB+=		FAAC_SUPPORT=""
 .else
@@ -95,41 +112,23 @@ PLIST_SUB+=		FAAC_SUPPORT="@comment "
 
 .if defined(WITH_SRT)
 CONFIGURE_ARGS+=	--enable-srt-support
-BUILD_DEPENDS+=		gocr:${PORTSDIR}/graphics/gocr
 RUN_DEPENDS+=		gocr:${PORTSDIR}/graphics/gocr
+MAN1+=			subp2pgm.1 subptools.1
 PLIST_SUB+=		SRT_SUPPORT=""
 .else
 CONFIGURE_ARGS+=	--disable-srt-support
 PLIST_SUB+=		SRT_SUPPORT="@comment "
 .endif
 
-.if defined(WITH_THEORA)
-CONFIGURE_ARGS+=	--enable-theora-support
-LIB_DEPENDS+=		theora:${PORTSDIR}/multimedia/libtheora
-PLIST_SUB+=		THEORA_SUPPORT=""
-.else
-CONFIGURE_ARGS+=	--disable-theora-support
-PLIST_SUB+=		THEORA_SUPPORT="@comment "
-.endif
-
-.if defined(WITH_ENCHANT)
-CONFIGURE_ARGS+=	--enable-enchant-support
-LIB_DEPENDS+=		enchant:${PORTSDIR}/textproc/enchant
-PLIST_SUB+=		ENCHANT_SUPPORT=""
-.else
-CONFIGURE_ARGS+=	--disable-enchant-support
-PLIST_SUB+=		ENCHANT_SUPPORT="@comment "
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-maintainer-mode --enable-devel-mode
 .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-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "This port requires a version of MEncoder compiled with XviD and/or"
+	@${ECHO_MSG} "x264 support if you want to use these codecs."
+	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
@@ -137,14 +136,6 @@ post-patch:
 		 s|^LDFLAGS=|#LDFLAGS|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} "" ; \
-	  ${ECHO_MSG} "This port requires a version of MEncoder compiled with XviD support." ; \
-	  ${ECHO_MSG} "" ; \
-	  ${FALSE} ; \
-	fi
-
 post-install:
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/ogmrip/distinfo b/multimedia/ogmrip/distinfo
index e90dc68..8dc237b 100644
--- a/multimedia/ogmrip/distinfo
+++ b/multimedia/ogmrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogmrip-0.11.2.tar.gz) = fa9123dee79af4b51e959695a2b99124
-SHA256 (ogmrip-0.11.2.tar.gz) = 6622721d58ed5b0eced2eeddcc60244788db164517df055c16c19dcb1a13011b
-SIZE (ogmrip-0.11.2.tar.gz) = 1893441
+MD5 (ogmrip-0.12.0.tar.gz) = 092a14dd7d95e13818fb8876f1a16f1a
+SHA256 (ogmrip-0.12.0.tar.gz) = df7f8f6cf1c59f15da7d9b87207014dedd12ea844510955300625b440628b53b
+SIZE (ogmrip-0.12.0.tar.gz) = 2911954
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index 2ae8b6c..32ef914 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -1,7 +1,9 @@
 bin/dvdcpy
 %%GUI_SUPPORT%%bin/ogmrip
-%%SRT_SUPPORT%%bin/srtutil
 %%SRT_SUPPORT%%bin/subp2pgm
+%%SRT_SUPPORT%%bin/subp2png
+%%SRT_SUPPORT%%bin/subp2tiff
+%%SRT_SUPPORT%%bin/subptools
 %%THEORA_SUPPORT%%bin/theoraenc
 include/ogmdvd/ogmdvd-audio.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-chapter-list.h
@@ -12,6 +14,8 @@ include/ogmdvd/ogmdvd-disc.h
 include/ogmdvd/ogmdvd-enums.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-gtk.h
 include/ogmdvd/ogmdvd-labels.h
+include/ogmdvd/ogmdvd-parser.h
+include/ogmdvd/ogmdvd-reader.h
 include/ogmdvd/ogmdvd-stream.h
 include/ogmdvd/ogmdvd-subp.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-title-chooser-widget.h
@@ -29,7 +33,7 @@ include/ogmjob/ogmjob-pipeline.h
 include/ogmjob/ogmjob-queue.h
 include/ogmjob/ogmjob-spawn.h
 include/ogmjob/ogmjob.h
-include/ogmrip/ogmrip-audio.h
+include/ogmrip/ogmrip-audio-codec.h
 %%GUI_SUPPORT%%include/ogmrip/ogmrip-chapter-list.h
 include/ogmrip/ogmrip-chapters.h
 %%GUI_SUPPORT%%include/ogmrip/ogmrip-chooser-list.h
@@ -42,15 +46,17 @@ include/ogmrip/ogmrip-file.h
 include/ogmrip/ogmrip-fs.h
 %%GUI_SUPPORT%%include/ogmrip/ogmrip-gtk.h
 %%GUI_SUPPORT%%include/ogmrip/ogmrip-helper.h
+include/ogmrip/ogmrip-lavc.h
 %%GUI_SUPPORT%%include/ogmrip/ogmrip-marshal.h
 include/ogmrip/ogmrip-mplayer.h
+%%GUI_SUPPORT%%include/ogmrip/ogmrip-options-plugin.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
+include/ogmrip/ogmrip-subp-codec.h
 include/ogmrip/ogmrip-version.h
-include/ogmrip/ogmrip-video.h
+include/ogmrip/ogmrip-video-codec.h
 include/ogmrip/ogmrip.h
 %%GUI_SUPPORT%%lib/libogmdvd-gtk.a
 %%GUI_SUPPORT%%lib/libogmdvd-gtk.la
@@ -68,6 +74,10 @@ lib/libogmjob.so.0
 %%GUI_SUPPORT%%lib/libogmrip-gtk.la
 %%GUI_SUPPORT%%lib/libogmrip-gtk.so
 %%GUI_SUPPORT%%lib/libogmrip-gtk.so.0
+lib/libogmrip-lavc.a
+lib/libogmrip-lavc.la
+lib/libogmrip-lavc.so
+lib/libogmrip-lavc.so.0
 lib/libogmrip-mplayer.a
 lib/libogmrip-mplayer.la
 lib/libogmrip-mplayer.so
@@ -76,54 +86,60 @@ 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
+%%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.a
+%%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.la
+%%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.so
+lib/ogmrip/audio-plugins/libogmrip-acopy.a
+lib/ogmrip/audio-plugins/libogmrip-acopy.la
+lib/ogmrip/audio-plugins/libogmrip-acopy.so
+lib/ogmrip/audio-plugins/libogmrip-mp3.a
+lib/ogmrip/audio-plugins/libogmrip-mp3.la
+lib/ogmrip/audio-plugins/libogmrip-mp3.so
+lib/ogmrip/audio-plugins/libogmrip-vorbis.a
+lib/ogmrip/audio-plugins/libogmrip-vorbis.la
+lib/ogmrip/audio-plugins/libogmrip-vorbis.so
+lib/ogmrip/audio-plugins/libogmrip-wav.a
+lib/ogmrip/audio-plugins/libogmrip-wav.la
+lib/ogmrip/audio-plugins/libogmrip-wav.so
+lib/ogmrip/container-plugins/libogmrip-avi.a
+lib/ogmrip/container-plugins/libogmrip-avi.la
+lib/ogmrip/container-plugins/libogmrip-avi.so
+%%MATROSKA_SUPPORT%%lib/ogmrip/container-plugins/libogmrip-mkv.a
+%%MATROSKA_SUPPORT%%lib/ogmrip/container-plugins/libogmrip-mkv.la
+%%MATROSKA_SUPPORT%%lib/ogmrip/container-plugins/libogmrip-mkv.so
+lib/ogmrip/container-plugins/libogmrip-mov.a
+lib/ogmrip/container-plugins/libogmrip-mov.la
+lib/ogmrip/container-plugins/libogmrip-mov.so
+%%MP4_SUPPORT%%lib/ogmrip/container-plugins/libogmrip-mp4.a
+%%MP4_SUPPORT%%lib/ogmrip/container-plugins/libogmrip-mp4.la
+%%MP4_SUPPORT%%lib/ogmrip/container-plugins/libogmrip-mp4.so
+lib/ogmrip/container-plugins/libogmrip-ogg.a
+lib/ogmrip/container-plugins/libogmrip-ogg.la
+lib/ogmrip/container-plugins/libogmrip-ogg.so
+%%GUI_SUPPORT%%lib/ogmrip/options-plugins/libogmrip-lavc-options.a
+%%GUI_SUPPORT%%lib/ogmrip/options-plugins/libogmrip-lavc-options.la
+%%GUI_SUPPORT%%lib/ogmrip/options-plugins/libogmrip-lavc-options.so
+%%GUI_SUPPORT%%lib/ogmrip/options-plugins/libogmrip-x264-options.a
+%%GUI_SUPPORT%%lib/ogmrip/options-plugins/libogmrip-x264-options.la
+%%GUI_SUPPORT%%lib/ogmrip/options-plugins/libogmrip-x264-options.so
+%%SRT_SUPPORT%%lib/ogmrip/subp-plugins/libogmrip-srt.a
+%%SRT_SUPPORT%%lib/ogmrip/subp-plugins/libogmrip-srt.la
+%%SRT_SUPPORT%%lib/ogmrip/subp-plugins/libogmrip-srt.so
+lib/ogmrip/subp-plugins/libogmrip-vobsub.a
+lib/ogmrip/subp-plugins/libogmrip-vobsub.la
+lib/ogmrip/subp-plugins/libogmrip-vobsub.so
+lib/ogmrip/video-plugins/libogmrip-lavc-mpeg4.a
+lib/ogmrip/video-plugins/libogmrip-lavc-mpeg4.la
+lib/ogmrip/video-plugins/libogmrip-lavc-mpeg4.so
+%%THEORA_SUPPORT%%lib/ogmrip/video-plugins/libogmrip-theora.a
+%%THEORA_SUPPORT%%lib/ogmrip/video-plugins/libogmrip-theora.la
+%%THEORA_SUPPORT%%lib/ogmrip/video-plugins/libogmrip-theora.so
+lib/ogmrip/video-plugins/libogmrip-x264.a
+lib/ogmrip/video-plugins/libogmrip-x264.la
+lib/ogmrip/video-plugins/libogmrip-x264.so
+lib/ogmrip/video-plugins/libogmrip-xvid.a
+lib/ogmrip/video-plugins/libogmrip-xvid.la
+lib/ogmrip/video-plugins/libogmrip-xvid.so
 libdata/pkgconfig/ogmdvd-gtk.pc
 libdata/pkgconfig/ogmdvd.pc
 libdata/pkgconfig/ogmjob.pc
@@ -134,22 +150,29 @@ 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
-share/locale/pl/LC_MESSAGES/ogmrip.mo
 share/locale/sv/LC_MESSAGES/ogmrip.mo
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-crop.glade
+%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-lavc.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-main.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-options.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-pref.glade
+%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-profile-editor.glade
+%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-profiles.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-progress.glade
+%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-simple-editor.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-spell.glade
 %%GUI_SUPPORT%%%%DATADIR%%/ogmrip-ui.xml
+%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-x264.glade
+%%GUI_SUPPORT%%%%DATADIR%%/profiles/profiles.xml
 %%GUI_SUPPORT%%share/pixmaps/ogmrip.png
+%%GUI_SUPPORT%%@dirrm %%DATADIR%%/profiles
 %%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/video-plugins
+@dirrm lib/ogmrip/subp-plugins
+%%GUI_SUPPORT%%@dirrm lib/ogmrip/options-plugins
+@dirrm lib/ogmrip/container-plugins
+@dirrm lib/ogmrip/audio-plugins
 @dirrm lib/ogmrip
 @dirrm include/ogmrip
 @dirrm include/ogmjob