(ham/wsjtx) more FLAG tweak, still fails, watch config.log

[Makoto Fujiwara (mef) <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (mef) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sat Mar 27 00:16:23 2021 +0900
Changeset:	9ab564dfd7490821335542c86654b77fb2aeea78

Modified Files:
	wsjtx/distinfo
	wsjtx/patches/patch-hamlib.patch

Log Message:
(ham/wsjtx) more FLAG tweak, still fails, watch config.log

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

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

diffstat:
 wsjtx/distinfo                   |  2 +-
 wsjtx/patches/patch-hamlib.patch | 31 ++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diffs:
diff --git a/wsjtx/distinfo b/wsjtx/distinfo
index 6b5984f184..9f40d99f24 100644
--- a/wsjtx/distinfo
+++ b/wsjtx/distinfo
@@ -4,4 +4,4 @@ SHA1 (wsjtx-2.3.0.tgz) = 2caae6d1b74d31cd7f6bc507dd15f8cfd17c2ffb
 RMD160 (wsjtx-2.3.0.tgz) = 9f5dc6c80551e4a70f90671b8d5be7b070e41916
 SHA512 (wsjtx-2.3.0.tgz) = 1b521a7c81d235b2f17b2a314528f5f9fc8b29de95a2f7f5471104866ff13d138f9913666bc00de71f34ed16e692f0f4b93c878cc3538d30a52852e4c179702c
 Size (wsjtx-2.3.0.tgz) = 17245200 bytes
-SHA1 (patch-hamlib.patch) = a9a7c7fe704553e63a10b4155c08c3eb300c7382
+SHA1 (patch-hamlib.patch) = 36920e05f2f95532a3c572eac23f00ae0f4edc89
diff --git a/wsjtx/patches/patch-hamlib.patch b/wsjtx/patches/patch-hamlib.patch
index b10e4b320c..56541ee66c 100644
--- a/wsjtx/patches/patch-hamlib.patch
+++ b/wsjtx/patches/patch-hamlib.patch
@@ -1,11 +1,10 @@
 $NetBSD$
 
-
 patch PREFIX inside patch
 
---- /dev/null	2021-03-22 22:25:49.591851345 +0900
-+++ hamlib.patch	2021-03-22 23:15:53.147421908 +0900
-@@ -0,0 +1,31 @@
+--- /dev/null	2021-03-27 00:10:09.428068469 +0900
++++ hamlib.patch	2021-03-27 00:10:47.690107720 +0900
+@@ -0,0 +1,41 @@
 +--- hamlib-prefix/src/hamlib/hamlib.pc.in.orig	2021-02-01 21:35:36.000000000 +0900
 ++++ hamlib/hamlib.pc.in	2021-03-21 21:07:31.473290128 +0900
 +@@ -9,5 +9,5 @@ URL: @PACKAGE_URL@
@@ -15,25 +14,35 @@ patch PREFIX inside patch
 +-Libs: -L${libdir} -lhamlib
 ++Libs: -L${libdir} ${libdir}/libhamlib.a
 + Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
-+--- hamlib-prefix/src/hamlib/configure.ac.orig	2021-02-01 21:35:36.000000000 +0900
-++++ hamlib/configure.ac	2021-03-21 21:03:16.858039431 +0900
++
++
++--- hamlib/configure.ac.orig	2021-02-01 21:35:36.000000000 +0900
+++++ hamlib/configure.ac	2021-03-27 00:00:57.899444006 +0900
 +@@ -278,6 +278,11 @@ AS_CASE(["$host_os"],
 + 	AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
 + 	AC_SUBST([AM_LDFLAGS])],
 + 
 ++    [netbsd*], [
-++	AM_CPPFLAGS="-I@PREFIX@/include ${AM_CPPFLAGS}"" 
-++	AM_LDFLAGS="-L@PREFIX@/lib -lusb-1.0 ${AMD_LDFLAGS}"
-++	AC_SUBST([AM_LDFLAGS])],
+++       AM_CPPFLAGS="-I@PREFIX@/include ${AM_CPPFLAGS} -L@PREFIX@/lib -lusb-1.0 ${AM_CPPFLAGS}"
+++       AM_LDFLAGS="-L@PREFIX@/lib -lusb-1.0 ${AM_LDFLAGS}"
+++       AC_SUBST([AM_LDFLAGS])],
 ++
 +     [darwin* | rhapsody*], [
 + 	# Tell the OS X linker to allocate enough space inside the
 + 	# libhamlib.X.dylib shared object for install_name_tool(1) to
-+@@ -321,6 +326,7 @@ AC_ARG_WITH([libusb],
++@@ -321,13 +326,13 @@ AC_ARG_WITH([libusb],
 + 
 + AC_MSG_RESULT([$cf_with_libusb])
 + 
++-LIBUSB=""
 ++LIBUSB="-L@PREFIX@/lib -lusb-1.0"
-+ LIBUSB=""
 + AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults])
 + AC_ARG_VAR([LIBUSB_LIBS], [linker flags for libusb, overriding configure check (useful for specifying static libusb-1.0.a (see INSTALL))])
++ 
++ AS_IF([test x"${cf_with_libusb}" = "xyes"],
++     [AS_IF([test -z $LIBUSB_LIBS],
++-	[AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBUSB_LIBS="-lusb-1.0"],
+++	[AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBUSB_LIBS="-lusb-1.0 @PREFIX@/lib"],
++ 	    [AC_MSG_WARN([libusb_init was not found in libusb-1.0--USB backends will be disabled])])
++ 	], [cf_with_libusb="yes"])
++