3 files changed, 18 insertions, 23 deletions

diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 9680ac0e79e3..61f81c963961 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ogmrip
-PORTVERSION=	0.13.1
+PORTVERSION=	0.13.2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}
 
@@ -25,7 +25,6 @@ RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		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 \
@@ -38,35 +37,30 @@ USE_GNOME=	glib20 gnomehack libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:22
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		ac_cv_path_EJECT_PROG="/usr/sbin/cdcontrol"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 MAN1=		dvdcpy.1 avibox.1
 
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_GUI)
-CONFIGURE_ARGS+=	--disable-gtk-support --disable-libnotify-support
+CONFIGURE_ARGS+=	--disable-gtk-support --disable-dbus-support \
+			--disable-libnotify-support
 PLIST_SUB+=		GUI_SUPPORT="@comment "
 .else
-CONFIGURE_ARGS+=	--enable-gtk-support --enable-libnotify-support
-LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=	--enable-gtk-support --enable-dbus-support \
+			--enable-libnotify-support
+LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+			notify.1:${PORTSDIR}/devel/libnotify
 USE_GNOME+=		gconf2 intlhack libglade2
 GCONF_SCHEMAS=		ogmrip.schemas
 PLIST_SUB+=		GUI_SUPPORT=""
 .endif
 
-.if defined(WITH_HAL)
-CONFIGURE_ARGS+=	--enable-hal-support
-LIB_DEPENDS+=		hal:${PORTSDIR}/sysutils/hal
-PLIST_SUB+=		HAL_SUPPORT=""
-.else
-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
@@ -141,8 +135,8 @@ post-patch:
 		'/PROGRAM/s|MP4Box|mp4box|g' ${WRKSRC}/libogmrip/ogmrip-mp4.c
 
 post-install:
-	@${ECHO_CMD} ""
+	@${ECHO_MSG} ""
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} ""
+	@${ECHO_MSG} ""
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/ogmrip/distinfo b/multimedia/ogmrip/distinfo
index 9b5e1a8bd1e3..e807be432dea 100644
--- a/multimedia/ogmrip/distinfo
+++ b/multimedia/ogmrip/distinfo
@@ -1,3 +1,3 @@
-MD5 (ogmrip-0.13.1.tar.gz) = 1c0db0bae74f28e646ca90933435d0b2
-SHA256 (ogmrip-0.13.1.tar.gz) = 83ceedb15575d5225a29e4b5746fccc23f1232539b9de77fd1b8974feefa7f00
-SIZE (ogmrip-0.13.1.tar.gz) = 3320169
+MD5 (ogmrip-0.13.2.tar.gz) = 357cbbb5b17263f4a22ff12045b64434
+SHA256 (ogmrip-0.13.2.tar.gz) = ed2e0cba58b7a642f4d097cb9addc76499a910d00daf564f92ab42a8da070cc9
+SIZE (ogmrip-0.13.2.tar.gz) = 3307453
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index e2614ad5c9ea..8d60ce703fa1 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -13,11 +13,12 @@ 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.h
+include/ogmdvd/ogmdvd-drive.h
 include/ogmdvd/ogmdvd-enums.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-gtk.h
 include/ogmdvd/ogmdvd-labels.h
 %%GUI_SUPPORT%%include/ogmdvd/ogmdvd-marshal.h
+include/ogmdvd/ogmdvd-monitor.h
 include/ogmdvd/ogmdvd-parser.h
 include/ogmdvd/ogmdvd-reader.h
 include/ogmdvd/ogmdvd-stream.h