- Update spice-gtk to 0.33

- Sort plist

PR:		213774
Submitted by:	olevole@olevole.ru (maintainer)

5 files changed, 82 insertions, 95 deletions

diff --git a/deskutils/spice-gtk/Makefile b/deskutils/spice-gtk/Makefile
index 9232d95225ba..7de50c6a148d 100644
--- a/deskutils/spice-gtk/Makefile
+++ b/deskutils/spice-gtk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	spice-gtk
-PORTVERSION=	0.32
+PORTVERSION=	0.33
 PORTREVISION?=	0
 CATEGORIES?=	deskutils gnome
 MASTER_SITES=	http://www.spice-space.org/download/gtk/
diff --git a/deskutils/spice-gtk/distinfo b/deskutils/spice-gtk/distinfo
index 273b672300aa..41a1d1300fd3 100644
--- a/deskutils/spice-gtk/distinfo
+++ b/deskutils/spice-gtk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472391330
-SHA256 (spice-gtk-0.32.tar.bz2) = 4c48f4099335e0cd100854162a44070d34ed73dfcad2115e80c075013b49ee02
-SIZE (spice-gtk-0.32.tar.bz2) = 1342742
+TIMESTAMP = 1477412449
+SHA256 (spice-gtk-0.33.tar.bz2) = 7daf33b786ab8ebc9fe6e7b11745100ee1ab66e61a5811d1d5aabe4d66eaaf39
+SIZE (spice-gtk-0.33.tar.bz2) = 1383927
diff --git a/deskutils/spice-gtk/files/patch-configure.ac b/deskutils/spice-gtk/files/patch-configure.ac
index ff13861ccfd0..040697555cd2 100644
--- a/deskutils/spice-gtk/files/patch-configure.ac
+++ b/deskutils/spice-gtk/files/patch-configure.ac
@@ -1,22 +1,26 @@
---- configure.ac.orig	2016-06-16 11:34:31 UTC
-+++ configure.ac
-@@ -108,7 +108,7 @@ SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIR
+--- configure.ac.orig	2016-08-30 15:45:02.000000000 +0300
++++ configure.ac	2016-10-25 19:39:44.610155000 +0300
+@@ -106,7 +106,10 @@
+ 
  PKG_CHECK_MODULES(SSL, openssl)
- AC_SUBST(SSL_CFLAGS)
- AC_SUBST(SSL_LIBS)
+ 
 -SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
-+#SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
++case $host_os in
++	freebsd*)	;;
++	*)		SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl" ;;
++esac
  
  SPICE_CHECK_SASL
  
