Attachment #233193 for bug #263151




LICENSE=	GPLv3

BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
		autoconf>=2.69:devel/autoconf \
		automake>=1.16.1:devel/automake \
		a2x:textproc/asciidoc \
		git:devel/git \
		libtool:devel/libtool \
		${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl
LIB_DEPENDS=	libfftw3.so:math/fftw3 \
		libfftw3f.so:math/fftw3-float \

FFLAGS+=	-fallow-argument-mismatch
.endif

_HAMLIB_PATCHES=	configure hamlib.pc.in tests/rigtestlibusb.c
make-hamlib-patch:
	${MV} ${FILESDIR}/hamlib.patch ${FILESDIR}/hamlib.patch.old
. for f in ${_HAMLIB_PATCHES}




--- hamlib/configure.orig	2022-01-02 11:10:19.000000000 +0100
+++ hamlib/configure	2022-04-13 12:51:01.174492000 +0200
@@ -19135,7 +19135,7 @@
 case "$host_os" in #(
   freebsd*) :
 
-	AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}"
+	AM_CPPFLAGS="${AM_CPPFLAGS} -I/usr/local/include"
 	AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
 	 ;; #(
   darwin* | rhapsody*) :
@@ -19211,6 +19211,7 @@
 fi
 
@@ -317,6 +317,7 @@
 AC_MSG_RESULT([$cf_with_libusb])
 AM_CONDITIONAL([HAVE_LIBUSB], [test x"${cf_with_libusb}" = "xyes"])
 
+LIBUSB_LIBS="-lusb"
 LIBUSB=""
 
 
--- hamlib/hamlib.pc.in.orig	2022-01-02 11:10:11.000000000 +0100
+++ hamlib/hamlib.pc.in	2022-04-13 12:34:36.119285000 +0200
@@ -7,7 +7,6 @@
 Description: Library to control radio and rotator equipment.
 URL: @PACKAGE_URL@

-Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
+Libs: -L${libdir} ${libdir}/libhamlib.a
+Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ -lusb
--- hamlib/tests/rigtestlibusb.c.orig	2022-01-02 11:10:11.000000000 +0100
+++ hamlib/tests/rigtestlibusb.c	2022-04-13 12:34:36.119728000 +0200
@@ -115,7 +115,10 @@
     printf("      wSpeedSupported:       %u\n", ss_usb_cap->wSpeedSupported);
     printf("      bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);

Lines 6-9 lib/libltdl.a Link Here

(-)b/devel/libltdl/pkg-plist (-1 / +1 lines)
6	lib/libltdl.la	6	lib/libltdl.la
7	lib/libltdl.so	7	lib/libltdl.so
8	lib/libltdl.so.7	8	lib/libltdl.so.7
9	lib/libltdl.so.7.3.1	9	lib/libltdl.so.7.3.2




# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>

PORTNAME=	libtool
PORTREVISION=	0

COMMENT=	Generic shared library support script



GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-ltdl-install
TEST_TARGET=	check
NO_ARCH=	yes
USES+=		makeinfo

NO_ARCH=	yes
INFO=		libtool

post-patch:
	@${RM} ${WRKSRC}/doc/*.info*
	@${TOUCH} ${WRKSRC}/doc/libtool.1

.include <bsd.port.mk>

Lines 1-4 Link Here

(-)b/devel/libtool/Makefile.common (-2 / +3 lines)
1	PORTVERSION= 2.4.6	1	PORTVERSION= 2.4.7
2	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.	2	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
3	CATEGORIES= devel	3	CATEGORIES= devel
4	MASTER_SITES= GNU/libtool	4	MASTER_SITES= GNU/libtool
Lines 6-13 DISTNAME= libtool-${PORTVERSION} Link Here
6		6
7	MAINTAINER= tijl@FreeBSD.org	7	MAINTAINER= tijl@FreeBSD.org
8		8
9	DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo
10	USES= cpe gmake tar:xz	9	USES= cpe gmake tar:xz
11		10
12	CPE_VENDOR= gnu	11	CPE_VENDOR= gnu
13	CPE_PRODUCT= libtool	12	CPE_PRODUCT= libtool
		13
		14	DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo

Lines 1-2 Link Here

(-)b/devel/libtool/distinfo (-2 / +3 lines)
1	SHA256 (libtool-2.4.6.tar.xz) = 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f	1	TIMESTAMP = 1649420958
2	SIZE (libtool-2.4.6.tar.xz) = 973080	2	SHA256 (libtool-2.4.7.tar.xz) = 4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d
		3	SIZE (libtool-2.4.7.tar.xz) = 1016040




--- tests/testsuite.orig	2022-03-17 02:45:47 UTC
+++ tests/testsuite
@@ -8737,7 +8737,7 @@ at_xfail=no
 
 { set +x
 $as_echo "$at_srcdir/demo.at:513: case \$host in
-hppa*|x86_64*|s390*)
+hppa*|amd64*|x86_64*|s390*)
   # These hosts cannot use non-PIC shared libs
   exit 77 ;;
 *-solaris*|*-sunos*)
@@ -8762,7 +8762,7 @@ fi
 "
 at_fn_check_prepare_notrace 'a `...` command substitution' "demo.at:513"
 ( $at_check_trace; case $host in
-hppa*|x86_64*|s390*)
+hppa*|amd64*|x86_64*|s390*)
   # These hosts cannot use non-PIC shared libs
   exit 77 ;;
 *-solaris*|*-sunos*)

Return to bug 263151

Lines 9-19 COMMENT= Weak signal ham radio communication package Link Here

(-)b/comms/wsjtx/Makefile (-4 / +1 lines)
9	LICENSE= GPLv3	9	LICENSE= GPLv3
10		10
11	BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \	11	BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \
12	autoconf>=2.69:devel/autoconf \
13	automake>=1.16.1:devel/automake \
14	a2x:textproc/asciidoc \	12	a2x:textproc/asciidoc \
15	git:devel/git \	13	git:devel/git \
16	libtool:devel/libtool \
17	${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl	14	${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl
18	LIB_DEPENDS= libfftw3.so:math/fftw3 \	15	LIB_DEPENDS= libfftw3.so:math/fftw3 \
19	libfftw3f.so:math/fftw3-float \	16	libfftw3f.so:math/fftw3-float \
Lines 42-48 _PATCHES= wsjtx.patch hamlib.patch Link Here
42	FFLAGS+= -fallow-argument-mismatch	39	FFLAGS+= -fallow-argument-mismatch
43	.endif	40	.endif
44		41
45	_HAMLIB_PATCHES= configure.ac hamlib.pc.in tests/rigtestlibusb.c	42	_HAMLIB_PATCHES= configure hamlib.pc.in tests/rigtestlibusb.c
46	make-hamlib-patch:	43	make-hamlib-patch:
47	${MV} ${FILESDIR}/hamlib.patch ${FILESDIR}/hamlib.patch.old	44	${MV} ${FILESDIR}/hamlib.patch ${FILESDIR}/hamlib.patch.old
48	. for f in ${_HAMLIB_PATCHES}	45	. for f in ${_HAMLIB_PATCHES}

Lines 1-24 Link Here

(-)b/comms/wsjtx/files/hamlib.patch (-16 / +16 lines)
1	--- hamlib/configure.ac.orig 2021-11-03 20:39:16.000000000 -0400	1	--- hamlib/configure.orig 2022-01-02 11:10:19.000000000 +0100
2	+++ hamlib/configure.ac 2021-12-28 12:12:44.629890000 -0500	2	+++ hamlib/configure 2022-04-13 12:51:01.174492000 +0200
3	@@ -269,7 +269,7 @@	3	@@ -19135,7 +19135,7 @@
4	dnl The host_os variable is set by the AC_CANONICAL_HOST macro above.	4	case "$host_os" in #(
5	AS_CASE(["$host_os"],	5	freebsd*) :
6	[freebsd*], [	6
7	- AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}"	7	- AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}"
8	+ AM_CPPFLAGS="${AM_CPPFLAGS} -I/usr/local/include"	8	+ AM_CPPFLAGS="${AM_CPPFLAGS} -I/usr/local/include"
9	AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"	9	AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
10	AC_SUBST([AM_LDFLAGS])],	10	;; #(
		11	darwin* \| rhapsody*) :
		12	@@ -19211,6 +19211,7 @@
		13	fi
11		14
12	@@ -317,6 +317,7 @@
13	AC_MSG_RESULT([$cf_with_libusb])
14	AM_CONDITIONAL([HAVE_LIBUSB], [test x"${cf_with_libusb}" = "xyes"])
15		15
16	+LIBUSB_LIBS="-lusb"	16	+LIBUSB_LIBS="-lusb"
17	LIBUSB=""	17	LIBUSB=""
18	AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults])	18
19	AC_ARG_VAR([LIBUSB_LIBS], [linker flags for libusb, overriding configure check (useful for specifying static libusb-1.0.a (see INSTALL))])	19
20	--- hamlib/hamlib.pc.in.orig 2021-11-03 20:39:16.000000000 -0400	20	--- hamlib/hamlib.pc.in.orig 2022-01-02 11:10:11.000000000 +0100
21	+++ hamlib/hamlib.pc.in 2021-12-28 12:19:09.120541000 -0500	21	+++ hamlib/hamlib.pc.in 2022-04-13 12:34:36.119285000 +0200
22	@@ -7,7 +7,6 @@	22	@@ -7,7 +7,6 @@
23	Description: Library to control radio and rotator equipment.	23	Description: Library to control radio and rotator equipment.
24	URL: @PACKAGE_URL@	24	URL: @PACKAGE_URL@
Lines 29-36 Link Here
29	-Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@	29	-Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
30	+Libs: -L${libdir} ${libdir}/libhamlib.a	30	+Libs: -L${libdir} ${libdir}/libhamlib.a
31	+Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ -lusb	31	+Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ -lusb
32	--- hamlib/tests/rigtestlibusb.c.orig 2021-11-03 20:39:16.000000000 -0400	32	--- hamlib/tests/rigtestlibusb.c.orig 2022-01-02 11:10:11.000000000 +0100
33	+++ hamlib/tests/rigtestlibusb.c 2021-12-28 12:12:44.630778000 -0500	33	+++ hamlib/tests/rigtestlibusb.c 2022-04-13 12:34:36.119728000 +0200
34	@@ -115,7 +115,10 @@	34	@@ -115,7 +115,10 @@
35	printf(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported);	35	printf(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported);
36	printf(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);	36	printf(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);

Lines 1-7 Link Here

(-)b/devel/libtool/Makefile (-8 / +3 lines)
1	# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>	1	# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>
2		2
3	PORTNAME= libtool	3	PORTNAME= libtool
4	PORTREVISION= 1	4	PORTREVISION= 0
5		5
6	COMMENT= Generic shared library support script	6	COMMENT= Generic shared library support script
7		7
Lines 15-28 RUN_DEPENDS= gm4:devel/m4 Link Here
15		15
16	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS= --disable-ltdl-install	17	CONFIGURE_ARGS= --disable-ltdl-install
18	MAKE_ARGS= MAKEINFOFLAGS=--no-split	18	TEST_TARGET= check
19	NO_ARCH= yes
20	USES+= makeinfo
21		19
		20	NO_ARCH= yes
22	INFO= libtool	21	INFO= libtool
23		22
24	post-patch:
25	@${RM} ${WRKSRC}/doc/.info
26	@${TOUCH} ${WRKSRC}/doc/libtool.1
27
28	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Added Link Here

(-)b/devel/libtool/files/patch-tests_testsuite (-1 / +20 lines)
0	-	1	--- tests/testsuite.orig 2022-03-17 02:45:47 UTC
		2	+++ tests/testsuite
		3	@@ -8737,7 +8737,7 @@ at_xfail=no
		4
		5	{ set +x
		6	$as_echo "$at_srcdir/demo.at:513: case \$host in
		7	-hppa\|x86_64\|s390*)
		8	+hppa\|amd64\|x86_64\|s390)
		9	# These hosts cannot use non-PIC shared libs
		10	exit 77 ;;
		11	-solaris\|-sunos)
		12	@@ -8762,7 +8762,7 @@ fi
		13	"
		14	at_fn_check_prepare_notrace 'a `...` command substitution' "demo.at:513"
		15	( $at_check_trace; case $host in
		16	-hppa\|x86_64\|s390*)
		17	+hppa\|amd64\|x86_64\|s390)
		18	# These hosts cannot use non-PIC shared libs
		19	exit 77 ;;
		20	-solaris\|-sunos)