deskutils/gucharmap: update 9.0.4 -> 11.0.1, remove NLS option

- Update to Unicode 11.0.0

PR:		220597
Submitted by:	Ting-Wei Lan <lantw44@gmail.com>,
Reported by:	vas@mpeks.tomsk.su
Reviewed by:	w.schwarzenfeld@utanet.at, Chris Hutchinson <portmaster@bsdforge.com>
Relnotes:	https://gitlab.gnome.org/GNOME/gucharmap/commits/master

5 files changed, 41 insertions, 24 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 3095b8534b44..c4b6448a45b9 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gucharmap
-PORTVERSION=	9.0.4
+PORTVERSION=	11.0.1
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	GNOME
+#MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -14,25 +14,29 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool \
-		UCD>=0:textproc/UCD
+		UCD>=0:textproc/UCD \
+		gtkdocize:textproc/gtk-doc \
+		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gmake gnome libtool localbase \
-		pathfix pkgconfig tar:xz
+USES=		autoreconf:build desktop-file-utils gettext gmake gnome \
+		libtool localbase pathfix pkgconfig tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-unicode-data=${LOCALBASE}/share/unicode/ucd/
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.gnome.org
+GL_ACCOUNT=	GNOME
+GL_COMMIT=	061cf7c0ba4ce62d2ce5743313a71cb272a5f82e
+
 GLIB_SCHEMAS=	org.gnome.Charmap.enums.xml \
 		org.gnome.Charmap.gschema.xml
 
-OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	NLS
-
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
+pre-configure:
+	cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 351732854a9f..0a2a44171b3c 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496229245
-SHA256 (gnome3/gucharmap-9.0.4.tar.xz) = 1588b2b183b843b24eb074fd0661bddb54f18876870ba475d65f35b7a9c677a0
-SIZE (gnome3/gucharmap-9.0.4.tar.xz) = 1029684
+TIMESTAMP = 1530106565
+SHA256 (gnome3/GNOME-gucharmap-061cf7c0ba4ce62d2ce5743313a71cb272a5f82e_GL0.tar.gz) = 835e58ee8702b53fb600854875286f857c4656dfafe95fd5c5c5842a51a1e52c
+SIZE (gnome3/GNOME-gucharmap-061cf7c0ba4ce62d2ce5743313a71cb272a5f82e_GL0.tar.gz) = 1978183
diff --git a/deskutils/gucharmap/files/patch-gucharmap_gen-guch-unicode-tables.pl b/deskutils/gucharmap/files/patch-gucharmap_gen-guch-unicode-tables.pl
deleted file mode 100644
index 104c3ee7eb79..000000000000
--- a/deskutils/gucharmap/files/patch-gucharmap_gen-guch-unicode-tables.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- gucharmap/gen-guch-unicode-tables.pl.orig	2017-05-09 22:11:10 UTC
-+++ gucharmap/gen-guch-unicode-tables.pl
-@@ -999,6 +999,7 @@ sub process_versions_txt
-         {
-             next;
-         }
-+        next if $raw_version > $v;
- 
-         my $version = $raw_version;
-         $version =~ tr/_/ /;
diff --git a/deskutils/gucharmap/pkg-descr b/deskutils/gucharmap/pkg-descr
index e693616630e6..94c810c09984 100644
--- a/deskutils/gucharmap/pkg-descr
+++ b/deskutils/gucharmap/pkg-descr
@@ -1,4 +1,4 @@
 gucharmap is a Unicode/ISO10646 character map and font viewer.  It uses
 GTK+ 2, and supports anti-aliased, scalable fonts.
 
-WWW: http://gucharmap.sourceforge.net/
+WWW: https://wiki.gnome.org/Gucharmap
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index a95b995785a0..67f92d0f4dde 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -20,44 +20,60 @@ lib/libgucharmap_2_90.so.7.0.0
 libdata/pkgconfig/gucharmap-2.90.pc
 share/applications/gucharmap.desktop
 share/gir-1.0/Gucharmap-2.90.gir
