[pkgsrc/trunk]: pkgsrc/audio/rhythmbox rhythmbox: fix "hal" option handling a...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca61f5aa0d08
branches:  trunk
changeset: 345949:ca61f5aa0d08
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Dec 22 06:17:10 2019 +0000

description:
rhythmbox: fix "hal" option handling and PLIST

diffstat:

 audio/rhythmbox/Makefile   |  7 ++++---
 audio/rhythmbox/PLIST      |  8 +++++---
 audio/rhythmbox/options.mk |  8 ++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diffs (90 lines):

diff -r 135a075b2286 -r ca61f5aa0d08 audio/rhythmbox/Makefile
--- a/audio/rhythmbox/Makefile  Sun Dec 22 04:14:33 2019 +0000
+++ b/audio/rhythmbox/Makefile  Sun Dec 22 06:17:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2019/11/06 14:34:29 wiz Exp $
+# $NetBSD: Makefile,v 1.166 2019/12/22 06:17:10 markd Exp $
 
 DISTNAME=      rhythmbox-3.4.2
 PKGREVISION=   12
@@ -26,16 +26,18 @@
 CONFIGURE_ARGS+=       --without-gudev
 CONFIGURE_ARGS+=       --enable-vala
 CONFIGURE_ARGS+=       --with-brasero
+CONFIGURE_ARGS+=       --with-ipod
 
 BUILD_DEPENDS+=        itstool-[0-9]*:../../textproc/itstool
 DEPENDS+=      gst-plugins1-libav-[0-9]*:../../multimedia/gst-plugins1-libav
-DEPENDS+=      gst-plugins1-good-[0-9]*:../../multimedia/gst-plugins1-libav
+DEPENDS+=      gst-plugins1-good-[0-9]*:../../multimedia/gst-plugins1-good
 DEPENDS+=      gst-plugins1-oss-[0-9]*:../../audio/gst-plugins1-oss
 DEPENDS+=      grilo-plugins-[0-9]*:../../net/grilo-plugins
 DEPENDS+=      ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 .include "../../lang/python/application.mk"
+.include "../../audio/libgpod/buildlink3.mk"
 .include "../../comms/lirc/buildlink3.mk"
 .include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/dconf/buildlink3.mk"
@@ -43,7 +45,6 @@
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/libpeas/buildlink3.mk"
-.include "../../devel/libmtp/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
diff -r 135a075b2286 -r ca61f5aa0d08 audio/rhythmbox/PLIST
--- a/audio/rhythmbox/PLIST     Sun Dec 22 04:14:33 2019 +0000
+++ b/audio/rhythmbox/PLIST     Sun Dec 22 06:17:10 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2018/05/29 03:26:10 youri Exp $
+@comment $NetBSD: PLIST,v 1.30 2019/12/22 06:17:10 markd Exp $
 bin/rhythmbox
 bin/rhythmbox-client
 include/rhythmbox/backends/rb-encoder.h
@@ -85,6 +85,8 @@
 lib/rhythmbox/plugins/audiocd/libaudiocd.la
 lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.plugin
 lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
+lib/rhythmbox/plugins/cd-recorder/cd-recorder.plugin
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
 lib/rhythmbox/plugins/dbus-media-server/dbus-media-server.plugin
 lib/rhythmbox/plugins/dbus-media-server/libdbus-media-server.la
 lib/rhythmbox/plugins/generic-player/generic-player.plugin
@@ -97,8 +99,8 @@
 lib/rhythmbox/plugins/mmkeys/mmkeys.plugin
 lib/rhythmbox/plugins/mpris/libmpris.la
 lib/rhythmbox/plugins/mpris/mpris.plugin
-lib/rhythmbox/plugins/mtpdevice/libmtpdevice.la
-lib/rhythmbox/plugins/mtpdevice/mtpdevice.plugin
+${PLIST.hal}lib/rhythmbox/plugins/mtpdevice/libmtpdevice.la
+${PLIST.hal}lib/rhythmbox/plugins/mtpdevice/mtpdevice.plugin
 lib/rhythmbox/plugins/notification/libnotification.la
 lib/rhythmbox/plugins/notification/notification.plugin
 lib/rhythmbox/plugins/power-manager/libpower-manager.la
diff -r 135a075b2286 -r ca61f5aa0d08 audio/rhythmbox/options.mk
--- a/audio/rhythmbox/options.mk        Sun Dec 22 04:14:33 2019 +0000
+++ b/audio/rhythmbox/options.mk        Sun Dec 22 06:17:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2010/02/03 12:45:15 drochner Exp $
+# $NetBSD: options.mk,v 1.3 2019/12/22 06:17:10 markd Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rhythmbox
 PKG_SUPPORTED_OPTIONS= hal daap
@@ -8,13 +8,9 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mhal)
-CONFIGURE_ARGS+=       --with-ipod
-.include "../../audio/libgpod/buildlink3.mk"
-# needs a newer libmtp
-#CONFIGURE_ARGS+=      --with-mtp
-#.include "../../devel/libmtp/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-hal
 PLIST.hal=             yes
+.include "../../devel/libmtp/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-hal