svn commit: r384943 - in head/audio/pavucontrol: . files

[Romain Tartière]

Author: romain
Date: Tue Apr 28 22:32:05 2015
New Revision: 384943
URL: https://svnweb.freebsd.org/changeset/ports/384943

Log:
  Update to 3.0
  
  PR:		ports/199762
  Submitted by:	olivierd

Added:
  head/audio/pavucontrol/files/patch-src_pavucontrol.glade   (contents, props changed)
Deleted:
  head/audio/pavucontrol/files/extra-patch-src_pavucontrol.glade
  head/audio/pavucontrol/files/extra-patch-support-gtkmm-24.patch
  head/audio/pavucontrol/files/extra-patch-support-gtkmm-30.patch
Modified:
  head/audio/pavucontrol/Makefile
  head/audio/pavucontrol/distinfo
  head/audio/pavucontrol/pkg-plist

Modified: head/audio/pavucontrol/Makefile
==============================================================================
--- head/audio/pavucontrol/Makefile	Tue Apr 28 22:16:44 2015	(r384942)
+++ head/audio/pavucontrol/Makefile	Tue Apr 28 22:32:05 2015	(r384943)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pavucontrol
-PORTVERSION=	2.0
+PORTVERSION=	3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://freedesktop.org/software/pulseaudio/${PORTNAME}/
 
@@ -32,17 +32,6 @@ GTK2_CONFIGURE_ON=	--disable-gtk3
 GTK3_USE=	GNOME=gtkmm30
 GTK3_LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-support-gtkmm-24.patch
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-support-gtkmm-30.patch \
-	${FILESDIR}/extra-patch-src_pavucontrol.glade
-.endif
-
 post-patch:
 # Install locales files in right place
 	${REINPLACE_CMD} -e 's|[$$][(]DATADIRNAME[)]|share|' \

Modified: head/audio/pavucontrol/distinfo
==============================================================================
--- head/audio/pavucontrol/distinfo	Tue Apr 28 22:16:44 2015	(r384942)
+++ head/audio/pavucontrol/distinfo	Tue Apr 28 22:32:05 2015	(r384943)
@@ -1,2 +1,2 @@
-SHA256 (pavucontrol-2.0.tar.xz) = 22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b
-SIZE (pavucontrol-2.0.tar.xz) = 151560
+SHA256 (pavucontrol-3.0.tar.xz) = b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890
+SIZE (pavucontrol-3.0.tar.xz) = 145092

Added: head/audio/pavucontrol/files/patch-src_pavucontrol.glade
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/pavucontrol/files/patch-src_pavucontrol.glade	Tue Apr 28 22:32:05 2015	(r384943)
@@ -0,0 +1,20 @@
+--- src/pavucontrol.glade.orig	2015-03-24 14:39:00 UTC
++++ src/pavucontrol.glade
+@@ -312,7 +312,7 @@
+                               <object class="GtkImage" id="image18">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="icon_name">stock_lock</property>
++                                <property name="icon_name">security-medium</property>
+                                 <property name="icon-size">1</property>
+                               </object>
+                             </child>
+@@ -1474,7 +1474,7 @@
+                               <object class="GtkImage" id="image18">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="icon_name">stock_lock</property>
++                                <property name="icon_name">security-medium</property>
+                                 <property name="icon-size">1</property>
+                               </object>
+                             </child>

Modified: head/audio/pavucontrol/pkg-plist
==============================================================================
--- head/audio/pavucontrol/pkg-plist	Tue Apr 28 22:16:44 2015	(r384942)
+++ head/audio/pavucontrol/pkg-plist	Tue Apr 28 22:32:05 2015	(r384943)
@@ -1,6 +1,5 @@
 bin/pavucontrol
 share/applications/pavucontrol.desktop
-%%DOCSDIR%%/README
 %%DOCSDIR%%/README.html
 %%DOCSDIR%%/style.css
 share/locale/as/LC_MESSAGES/pavucontrol.mo