Update appstream-glib to 0.5.4.

Switch from custom code to using USES=libarchive.
Adjust BUILD_DEPEND lines in where needed.

5 files changed, 62 insertions, 51 deletions

diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
index 9dd7146d2f38..fb71769ff343 100644
--- a/devel/appstream-glib/Makefile
+++ b/devel/appstream-glib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	appstream-glib
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5.4
 CATEGORIES=	devel
 MASTER_SITES=	http://people.freedesktop.org/~hughsient/appstream-glib/releases/
 DIST_SUBDIR=	gnome3
@@ -21,7 +21,8 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	gcab:${PORTSDIR}/archivers/gcab
 
-USES=		gettext gperf gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gperf gmake libarchive libtool pathfix \
+		pkgconfig tar:xz
 USE_GNOME=	gdkpixbuf2 glib20 gtk30 intlhack introspection:build \
 		libxml2:build pango
 USE_LDCONFIG=	yes
@@ -44,10 +45,6 @@ MANPAGES_USE=	GNOME=libxslt:build
 
 .include <bsd.port.options.mk>
 
-.if !exists(/usr/libdata/pkgconfig/libarchive.pc)
-LIB_DEPENDS+=	libarchive.so.13:${PORTSDIR}/archivers/libarchive
-.endif
-
 .if ${OSVERSION} < 1000000 && ${OPSYS} == FreeBSD
 post-patch:
 	${REINPLACE_CMD} -e 's|-Wtype-limits||g' \
diff --git a/devel/appstream-glib/distinfo b/devel/appstream-glib/distinfo
index 70c43a6eeb41..29b0273c782e 100644
--- a/devel/appstream-glib/distinfo
+++ b/devel/appstream-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/appstream-glib-0.4.1.tar.xz) = e999383cd7ab1875b345f738789cb0fe55faa5caebdf4de6507aead649592ada
-SIZE (gnome3/appstream-glib-0.4.1.tar.xz) = 1822324
+SHA256 (gnome3/appstream-glib-0.5.4.tar.xz) = c7d21f92ec8d85656066ecc55dfb9dbd6ec4ae10ebffd5f8267ec7687d8060d7
+SIZE (gnome3/appstream-glib-0.5.4.tar.xz) = 1854284
diff --git a/devel/appstream-glib/pkg-plist b/devel/appstream-glib/pkg-plist
index 8e0fa7da2936..7890991e8f59 100644
--- a/devel/appstream-glib/pkg-plist
+++ b/devel/appstream-glib/pkg-plist
@@ -1,4 +1,3 @@
-bin/appdata-validate
 bin/appstream-builder
 bin/appstream-util
 include/libappstream-builder/appstream-builder.h
@@ -6,12 +5,14 @@ include/libappstream-builder/asb-app.h
 include/libappstream-glib/appstream-glib.h
 include/libappstream-glib/as-app.h
 include/libappstream-glib/as-bundle.h
+include/libappstream-glib/as-checksum.h
 include/libappstream-glib/as-enums.h
 include/libappstream-glib/as-icon.h
 include/libappstream-glib/as-image.h
 include/libappstream-glib/as-inf.h
 include/libappstream-glib/as-node.h
 include/libappstream-glib/as-problem.h
+include/libappstream-glib/as-profile.h
 include/libappstream-glib/as-provide.h
 include/libappstream-glib/as-release.h
 include/libappstream-glib/as-screenshot.h
@@ -19,52 +20,42 @@ include/libappstream-glib/as-store.h
 include/libappstream-glib/as-tag.h
 include/libappstream-glib/as-utils.h
 include/libappstream-glib/as-version.h
