Update appdata-tools to 0.18.0. Say also 'Hello!' to appstream-glib, which

is needed by appdata-tools.

For both ports, ensure NOCONFIGURE=yes is set by using ${SETENV}

For appstream-glib, remove libarchive from the configure.ac and add -larchive
to the LDFLAGS to use the version we have in base.


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

7 files changed, 131 insertions, 7 deletions

diff --git a/devel/appdata-tools/Makefile b/devel/appdata-tools/Makefile
index 922773f21..51a02db58 100644
--- a/devel/appdata-tools/Makefile
+++ b/devel/appdata-tools/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	appdata-tools
-PORTVERSION=	0.1.7
+PORTVERSION=	0.1.8
 CATEGORIES=	devel
 DIST_SUBDIR=	gnome3
 
@@ -12,21 +12,23 @@ WRKSRC=		${WRKDIR}/hughsie-appdata-tools-${GH_COMMIT}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	AppData is a subset of AppStream
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+		libappstream-glib.so:${PORTSDIR}/devel/appstream-glib
 
 GH_ACCOUNT=	hughsie
 GH_PROJECT=	appdata-tools
-GH_COMMIT=      b364e3e
+GH_COMMIT=      c1238e3
 GH_TAGNAME=	${GH_COMMIT}
 
 GNU_CONFIGURE=	yes
+PATHFIX_MAKEFILEIN=	Makefile.am
 #CONFIGURE_ARGS=	--enable-introspection=yes
 USE_GITHUB=	yes
-USES=		autoreconf gmake libtool pathfix pkgconfig
+USES=		autoreconf:build gmake libtool pathfix pkgconfig
 USE_GNOME=	gdkpixbuf2 glib20 gnomehier intlhack introspection:build
 USE_LDCONFIG=	yes
 
 pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
+	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
 
 .include <bsd.port.mk>
