Update gucharmap to 3.14.0. Pull in appdata-tools and remove

desktop-file-utils.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19976 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 7 insertions, 86 deletions

diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index fc9db6b6e..95814966c 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gucharmap
-PORTVERSION=	3.12.1
-PORTREVISION=	1
+PORTVERSION=	3.14.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,16 +11,16 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Unicode/ISO10646 character map and font viewer
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
+		appdata-tools>=0:${PORTSDIR}/devel/appdata-tools
 
-USES=		desktop-file-utils gettext gmake libtool pathfix \
-		pkgconfig tar:xz
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-Bsymbolic
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.Charmap.enums.xml org.gnome.Charmap.gschema.xml
diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo
index 8e3fe158c..1c992c1f8 100644
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gucharmap-3.12.1.tar.xz) = 5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9
-SIZE (gnome3/gucharmap-3.12.1.tar.xz) = 1918188
+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 95416cc1b..4826419c4 100644
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@@ -146,81 +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
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mi/LC_MESSAGES
-@dirrmtry share/locale/mi
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm share/help/zh_CN/gucharmap
-@dirrmtry share/help/zh_CN
-@dirrm share/help/vi/gucharmap
-@dirrmtry share/help/vi
-@dirrm share/help/sv/gucharmap
-@dirrmtry share/help/sv
-@dirrm share/help/sl/gucharmap
-@dirrmtry share/help/sl
-@dirrm share/help/ru/gucharmap
-@dirrmtry share/help/ru
-@dirrm share/help/pt_BR/gucharmap
-@dirrmtry share/help/pt_BR
-@dirrm share/help/oc/gucharmap
-@dirrmtry share/help/oc
-@dirrm share/help/ko/gucharmap
-@dirrmtry share/help/ko
-@dirrm share/help/gl/gucharmap
-@dirrmtry share/help/gl
-@dirrm share/help/fr/gucharmap
-@dirrmtry share/help/fr
-@dirrm share/help/fi/gucharmap
-@dirrmtry share/help/fi
-@dirrm share/help/es/gucharmap
-@dirrmtry share/help/es
-@dirrm share/help/en_GB/gucharmap
-@dirrmtry share/help/en_GB
-@dirrm share/help/el/gucharmap
-@dirrmtry share/help/el
-@dirrm share/help/de/gucharmap
-@dirrmtry share/help/de
-@dirrm share/help/cs/gucharmap
-@dirrmtry share/help/cs
-@dirrm share/help/ca/gucharmap
-@dirrmtry share/help/ca
-@dirrm share/help/bg/gucharmap
-@dirrmtry share/help/bg
-@dirrm share/help/C/gucharmap
-@dirrmtry share/help/C
-@dirrmtry share/help
-@dirrmtry share/appdata
-@dirrm include/gucharmap-2.90/gucharmap
-@dirrm include/gucharmap-2.90