-lib/asb-plugins-2/libasb_plugin_absorb.a
-lib/asb-plugins-2/libasb_plugin_absorb.so
-lib/asb-plugins-2/libasb_plugin_appdata.a
-lib/asb-plugins-2/libasb_plugin_appdata.so
-lib/asb-plugins-2/libasb_plugin_blacklist.a
-lib/asb-plugins-2/libasb_plugin_blacklist.so
-lib/asb-plugins-2/libasb_plugin_dbus.a
-lib/asb-plugins-2/libasb_plugin_dbus.so
-lib/asb-plugins-2/libasb_plugin_desktop.a
-lib/asb-plugins-2/libasb_plugin_desktop.so
-lib/asb-plugins-2/libasb_plugin_firmware.a
-lib/asb-plugins-2/libasb_plugin_firmware.so
-lib/asb-plugins-2/libasb_plugin_font.a
-lib/asb-plugins-2/libasb_plugin_font.so
-lib/asb-plugins-2/libasb_plugin_gettext.a
-lib/asb-plugins-2/libasb_plugin_gettext.so
-lib/asb-plugins-2/libasb_plugin_gir.a
-lib/asb-plugins-2/libasb_plugin_gir.so
-lib/asb-plugins-2/libasb_plugin_gresource.a
-lib/asb-plugins-2/libasb_plugin_gresource.so
-lib/asb-plugins-2/libasb_plugin_gstreamer.a
-lib/asb-plugins-2/libasb_plugin_gstreamer.so
-lib/asb-plugins-2/libasb_plugin_hardcoded.a
-lib/asb-plugins-2/libasb_plugin_hardcoded.so
-lib/asb-plugins-2/libasb_plugin_ibus_sql.a
-lib/asb-plugins-2/libasb_plugin_ibus_sql.so
-lib/asb-plugins-2/libasb_plugin_ibus_xml.a
-lib/asb-plugins-2/libasb_plugin_ibus_xml.so
-lib/asb-plugins-2/libasb_plugin_kde_notifyrc.a
-lib/asb-plugins-2/libasb_plugin_kde_notifyrc.so
-lib/asb-plugins-2/libasb_plugin_kde_services.a
-lib/asb-plugins-2/libasb_plugin_kde_services.so
-lib/asb-plugins-2/libasb_plugin_metainfo.a
-lib/asb-plugins-2/libasb_plugin_metainfo.so
-lib/asb-plugins-2/libasb_plugin_nm.a
-lib/asb-plugins-2/libasb_plugin_nm.so
+lib/asb-plugins-4/libasb_plugin_absorb.a
+lib/asb-plugins-4/libasb_plugin_absorb.so
+lib/asb-plugins-4/libasb_plugin_appdata.a
+lib/asb-plugins-4/libasb_plugin_appdata.so
+lib/asb-plugins-4/libasb_plugin_dbus.a
+lib/asb-plugins-4/libasb_plugin_dbus.so
+lib/asb-plugins-4/libasb_plugin_desktop.a
+lib/asb-plugins-4/libasb_plugin_desktop.so
+lib/asb-plugins-4/libasb_plugin_font.a
+lib/asb-plugins-4/libasb_plugin_font.so
+lib/asb-plugins-4/libasb_plugin_gettext.a
+lib/asb-plugins-4/libasb_plugin_gettext.so
+lib/asb-plugins-4/libasb_plugin_gir.a
+lib/asb-plugins-4/libasb_plugin_gir.so
+lib/asb-plugins-4/libasb_plugin_gresource.a
+lib/asb-plugins-4/libasb_plugin_gresource.so
+lib/asb-plugins-4/libasb_plugin_gstreamer.a
+lib/asb-plugins-4/libasb_plugin_gstreamer.so
+lib/asb-plugins-4/libasb_plugin_hardcoded.a
+lib/asb-plugins-4/libasb_plugin_hardcoded.so
+lib/asb-plugins-4/libasb_plugin_kde_notifyrc.a
+lib/asb-plugins-4/libasb_plugin_kde_notifyrc.so
+lib/asb-plugins-4/libasb_plugin_kde_services.a
+lib/asb-plugins-4/libasb_plugin_kde_services.so
+lib/asb-plugins-4/libasb_plugin_nm.a
+lib/asb-plugins-4/libasb_plugin_nm.so
 lib/girepository-1.0/AppStreamBuilder-1.0.typelib
 lib/girepository-1.0/AppStreamGlib-1.0.typelib
 lib/libappstream-builder.a
 lib/libappstream-builder.so
