zero-epwing-git: sync-up Makefile and patches with upstream changes

[Dean Matzkov <bapabooiee%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dean Matzkov <bapabooiee%gmail.com@localhost>
Pushed By:	bapa
Date:		Wed Jan 16 21:40:15 2019 -0700
Changeset:	f67b8f63ed5014f8c55ddb78d7ff591e58f9af12

Modified Files:
	zero-epwing-git/Makefile
	zero-epwing-git/TODO
	zero-epwing-git/distinfo
	zero-epwing-git/patches/patch-CMakeLists.txt

Log Message:
zero-epwing-git: sync-up Makefile and patches with upstream changes

One notable change is that upstream integrated the building of
libeb into its own CMake files, so we no longer need to jump through
hoops to get Autotools and CMake to coexist in the pkgsrc Makefile.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f67b8f63ed5014f8c55ddb78d7ff591e58f9af12

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zero-epwing-git/Makefile                     | 21 ---------------------
 zero-epwing-git/TODO                         |  7 ++-----
 zero-epwing-git/distinfo                     |  2 +-
 zero-epwing-git/patches/patch-CMakeLists.txt | 25 +++++++++++++++----------
 4 files changed, 18 insertions(+), 37 deletions(-)

diffs:
diff --git a/zero-epwing-git/Makefile b/zero-epwing-git/Makefile
index 80d13b7f3c..7b40d3b587 100644
--- a/zero-epwing-git/Makefile
+++ b/zero-epwing-git/Makefile
@@ -20,31 +20,10 @@ INSTALLATION_DIRS+=	share/doc/${PKGBASE}
 CFLAGS+=	-std=gnu99
 
 
-# Okay, here's the rationale for the following mess:
-#
-# zero-epwing requires libeb, *however*, it only works with
-# the author's fork, which is included with the source code.
-# So, we have to build that fork of libeb here as well, and then
-# statically link it.
-#
-# ...unless everyone wants a libeb-but-only-for-zero-epwing pkg in pkgsrc.
-
-do-configure:
-	${RUN} cd ${WRKSRC}/eb; \
-	./configure --disable-shared --disable-ebnet --disable-nls
-
-	${RUN} cd ${WRKSRC}; \
-	${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
-		cmake ${CMAKE_ARGS} ${CMAKE_ARG_PATH}
-
-pre-build:
-	${RUN} cd ${WRKSRC}/eb && ${MAKE_PROGRAM}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zero-epwing ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../wip/mk/git-package.mk"
 .include "../../textproc/jansson/buildlink3.mk"
-#include "../../wip/libeb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/zero-epwing-git/TODO b/zero-epwing-git/TODO
index 213e78b1c0..6e4238efce 100644
--- a/zero-epwing-git/TODO
+++ b/zero-epwing-git/TODO
@@ -12,8 +12,5 @@
   code, since (at least at a cursory glance) it didn't look like too much would need to
   be changed.
 
-- A kind and wise man has suggested that perhaps it *is* a good idea to
-  make the fork of libeb included with the source code into its own pkg
-  here on pkgsrc-wip.
-
-  It'd certainly make things easier to work with if we did.
+- There seems to be a lot of new documentation files in doc/ that we might be
+  interested in installing.
diff --git a/zero-epwing-git/distinfo b/zero-epwing-git/distinfo
index 160c561640..650a337d0a 100644
--- a/zero-epwing-git/distinfo
+++ b/zero-epwing-git/distinfo
@@ -1,4 +1,4 @@
 $NetBSD$
 
-SHA1 (patch-CMakeLists.txt) = 3c48e80d95db1a48e543506dd05a81d72096c0c4
+SHA1 (patch-CMakeLists.txt) = 0209f2bc2ec9dc9e73637a125ea0e1b342a83c31
 SHA1 (patch-book.c) = de46c996e5cb82d8397ca24ac94a45669d3a1c40
diff --git a/zero-epwing-git/patches/patch-CMakeLists.txt b/zero-epwing-git/patches/patch-CMakeLists.txt
index 35a508c4c6..3073dcc1bd 100644
--- a/zero-epwing-git/patches/patch-CMakeLists.txt
+++ b/zero-epwing-git/patches/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
-A few things are done here:
+Changes:
 
 1) Make libm, libz, libjansson and libiconv dynamically linked, instead of statically.
 2) Use system libjansson instead of the one included with zero-epwing.
@@ -8,23 +8,28 @@ A few things are done here:
 4) Specify the full path to the libeb static library, since (at least on macOS) the linker
    has trouble linking it otherwise.
 
---- CMakeLists.txt.orig	2017-10-06 02:15:49.000000000 +0000
+--- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -1,10 +1,15 @@
- cmake_minimum_required(VERSION 3.5)
- project(zero-epwing)
- include_directories(eb)
--link_directories(eb/eb/.libs jansson/lib)
+@@ -15,11 +15,20 @@
+ option(JANSSON_BUILD_DOCS "" OFF)
+ option(JANSSON_WITHOUT_TESTS "" ON)
+ add_subdirectory(jansson)
+-link_directories(eb/eb/.libs ${CMAKE_BINARY_DIR}/jansson/lib)
 +link_directories(eb/eb/.libs)
  add_executable(zero-epwing main.c book.c convert.c hooks.c)
--target_link_libraries(zero-epwing libm.a libeb.a libm.a libz.a libjansson.a)
+ add_dependencies(zero-epwing eb jansson)
+-target_link_libraries(zero-epwing libeb.a libz.a libjansson.a)
 +target_link_libraries(zero-epwing
-+    m z jansson
-+    ${CMAKE_SOURCE_DIR}/eb/eb/.libs/libeb.a
++    z jansson
++    ${CMAKE_CURRENT_SOURCE_DIR}/eb/eb/.libs/libeb.a
 +)
++
++# Dynamically link libintl on non-Apple UNIX-alikes
 +if (UNIX AND NOT APPLE)
 +    target_link_libraries(zero-epwing intl)
 +endif (UNIX AND NOT APPLE)
++
++# Dynamically link libiconv on Windows or macOS
  if (WIN32 OR APPLE)
 -    target_link_libraries(zero-epwing libiconv.a)
 +    target_link_libraries(zero-epwing iconv)