The FreeBSD GNOME team proudly presents GNOME 3.18 for FreeBSD.

The offical GNOME 3.18 release notes can be found at
https://help.gnome.org/misc/release-notes/3.18/

This update doesn't contain the glib/gtk c++ bindings which will
be done in a another update due to the requirement on c++11 and the
amount of fallout this probably will give.

GDM is still at version 3.16 due to some issues.

Bump mate-themes to use the gtk 3.18 version of the themes.

Thanks to Antoine Brodin for running the exp-runs.

This release was made possible by the following people:
  Gustau Perez
  Ting-Wei_Lan

PR:	207006

4 files changed, 59 insertions, 8 deletions

diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 5424248f57f0..e5732ebf5cca 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnote
-PORTVERSION=	3.16.2
-PORTREVISION=	1
+PORTVERSION=	3.18.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 
@@ -21,8 +20,8 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 USE_GNOME=	gtk30 gtkmm30 intltool libxml2 libxslt
-USES=		desktop-file-utils gettext gmake libtool \
-		pathfix pkgconfig tar:xz
+USES=		desktop-file-utils compiler:c++11-lib gettext gmake \
+		gnome libtool pathfix pkgconfig tar:xz
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -37,6 +36,12 @@ DOCS=		AUTHORS ChangeLog NEWS README TODO
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+EXTRA_PATCHES=	${FILESDIR}/extra-src_base_macros.hpp
+.endif
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
diff --git a/deskutils/gnote/distinfo b/deskutils/gnote/distinfo
index d9061240cc14..b7645fdc9603 100644
--- a/deskutils/gnote/distinfo
+++ b/deskutils/gnote/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnote-3.16.2.tar.xz) = 5c5b55b5c548d15e344d59fdd2a0260b1acbd13a9fa4cf9bfc1fe6e68a041e07
-SIZE (gnote-3.16.2.tar.xz) = 3068136
+SHA256 (gnote-3.18.1.tar.xz) = 5da4ec9e7852b09af1067311fc6ee18a2c64384f4f5943b71ac37665144be58d
+SIZE (gnote-3.18.1.tar.xz) = 3310004
diff --git a/deskutils/gnote/files/extra-src_base_macros.hpp b/deskutils/gnote/files/extra-src_base_macros.hpp
new file mode 100644
index 000000000000..a04e604f38ab
--- /dev/null
+++ b/deskutils/gnote/files/extra-src_base_macros.hpp
@@ -0,0 +1,46 @@
+Working around c++11 issues with the port compiler used on 9.3.
+
+--- src/base/macros.hpp.orig	2016-01-06 21:33:38.207318000 +0100
++++ src/base/macros.hpp	2016-01-06 21:45:25.932524000 +0100
+@@ -29,14 +29,16 @@
+ #ifndef __BASE_MACROS_
+ #define __BASE_MACROS_
+ 
+-#if __cplusplus < 201103L
++//#if __cplusplus < 201103L
+   #include <tr1/memory>
+   #include <boost/foreach.hpp>
+   #include <boost/lexical_cast.hpp>
++/*
+ #else
+   #include <memory>
+   #include <string>
+ #endif
++*/
+ 
+ #if __GNUC__
+ #define _PRINTF_FORMAT(f,a) \
+@@ -46,7 +48,7 @@
+ #endif
+ 
+ // define 'final' and 'override' for pre-C++11 compilers
+-#if __cplusplus < 201103L
++//#if __cplusplus < 201103L
+   #define final
+   #define override
+   #define FOREACH(var, container) BOOST_FOREACH(var, container)
+@@ -58,6 +60,7 @@
+   using std::tr1::enable_shared_from_this;
+   using std::tr1::dynamic_pointer_cast;
+   using std::tr1::static_pointer_cast;
++/*
+ #else
+   #define FOREACH(var, container) for(var : container)
+   #define TO_STRING(x) std::to_string(x)
+@@ -69,5 +72,6 @@
+   using std::dynamic_pointer_cast;
+   using std::static_pointer_cast;
+ #endif
++*/
+ 
+ #endif
diff --git a/deskutils/gnote/pkg-plist b/deskutils/gnote/pkg-plist
index ff81c70bd4b4..48dbbe61b11e 100644
--- a/deskutils/gnote/pkg-plist
+++ b/deskutils/gnote/pkg-plist
@@ -39,8 +39,8 @@ lib/gnote/addins/%%VERSION%%/underline.desktop
 lib/gnote/addins/%%VERSION%%/underline.so
 lib/gnote/addins/%%VERSION%%/webdavsyncservice.desktop
 lib/gnote/addins/%%VERSION%%/webdavsyncservice.so
-lib/libgnote-3.16.so.0
-lib/libgnote-3.16.so.0.1.1
+lib/libgnote-3.18.so.0
+lib/libgnote-3.18.so.0.0.1
 lib/libgnote.so
 man/man1/gnote.1.gz
 share/appdata/gnote.appdata.xml