Fix build issues pointed out by joerg@

6 files changed, 34 insertions, 9 deletions

diff --git a/sysutils/sunxi-tools/Makefile b/sysutils/sunxi-tools/Makefile
index eba4bc8080f..7791148f839 100644
--- a/sysutils/sunxi-tools/Makefile
+++ b/sysutils/sunxi-tools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2015/10/23 11:01:24 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2015/10/25 09:05:23 bouyer Exp $
 #
 
 VERSION=	20150915
 DISTNAME=	sunxi-tools-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linux-sunxi/}
 GITHUB_PROJECT=	sunxi-tools
@@ -13,7 +14,7 @@ HOMEPAGE=	http://linux-sunxi.org/
 COMMENT=	Tools to help hacking Allwinner A10 (and successors) devices
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 
 INSTALLATION_DIRS=	bin libdata/sunxi-tools
 
diff --git a/sysutils/sunxi-tools/PLIST b/sysutils/sunxi-tools/PLIST
index b96e7a4cda7..c2f7416bab0 100644
--- a/sysutils/sunxi-tools/PLIST
+++ b/sysutils/sunxi-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/10/22 15:51:47 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/10/25 09:05:23 bouyer Exp $
 bin/fexc
 bin/bin2fex
 bin/fex2bin
diff --git a/sysutils/sunxi-tools/distinfo b/sysutils/sunxi-tools/distinfo
index ca24e41dea2..fa84ff97931 100644
--- a/sysutils/sunxi-tools/distinfo
+++ b/sysutils/sunxi-tools/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2015/10/22 15:51:47 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2015/10/25 09:05:23 bouyer Exp $
 
 SHA1 (sunxi-tools-20150915-568c7a0e81fc5d52189710c6d832677aa8770b16.tar.gz) = 294576067bea1d7d1c66148870b1a4767881762b
 RMD160 (sunxi-tools-20150915-568c7a0e81fc5d52189710c6d832677aa8770b16.tar.gz) = 6e1318bfea20bd57c740e13b14b1059530df073f
 Size (sunxi-tools-20150915-568c7a0e81fc5d52189710c6d832677aa8770b16.tar.gz) = 51232 bytes
-SHA1 (patch-Makefile) = 3748970711ddd5ed1303d8817961d6ec8641f57d
+SHA1 (patch-Makefile) = e4e54571315dd6614ecab75321586dbecae89a06
 SHA1 (patch-include_endian_compat.h) = f2e6fd1305c25a9b34f26fe70ad223ec5156211b
+SHA1 (patch-phoenix_info.c) = 824a1237dd5652fdd336b1d09eac03f2d3db9209
diff --git a/sysutils/sunxi-tools/patches/patch-Makefile b/sysutils/sunxi-tools/patches/patch-Makefile
index 5f71bf0624d..890f4f3350a 100644
--- a/sysutils/sunxi-tools/patches/patch-Makefile
+++ b/sysutils/sunxi-tools/patches/patch-Makefile
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile,v 1.1 2015/10/22 15:51:47 bouyer Exp $
+$NetBSD: patch-Makefile,v 1.2 2015/10/25 09:05:23 bouyer Exp $
 
 --- Makefile.orig	2015-09-13 22:56:46.000000000 +0200
-+++ Makefile	2015-10-01 16:29:36.000000000 +0200
++++ Makefile	2015-10-25 09:55:26.000000000 +0100
 @@ -18,11 +18,11 @@
  
  CC = gcc
  CFLAGS = -g -O0 -Wall -Wextra
 -CFLAGS += -std=c99 -D_POSIX_C_SOURCE=200112L
-+CFLAGS += -std=c99 -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE
++CFLAGS += -std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE
  CFLAGS += -Iinclude/
  
  TOOLS = fexc bin2fex fex2bin bootinfo fel pio
diff --git a/sysutils/sunxi-tools/patches/patch-include_endian_compat.h b/sysutils/sunxi-tools/patches/patch-include_endian_compat.h
index ef7563ae2a6..b131f3b5d8f 100644
--- a/sysutils/sunxi-tools/patches/patch-include_endian_compat.h
+++ b/sysutils/sunxi-tools/patches/patch-include_endian_compat.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-include_endian_compat.h,v 1.1 2015/10/22 15:51:47 bouyer Exp $
+$NetBSD: patch-include_endian_compat.h,v 1.2 2015/10/25 09:05:23 bouyer Exp $
 
 --- include/endian_compat.h.orig	2015-10-01 16:09:19.000000000 +0200
 +++ include/endian_compat.h	2015-10-01 16:20:48.000000000 +0200
diff --git a/sysutils/sunxi-tools/patches/patch-phoenix_info.c b/sysutils/sunxi-tools/patches/patch-phoenix_info.c
new file mode 100644
index 00000000000..c2d89cdd78f
--- /dev/null
+++ b/sysutils/sunxi-tools/patches/patch-phoenix_info.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-phoenix_info.c,v 1.1 2015/10/25 09:05:23 bouyer Exp $
+fix uninitialised variable use
+
+--- phoenix_info.c.orig	2015-10-24 23:20:32.000000000 +0200
++++ phoenix_info.c	2015-10-24 23:22:06.000000000 +0200
+@@ -45,7 +45,7 @@
+ {
+ 	int l = strlen(dest) + 16;
+ 	char outname[l];
+-	FILE *out;
++	FILE *out = NULL;
+ 	char *buf = NULL;
+ 	int ret = 0;
+ 	snprintf(outname, l, dest, part);
+@@ -72,7 +72,7 @@
+ _exit:
+ 	if (buf)
+ 		free(buf);
+-	if (out != stdout)
++	if (out != NULL && out != stdout)
+ 		fclose(out);
+ 	return ret;
+ err: