From 39032838190fc387e177d1f3b011d24b8bc8e39d Mon Sep 17 00:00:00 2001
From: Dean Matzkov <bapabooiee@gmail.com>
Date: Fri, 18 Jan 2019 21:18:59 -0700
Subject: [PATCH] zero-epwing-git: use USE_LANGUAGES for setting c99, and
 update TODO

---
 zero-epwing-git/Makefile |  4 +---
 zero-epwing-git/TODO     | 15 ++-------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/zero-epwing-git/Makefile b/zero-epwing-git/Makefile
index 7b40d3b587..0598d5fa4d 100644
--- a/zero-epwing-git/Makefile
+++ b/zero-epwing-git/Makefile
@@ -10,15 +10,13 @@ COMMENT=	Tool that converts EPWING files to JSON
 LICENSE=	gnu-gpl-v3
 
 USE_CMAKE=	yes
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c99 c++
 
 USE_TOOLS+=	gmake perl # required for the bundled libeb
 
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	share/doc/${PKGBASE}
 
-CFLAGS+=	-std=gnu99
-
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zero-epwing ${DESTDIR}${PREFIX}/bin
diff --git a/zero-epwing-git/TODO b/zero-epwing-git/TODO
index 520a8f0ad7..5a2342ed5c 100644
--- a/zero-epwing-git/TODO
+++ b/zero-epwing-git/TODO
@@ -1,15 +1,4 @@
-- Haven't tested how Linux/FreeBSD/OpenBSD will react to the
-  exclusion of linking libintl via |UNIX AND NOT APPLE| in CMakeLists.txt.
-  But for now, it works on both NetBSD and macOS.
-
 - Internal (lib)eb doesn't seem to honor CFLAGS.
 
-- On NetBSD, `-std={c99,gnu99}' is required in CFLAGS for the build to succeed.
-  However, it's not required for macOS/clang, and it in fact causes the build to fail
-  on that platform.
-
-  We could either set CFLAGS depending on the platform/compiler, or patch the zero-epwing
-  code, since (at least at a cursory glance) it didn't look like too much would need to
-  be changed.
-
-- The bundled libjansson shouldn't be built, since we use the pkgsrc-supplied one.
+- Currently the bundled libjansson is built and statically linked. We should avoid
+  building it and dynamically link the pkgsrc-supplied libjansson instead.