4 files changed, 14 insertions, 32 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f317b2e72289..3ed8017684e6 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-desktop
-PORTVERSION=	3.18.2
-PORTREVISION=	1
+PORTVERSION=	3.28.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,27 +15,25 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LIB
 
-USES=		tar:xz
-
-.if !defined(REFERENCE_PORT)
 PORTSCOUT=	limitw:1,even
 
 BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
 		xkeyboard-config>=0:x11/xkeyboard-config \
-		libxkbfile>=0:x11/libxkbfile \
 		itstool:textproc/itstool
 RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
-		xkeyboard-config>=0:x11/xkeyboard-config \
-		libxkbfile>=0:x11/libxkbfile
+		cantarell-fonts>=0:x11-fonts/cantarell-fonts \
+		xkeyboard-config>=0:x11/xkeyboard-config
 
-USES+=		bison gettext gmake gnome libtool localbase pathfix pkgconfig python:3.4+
-USE_GNOME=	gtk30 intlhack introspection:build referencehack
-USE_XORG=	x11 xrandr xext
+USES=		bison gettext gmake gnome libtool localbase pathfix \
+		pkgconfig python:3.4+ tar:xz
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build
+USE_XORG=	x11
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project"
+CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
+		--disable-udev
 INSTALL_TARGET=	install-strip
 
 post-patch:
@@ -46,5 +43,3 @@ post-patch:
 		${WRKSRC}/desktop-docs/lgpl/Makefile.in
 
 .include <bsd.port.mk>
-
-.endif
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index fb2cff555234..8f9da2dfff79 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-desktop-3.18.2.tar.xz) = ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56
-SIZE (gnome3/gnome-desktop-3.18.2.tar.xz) = 1091568
+TIMESTAMP = 1525954310
+SHA256 (gnome3/gnome-desktop-3.28.2.tar.xz) = 605087bff17c61bc167ccb5a61ed4d06eab922fcce384576ed2a3577214c8330
+SIZE (gnome3/gnome-desktop-3.28.2.tar.xz) = 1077556
diff --git a/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c b/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c
deleted file mode 100644
index 2892239bb633..000000000000
--- a/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnome-desktop/gnome-languages.c.orig	2016-01-08 00:52:40.415603000 +0100
-+++ libgnome-desktop/gnome-languages.c	2016-01-08 01:30:53.511431000 +0100
-@@ -229,7 +231,7 @@
- {
-         char *name;
- 
--        g_assert (language[0] != 0);
-+        g_assert (language == NULL || language[0] != 0);
-         g_assert (territory == NULL || territory[0] != 0);
-         g_assert (codeset == NULL || codeset[0] != 0);
-         g_assert (modifier == NULL || modifier[0] != 0);
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 12df042647f3..6cbaf46d6015 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -11,8 +11,8 @@ include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
 lib/girepository-1.0/GnomeDesktop-3.0.typelib
 lib/libgnome-desktop-3.so
-lib/libgnome-desktop-3.so.12
-lib/libgnome-desktop-3.so.12.0.0
+lib/libgnome-desktop-3.so.17
+lib/libgnome-desktop-3.so.17.0.0
 libdata/pkgconfig/gnome-desktop-3.0.pc
 libexec/gnome-rr-debug
 share/gir-1.0/GnomeDesktop-3.0.gir
@@ -32,7 +32,6 @@ share/gtk-doc/html/gnome-desktop3/gnome-desktop3.devhelp2
 share/gtk-doc/html/gnome-desktop3/home.png
 share/gtk-doc/html/gnome-desktop3/idle-monitor.html
 share/gtk-doc/html/gnome-desktop3/index.html
-share/gtk-doc/html/gnome-desktop3/index.sgml
 share/gtk-doc/html/gnome-desktop3/intro.html
 share/gtk-doc/html/gnome-desktop3/languages.html
 share/gtk-doc/html/gnome-desktop3/left-insensitive.png
@@ -87,7 +86,6 @@ share/help/oc/gpl/index.docbook
 share/help/oc/lgpl/index.docbook
 share/help/pa/gpl/index.docbook
 share/help/pa/lgpl/index.docbook
-share/help/pl/fdl/index.docbook
 share/help/pt_BR/fdl/index.docbook
 share/help/pt_BR/gpl/index.docbook
 share/help/pt_BR/lgpl/index.docbook
@@ -108,7 +106,6 @@ share/help/vi/lgpl/index.docbook
 share/help/zh_CN/fdl/index.docbook
 share/help/zh_CN/gpl/index.docbook
 share/help/zh_CN/lgpl/index.docbook
-share/libgnome-desktop-3.0/pnp.ids
 share/locale/af/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/an/LC_MESSAGES/gnome-desktop-3.0.mo