- Update to 1.6

- Add options
- Pet portlint
- Pass maintainership to submitter

PR:		227287
Submitted by:	alfix86@gmail.com

4 files changed, 87 insertions, 93 deletions

diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 668f930da00a..9c0f8a799694 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -2,51 +2,59 @@
 # $FreeBSD$
 
 PORTNAME=	ario
-PORTVERSION=	1.5.1
-PORTREVISION=	11
+PORTVERSION=	1.6
 CATEGORIES=	audio
 MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alfix86@gmail.com
 COMMENT=	Ario is a GTK2 client for MPD
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnutls.so:security/gnutls \
-		libgcrypt.so:security/libgcrypt \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libcurl.so:ftp/curl \
-		libnotify.so:devel/libnotify \
-		libsoup-2.4.so:devel/libsoup \
-		libtag_c.so:audio/taglib \
-		libunique-1.0.so:x11-toolkits/unique \
-		libmpdclient.so:audio/libmpdclient
+BUILD_DEPENDS=	intltoolize:textproc/intltool
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	gtk20 intltool
+USE_GNOME=	gtk30 pango atk cairo gdkpixbuf2 glib20 libxml2
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	AVAHI NLS
-AVAHI_DESC=	Zeroconf support (Avahi)
+OPTIONS_DEFINE=	AVAHI DBUS DEBUG LIBMPDCLIENT2 MPDIDLE NLS PLAYLISTS SEARCH TAGLIB
+
+OPTIONS_SUB=	yes
+
+LIBMPDCLIENT2_DESC=	API library for interfacing MPD
+MPDIDLE_DESC=	MPD idle mode support
+PLAYLISTS_DESC=	Playlists support
+SEARCH_DESC=	Search view support
+TAGLIB_DESC=	Manage ID3 tags and Ogg comments
+
+OPTIONS_DEFAULT=	DBUS LIBMPDCLIENT2 MPDIDLE NLS PLAYLISTS SEARCH TAGLIB
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus libdbus-glib-1.so:devel/dbus-glib
+DBUS_CONFIGURE_ENABLE=	dbus
+
+DEBUG_CONFIGURE_ENABLE=	debug
+
+LIBMPDCLIENT2_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
+LIBMPDCLIENT2_CONFIGURE_ENABLE=	libmpdclient2
+
+MPDIDLE_CONFIGURE_ENABLE=	mpdidle
+
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES_OFF=		gettext-tools
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|glib/gslist.h|glib.h|g ; \
-		 s|glib/gkeyfile.h>|glib.h>|g' \
-		${WRKSRC}/src/ario-util.h \
-		${WRKSRC}/src/plugins/ario-plugin-info.c \
-		${WRKSRC}/src/ario-profiles.h
+
+PLAYLISTS_CONFIGURE_ENABLE=	playlists
+
+SEARCH_CONFIGURE_ENABLE=	search
+
+TAGLIB_LIB_DEPENDS=		libtag_c.so:audio/taglib libtag.so:audio/taglib
+TAGLIB_CONFIGURE_ENABLE=	taglib
 
 .include <bsd.port.mk>
diff --git a/audio/ario/distinfo b/audio/ario/distinfo
index 1f546724d2f4..39c3eeb9493b 100644
--- a/audio/ario/distinfo
+++ b/audio/ario/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ario-1.5.1.tar.gz) = 0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e
-SIZE (ario-1.5.1.tar.gz) = 1135444
+TIMESTAMP = 1522837890
+SHA256 (ario-1.6.tar.gz) = 1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
+SIZE (ario-1.6.tar.gz) = 1151747
diff --git a/audio/ario/files/patch-src_ario-avahi.c b/audio/ario/files/patch-src_ario-avahi.c
index d1619e199685..ae08aca9ec9b 100644
--- a/audio/ario/files/patch-src_ario-avahi.c
+++ b/audio/ario/files/patch-src_ario-avahi.c
@@ -1,4 +1,4 @@
---- src/ario-avahi.c.orig	2011-02-27 15:07:31 UTC
+--- src/ario-avahi.c.orig	2018-04-04 12:36:02 UTC
 +++ src/ario-avahi.c
 @@ -34,6 +34,11 @@
  #include <avahi-common/simple-watch.h>
diff --git a/audio/ario/pkg-plist b/audio/ario/pkg-plist
index a58d61756588..67cba851f3e2 100644
--- a/audio/ario/pkg-plist
+++ b/audio/ario/pkg-plist
@@ -1,11 +1,6 @@
 bin/ario
-lib/ario/plugins/audioscrobbler.ario-plugin
 lib/ario/plugins/filesystem.ario-plugin
 lib/ario/plugins/information.ario-plugin