-@@ -163,6 +163,10 @@ AS_IF([test "x$have_win32" = "xyes"], [A
- AM_CONDITIONAL([WITH_DISPLAY_WINDOWS], [test "x$have_win32" = "xyes"])
- 
+@@ -155,6 +158,11 @@
+ PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [PKG_CHECK_MODULES(X11, x11)])
  AC_CHECK_HEADERS([X11/XKBlib.h])
+ 
 +AS_IF([test "x$have_quartz" != "xyes" && test "x$have_win32" != "xyes"],
 +      [PKG_CHECK_MODULES(X11,x11)])
 +AC_SUBST(X11_CFLAGS)
 +AC_SUBST(X11_LIBS)
- 
++
  AC_ARG_WITH([pnp-ids-path],
    AC_HELP_STRING([--with-pnp-ids-path],
+                  [Specify the path to pnp.ids @<:@default=(internal)@:>@]),
diff --git a/deskutils/spice-gtk/files/patch-src_Makefile.am b/deskutils/spice-gtk/files/patch-src_Makefile.am
deleted file mode 100644
index 63850b169113..000000000000
--- a/deskutils/spice-gtk/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/Makefile.am.orig	2016-06-20 16:42:39 UTC
-+++ src/Makefile.am
-@@ -100,6 +100,7 @@ SPICE_COMMON_CPPFLAGS =						\
- 	$(GUDEV_CFLAGS)						\
- 	$(SOUP_CFLAGS)						\
- 	$(PHODAV_CFLAGS)					\
-+	$(X11_CFLAGS)					\
- 	$(LZ4_CFLAGS)					\
- 	$(NULL)
- 
-@@ -119,6 +120,7 @@ SPICE_GTK_LIBADD_COMMON =		\
- 	libspice-client-glib-2.0.la	\
- 	$(GTK_LIBS)			\
- 	$(CAIRO_LIBS)			\
-+	$(X11_LIBS)			\
- 	$(LIBM)				\
- 	$(NULL)
- 
diff --git a/deskutils/spice-gtk/pkg-plist b/deskutils/spice-gtk/pkg-plist
index ba5239f66b48..1e0634db124b 100644
--- a/deskutils/spice-gtk/pkg-plist
+++ b/deskutils/spice-gtk/pkg-plist
@@ -1,63 +1,6 @@
-share/vala/vapi/spice-protocol.vapi
-%%NLS%%share/locale/fr/LC_MESSAGES/spice-gtk.mo
-share/gir-1.0/SpiceClientGtk-3.0.gir
-share/gir-1.0/SpiceClientGLib-2.0.gir
-share/doc/spice-gtk/up.png
-share/doc/spice-gtk/up-insensitive.png
-share/doc/spice-gtk/style.css
-share/doc/spice-gtk/spice-gtk.devhelp2
-share/doc/spice-gtk/spice-gtk-Utilities.html
-share/doc/spice-gtk/spice-gtk-SpiceURI.html
-share/doc/spice-gtk/right.png
-share/doc/spice-gtk/right-insensitive.png
-share/doc/spice-gtk/object-tree.html
-share/doc/spice-gtk/left.png
-share/doc/spice-gtk/left-insensitive.png
-share/doc/spice-gtk/index.html
-share/doc/spice-gtk/home.png
-share/doc/spice-gtk/ch03.html
-share/doc/spice-gtk/ch02.html
-share/doc/spice-gtk/ch01.html
-share/doc/spice-gtk/application-support.html
-share/doc/spice-gtk/api-reference.html
-share/doc/spice-gtk/api-index-full.html
-share/doc/spice-gtk/api-index-deprecated.html
-share/doc/spice-gtk/annotation-glossary.html
-share/doc/spice-gtk/SpiceWebdavChannel.html
-share/doc/spice-gtk/SpiceUsbredirChannel.html
-share/doc/spice-gtk/SpiceUsbDeviceManager.html
-share/doc/spice-gtk/SpiceSmartcardManager.html
-share/doc/spice-gtk/SpiceSmartcardChannel.html
-share/doc/spice-gtk/SpiceSession.html
-share/doc/spice-gtk/SpiceRecordChannel.html
-share/doc/spice-gtk/SpicePortChannel.html
-share/doc/spice-gtk/SpicePlaybackChannel.html
-share/doc/spice-gtk/SpiceMainChannel.html
-share/doc/spice-gtk/SpiceInputsChannel.html
-share/doc/spice-gtk/SpiceDisplayChannel.html
-share/doc/spice-gtk/SpiceCursorChannel.html
-share/doc/spice-gtk/SpiceChannel.html
-share/doc/spice-gtk/SpiceAudio.html
-%%PORTDOCS%%%%DOCSDIR%%/SpiceFileTransferTask.html
-%%PORTDOCS%%%%DOCSDIR%%/spice-gtk-SpiceDisplay.html
-%%PORTDOCS%%%%DOCSDIR%%/spice-gtk-SpiceGtkSession.html
-%%PORTDOCS%%%%DOCSDIR%%/spice-gtk-SpiceUsbDeviceWidget.html
-%%PORTDOCS%%%%DOCSDIR%%/spice-gtk-Version-Information.html
-man/man1/spice-client.1.gz
-libdata/pkgconfig/spice-controller.pc
-libdata/pkgconfig/spice-client-gtk-3.0.pc
-libdata/pkgconfig/spice-client-glib-2.0.pc
-lib/libspice-controller.so.0.0.0
-lib/libspice-controller.so.0
-lib/libspice-controller.so
-lib/libspice-client-gtk-3.0.so.5.0.0
-lib/libspice-client-gtk-3.0.so.5
-lib/libspice-client-gtk-3.0.so
-lib/libspice-client-glib-2.0.so.8.5.0
-lib/libspice-client-glib-2.0.so.8
-lib/libspice-client-glib-2.0.so
-lib/girepository-1.0/SpiceClientGtk-3.0.typelib
-lib/girepository-1.0/SpiceClientGLib-2.0.typelib
+bin/spicy
+bin/spicy-screenshot
+bin/spicy-stats
 include/spice-client-glib-2.0/channel-cursor.h
 include/spice-client-glib-2.0/channel-display.h
 include/spice-client-glib-2.0/channel-inputs.h
@@ -89,6 +32,64 @@ include/spice-client-gtk-3.0/spice-widget-enums.h
 include/spice-client-gtk-3.0/spice-widget.h
 include/spice-client-gtk-3.0/usb-device-widget.h
 include/spice-controller/spice-controller.h
-bin/spicy-stats
-bin/spicy-screenshot
-bin/spicy
+lib/girepository-1.0/SpiceClientGLib-2.0.typelib
+lib/girepository-1.0/SpiceClientGtk-3.0.typelib
+lib/libspice-client-glib-2.0.so
+lib/libspice-client-glib-2.0.so.8
+lib/libspice-client-glib-2.0.so.8.6.0
+lib/libspice-client-gtk-3.0.so
+lib/libspice-client-gtk-3.0.so.5
+lib/libspice-client-gtk-3.0.so.5.0.0
+lib/libspice-controller.so
+lib/libspice-controller.so.0
+lib/libspice-controller.so.0.0.0
+libdata/pkgconfig/spice-client-glib-2.0.pc
+libdata/pkgconfig/spice-client-gtk-3.0.pc
+libdata/pkgconfig/spice-controller.pc
+man/man1/spice-client.1.gz
+share/doc/spice-gtk/SpiceAudio.html
+share/doc/spice-gtk/SpiceChannel.html
+share/doc/spice-gtk/SpiceCursorChannel.html
+share/doc/spice-gtk/SpiceDisplayChannel.html
+share/doc/spice-gtk/SpiceFileTransferTask.html
+share/doc/spice-gtk/SpiceInputsChannel.html
+share/doc/spice-gtk/SpiceMainChannel.html
+share/doc/spice-gtk/SpicePlaybackChannel.html
+share/doc/spice-gtk/SpicePortChannel.html
+share/doc/spice-gtk/SpiceRecordChannel.html
+share/doc/spice-gtk/SpiceSession.html
+share/doc/spice-gtk/SpiceSmartcardChannel.html
+share/doc/spice-gtk/SpiceSmartcardManager.html
+share/doc/spice-gtk/SpiceUsbDeviceManager.html
+share/doc/spice-gtk/SpiceUsbredirChannel.html
+share/doc/spice-gtk/SpiceWebdavChannel.html
+share/doc/spice-gtk/annotation-glossary.html
+share/doc/spice-gtk/api-index-deprecated.html
+share/doc/spice-gtk/api-index-full.html
+share/doc/spice-gtk/api-reference.html
+share/doc/spice-gtk/application-support.html
+share/doc/spice-gtk/ch01.html
+share/doc/spice-gtk/ch02.html
+share/doc/spice-gtk/ch03.html
+share/doc/spice-gtk/home.png
+share/doc/spice-gtk/index.html
+share/doc/spice-gtk/left-insensitive.png
+share/doc/spice-gtk/left.png
+share/doc/spice-gtk/object-tree.html
+share/doc/spice-gtk/right-insensitive.png
+share/doc/spice-gtk/right.png
+share/doc/spice-gtk/spice-gtk-SpiceDisplay.html
+share/doc/spice-gtk/spice-gtk-SpiceGtkSession.html
+share/doc/spice-gtk/spice-gtk-SpiceURI.html
+share/doc/spice-gtk/spice-gtk-SpiceUsbDeviceWidget.html
+share/doc/spice-gtk/spice-gtk-Utilities.html
+share/doc/spice-gtk/spice-gtk-Version-Information.html
+share/doc/spice-gtk/spice-gtk.devhelp2
+share/doc/spice-gtk/style.css
+share/doc/spice-gtk/up-insensitive.png
+share/doc/spice-gtk/up.png
+share/gir-1.0/SpiceClientGLib-2.0.gir
+share/gir-1.0/SpiceClientGtk-3.0.gir
+%%NLS%%share/locale/fr/LC_MESSAGES/spice-gtk.mo
+%%NLS%%share/locale/it/LC_MESSAGES/spice-gtk.mo
+share/vala/vapi/spice-protocol.vapi