The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2.

Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up.

This commit removes the old GNOME 2 desktop, bindings and some ports that
can't be compiled. A few ports where updated to more recent versions to
allow them to compile with this update.

Apart from updating ports to newer versions

GDM is more integrated with gnome-shell now, and handles several things for
the GNOME desktop such as screen locking. If you want to use GNOME 3 via
startx, you will have to add your own lock screen/screensaver. For example xscreensaver
can be used for sessions started without GDM.

Shell Extensions can be installed via https://extensions.gnome.org/ , we have
ported a few that can't be installed via this way.
The old gnome-utils and gnome-games ports where split up into single ports
and where converted to meta-ports.
gnome-terminal requires a UTF-8 locale to run, gdm handles this already, but
if you use startx you need to do this yourself.

Upgrade instructions:

Delete the old and conflicting packages:
# pkg delete clutter gnome-utils gnome-panel gnome-keyring vala-vapigen \
    guile gcalctool gnome-media libgnomekbd
# pkg delete gnome-screensaver gnome-applets bug-buddy evolution-exchange \
    evolution-webcal gnome-system-tools seahorse-plugins gnome-control-center

For package users the following lines will be enough:
# pkg upgrade
# pkg install gnome3

For ports users should do the following:
# portmaster -a
# portmaster x11/gnome3

We are currently aware of two issues. The first issue is a bug in the
file monitoring code in the glib20 port. This bug causes glib programs
to crash when files in a monitored directory are added or removed.
Upstream is aware of the problem, but since the problem is quite complex
there is no solution yet. This problem isn't restricted to BSD.

The second issue is that on certain video cards totem will display a
purple/pink overlay on the video. It not clear yet where the issues
comes from.

Major thanks goes to Gustau Perez for being a driving force behind getting
GNOME 3 up to speed again. Also thanks to Antoine Brodin for running the exp-runs.

This update was also made possible by:
	Joe Maloney
	Kris Moore
	Beeblebrox
	Ryan Lortie
	Antoine Jacoutot
	and everyone I missed

3 files changed, 38 insertions, 57 deletions

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 9529b3f5df39..3b9e518bfe54 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,10 +1,9 @@
 # Created by: fenner
 # $FreeBSD$
-#    $MCom: ports/trunk/textproc/gtk-doc/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#    $MCom: ports/trunk/textproc/gtk-doc/Makefile 19804 2014-08-13 14:55:11Z kwm $
 
 PORTNAME=	gtk-doc
-PORTVERSION=	1.18
-PORTREVISION=	1
+PORTVERSION=	1.21
 CATEGORIES=	textproc
 MASTER_SITES=	GNOME
 
@@ -12,6 +11,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Code documentation system, originally for GTK+
 
 BUILD_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
+		itstool:${PORTSDIR}/textproc/itstool \
 		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
 		rarian-sk-config:${PORTSDIR}/textproc/rarian
@@ -26,20 +26,13 @@ CATALOG_DIR=		${PREFIX}/share/sgml/${PORTNAME}
 XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
-USE_PYTHON_RUN=	2
+USES=		gmake pathfix perl5 pkgconfig python tar:xz
+USE_GNOME=	gnomeprefix libxslt
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig shebangfix perl5 tar:xz
-USE_GNOME=	gnomeprefix libxslt gnomedocutils
-INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-SHEBANG_FILES=	tools/docpercentages.pl
 
 PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
 		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
 		CATALOG_DIR=${CATALOG_DIR}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
-		${WRKSRC}/tests/tools.sh
-
 .include <bsd.port.mk>
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index e5a1075cef7e..aea785b9f413 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-doc-1.18.tar.xz) = 785b591c561be1c8206f0d2575dc63558ea6199c3afe49cbc4efde94a6629a20
-SIZE (gtk-doc-1.18.tar.xz) = 637936
+SHA256 (gtk-doc-1.21.tar.xz) = 5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e
+SIZE (gtk-doc-1.21.tar.xz) = 647484
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index 905715452a74..a9bf9e6cc10f 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -9,23 +9,9 @@ bin/gtkdoc-mktmpl
 bin/gtkdoc-rebase
 bin/gtkdoc-scan
 bin/gtkdoc-scangobj
