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

5 files changed, 73 insertions, 103 deletions

diff --git a/games/hitori/Makefile b/games/hitori/Makefile
index 185d47570188..7bd9f3627421 100644
--- a/games/hitori/Makefile
+++ b/games/hitori/Makefile
@@ -1,54 +1,23 @@
-# Created by: Rusmir Dusko <nemysis@FreeBSD.org>
+# Created by: FreeBSD GNOME Team <gnome@freebsd.org>
 # $FreeBSD$
+#   $MCom: ports/trunk/games/hitori/Makefile 20028 2014-10-28 13:52:15Z gusi $
 
 PORTNAME=	hitori
-PORTVERSION=	0.4.3
-CATEGORIES=	games
+PORTVERSION=	3.14.1
+CATEGORIES=	games gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Logic game similar to Sudoku
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Hitori
 
-LICENSE=	GPLv3 CCbyNCSA3
-LICENSE_COMB=	dual
-LICENSE_NAME_CCbyNCSA3=	Attribution-NonCommercial-ShareAlike 3.0 Unported
-LICENSE_FILE_CCbyNCSA3=	${WRKSRC}/COPYING-DOCS
-LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		xml2po:${PORTSDIR}/textproc/gnome-doc-utils \
-		itstool:${PORTSDIR}/textproc/itstool
-
-USES=		gmake pkgconfig tar:xz
-USE_GNOME=	cairo glib20 gtk30
-GNU_CONFIGURE=	yes
+USES=		gettext gmake pathfix pkgconfig tar:xz
+USE_GNOME=	gtk30 intlhack librsvg2 libxml2:build
 INSTALLS_ICONS=	yes
-
-PORTDOCS=	AUTHORS ChangeLog MAINTAINERS NEWS README
-
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
-
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	gettext
-
-# Wrong versioning upstream, Upstream use GTK3 in newer Versions
-PORTSCOUT=	ignore:1
-
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \
-		${WRKSRC}/po/Makefile.in.in
-.endif
-
-post-install:
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
-	${STAGEDIR}${PREFIX}/share/pixmaps/
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/games/hitori/distinfo b/games/hitori/distinfo
index ff24001e19b8..3f2dcc675acf 100644
--- a/games/hitori/distinfo
+++ b/games/hitori/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/hitori-0.4.3.tar.xz) = 870657747e7afb6796dae66fccc4fa36a562750bec8f093191c5895ce0f010c2
-SIZE (gnome2/hitori-0.4.3.tar.xz) = 467148
+SHA256 (gnome3/hitori-3.14.1.tar.xz) = d587d86b10c44e153c30aaa0c10caca53d3ae73112c709bbe687039659333236
+SIZE (gnome3/hitori-3.14.1.tar.xz) = 483656
diff --git a/games/hitori/files/patch-src__interface.c b/games/hitori/files/patch-src__interface.c
deleted file mode 100644
index 0593bd7298fb..000000000000
--- a/games/hitori/files/patch-src__interface.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/interface.c.orig	2013-10-10 10:27:44.000000000 +0200
-+++ ./src/interface.c	2013-11-12 19:36:25.000000000 +0100
-@@ -26,6 +26,7 @@
- #include "main.h"
- #include "interface.h"
- #include "rules.h"
-+#include <string.h>
- 
- #define NORMAL_FONT_SCALE 0.9
- #define PAINTED_FONT_SCALE 0.6
diff --git a/games/hitori/pkg-descr b/games/hitori/pkg-descr
index 6cd1f47dad43..8263b899e60e 100644
--- a/games/hitori/pkg-descr
+++ b/games/hitori/pkg-descr
@@ -1,5 +1,4 @@
-Hitori is a small application written to allow one to play the eponymous
-puzzle game, which is similar in theme to more popular puzzles such as Sudoku
-created by Nikoli.
+Hitori is a small application written to allow one to play the eponymous 
+puzzle game, which is similar in theme to more popular puzzles such as Sudoku.
 
 WWW: https://wiki.gnome.org/Apps/Hitori
