ario: Update to 1.6

Switch to GTK3 and remove unused patches/dependencies.

7 files changed, 28 insertions, 94 deletions

diff --git a/audio/ario/DESCR b/audio/ario/DESCR
index a040ac14b4c..3f7cb6cfd4e 100644
--- a/audio/ario/DESCR
+++ b/audio/ario/DESCR
@@ -1,3 +1,3 @@
-Ario is a GTK2 client for MPD (Music player daemon). The interface used
+Ario is a GTK3 client for MPD (Music player daemon). The interface used
 to browse the library is inspired by Rhythmbox but Ario aims to be
 much lighter and faster.
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 3a5e4c51324..7d0f289cdaa 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -1,41 +1,29 @@
-# $NetBSD: Makefile,v 1.85 2019/08/22 12:22:49 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.86 2019/09/14 10:41:00 nia Exp $
 
-DISTNAME=	ario-1.5.1
-PKGREVISION=	68
+DISTNAME=	ario-1.6
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ario-player/1.5.1/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ario-player/1.6/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ario-player.sourceforge.net/
-COMMENT=	Client for mpd
+COMMENT=	Graphical client for mpd using GTK3
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	intltool msgfmt pkg-config gmake
+USE_TOOLS+=	intltool pkg-config perl gmake
+USE_TOOLS+=	msgfmt msgmerge xgettext
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS+= --disable-avahi
-CONFIGURE_ARGS+= --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt}
 
-.for fl in clobbered empty-body ignored-qualifiers \
-	missing-parameter-type old-style-declaration \
-	override-init type-limits
-BUILDLINK_TRANSFORM+=	rm:-W${fl}
-.endfor
+TOOL_DEPENDS+=	p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
+
+CONFIGURE_ARGS+=	--disable-avahi
 
 .include "../../audio/libmpdclient/buildlink3.mk"
+.include "../../audio/taglib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libunique/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
-#.include "../../net/avahi/buildlink3.mk"
-.include "../../audio/taglib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.4.0
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/ario/PLIST b/audio/ario/PLIST
index 8f8344dd80e..2340c8556e1 100644
--- a/audio/ario/PLIST
+++ b/audio/ario/PLIST
@@ -1,23 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2012/01/19 19:22:35 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/09/14 10:41:00 nia Exp $
 bin/ario
-lib/ario/plugins/audioscrobbler.ario-plugin
 lib/ario/plugins/filesystem.ario-plugin
 lib/ario/plugins/information.ario-plugin
-lib/ario/plugins/libaudioscrobbler.la
 lib/ario/plugins/libfilesystem.la
 lib/ario/plugins/libinformation.la
-lib/ario/plugins/liblibnotify.la
 lib/ario/plugins/libmmkeys.la
-lib/ario/plugins/libnotify.ario-plugin
 lib/ario/plugins/libradios.la
-lib/ario/plugins/libwikipedia.la
 lib/ario/plugins/mmkeys.ario-plugin
 lib/ario/plugins/radios.ario-plugin
-lib/ario/plugins/wikipedia.ario-plugin
 share/applications/ario.desktop
 share/ario/art/ario-pause.png
 share/ario/art/ario-play.png
 share/ario/art/ario.png
+share/ario/art/consume.png
 share/ario/art/logo.png
 share/ario/art/pl-below.png
 share/ario/art/pl-inside.png
@@ -26,18 +21,18 @@ share/ario/art/play.png
 share/ario/art/repeat.png
 share/ario/art/shuffle.png
 share/ario/data/profiles.xml.default
-share/ario/plugins/audioscrobbler-prefs.ui
-share/ario/plugins/filesystem-ui.xml
-share/ario/plugins/icons/audioscrobbler.png
-share/ario/plugins/icons/wikipedia.png
+share/ario/plugins/ario-filesystem-menu.ui
+share/ario/plugins/ario-radios-menu.ui
 share/ario/plugins/information.ui
-share/ario/plugins/radios-ui.xml
 share/ario/plugins/radios.xml.default
-share/ario/plugins/wikipedia-ui.xml
-share/ario/ui/ario-ui.xml
+share/ario/ui/ario-browser-menu.ui
+share/ario/ui/ario-playlist-menu.ui
+share/ario/ui/ario-shell-menu.ui
+share/ario/ui/ario-songlist-menu.ui
 share/ario/ui/browser-prefs.ui
 share/ario/ui/connection-assistant.ui
 share/ario/ui/connection-autodetect.ui
+share/ario/ui/connection-dialog.ui
 share/ario/ui/connection-prefs.ui
 share/ario/ui/connection-widget.ui
 share/ario/ui/cover-prefs.ui
