Update to 1.3

* Reflect reality to USE_TOOLS
* Remove msgfmt --xml and --desktop

Changelog:
Not available

4 files changed, 49 insertions, 11 deletions

diff --git a/net/corebird/Makefile b/net/corebird/Makefile
index 9cde4dc2a60..5f0da80efbf 100644
--- a/net/corebird/Makefile
+++ b/net/corebird/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2016/08/03 10:23:13 adam Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/05 15:12:56 ryoon Exp $
 
-DISTNAME=	corebird-1.2.2
-PKGREVISION=	1
+DISTNAME=	corebird-1.3
 CATEGORIES=	net
 MASTER_SITES=	-https://github.com/baedert/corebird/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
@@ -14,7 +13,7 @@ USE_LIBTOOL=	yes
 USE_LANGUAGES=	c
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	autogen.sh
-USE_TOOLS+=	autoconf automake intltool gettext-m4 pkg-config gmake msgfmt
+USE_TOOLS+=	autoconf automake autopoint gettext-m4 pkg-config gmake msgfmt
 
 .include "options.mk"
 
diff --git a/net/corebird/PLIST b/net/corebird/PLIST
index 9e8e44d57a8..98669a88114 100644
--- a/net/corebird/PLIST
+++ b/net/corebird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/03/05 09:40:53 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/09/05 15:12:56 ryoon Exp $
 bin/corebird
 man/man1/corebird.1
 share/appdata/org.baedert.corebird.appdata.xml
@@ -20,17 +20,27 @@ share/locale/ca@valencia/LC_MESSAGES/corebird.mo
 share/locale/de/LC_MESSAGES/corebird.mo
 share/locale/en_AU/LC_MESSAGES/corebird.mo
 share/locale/es/LC_MESSAGES/corebird.mo
+share/locale/es_419/LC_MESSAGES/corebird.mo
+share/locale/es_MX/LC_MESSAGES/corebird.mo
 share/locale/es_VE/LC_MESSAGES/corebird.mo
 share/locale/fa/LC_MESSAGES/corebird.mo
 share/locale/fi/LC_MESSAGES/corebird.mo
 share/locale/fr/LC_MESSAGES/corebird.mo
+share/locale/hi/LC_MESSAGES/corebird.mo
 share/locale/hu/LC_MESSAGES/corebird.mo
-share/locale/id_ID/LC_MESSAGES/corebird.mo
+share/locale/id/LC_MESSAGES/corebird.mo
 share/locale/it/LC_MESSAGES/corebird.mo
 share/locale/ja/LC_MESSAGES/corebird.mo
+share/locale/ko/LC_MESSAGES/corebird.mo
 share/locale/lt/LC_MESSAGES/corebird.mo
 share/locale/nl/LC_MESSAGES/corebird.mo
 share/locale/pl/LC_MESSAGES/corebird.mo
+share/locale/pt/LC_MESSAGES/corebird.mo
 share/locale/pt_BR/LC_MESSAGES/corebird.mo
+share/locale/ro/LC_MESSAGES/corebird.mo
 share/locale/ru/LC_MESSAGES/corebird.mo
+share/locale/sr/LC_MESSAGES/corebird.mo
+share/locale/tr/LC_MESSAGES/corebird.mo
+share/locale/uk_UA/LC_MESSAGES/corebird.mo
 share/locale/zh_CN/LC_MESSAGES/corebird.mo
+share/locale/zh_TW/LC_MESSAGES/corebird.mo
diff --git a/net/corebird/distinfo b/net/corebird/distinfo
index 0c12e6ae464..a2d7e1f4819 100644
--- a/net/corebird/distinfo
+++ b/net/corebird/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2016/05/29 18:34:44 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2016/09/05 15:12:56 ryoon Exp $
 
-SHA1 (corebird-1.2.2.tar.gz) = 0eef7e210167dbb8bbe471fa075f06d01c2b1b50
-RMD160 (corebird-1.2.2.tar.gz) = ab0785c0ae3150689d1f4c9295a843f6c8cc0bcc
-SHA512 (corebird-1.2.2.tar.gz) = 57a0c5cf212f3b190e8db8e946b1eab8c737e7ed39bf9aa5ebdce936517425a76a2948bd953838d9ae7a56d5b654539638dae35688d672e5551c854ca4eb9b76
-Size (corebird-1.2.2.tar.gz) = 423551 bytes
+SHA1 (corebird-1.3.tar.gz) = b2669bc794bfea2b5caa236221d91068406e458e
+RMD160 (corebird-1.3.tar.gz) = bcca0b305c7eede7ae5f3d1eb571f4acd09ffae2
+SHA512 (corebird-1.3.tar.gz) = b938213812c7c31877798e80cad5485d09a9f3640722e924d35662613ed0651f4df6f915839d43eb18c0752df355fac152f3c28fc765b98afd21ae57dab5c03b
+Size (corebird-1.3.tar.gz) = 431652 bytes
+SHA1 (patch-data_Makefile.am) = c6e4939d567336855a5768c7fa0457d6a8a7dbdc
diff --git a/net/corebird/patches/patch-data_Makefile.am b/net/corebird/patches/patch-data_Makefile.am
new file mode 100644
index 00000000000..510df12d923
--- /dev/null
+++ b/net/corebird/patches/patch-data_Makefile.am
@@ -0,0 +1,28 @@
+$NetBSD: patch-data_Makefile.am,v 1.1 2016/09/05 15:12:56 ryoon Exp $
+
+* Workarounf for a lack of 'msgfmt --xml' and 'msgfmt --desktop'
+
+--- data/Makefile.am.orig	2016-07-31 06:42:48.000000000 +0000
++++ data/Makefile.am
+@@ -9,13 +9,17 @@ appdatadir = $(datarootdir)/appdata
+ appdata_in_files = org.baedert.corebird.appdata.xml.in
+ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+ 
++#%.desktop: %.desktop.in
++#	msgfmt --desktop -d $(top_srcdir)/po \
++#	--template $< -o $@
+ %.desktop: %.desktop.in
+-	msgfmt --desktop -d $(top_srcdir)/po \
+-	--template $< -o $@
++	cp $^ $@
+ 
++#%.appdata.xml: %.appdata.xml.in
++#	msgfmt --xml -d $(top_srcdir)/po \
++#	--template $< -o $@
+ %.appdata.xml: %.appdata.xml.in
+-	msgfmt --xml -d $(top_srcdir)/po \
+-	--template $< -o $@
++	cp $^ $@
+ 
+ # Actually, just ignore gschema translations...
+ org.baedert.corebird.gschema.xml: org.baedert.corebird.gschema.xml.in