-lib/ario/plugins/libaudioscrobbler.a
-lib/ario/plugins/libaudioscrobbler.so
-lib/ario/plugins/libaudioscrobbler.so.0
-lib/ario/plugins/libaudioscrobbler.so.0.0.0
 lib/ario/plugins/libfilesystem.a
 lib/ario/plugins/libfilesystem.so
 lib/ario/plugins/libfilesystem.so.0
@@ -14,30 +9,58 @@ lib/ario/plugins/libinformation.a
 lib/ario/plugins/libinformation.so
 lib/ario/plugins/libinformation.so.0
 lib/ario/plugins/libinformation.so.0.0.0
-lib/ario/plugins/liblibnotify.a
-lib/ario/plugins/liblibnotify.so
-lib/ario/plugins/liblibnotify.so.0
-lib/ario/plugins/liblibnotify.so.0.0.0
-lib/ario/plugins/libmmkeys.a
-lib/ario/plugins/libmmkeys.so
-lib/ario/plugins/libmmkeys.so.0
-lib/ario/plugins/libmmkeys.so.0.0.0
-lib/ario/plugins/libnotify.ario-plugin
+%%DBUS%%lib/ario/plugins/libmmkeys.a
+%%DBUS%%lib/ario/plugins/libmmkeys.so
+%%DBUS%%lib/ario/plugins/libmmkeys.so.0
+%%DBUS%%lib/ario/plugins/libmmkeys.so.0.0.0
 lib/ario/plugins/libradios.a
 lib/ario/plugins/libradios.so
 lib/ario/plugins/libradios.so.0
 lib/ario/plugins/libradios.so.0.0.0
-lib/ario/plugins/libwikipedia.a
-lib/ario/plugins/libwikipedia.so
-lib/ario/plugins/libwikipedia.so.0
-lib/ario/plugins/libwikipedia.so.0.0.0
-lib/ario/plugins/mmkeys.ario-plugin
+%%DBUS%%lib/ario/plugins/mmkeys.ario-plugin
 lib/ario/plugins/radios.ario-plugin
-lib/ario/plugins/wikipedia.ario-plugin
+%%NLS%%locale/ar/LC_MESSAGES/ario.mo
+%%NLS%%locale/ca/LC_MESSAGES/ario.mo
+%%NLS%%locale/cs/LC_MESSAGES/ario.mo
+%%NLS%%locale/da/LC_MESSAGES/ario.mo
+%%NLS%%locale/de/LC_MESSAGES/ario.mo
+%%NLS%%locale/en_AU/LC_MESSAGES/ario.mo
+%%NLS%%locale/en_CA/LC_MESSAGES/ario.mo
+%%NLS%%locale/en_GB/LC_MESSAGES/ario.mo
+%%NLS%%locale/eo/LC_MESSAGES/ario.mo
+%%NLS%%locale/es/LC_MESSAGES/ario.mo
+%%NLS%%locale/et/LC_MESSAGES/ario.mo
+%%NLS%%locale/fi/LC_MESSAGES/ario.mo
+%%NLS%%locale/fr/LC_MESSAGES/ario.mo
+%%NLS%%locale/ga/LC_MESSAGES/ario.mo
+%%NLS%%locale/he/LC_MESSAGES/ario.mo
+%%NLS%%locale/hr/LC_MESSAGES/ario.mo
+%%NLS%%locale/hu/LC_MESSAGES/ario.mo
+%%NLS%%locale/id/LC_MESSAGES/ario.mo
+%%NLS%%locale/it/LC_MESSAGES/ario.mo
+%%NLS%%locale/ja/LC_MESSAGES/ario.mo
+%%NLS%%locale/nb/LC_MESSAGES/ario.mo
+%%NLS%%locale/nds/LC_MESSAGES/ario.mo
+%%NLS%%locale/nl/LC_MESSAGES/ario.mo
+%%NLS%%locale/oc/LC_MESSAGES/ario.mo
+%%NLS%%locale/pl/LC_MESSAGES/ario.mo
+%%NLS%%locale/pt/LC_MESSAGES/ario.mo
+%%NLS%%locale/pt_BR/LC_MESSAGES/ario.mo
+%%NLS%%locale/ro/LC_MESSAGES/ario.mo
+%%NLS%%locale/ru/LC_MESSAGES/ario.mo
+%%NLS%%locale/sv/LC_MESSAGES/ario.mo
+%%NLS%%locale/th/LC_MESSAGES/ario.mo
+%%NLS%%locale/tr/LC_MESSAGES/ario.mo
+%%NLS%%locale/uk/LC_MESSAGES/ario.mo
+%%NLS%%locale/vi/LC_MESSAGES/ario.mo
+%%NLS%%locale/zh_CN/LC_MESSAGES/ario.mo
+%%NLS%%locale/zh_HK/LC_MESSAGES/ario.mo
+%%NLS%%locale/zh_TW/LC_MESSAGES/ario.mo
 share/applications/ario.desktop
 %%DATADIR%%/art/ario-pause.png
 %%DATADIR%%/art/ario-play.png
 %%DATADIR%%/art/ario.png