@@ -51,7 +46,6 @@ share/ario/ui/server-prefs.ui
 share/ario/ui/similar-artists.ui
 share/ario/ui/song-infos.ui
 share/ario/ui/stats-prefs.ui
-share/ario/ui/trayicon-prefs.ui
 share/icons/hicolor/128x128/apps/ario.png
 share/icons/hicolor/16x16/apps/ario.png
 share/icons/hicolor/22x22/apps/ario.png
diff --git a/audio/ario/distinfo b/audio/ario/distinfo
index 2fb4982e6c7..c069198da2f 100644
--- a/audio/ario/distinfo
+++ b/audio/ario/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:12:25 agc Exp $
+$NetBSD: distinfo,v 1.5 2019/09/14 10:41:00 nia Exp $
 
-SHA1 (ario-1.5.1.tar.gz) = 99c1ae6318a596cd27ac3c38ad25bc716527a94d
-RMD160 (ario-1.5.1.tar.gz) = dfc819cf46a80e822aa3b654c334d8cbaddb3b9d
-SHA512 (ario-1.5.1.tar.gz) = 78c3d881d51c3109b73252da0742da2a77bcc24ec21ff2ff02fd3527d62d49a75e412bf092051a9035863d645cba73e6cd2fc674d97629909b931ae9d3ec002b
-Size (ario-1.5.1.tar.gz) = 1135444 bytes
-SHA1 (patch-src_ario-profiles_h) = 5610730865e843beeba09257ce5db1db3160359f
-SHA1 (patch-src_ario-util_h) = d376e424d948c0545e2238466e3fbd229cde3325
-SHA1 (patch-src_plugins_ario-plugin-info_c) = 06db2d0df1ebb3f626d92ed3f0126ebc5735c11e
+SHA1 (ario-1.6.tar.gz) = 246bef864360953b70a00b2c8123547d669d686b
+RMD160 (ario-1.6.tar.gz) = dc908a04ae17429030c1eeab41e29e5f9171d0d8
+SHA512 (ario-1.6.tar.gz) = 93057da62616e79f6ba6f7204fabac37417fb34c350b53eeea61508f4c65322fabaef7a9fdbe7beb8dcbf92c8f86f0d33caf1ffa0ad76de8050fe72d57408ec0
+Size (ario-1.6.tar.gz) = 1151747 bytes
diff --git a/audio/ario/patches/patch-src_ario-profiles_h b/audio/ario/patches/patch-src_ario-profiles_h
deleted file mode 100644
index b85349352a1..00000000000
--- a/audio/ario/patches/patch-src_ario-profiles_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_ario-profiles_h,v 1.1 2012/05/06 19:06:21 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/ario-profiles.h~	2011-05-17 17:54:49.000000000 +0000
-+++ src/ario-profiles.h
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_PROFILES_H
- #define __ARIO_PROFILES_H
- 
--#include <glib/gslist.h>
-+#include <glib.h>
- #include "servers/ario-server.h"
- 
- G_BEGIN_DECLS
diff --git a/audio/ario/patches/patch-src_ario-util_h b/audio/ario/patches/patch-src_ario-util_h
deleted file mode 100644
index aa86374be9a..00000000000
--- a/audio/ario/patches/patch-src_ario-util_h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_ario-util_h,v 1.1 2012/05/06 19:06:21 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/ario-util.h~	2011-02-27 15:07:31.000000000 +0000
-+++ src/ario-util.h
-@@ -18,7 +18,7 @@
-  */
- 
- #include "servers/ario-server.h"
--#include "glib/gslist.h"
-+#include "glib.h"
- #include "gdk/gdkpixbuf.h"
- 
- /* Number of covers used to generate the drag & drop image */
diff --git a/audio/ario/patches/patch-src_plugins_ario-plugin-info_c b/audio/ario/patches/patch-src_plugins_ario-plugin-info_c
deleted file mode 100644
index 979d6b0c4c9..00000000000
--- a/audio/ario/patches/patch-src_plugins_ario-plugin-info_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_ario-plugin-info_c,v 1.1 2012/05/06 19:06:21 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/plugins/ario-plugin-info.c~	2011-02-27 15:07:28.000000000 +0000
-+++ src/plugins/ario-plugin-info.c
-@@ -27,7 +27,7 @@
- 
- #include <string.h>
- #include <glib/gi18n.h>
--#include <glib/gkeyfile.h>
-+#include <glib.h>
- 
- #include "plugins/ario-plugin-info-priv.h"
- #include "ario-debug.h"