-bin/gtkdoc-scanobj
 bin/gtkdocize
 libdata/pkgconfig/gtk-doc.pc
 share/aclocal/gtk-doc.m4
-share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
-share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/bn_IN/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/de/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/el/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/en_GB/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/es/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/sl/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml
 %%DATADIR%%/data/devhelp2.xsl
 %%DATADIR%%/data/gtk-doc.dcl
 %%DATADIR%%/data/gtk-doc.dsl
@@ -36,40 +22,42 @@ share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml
 %%DATADIR%%/data/gtk-doc.xsl
 %%DATADIR%%/data/gtkdoc-common.pl
 %%DATADIR%%/data/home.png
+%%DATADIR%%/data/left-insensitive.png
 %%DATADIR%%/data/left.png
+%%DATADIR%%/data/right-insensitive.png
 %%DATADIR%%/data/right.png
 %%DATADIR%%/data/style.css
+%%DATADIR%%/data/up-insensitive.png
 %%DATADIR%%/data/up.png
 %%DATADIR%%/data/version-greater-or-equal.xsl
-share/omf/gtk-doc-manual/gtk-doc-manual-C.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-bn_IN.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-de.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-el.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-en_GB.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-es.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-sl.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-te.omf
+share/help/C/gtk-doc-manual/fdl-appendix.xml
+share/help/C/gtk-doc-manual/index.docbook
+share/help/bn_IN/gtk-doc-manual/fdl-appendix.xml
+share/help/bn_IN/gtk-doc-manual/index.docbook
+share/help/de/gtk-doc-manual/fdl-appendix.xml
+share/help/de/gtk-doc-manual/index.docbook
+share/help/el/gtk-doc-manual/fdl-appendix.xml
+share/help/el/gtk-doc-manual/index.docbook
+share/help/en_GB/gtk-doc-manual/fdl-appendix.xml
+share/help/en_GB/gtk-doc-manual/index.docbook
+share/help/es/gtk-doc-manual/fdl-appendix.xml
+share/help/es/gtk-doc-manual/index.docbook
+share/help/fr/gtk-doc-manual/fdl-appendix.xml
+share/help/fr/gtk-doc-manual/index.docbook
+share/help/gu/gtk-doc-manual/fdl-appendix.xml
+share/help/gu/gtk-doc-manual/index.docbook
+share/help/pt_BR/gtk-doc-manual/fdl-appendix.xml
+share/help/pt_BR/gtk-doc-manual/index.docbook
+share/help/sl/gtk-doc-manual/fdl-appendix.xml
+share/help/sl/gtk-doc-manual/index.docbook
+share/help/sv/gtk-doc-manual/fdl-appendix.xml
+share/help/sv/gtk-doc-manual/index.docbook
+share/help/ta/gtk-doc-manual/fdl-appendix.xml
+share/help/ta/gtk-doc-manual/index.docbook
+share/help/te/gtk-doc-manual/fdl-appendix.xml
+share/help/te/gtk-doc-manual/index.docbook
+share/help/zh_CN/gtk-doc-manual/fdl-appendix.xml
+share/help/zh_CN/gtk-doc-manual/index.docbook
 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%CATALOG_DIR%%/gtk-doc.cat
 share/sgml/gtk-doc/gtk-doc.cat
 @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%CATALOG_DIR%%/gtk-doc.cat
-@dirrm share/sgml/gtk-doc
-@dirrm share/omf/gtk-doc-manual
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
-@dirrm share/gnome/help/gtk-doc-manual/te
-@dirrm share/gnome/help/gtk-doc-manual/ta
-@dirrm share/gnome/help/gtk-doc-manual/sv
-@dirrm share/gnome/help/gtk-doc-manual/sl
-@dirrm share/gnome/help/gtk-doc-manual/gu
-@dirrm share/gnome/help/gtk-doc-manual/fr
-@dirrm share/gnome/help/gtk-doc-manual/es
-@dirrm share/gnome/help/gtk-doc-manual/en_GB
-@dirrm share/gnome/help/gtk-doc-manual/el
-@dirrm share/gnome/help/gtk-doc-manual/de
-@dirrm share/gnome/help/gtk-doc-manual/bn_IN
-@dirrm share/gnome/help/gtk-doc-manual/C
-@dirrm share/gnome/help/gtk-doc-manual