diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index e76b13b02844..b06981e2322f 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -1,88 +1,85 @@ PORTNAME= wsjtx DISTVERSION= 2.5.4 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= hamradio@FreeBSD.org COMMENT= Weak signal ham radio communication package 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 \ libboost_log_setup.so:devel/boost-libs \ libxslt.so:textproc/libxslt USES= cmake:noninja compiler:c++11-lang fortran gl libedit \ makeinfo pkgconfig qt:5 readline tar:tgz USE_GL= glu USE_QT= core gui network widgets \ multimedia concurrent printsupport serialport sql sql-sqlite3 \ buildtools_build linguisttools_build qmake_build testlib CONFLICTS_INSTALL= wsjtz # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace PLIST_SUB+= PORTVERSION="${PORTVERSION}" _PATCHES= wsjtx.patch hamlib.patch .include .if ${GCC_DEFAULT} >= 10 # workaround for More actual than formal arguments in procedure call at (1) FFLAGS+= -fallow-argument-mismatch .endif -_HAMLIB_PATCHES= configure.ac hamlib.pc.in tests/rigtestlibusb.c +_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} (cd ${WRKDIR}/.build/hamlib-prefix/src;diff -u hamlib/$f.orig hamlib/$f >> ${FILESDIR}/hamlib.patch || true) . endfor _WSJTX_PATCHES= CMakeLists.txt Radio.cpp widgets/FrequencyLineEdit.cpp \ widgets/FrequencyDeltaLineEdit.cpp \ CMake/Modules/FindUsb.cmake \ CMake/Modules/FindHamlib.cmake make-wsjtx-patch: ${MV} ${FILESDIR}/wsjtx.patch ${FILESDIR}/wsjtx.patch.old . for f in ${_WSJTX_PATCHES} (cd ${WRKDIR}/.build/wsjtx-prefix/src;diff -u wsjtx/$f.orig wsjtx/$f >> ${FILESDIR}/wsjtx.patch || true) . endfor post-patch: . for _patch in ${_PATCHES} # Keep a copy of the blank patch for the post-build target below ${MV} ${WRKSRC}/${_patch} ${WRKSRC}/${_patch}.orig # Copy the patch provided by the ports system ${CP} ${FILESDIR}/${_patch} ${WRKSRC} . endfor post-build: # With cmake 3.18, the patching stage in the internal build # is run again, trick it by removing the patch again. . for _patch in ${_PATCHES} ${MV} ${WRKSRC}/${_patch}.orig ${WRKSRC}/${_patch} . endfor do-install: (cd ${CONFIGURE_WRKSRC};${MAKE} -f Makefile DESTDIR=${STAGEDIR} install) post-install: .for f in fcal fmeasure fmtave fst4sim ft8code jt4code jt65code jt9 jt9code \ message_aggregator msk144code rigctld-wsjtx rigctlcom-wsjtx \ rigctl-wsjtx udp_daemon q65code q65sim \ wsjtx wsjtx_app_version wsprd ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor .include diff --git a/comms/wsjtx/files/hamlib.patch b/comms/wsjtx/files/hamlib.patch index c9cb55d808de..448098d51819 100644 --- a/comms/wsjtx/files/hamlib.patch +++ b/comms/wsjtx/files/hamlib.patch @@ -1,62 +1,62 @@ ---- hamlib/configure.ac.orig 2021-11-03 20:39:16.000000000 -0400 -+++ hamlib/configure.ac 2021-12-28 12:12:44.629890000 -0500 -@@ -269,7 +269,7 @@ - dnl The host_os variable is set by the AC_CANONICAL_HOST macro above. - AS_CASE(["$host_os"], - [freebsd*], [ +--- 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" - AC_SUBST([AM_LDFLAGS])], + ;; #( + 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="" - 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))]) ---- hamlib/hamlib.pc.in.orig 2021-11-03 20:39:16.000000000 -0400 -+++ hamlib/hamlib.pc.in 2021-12-28 12:19:09.120541000 -0500 + + +--- 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@ Version: @PACKAGE_VERSION@ -Requires.private: @LIBUSB@ Cflags: -I${includedir} @PTHREAD_CFLAGS@ -Libs: -L${libdir} -lhamlib -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 2021-11-03 20:39:16.000000000 -0400 -+++ hamlib/tests/rigtestlibusb.c 2021-12-28 12:12:44.630778000 -0500 +--- 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); printf(" bU1devExitLat: %u\n", ss_usb_cap->bU1DevExitLat); - printf(" bU2devExitLat: %u\n", ss_usb_cap->bU2DevExitLat); +/* + * does not exist on FreeBSD libusb.h yet + * printf(" bU2devExitLat: %u\n", ss_usb_cap->bU2DevExitLat); + */ } static void print_bos(libusb_device_handle *handle) @@ -133,6 +136,7 @@ printf(" Binary Object Store (BOS):\n"); printf(" wTotalLength: %u\n", bos->wTotalLength); +#if 0 printf(" bNumDeviceCaps: %u\n", bos->bNumDeviceCaps); for (i = 0; i < bos->bNumDeviceCaps; i++) @@ -170,7 +174,7 @@ libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap); } } - +#endif libusb_free_bos_descriptor(bos); } diff --git a/devel/libltdl/pkg-plist b/devel/libltdl/pkg-plist index 9758fd9ba16d..e16d56804daf 100644 --- a/devel/libltdl/pkg-plist +++ b/devel/libltdl/pkg-plist @@ -1,9 +1,9 @@ include/libltdl/lt_dlloader.h include/libltdl/lt_error.h include/libltdl/lt_system.h include/ltdl.h lib/libltdl.a lib/libltdl.la lib/libltdl.so lib/libltdl.so.7 -lib/libltdl.so.7.3.1 +lib/libltdl.so.7.3.2 diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index 262518d6520a..e740024c1cc5 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,28 +1,23 @@ # Created by: Motoyuki Kasahara PORTNAME= libtool -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Generic shared library support script .include "${.CURDIR}/../libtool/Makefile.common" LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gm4:devel/m4 RUN_DEPENDS= gm4:devel/m4 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ltdl-install -MAKE_ARGS= MAKEINFOFLAGS=--no-split -NO_ARCH= yes -USES+= makeinfo +TEST_TARGET= check +NO_ARCH= yes INFO= libtool -post-patch: - @${RM} ${WRKSRC}/doc/*.info* - @${TOUCH} ${WRKSRC}/doc/libtool.1 - .include diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index a9e1b03e57a4..e819193d5805 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,13 +1,14 @@ -PORTVERSION= 2.4.6 +PORTVERSION= 2.4.7 PORTREVISION?= 0 # Leave this zero. Set in Makefile instead. CATEGORIES= devel MASTER_SITES= GNU/libtool DISTNAME= libtool-${PORTVERSION} MAINTAINER= tijl@FreeBSD.org -DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo USES= cpe gmake tar:xz CPE_VENDOR= gnu CPE_PRODUCT= libtool + +DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index ad91ca4e3da4..6a90e9d8d11c 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,2 +1,3 @@ -SHA256 (libtool-2.4.6.tar.xz) = 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f -SIZE (libtool-2.4.6.tar.xz) = 973080 +TIMESTAMP = 1649420958 +SHA256 (libtool-2.4.7.tar.xz) = 4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d +SIZE (libtool-2.4.7.tar.xz) = 1016040 diff --git a/devel/libtool/files/patch-tests_testsuite b/devel/libtool/files/patch-tests_testsuite new file mode 100644 index 000000000000..bd223f4dd39f --- /dev/null +++ b/devel/libtool/files/patch-tests_testsuite @@ -0,0 +1,20 @@ +--- 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*)