3 files changed, 73 insertions, 113 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 6a539f4eb813..d99460695107 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -1,27 +1,29 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.75 2010/11/13 13:05:08 kwm Exp $
+#   $MCom: ports/trunk/deskutils/gucharmap/Makefile 20012 2014-10-22 05:38:08Z gusi $
 
 PORTNAME=	gucharmap
-PORTVERSION=	2.32.1
-PORTREVISION=	2
+PORTVERSION=	3.14.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Unicode/ISO10646 character map and font viewer
 
-LIB_DEPENDS=	librarian.so:${PORTSDIR}/textproc/rarian
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
+		appdata-tools>=0:${PORTSDIR}/devel/appdata-tools
 
-USES=		gettext pkgconfig gmake libtool pathfix tar:bzip2
-USE_GNOME=	gnomeprefix intlhack gtk20 gnomedocutils gconf2
+USES=		desktop-file-utils gettext gmake libtool pathfix \
+		pkgconfig tar:xz
+USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--disable-Bsymbolic
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
-GCONF_SCHEMAS=	gucharmap.schemas
+GLIB_SCHEMAS=	org.gnome.Charmap.enums.xml org.gnome.Charmap.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 92ddc91dda5d..1c992c1f8b39 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gucharmap-2.32.1.tar.bz2) = fdef066f35f4301bc128b91f15a30d64a2459721cb50daa53f923789df315c28
-SIZE (gnome2/gucharmap-2.32.1.tar.bz2) = 3242939
+SHA256 (gnome3/gucharmap-3.14.0.tar.xz) = 7aeda976f0db68f923291717a166456da6d1c765fee6838e0d9432cea74749c8
+SIZE (gnome3/gucharmap-3.14.0.tar.xz) = 1983364
diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist
index d95e0042436d..4826419c4834 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -1,87 +1,64 @@
 bin/charmap
 bin/gnome-character-map
 bin/gucharmap
-include/gucharmap-2.0/gucharmap/gucharmap-block-chapters-model.h
-include/gucharmap-2.0/gucharmap/gucharmap-block-codepoint-list.h
-include/gucharmap-2.0/gucharmap/gucharmap-chapters-model.h
-include/gucharmap-2.0/gucharmap/gucharmap-chapters-view.h
-include/gucharmap-2.0/gucharmap/gucharmap-charmap.h
-include/gucharmap-2.0/gucharmap/gucharmap-chartable.h
-include/gucharmap-2.0/gucharmap/gucharmap-codepoint-list.h
-include/gucharmap-2.0/gucharmap/gucharmap-script-chapters-model.h
-include/gucharmap-2.0/gucharmap/gucharmap-script-codepoint-list.h
-include/gucharmap-2.0/gucharmap/gucharmap-type-builtins.h
-include/gucharmap-2.0/gucharmap/gucharmap-unicode-info.h
-include/gucharmap-2.0/gucharmap/gucharmap.h
-lib/libgucharmap.so
-lib/libgucharmap.so.7
-lib/libgucharmap.so.7.0.0
-libdata/pkgconfig/gucharmap-2.pc
+include/gucharmap-2.90/gucharmap/gucharmap-block-chapters-model.h
+include/gucharmap-2.90/gucharmap/gucharmap-block-codepoint-list.h
+include/gucharmap-2.90/gucharmap/gucharmap-chapters-model.h
+include/gucharmap-2.90/gucharmap/gucharmap-chapters-view.h
+include/gucharmap-2.90/gucharmap/gucharmap-charmap.h
+include/gucharmap-2.90/gucharmap/gucharmap-chartable.h
+include/gucharmap-2.90/gucharmap/gucharmap-codepoint-list.h
+include/gucharmap-2.90/gucharmap/gucharmap-script-chapters-model.h
+include/gucharmap-2.90/gucharmap/gucharmap-script-codepoint-list.h
+include/gucharmap-2.90/gucharmap/gucharmap-type-builtins.h
+include/gucharmap-2.90/gucharmap/gucharmap-unicode-info.h
+include/gucharmap-2.90/gucharmap/gucharmap.h
+lib/girepository-1.0/Gucharmap-2.90.typelib
+lib/libgucharmap_2_90.so
+lib/libgucharmap_2_90.so.7
+lib/libgucharmap_2_90.so.7.0.0
+libdata/pkgconfig/gucharmap-2.90.pc
+share/appdata/gucharmap.appdata.xml
 share/applications/gucharmap.desktop
-share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/C/figures/gucharmap_window.png
-share/gnome/help/gucharmap/C/gucharmap.xml
-share/gnome/help/gucharmap/C/legal.xml
-share/gnome/help/gucharmap/bg/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/bg/figures/gucharmap_window.png
-share/gnome/help/gucharmap/bg/gucharmap.xml
-share/gnome/help/gucharmap/ca/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/ca/figures/gucharmap_window.png
-share/gnome/help/gucharmap/ca/gucharmap.xml
-share/gnome/help/gucharmap/cs/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/cs/figures/gucharmap_window.png
-share/gnome/help/gucharmap/cs/gucharmap.xml
-share/gnome/help/gucharmap/de/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/de/figures/gucharmap_window.png
-share/gnome/help/gucharmap/de/gucharmap.xml
-share/gnome/help/gucharmap/el/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/el/figures/gucharmap_window.png
-share/gnome/help/gucharmap/el/gucharmap.xml
-share/gnome/help/gucharmap/en_GB/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/en_GB/figures/gucharmap_window.png
-share/gnome/help/gucharmap/en_GB/gucharmap.xml
-share/gnome/help/gucharmap/es/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/es/figures/gucharmap_window.png
-share/gnome/help/gucharmap/es/gucharmap.xml
-share/gnome/help/gucharmap/fi/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/fi/figures/gucharmap_window.png
-share/gnome/help/gucharmap/fi/gucharmap.xml
-share/gnome/help/gucharmap/fr/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/fr/figures/gucharmap_window.png
-share/gnome/help/gucharmap/fr/gucharmap.xml
-share/gnome/help/gucharmap/it/figures/gucharmap_window.png
-share/gnome/help/gucharmap/it/gucharmap.xml
-share/gnome/help/gucharmap/it/legal.xml
-share/gnome/help/gucharmap/ja/figures/gucharmap_window.png
-share/gnome/help/gucharmap/ja/gucharmap.xml
-share/gnome/help/gucharmap/ja/legal.xml
-share/gnome/help/gucharmap/ko/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/ko/figures/gucharmap_window.png
-share/gnome/help/gucharmap/ko/gucharmap.xml
-share/gnome/help/gucharmap/oc/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/oc/figures/gucharmap_window.png
-share/gnome/help/gucharmap/oc/gucharmap.xml
-share/gnome/help/gucharmap/pt_BR/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/pt_BR/figures/gucharmap_window.png
-share/gnome/help/gucharmap/pt_BR/gucharmap.xml
-share/gnome/help/gucharmap/ru/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/ru/figures/gucharmap_window.png
-share/gnome/help/gucharmap/ru/gucharmap.xml
-share/gnome/help/gucharmap/sv/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/sv/figures/gucharmap_window.png
-share/gnome/help/gucharmap/sv/gucharmap.xml
-share/gnome/help/gucharmap/vi/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/vi/figures/gucharmap_window.png
-share/gnome/help/gucharmap/vi/gucharmap.xml
-share/gnome/help/gucharmap/zh_CN/figures/gucharmap_start_window.png
-share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png
-share/gnome/help/gucharmap/zh_CN/gucharmap.xml
-share/gnome/help/gucharmap/zh_HK/figures/gucharmap_window.png
-share/gnome/help/gucharmap/zh_HK/gucharmap.xml
-share/gnome/help/gucharmap/zh_HK/legal.xml
-share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png
-share/gnome/help/gucharmap/zh_TW/gucharmap.xml
-share/gnome/help/gucharmap/zh_TW/legal.xml
+share/gir-1.0/Gucharmap-2.90.gir
+share/help/C/gucharmap/index.docbook
+share/help/C/gucharmap/legal.xml
+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/index.docbook
+share/help/cs/gucharmap/legal.xml
+share/help/de/gucharmap/index.docbook
+share/help/de/gucharmap/legal.xml
+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/index.docbook
+share/help/es/gucharmap/legal.xml
+share/help/fi/gucharmap/index.docbook
+share/help/fi/gucharmap/legal.xml
+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/ko/gucharmap/index.docbook
+share/help/ko/gucharmap/legal.xml
+share/help/oc/gucharmap/index.docbook
+share/help/oc/gucharmap/legal.xml
+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/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/index.docbook
+share/help/zh_CN/gucharmap/legal.xml
 share/locale/af/LC_MESSAGES/gucharmap.mo
 share/locale/am/LC_MESSAGES/gucharmap.mo
 share/locale/ar/LC_MESSAGES/gucharmap.mo
@@ -158,8 +135,10 @@ share/locale/sr@latin/LC_MESSAGES/gucharmap.mo
 share/locale/sv/LC_MESSAGES/gucharmap.mo
 share/locale/ta/LC_MESSAGES/gucharmap.mo
 share/locale/te/LC_MESSAGES/gucharmap.mo
+share/locale/tg/LC_MESSAGES/gucharmap.mo
 share/locale/th/LC_MESSAGES/gucharmap.mo
 share/locale/tr/LC_MESSAGES/gucharmap.mo
+share/locale/ug/LC_MESSAGES/gucharmap.mo
 share/locale/uk/LC_MESSAGES/gucharmap.mo
 share/locale/vi/LC_MESSAGES/gucharmap.mo
 share/locale/wa/LC_MESSAGES/gucharmap.mo
@@ -167,24 +146,3 @@ share/locale/xh/LC_MESSAGES/gucharmap.mo
 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/omf/gucharmap/gucharmap-C.omf
-share/omf/gucharmap/gucharmap-bg.omf
-share/omf/gucharmap/gucharmap-ca.omf
-share/omf/gucharmap/gucharmap-cs.omf
-share/omf/gucharmap/gucharmap-de.omf
-share/omf/gucharmap/gucharmap-el.omf
-share/omf/gucharmap/gucharmap-en_GB.omf
-share/omf/gucharmap/gucharmap-es.omf
-share/omf/gucharmap/gucharmap-fi.omf
-share/omf/gucharmap/gucharmap-fr.omf
-share/omf/gucharmap/gucharmap-it.omf
-share/omf/gucharmap/gucharmap-ja.omf
-share/omf/gucharmap/gucharmap-ko.omf
-share/omf/gucharmap/gucharmap-oc.omf
-share/omf/gucharmap/gucharmap-pt_BR.omf
-share/omf/gucharmap/gucharmap-ru.omf
-share/omf/gucharmap/gucharmap-sv.omf
-share/omf/gucharmap/gucharmap-vi.omf
-share/omf/gucharmap/gucharmap-zh_CN.omf
-share/omf/gucharmap/gucharmap-zh_HK.omf
-share/omf/gucharmap/gucharmap-zh_TW.omf