+share/help/C/gucharmap/figures/gucharmap_window.png
 share/help/C/gucharmap/index.docbook
 share/help/C/gucharmap/legal.xml
+share/help/bg/gucharmap/figures/gucharmap_window.png
 share/help/bg/gucharmap/index.docbook
 share/help/bg/gucharmap/legal.xml
 share/help/ca/gucharmap/index.docbook
 share/help/ca/gucharmap/legal.xml
+share/help/cs/gucharmap/figures/gucharmap_window.png
 share/help/cs/gucharmap/index.docbook
 share/help/cs/gucharmap/legal.xml
+share/help/de/gucharmap/figures/gucharmap_window.png
 share/help/de/gucharmap/index.docbook
 share/help/de/gucharmap/legal.xml
+share/help/el/gucharmap/figures/gucharmap_window.png
 share/help/el/gucharmap/index.docbook
 share/help/el/gucharmap/legal.xml
 share/help/en_GB/gucharmap/index.docbook
 share/help/en_GB/gucharmap/legal.xml
+share/help/es/gucharmap/figures/gucharmap_window.png
 share/help/es/gucharmap/index.docbook
 share/help/es/gucharmap/legal.xml
+share/help/fi/gucharmap/figures/gucharmap_window.png
 share/help/fi/gucharmap/index.docbook
 share/help/fi/gucharmap/legal.xml
+share/help/fr/gucharmap/figures/gucharmap_window.png
 share/help/fr/gucharmap/index.docbook
 share/help/fr/gucharmap/legal.xml
 share/help/gl/gucharmap/index.docbook
 share/help/gl/gucharmap/legal.xml
+share/help/hu/gucharmap/figures/gucharmap_window.png
 share/help/hu/gucharmap/index.docbook
 share/help/hu/gucharmap/legal.xml
+share/help/ko/gucharmap/figures/gucharmap_window.png
 share/help/ko/gucharmap/index.docbook
 share/help/ko/gucharmap/legal.xml
 share/help/oc/gucharmap/index.docbook
 share/help/oc/gucharmap/legal.xml
+share/help/pl/gucharmap/figures/gucharmap_window.png
+share/help/pl/gucharmap/index.docbook
+share/help/pl/gucharmap/legal.xml
+share/help/pt_BR/gucharmap/figures/gucharmap_window.png
 share/help/pt_BR/gucharmap/index.docbook
 share/help/pt_BR/gucharmap/legal.xml
 share/help/ru/gucharmap/index.docbook
 share/help/ru/gucharmap/legal.xml
 share/help/sl/gucharmap/index.docbook
 share/help/sl/gucharmap/legal.xml
+share/help/sv/gucharmap/figures/gucharmap_window.png
 share/help/sv/gucharmap/index.docbook
 share/help/sv/gucharmap/legal.xml
 share/help/vi/gucharmap/index.docbook
 share/help/vi/gucharmap/legal.xml
+share/help/zh_CN/gucharmap/figures/gucharmap_window.png
 share/help/zh_CN/gucharmap/index.docbook
 share/help/zh_CN/gucharmap/legal.xml
 share/locale/af/LC_MESSAGES/gucharmap.mo
@@ -149,3 +165,10 @@ share/locale/zh_CN/LC_MESSAGES/gucharmap.mo
 share/locale/zh_HK/LC_MESSAGES/gucharmap.mo
 share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 share/metainfo/gucharmap.appdata.xml
+@dir share/help/ca/gucharmap/figures
+@dir share/help/en_GB/gucharmap/figures
+@dir share/help/gl/gucharmap/figures
+@dir share/help/oc/gucharmap/figures
+@dir share/help/ru/gucharmap/figures
+@dir share/help/sl/gucharmap/figures
+@dir share/help/vi/gucharmap/figures