diff --git a/games/hitori/pkg-plist b/games/hitori/pkg-plist
index 43b30fc8a064..fef954d75b68 100644
--- a/games/hitori/pkg-plist
+++ b/games/hitori/pkg-plist
@@ -1,125 +1,137 @@
 bin/hitori
 share/appdata/hitori.appdata.xml
 share/applications/hitori.desktop
+share/glib-2.0/schemas/org.gnome.hitori.gschema.xml
 share/help/C/hitori/customization.page
 share/help/C/hitori/figures/hitori_main_window.png
 share/help/C/hitori/game.page
 share/help/C/hitori/index.page
-share/help/C/hitori/license.page
+share/help/C/hitori/legal.xml
 share/help/C/hitori/playing.page
 share/help/C/hitori/strategy.page
 share/help/cs/hitori/customization.page
 share/help/cs/hitori/figures/hitori_main_window.png
 share/help/cs/hitori/game.page
 share/help/cs/hitori/index.page
-share/help/cs/hitori/license.page
+share/help/cs/hitori/legal.xml
 share/help/cs/hitori/playing.page
 share/help/cs/hitori/strategy.page
 share/help/da/hitori/customization.page
 share/help/da/hitori/figures/hitori_main_window.png
 share/help/da/hitori/game.page
 share/help/da/hitori/index.page
-share/help/da/hitori/license.page
+share/help/da/hitori/legal.xml
 share/help/da/hitori/playing.page
 share/help/da/hitori/strategy.page
 share/help/de/hitori/customization.page
 share/help/de/hitori/figures/hitori_main_window.png
 share/help/de/hitori/game.page
 share/help/de/hitori/index.page
-share/help/de/hitori/license.page
+share/help/de/hitori/legal.xml
 share/help/de/hitori/playing.page
 share/help/de/hitori/strategy.page
 share/help/el/hitori/customization.page
 share/help/el/hitori/figures/hitori_main_window.png
 share/help/el/hitori/game.page
 share/help/el/hitori/index.page
-share/help/el/hitori/license.page
+share/help/el/hitori/legal.xml
 share/help/el/hitori/playing.page
 share/help/el/hitori/strategy.page
 share/help/en_GB/hitori/customization.page
 share/help/en_GB/hitori/figures/hitori_main_window.png
 share/help/en_GB/hitori/game.page
 share/help/en_GB/hitori/index.page
-share/help/en_GB/hitori/license.page
+share/help/en_GB/hitori/legal.xml
 share/help/en_GB/hitori/playing.page
 share/help/en_GB/hitori/strategy.page
 share/help/es/hitori/customization.page
 share/help/es/hitori/figures/hitori_main_window.png
 share/help/es/hitori/game.page
 share/help/es/hitori/index.page
-share/help/es/hitori/license.page
+share/help/es/hitori/legal.xml
 share/help/es/hitori/playing.page
 share/help/es/hitori/strategy.page
 share/help/fr/hitori/customization.page
 share/help/fr/hitori/figures/hitori_main_window.png
 share/help/fr/hitori/game.page
 share/help/fr/hitori/index.page
-share/help/fr/hitori/license.page
+share/help/fr/hitori/legal.xml
 share/help/fr/hitori/playing.page
 share/help/fr/hitori/strategy.page
 share/help/hu/hitori/customization.page
 share/help/hu/hitori/figures/hitori_main_window.png
 share/help/hu/hitori/game.page
 share/help/hu/hitori/index.page
-share/help/hu/hitori/license.page
+share/help/hu/hitori/legal.xml
 share/help/hu/hitori/playing.page
 share/help/hu/hitori/strategy.page
 share/help/ro/hitori/customization.page
 share/help/ro/hitori/figures/hitori_main_window.png
 share/help/ro/hitori/game.page
 share/help/ro/hitori/index.page
-share/help/ro/hitori/license.page
+share/help/ro/hitori/legal.xml
 share/help/ro/hitori/playing.page
 share/help/ro/hitori/strategy.page
 share/help/sl/hitori/customization.page
 share/help/sl/hitori/figures/hitori_main_window.png
 share/help/sl/hitori/game.page
 share/help/sl/hitori/index.page