+%%DATADIR%%/art/consume.png
 %%DATADIR%%/art/logo.png
 %%DATADIR%%/art/pl-below.png
 %%DATADIR%%/art/pl-inside.png
@@ -46,18 +69,18 @@ share/applications/ario.desktop
 %%DATADIR%%/art/repeat.png
 %%DATADIR%%/art/shuffle.png
 %%DATADIR%%/data/profiles.xml.default
-%%DATADIR%%/plugins/audioscrobbler-prefs.ui
-%%DATADIR%%/plugins/filesystem-ui.xml
-%%DATADIR%%/plugins/icons/audioscrobbler.png
-%%DATADIR%%/plugins/icons/wikipedia.png
+%%DATADIR%%/plugins/ario-filesystem-menu.ui
+%%DATADIR%%/plugins/ario-radios-menu.ui
 %%DATADIR%%/plugins/information.ui
-%%DATADIR%%/plugins/radios-ui.xml
 %%DATADIR%%/plugins/radios.xml.default
-%%DATADIR%%/plugins/wikipedia-ui.xml
-%%DATADIR%%/ui/ario-ui.xml
+%%DATADIR%%/ui/ario-browser-menu.ui
+%%DATADIR%%/ui/ario-playlist-menu.ui
+%%DATADIR%%/ui/ario-shell-menu.ui
+%%DATADIR%%/ui/ario-songlist-menu.ui
 %%DATADIR%%/ui/browser-prefs.ui
 %%DATADIR%%/ui/connection-assistant.ui
 %%DATADIR%%/ui/connection-autodetect.ui
+%%DATADIR%%/ui/connection-dialog.ui
 %%DATADIR%%/ui/connection-prefs.ui
 %%DATADIR%%/ui/connection-widget.ui
 %%DATADIR%%/ui/cover-prefs.ui
@@ -71,7 +94,6 @@ share/applications/ario.desktop
 %%DATADIR%%/ui/similar-artists.ui
 %%DATADIR%%/ui/song-infos.ui
 %%DATADIR%%/ui/stats-prefs.ui
-%%DATADIR%%/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
@@ -83,40 +105,3 @@ share/icons/hicolor/64x64/apps/ario.png
 share/icons/hicolor/72x72/apps/ario.png
 share/icons/hicolor/96x96/apps/ario.png
 share/icons/hicolor/scalable/apps/ario.svg
-share/locale/da/LC_MESSAGES/ario.mo
-share/locale/tr/LC_MESSAGES/ario.mo
-share/locale/zh_CN/LC_MESSAGES/ario.mo
-share/locale/zh_HK/LC_MESSAGES/ario.mo
-share/locale/ca/LC_MESSAGES/ario.mo
-share/locale/zh_TW/LC_MESSAGES/ario.mo
-share/locale/ro/LC_MESSAGES/ario.mo
-share/locale/it/LC_MESSAGES/ario.mo
-share/locale/ru/LC_MESSAGES/ario.mo
-share/locale/id/LC_MESSAGES/ario.mo
-share/locale/fi/LC_MESSAGES/ario.mo
-share/locale/sv/LC_MESSAGES/ario.mo
-share/locale/pt/LC_MESSAGES/ario.mo
-share/locale/th/LC_MESSAGES/ario.mo
-share/locale/de/LC_MESSAGES/ario.mo
-share/locale/ja/LC_MESSAGES/ario.mo
-share/locale/pt_BR/LC_MESSAGES/ario.mo
-share/locale/nds/LC_MESSAGES/ario.mo
-share/locale/nl/LC_MESSAGES/ario.mo
-share/locale/fr/LC_MESSAGES/ario.mo
-share/locale/he/LC_MESSAGES/ario.mo
-share/locale/ar/LC_MESSAGES/ario.mo
-share/locale/cs/LC_MESSAGES/ario.mo
-share/locale/pl/LC_MESSAGES/ario.mo
-share/locale/es/LC_MESSAGES/ario.mo
-share/locale/hu/LC_MESSAGES/ario.mo
-share/locale/hr/LC_MESSAGES/ario.mo
-share/locale/en_GB/LC_MESSAGES/ario.mo
-share/locale/et/LC_MESSAGES/ario.mo
-share/locale/nb/LC_MESSAGES/ario.mo
-share/locale/ga/LC_MESSAGES/ario.mo
-share/locale/oc/LC_MESSAGES/ario.mo
-share/locale/vi/LC_MESSAGES/ario.mo
-share/locale/eo/LC_MESSAGES/ario.mo
-share/locale/en_CA/LC_MESSAGES/ario.mo
-share/locale/uk/LC_MESSAGES/ario.mo
-share/locale/en_AU/LC_MESSAGES/ario.mo