-lib/libappstream-builder.so.7
-lib/libappstream-builder.so.7.0.5
+lib/libappstream-builder.so.8
+lib/libappstream-builder.so.8.0.2
 lib/libappstream-glib.a
 lib/libappstream-glib.so
-lib/libappstream-glib.so.7
-lib/libappstream-glib.so.7.0.5
+lib/libappstream-glib.so.8
+lib/libappstream-glib.so.8.0.2
 libdata/pkgconfig/appstream-builder.pc
 libdata/pkgconfig/appstream-glib.pc
 %%MANPAGES%%man/man1/appstream-builder.1.gz
@@ -76,6 +67,7 @@ share/bash-completion/completions/appstream-util
 share/gir-1.0/AppStreamBuilder-1.0.gir
 share/gir-1.0/AppStreamGlib-1.0.gir
 share/gtk-doc/html/appstream-glib/AsApp.html
+share/gtk-doc/html/appstream-glib/AsChecksum.html
 share/gtk-doc/html/appstream-glib/AsIcon.html
 share/gtk-doc/html/appstream-glib/AsImage.html
 share/gtk-doc/html/appstream-glib/AsProblem.html
@@ -103,4 +95,26 @@ share/gtk-doc/html/appstream-glib/up-insensitive.png
 share/gtk-doc/html/appstream-glib/up.png
 share/installed-tests/appstream-glib/appdata-validate.test
 share/installed-tests/appstream-glib/destdir-check.test
+share/locale/ca/LC_MESSAGES/appstream-glib.mo
+share/locale/cs/LC_MESSAGES/appstream-glib.mo
+share/locale/da/LC_MESSAGES/appstream-glib.mo
+share/locale/de/LC_MESSAGES/appstream-glib.mo
+share/locale/en_GB/LC_MESSAGES/appstream-glib.mo
+share/locale/es/LC_MESSAGES/appstream-glib.mo
+share/locale/fi/LC_MESSAGES/appstream-glib.mo
+share/locale/fr/LC_MESSAGES/appstream-glib.mo
+share/locale/gl/LC_MESSAGES/appstream-glib.mo
+share/locale/hu/LC_MESSAGES/appstream-glib.mo
+share/locale/it/LC_MESSAGES/appstream-glib.mo
+share/locale/ko/LC_MESSAGES/appstream-glib.mo
+share/locale/pl/LC_MESSAGES/appstream-glib.mo
+share/locale/pt_BR/LC_MESSAGES/appstream-glib.mo
 share/locale/ru/LC_MESSAGES/appstream-glib.mo
+share/locale/sk/LC_MESSAGES/appstream-glib.mo
+share/locale/sl/LC_MESSAGES/appstream-glib.mo
+share/locale/sr/LC_MESSAGES/appstream-glib.mo
+share/locale/sr@latin/LC_MESSAGES/appstream-glib.mo
+share/locale/sv/LC_MESSAGES/appstream-glib.mo
+share/locale/tr/LC_MESSAGES/appstream-glib.mo
+share/locale/uk/LC_MESSAGES/appstream-glib.mo
+share/locale/zh_TW/LC_MESSAGES/appstream-glib.mo
diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile
index d939128521e2..c49f982581a4 100644
--- a/games/aisleriot/Makefile
+++ b/games/aisleriot/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of patience games written in guile scheme
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		appdata-validate:${PORTSDIR}/devel/appstream-glib \
+		appstream-builder:${PORTSDIR}/devel/appstream-glib \
 		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2 \
 		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index d1b33ec2de5d..2eacf874281d 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Terminal component for the GNOME 3 Desktop
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		itstool:${PORTSDIR}/textproc/itstool \
-		appdata-validate:${PORTSDIR}/devel/appstream-glib \
+		appstream-builder:${PORTSDIR}/devel/appstream-glib \
 		vala:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid