(ham/wsjtx) configure.ac is not used. delete it. Add devel/readline/bldlk3

[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 15:46:58 2021 +0900
Changeset:	23006193bdb24c3f7dd74b22d37640a1543b30ad

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

Log Message:
(ham/wsjtx) configure.ac is not used. delete it. Add devel/readline/bldlk3

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

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

diffstat:
 wsjtx/Makefile                   |  3 ++-
 wsjtx/distinfo                   |  2 +-
 wsjtx/patches/patch-hamlib.patch | 42 +++-------------------------------------
 3 files changed, 6 insertions(+), 41 deletions(-)

diffs:
diff --git a/wsjtx/Makefile b/wsjtx/Makefile
index 038ef518f0..18ffdf12f1 100644
--- a/wsjtx/Makefile
+++ b/wsjtx/Makefile
@@ -52,7 +52,8 @@ SUBST_VARS.hamlib=	PREFIX
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-#include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/libusb.buildlink3.mk"
 BUILDLINK_API_DEPENDS.hamlib+=	hamlib>=4.1
 .include "../../ham/hamlib/buildlink3.mk"
diff --git a/wsjtx/distinfo b/wsjtx/distinfo
index c0c57b20c0..578c4cda7f 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) = 1a21d91fbb1ab31ba511fa5fb084d78e78cb55d3
+SHA1 (patch-hamlib.patch) = 8d5cec646b0fe317a41da3ed66a299ea1510c87f
diff --git a/wsjtx/patches/patch-hamlib.patch b/wsjtx/patches/patch-hamlib.patch
index c705b42015..246f69eac2 100644
--- a/wsjtx/patches/patch-hamlib.patch
+++ b/wsjtx/patches/patch-hamlib.patch
@@ -4,7 +4,7 @@ patch PREFIX inside patch
 
 --- /dev/null	2021-03-27 14:25:58.185030027 +0900
 +++ hamlib.patch 2021-03-27 14:26:58.703680417 +0900
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,21 @@
 +--- 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,50 +15,14 @@ patch PREFIX inside patch
 ++Libs: -L${libdir} ${libdir}/libhamlib.a
 + Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
 +
-+
-+--- 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,14 @@ AS_CASE(["$host_os"],
-+ 	AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
-+ 	AC_SUBST([AM_LDFLAGS])],
-+ 
-++    [netbsd*], [
-++       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}"
-++       LIBUSB_CFLAGS="-I@PREFIX@/include ${AM_CPPFLAGS} -L@PREFIX@/lib -lusb-1.0 ${AM_CPPFLAGS}"
-++       LIBUSB_LIBS="-L@PREFIX@/lib -lusb-1.0 ${AM_LDFLAGS}"
-++       LIBS="-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,16 +325,16 @@ AC_ARG_WITH([libusb],
-+ 
-+ AC_MSG_RESULT([$cf_with_libusb])
-+ 
-+-LIBUSB=""
-++LIBUSB="-L@PREFIX@/lib -lusb-1.0"
-++LIBS="-L@PREFIX@/lib -lusb-1.0"
-+ 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 -L@PREFIX@/lib"],
-+ 	    [AC_MSG_WARN([libusb_init was not found in libusb-1.0--USB backends will be disabled])])
-+ 	], [cf_with_libusb="yes"])
-+
-+
 +--- hamlib/configure.orig	2021-02-01 21:35:58.000000000 +0900
 ++++ hamlib/configure	2021-03-27 14:11:34.897938353 +0900
-+@@ -19344,7 +19344,7 @@ fi
++@@ -19344,7 +19344,7 @@
 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_1_0_libusb_init" >&5
 + $as_echo "$ac_cv_lib_usb_1_0_libusb_init" >&6; }
 + if test "x$ac_cv_lib_usb_1_0_libusb_init" = xyes; then :
 +-  LIBUSB_LIBS="-lusb-1.0"
-++  LIBUSB_LIBS="-lusb-1.0 -L@PREFIX@lib"
+++  LIBUSB_LIBS="-lusb-1.0 -L@PREFIX@/lib"
 + else
 +   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libusb_init was not found in libusb-1.0--USB backends will be disabled" >&5
 + $as_echo "$as_me: WARNING: libusb_init was not found in libusb-1.0--USB backends will be disabled" >&2;}