-share/help/sl/hitori/license.page
+share/help/sl/hitori/legal.xml
 share/help/sl/hitori/playing.page
 share/help/sl/hitori/strategy.page
 share/help/sv/hitori/customization.page
 share/help/sv/hitori/figures/hitori_main_window.png
 share/help/sv/hitori/game.page
 share/help/sv/hitori/index.page
-share/help/sv/hitori/license.page
+share/help/sv/hitori/legal.xml
 share/help/sv/hitori/playing.page
 share/help/sv/hitori/strategy.page
 share/help/zh_CN/hitori/customization.page
 share/help/zh_CN/hitori/figures/hitori_main_window.png
 share/help/zh_CN/hitori/game.page
 share/help/zh_CN/hitori/index.page
-share/help/zh_CN/hitori/license.page
+share/help/zh_CN/hitori/legal.xml
 share/help/zh_CN/hitori/playing.page
 share/help/zh_CN/hitori/strategy.page
-%%DATADIR%%/hitori.ui
-%%NLS%%share/icons/hicolor/16x16/apps/hitori.png
-%%NLS%%share/icons/hicolor/22x22/apps/hitori.png
-%%NLS%%share/icons/hicolor/32x32/apps/hitori.png
-%%NLS%%share/icons/hicolor/48x48/apps/hitori.png
-%%NLS%%share/locale/cs/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/da/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/de/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/el/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/es/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/he/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/id/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/sr@latin/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/hitori.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/hitori.mo
-share/pixmaps/hitori.png
+share/hitori/hitori.css
+share/hitori/hitori.ui
+share/icons/hicolor/16x16/apps/hitori.png
+share/icons/hicolor/22x22/apps/hitori.png
+share/icons/hicolor/32x32/apps/hitori.png
+share/icons/hicolor/48x48/apps/hitori.png
+share/locale/as/LC_MESSAGES/hitori.mo
+share/locale/ca/LC_MESSAGES/hitori.mo
+share/locale/ca@valencia/LC_MESSAGES/hitori.mo
+share/locale/cs/LC_MESSAGES/hitori.mo
+share/locale/da/LC_MESSAGES/hitori.mo
+share/locale/de/LC_MESSAGES/hitori.mo
+share/locale/el/LC_MESSAGES/hitori.mo
+share/locale/en_GB/LC_MESSAGES/hitori.mo
+share/locale/es/LC_MESSAGES/hitori.mo
+share/locale/fi/LC_MESSAGES/hitori.mo
+share/locale/fr/LC_MESSAGES/hitori.mo
+share/locale/gl/LC_MESSAGES/hitori.mo
+share/locale/he/LC_MESSAGES/hitori.mo
+share/locale/hu/LC_MESSAGES/hitori.mo
+share/locale/id/LC_MESSAGES/hitori.mo
+share/locale/it/LC_MESSAGES/hitori.mo
+share/locale/ko/LC_MESSAGES/hitori.mo
+share/locale/lt/LC_MESSAGES/hitori.mo
+share/locale/lv/LC_MESSAGES/hitori.mo
+share/locale/nb/LC_MESSAGES/hitori.mo
+share/locale/ne/LC_MESSAGES/hitori.mo
+share/locale/pa/LC_MESSAGES/hitori.mo
+share/locale/pl/LC_MESSAGES/hitori.mo
+share/locale/pt_BR/LC_MESSAGES/hitori.mo
+share/locale/ro/LC_MESSAGES/hitori.mo
+share/locale/ru/LC_MESSAGES/hitori.mo
+share/locale/sk/LC_MESSAGES/hitori.mo
+share/locale/sl/LC_MESSAGES/hitori.mo
+share/locale/sr/LC_MESSAGES/hitori.mo
+share/locale/sr@latin/LC_MESSAGES/hitori.mo
+share/locale/sv/LC_MESSAGES/hitori.mo
+share/locale/uk/LC_MESSAGES/hitori.mo
+share/locale/vi/LC_MESSAGES/hitori.mo
+share/locale/zh_CN/LC_MESSAGES/hitori.mo
+share/locale/zh_HK/LC_MESSAGES/hitori.mo
+share/locale/zh_TW/LC_MESSAGES/hitori.mo