diff --git a/devel/appdata-tools/distinfo b/devel/appdata-tools/distinfo
index d85e859df..9c30abb5d 100644
--- a/devel/appdata-tools/distinfo
+++ b/devel/appdata-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/appdata-tools-0.1.7.tar.gz) = 8746177f8ef4cb6babdb7663240ebf9fd381196834fd0c9436896fc261898f3b
-SIZE (gnome3/appdata-tools-0.1.7.tar.gz) = 124584
+SHA256 (gnome3/appdata-tools-0.1.8.tar.gz) = 2a224a83dc88ddda1834b2f11837332a2a0721c2666bab44c96f648534291340
+SIZE (gnome3/appdata-tools-0.1.8.tar.gz) = 113538
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
new file mode 100644
index 000000000..dc4cbb344
--- /dev/null
+++ b/devel/appstream-glib/Makefile
@@ -0,0 +1,35 @@
+# Created by: FreeBSD GNOME Team <gnome@freebsd.org>
+# $FreeBSD$
+#   $MCom$
+
+PORTNAME=	appstream-glib
+PORTVERSION=	0.2.6
+CATEGORIES=	devel
+DIST_SUBDIR=	gnome3
+
+WRKSRC=		${WRKDIR}/hughsie-appstream-glib-${GH_COMMIT}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Library to help with AppStream metadata
+
+BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
+LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+
+GH_ACCOUNT=	hughsie
+GH_PROJECT=	appstream-glib
+GH_COMMIT=      f4f3230
+GH_TAGNAME=	${GH_COMMIT}
+
+GNU_CONFIGURE=	yes
+USE_GITHUB=	yes
+USES=		autoreconf:build gmake libtool pathfix pkgconfig
+USE_GNOME=	gdkpixbuf2 glib20 gnomehier gtk30 intlhack
+USE_LDCONFIG=	yes
+PATHFIX_MAKEFILEIN=	Makefile.am
+LDFLAGS+=	-larchive
+INSTALL_TARGET=	install-strip
+
+pre-configure:
+	cd ${WRKSRC} && intltoolize -f -c && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
+
+.include <bsd.port.mk>
diff --git a/devel/appstream-glib/distinfo b/devel/appstream-glib/distinfo
new file mode 100644
index 000000000..dfa5076d8
--- /dev/null
+++ b/devel/appstream-glib/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/appstream-glib-0.2.6.tar.gz) = 3a0b1827c8b2ba5f315cbe47a44a52c1a87879545fad6d6674b3de8d213579cb
+SIZE (gnome3/appstream-glib-0.2.6.tar.gz) = 1755005
diff --git a/devel/appstream-glib/files/patch-configure.ac b/devel/appstream-glib/files/patch-configure.ac
new file mode 100644
index 000000000..4fbbc9a9b
--- /dev/null
+++ b/devel/appstream-glib/files/patch-configure.ac
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2014-10-21 08:42:44.875520834 +0200
++++ configure.ac	2014-10-21 08:42:55.278520321 +0200
+@@ -123,7 +123,6 @@
+ AM_CONDITIONAL(HAVE_GPERF, [test x$GPERF != xno])
+ 
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.1 gio-2.0 gobject-2.0 gthread-2.0 gio-unix-2.0 gmodule-2.0)
+-PKG_CHECK_MODULES(LIBARCHIVE, libarchive)
+ PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.24)
+ PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0 >= 2.14 gtk+-3.0)
+ PKG_CHECK_MODULES(SQLITE, sqlite3)
diff --git a/devel/appstream-glib/pkg-descr b/devel/appstream-glib/pkg-descr
new file mode 100644
index 000000000..b2416f5af
--- /dev/null
+++ b/devel/appstream-glib/pkg-descr
@@ -0,0 +1,4 @@
+This library provides objects and helper methods to help 
+reading and writing AppStream metadata.
+
+WWW: https://github.com/hughsie/appstream-glib/
diff --git a/devel/appstream-glib/pkg-plist b/devel/appstream-glib/pkg-plist
new file mode 100644
index 000000000..9a9ffe90a
--- /dev/null
+++ b/devel/appstream-glib/pkg-plist
@@ -0,0 +1,71 @@
+bin/appstream-builder
+bin/appstream-util
+include/libappstream-builder/appstream-builder.h
+include/libappstream-builder/asb-app.h
+include/libappstream-glib/appstream-glib.h
+include/libappstream-glib/as-app.h
+include/libappstream-glib/as-enums.h
+include/libappstream-glib/as-image.h
+include/libappstream-glib/as-node.h
+include/libappstream-glib/as-problem.h
+include/libappstream-glib/as-provide.h
+include/libappstream-glib/as-release.h
+include/libappstream-glib/as-screenshot.h
+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/libasb_plugin_absorb.a
+lib/asb-plugins/libasb_plugin_absorb.so
+lib/asb-plugins/libasb_plugin_appdata.a
+lib/asb-plugins/libasb_plugin_appdata.so
+lib/asb-plugins/libasb_plugin_blacklist.a
+lib/asb-plugins/libasb_plugin_blacklist.so
+lib/asb-plugins/libasb_plugin_dbus.a
+lib/asb-plugins/libasb_plugin_dbus.so
+lib/asb-plugins/libasb_plugin_desktop.a
+lib/asb-plugins/libasb_plugin_desktop.so
+lib/asb-plugins/libasb_plugin_font.a
+lib/asb-plugins/libasb_plugin_font.so
+lib/asb-plugins/libasb_plugin_gettext.a
+lib/asb-plugins/libasb_plugin_gettext.so
+lib/asb-plugins/libasb_plugin_gir.a
+lib/asb-plugins/libasb_plugin_gir.so
+lib/asb-plugins/libasb_plugin_gresource.a
+lib/asb-plugins/libasb_plugin_gresource.so
+lib/asb-plugins/libasb_plugin_gstreamer.a
+lib/asb-plugins/libasb_plugin_gstreamer.so
+lib/asb-plugins/libasb_plugin_hardcoded.a
+lib/asb-plugins/libasb_plugin_hardcoded.so
+lib/asb-plugins/libasb_plugin_ibus_sql.a
+lib/asb-plugins/libasb_plugin_ibus_sql.so
+lib/asb-plugins/libasb_plugin_ibus_xml.a
+lib/asb-plugins/libasb_plugin_ibus_xml.so
+lib/asb-plugins/libasb_plugin_kde_notifyrc.a
+lib/asb-plugins/libasb_plugin_kde_notifyrc.so
+lib/asb-plugins/libasb_plugin_kde_services.a
+lib/asb-plugins/libasb_plugin_kde_services.so
+lib/asb-plugins/libasb_plugin_metainfo.a
+lib/asb-plugins/libasb_plugin_metainfo.so
+lib/asb-plugins/libasb_plugin_nm.a
+lib/asb-plugins/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.1
+lib/libappstream-builder.so.1.5.6
+lib/libappstream-glib.a
+lib/libappstream-glib.so
+lib/libappstream-glib.so.1
+lib/libappstream-glib.so.1.5.6
+lib/locale/ru/LC_MESSAGES/appstream-glib.mo
+libdata/pkgconfig/appstream-builder.pc
+libdata/pkgconfig/appstream-glib.pc
+share/aclocal/appstream-xml.m4
+share/bash-completion/completions/appstream-builder
+share/bash-completion/completions/appstream-util
+share/gir-1.0/AppStreamBuilder-1.0.gir
+share/gir-1.0/AppStreamGlib-1.0.gir
+share/installed-tests/appstream-glib/appdata-validate.test
+share/installed-tests/appstream-glib/destdir-check.test