audio/volumeicon:

- Update to 0.5.1
- Change WWW and download source to Github (MASTER_SITE disappeared)
- Pet portlint

PR:		224279
Submitted by:	Dmitri Goutnik

8 files changed, 62 insertions, 10 deletions

diff --git a/audio/volumeicon/Makefile b/audio/volumeicon/Makefile
index d504f4f827db..465a354ca0cb 100644
--- a/audio/volumeicon/Makefile
+++ b/audio/volumeicon/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	volumeicon
-PORTVERSION=	0.5.0
+PORTVERSION=	0.5.1
 CATEGORIES=	audio
-MASTER_SITES=	http://softwarebakery.com/maato/files/volumeicon/
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Lightweight volume control for the systray
@@ -16,14 +15,22 @@ CONFIGURE_ARGS=	--enable-oss \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-USES=		gmake gettext pkgconfig
-USE_GNOME=	gtk30 intltool
+USES=		autoreconf gmake gettext pkgconfig
+USE_GNOME=	gtk30 intltool cairo gdkpixbuf2
+USE_XORG=	x11
+USE_GITHUB=	yes
+GH_ACCOUNT=	Maato
 
 OPTIONS_DEFINE=		NLS NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
 OPTIONS_SUB=		yes
 
+NLS_USES=	gettext
+
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=notify
 
+pre-configure:
+	cd ${WRKSRC} && ./autogen.sh
+
 .include <bsd.port.mk>
diff --git a/audio/volumeicon/distinfo b/audio/volumeicon/distinfo
index 99b20f834e6e..f341c33885eb 100644
--- a/audio/volumeicon/distinfo
+++ b/audio/volumeicon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (volumeicon-0.5.0.tar.gz) = e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782
-SIZE (volumeicon-0.5.0.tar.gz) = 160089
+TIMESTAMP = 1513090597
+SHA256 (Maato-volumeicon-0.5.1_GH0.tar.gz) = 607979f316e6837eb7c65837c71b213a7dc6a2091153504f7b177a1d67f3da71
+SIZE (Maato-volumeicon-0.5.1_GH0.tar.gz) = 60651
diff --git a/audio/volumeicon/files/patch-data_gui_preferences.ui b/audio/volumeicon/files/patch-data_gui_preferences.ui
new file mode 100644
index 000000000000..81f95baa330d
--- /dev/null
+++ b/audio/volumeicon/files/patch-data_gui_preferences.ui
@@ -0,0 +1,11 @@
+--- data/gui/preferences.ui.orig	2017-12-12 18:43:30 UTC
++++ data/gui/preferences.ui
+@@ -197,7 +197,7 @@
+                               <object class="GtkLabel" id="label5">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="label" translatable="yes">&lt;b&gt;Alsa&lt;/b&gt;</property>
++                                <property name="label" translatable="yes">&lt;b&gt;OSS&lt;/b&gt;</property>
+                                 <property name="use_markup">True</property>
+                               </object>
+                             </child>
diff --git a/audio/volumeicon/files/patch-src_oss__backend.c b/audio/volumeicon/files/patch-src_oss__backend.c
index 86cf02c355ed..68fe9c091b84 100644
--- a/audio/volumeicon/files/patch-src_oss__backend.c
+++ b/audio/volumeicon/files/patch-src_oss__backend.c
@@ -1,4 +1,4 @@
---- src/oss_backend.c.orig	2013-02-25 15:52:49 UTC
+--- src/oss_backend.c.orig	2015-03-02 22:54:36 UTC
 +++ src/oss_backend.c
 @@ -22,7 +22,7 @@
  //##############################################################################
@@ -154,13 +154,13 @@
  	{
 @@ -251,6 +277,7 @@ void oss_set_volume(int volume)
  	assert(m_mixer_fd != -1);
- 	assert(volume >= 0 && volume <= 100);
+ 	volume = (volume < 0 ? 0 : (volume > 100 ? 100 : volume));
  
 +#if 0
  	oss_mixer_value vr;
  	vr.dev = m_ext.dev;
  	vr.ctrl = m_ext.ctrl;
-@@ -286,9 +313,14 @@ void oss_set_volume(int volume)
+@@ -286,9 +313,24 @@ void oss_set_volume(int volume)
  		default:
  			return;
  	}
@@ -177,4 +177,14 @@
  	if(volume == 100)
  		m_actual_maxvalue = get_raw_value();
 +#endif
++}
++
++const gchar * oss_get_device()
++{
++	return NULL;
++}
++
++const GList * oss_get_device_names()
++{
++	return NULL;
  }
diff --git a/audio/volumeicon/files/patch-src_oss__backend.h b/audio/volumeicon/files/patch-src_oss__backend.h
new file mode 100644
index 000000000000..fee1081e8579
--- /dev/null
+++ b/audio/volumeicon/files/patch-src_oss__backend.h
@@ -0,0 +1,10 @@
+--- src/oss_backend.h.orig	2015-03-02 22:54:36 UTC
++++ src/oss_backend.h
+@@ -35,5 +35,7 @@ int oss_get_volume();
+ gboolean oss_get_mute();
+ const gchar * oss_get_channel();
+ const GList * oss_get_channel_names();
++const gchar * oss_get_device();
++const GList * oss_get_device_names();
+ 
+ #endif
diff --git a/audio/volumeicon/files/patch-src_volumeicon.c b/audio/volumeicon/files/patch-src_volumeicon.c
new file mode 100644
index 000000000000..6bac43da14fe
--- /dev/null
+++ b/audio/volumeicon/files/patch-src_volumeicon.c
@@ -0,0 +1,11 @@
+--- src/volumeicon.c.orig	2015-03-02 22:54:36 UTC
++++ src/volumeicon.c
+@@ -1295,6 +1295,8 @@ int main(int argc, char * argv[])
+ 	backend_get_mute = &oss_get_mute;
+ 	backend_get_channel = &oss_get_channel;
+ 	backend_get_channel_names = &oss_get_channel_names;
++	backend_get_device = &oss_get_device;
++	backend_get_device_names = &oss_get_device_names;
+ 	#else
+ 	backend_setup = &asound_setup;
+ 	backend_set_channel = &asound_set_channel;
diff --git a/audio/volumeicon/pkg-descr b/audio/volumeicon/pkg-descr
index 761a6f6c9f6c..2c0755acfa18 100644
--- a/audio/volumeicon/pkg-descr
+++ b/audio/volumeicon/pkg-descr
@@ -10,4 +10,4 @@ Features
 - Volume Slider
 - Hotkey support
 
-WWW: http://softwarebakery.com/maato/volumeicon.html
+WWW: https://github.com/Maato/volumeicon/
diff --git a/audio/volumeicon/pkg-plist b/audio/volumeicon/pkg-plist
index 87a2db1fa539..f3aa480db970 100644
--- a/audio/volumeicon/pkg-plist
+++ b/audio/volumeicon/pkg-plist
@@ -1,5 +1,7 @@
 bin/volumeicon
+%%NLS%%share/locale/de/LC_MESSAGES/volumeicon.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/volumeicon.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/volumeicon.mo
 %%DATADIR%%/gui/appicon.svg
 %%DATADIR%%/gui/preferences.ui
 %%DATADIR%%/icons/Black Gnome/1.png