diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile --- a/comms/cqrlog/Makefile +++ b/comms/cqrlog/Makefile @@ -1,6 +1,6 @@ PORTNAME= cqrlog PORTVERSION= 2.5.2 -PORTREVISION= 15 +PORTREVISION= 16 DISTVERSIONPREFIX= v CATEGORIES= comms hamradio PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/comms/cubicsdr/Makefile b/comms/cubicsdr/Makefile --- a/comms/cubicsdr/Makefile +++ b/comms/cubicsdr/Makefile @@ -1,6 +1,6 @@ PORTNAME= cubicsdr PORTVERSION= 0.2.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/direwolf/Makefile b/comms/direwolf/Makefile --- a/comms/direwolf/Makefile +++ b/comms/direwolf/Makefile @@ -1,5 +1,6 @@ PORTNAME= direwolf DISTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -1,5 +1,6 @@ PORTNAME= fldigi DISTVERSION= 4.2.09 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= SF/fldigi/${PORTNAME} diff --git a/comms/freedv/Makefile b/comms/freedv/Makefile --- a/comms/freedv/Makefile +++ b/comms/freedv/Makefile @@ -1,7 +1,7 @@ PORTNAME= freedv DISTVERSIONPREFIX=v DISTVERSION= 1.7.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile --- a/comms/gpredict/Makefile +++ b/comms/gpredict/Makefile @@ -1,6 +1,6 @@ PORTNAME= gpredict DISTVERSION= 2.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= comms hamradio MASTER_SITES= https://github.com/csete/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/comms/grig/Makefile b/comms/grig/Makefile --- a/comms/grig/Makefile +++ b/comms/grig/Makefile @@ -1,6 +1,6 @@ PORTNAME= grig PORTVERSION= 0.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -1,5 +1,5 @@ PORTNAME= hamlib -PORTVERSION= 4.6.4 +DISTVERSION= 4.6.5 CATEGORIES= comms hamradio MASTER_SITES= SF @@ -7,31 +7,40 @@ COMMENT= Shared libraries for Amateur Radio Equipment Control Applications WWW= https://sourceforge.net/projects/hamlib/ -LICENSE= LGPL20 +LICENSE= GPLv2+ LGPL21+ +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING +LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= swig:devel/swig -LIB_DEPENDS= libltdl.so:devel/libltdl -USES= autoreconf gnome libtool:keepla localbase:ldflags perl5 pkgconfig python \ - readline shebangfix tcl -USE_GNOME= libxml2 +USES= autoreconf gnome libtool:keepla localbase:ldflags perl5 \ + pkgconfig python readline shebangfix tcl USE_LDCONFIG= yes USE_PERL5= build run USE_PYTHON= py3kplist # $TCL_INCLUDE_SPEC SHEBANG_FILES= bindings/perltest.pl + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-perl-binding \ - --with-tcl-binding --with-tcl=${TCL_LIBDIR} \ - --with-libusb \ - --with-python-binding -CONFIGURE_ENV= LIBUSB_LIBS="-lusb" cf_with_cxx=yes +CONFIGURE_ARGS= --with-libusb \ + --with-perl-binding \ + --with-python-binding \ + --with-tcl-binding \ + --with-tcl=${TCL_LIBDIR} +CONFIGURE_ENV= cf_with_cxx=yes \ + LIBUSB_LIBS="-lusb" + INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib + PLIST_SUB= TCL_VER=${TCL_VER} -OPTIONS_DEFINE= DOCS +PORTDOCS= AUTHORS COPYING* ChangeLog INSTALL LICENSE NEWS PLAN README* THANKS + +OPTIONS_DEFINE= DOCS STATIC +OPTIONS_SUB= yes + +STATIC_CONFIGURE_ENABLE= static post-build: ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \ @@ -39,14 +48,13 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Hamlib/Hamlib.so - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \ - ${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \ - ${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \ - ${WRKSRC}/README.betatester ${WRKSRC}/README.osx \ - ${WRKSRC}/README.developer ${WRKSRC}/README.freqranges \ - ${WRKSRC}/README.multicast ${WRKSRC}/THANKS - ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} -.endfor + +post-install-DOCS-on: + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + +post-install-DOCS-off: +# Upstream scripts install some of the ${PORTDOCS} by default, +# so we need to remove the whole ${STAGEDIR}${DOCSDIR} explicitly. + ${RM} -r ${STAGEDIR}${DOCSDIR} .include diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo --- a/comms/hamlib/distinfo +++ b/comms/hamlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752936628 -SHA256 (hamlib-4.6.4.tar.gz) = 5a92e93e805b2263c63da40028d67580fda15752b5389c68b237203f29b592bb -SIZE (hamlib-4.6.4.tar.gz) = 2923171 +TIMESTAMP = 1758466889 +SHA256 (hamlib-4.6.5.tar.gz) = 90d6f1dba59417c00f8f4545131c7efd31930cd0e178598980a8210425e3852e +SIZE (hamlib-4.6.5.tar.gz) = 2947731 diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist --- a/comms/hamlib/pkg-plist +++ b/comms/hamlib/pkg-plist @@ -1,3 +1,6 @@ +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py +%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl bin/ampctl bin/ampctld bin/rigctl @@ -9,6 +12,7 @@ bin/rigmem bin/rigsmtr bin/rigswr +bin/rigtestlibusb bin/rigtestmcast bin/rigtestmcastrx bin/rotctl @@ -24,10 +28,12 @@ include/hamlib/rotator.h include/hamlib/rotclass.h include/hamlib/rotlist.h +%%STATIC%%lib/libhamlib++.a lib/libhamlib++.la lib/libhamlib++.so lib/libhamlib++.so.4 lib/libhamlib++.so.4.0.6 +%%STATIC%%lib/libhamlib.a lib/libhamlib.la lib/libhamlib.so lib/libhamlib.so.4 @@ -36,12 +42,14 @@ %%SITE_ARCH%%/auto/Hamlib/Hamlib.so %%SITE_ARCH%%/perltest.pl %%PYTHON_SITELIBDIR%%/Hamlib.py +%%STATIC%%%%PYTHON_SITELIBDIR%%/_Hamlib.a %%PYTHON_SITELIBDIR%%/_Hamlib.la %%PYTHON_SITELIBDIR%%/_Hamlib.so %%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_TAG%%.pyc lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.6.so +%%STATIC%%lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so lib/tcl%%TCL_VER%%/Hamlib/pkgIndex.tcl @@ -61,22 +69,3 @@ share/man/man7/hamlib-primer.7.gz share/man/man7/hamlib-utilities.7.gz share/man/man7/hamlib.7.gz -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/PLAN -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.betatester -%%PORTDOCS%%%%DOCSDIR%%/README.developer -%%PORTDOCS%%%%DOCSDIR%%/README.freqranges -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/README.multicast -%%PORTDOCS%%%%DOCSDIR%%/README.osx -%%PORTDOCS%%%%DOCSDIR%%/THANKS -%%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl -%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py -%%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl diff --git a/comms/klog/Makefile b/comms/klog/Makefile --- a/comms/klog/Makefile +++ b/comms/klog/Makefile @@ -1,5 +1,6 @@ PORTNAME= klog PORTVERSION= 2.4.2 +PORTREVISION= 1 #PORTREVISION= 1 CATEGORIES= comms hamradio diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile --- a/comms/qsstv/Makefile +++ b/comms/qsstv/Makefile @@ -1,6 +1,6 @@ PORTNAME= qsstv PORTVERSION= 9.5.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MASTER_SITES= ${WWW}/${PORTNAME}/downloads/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile --- a/comms/tlf/Makefile +++ b/comms/tlf/Makefile @@ -1,7 +1,7 @@ PORTNAME= tlf PORTVERSION= 1.4.1 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/comms/wsjtz/Makefile b/comms/wsjtz/Makefile --- a/comms/wsjtz/Makefile +++ b/comms/wsjtz/Makefile @@ -1,6 +1,6 @@ PORTNAME= wsjtz DISTVERSION= 2.5.4-1.22 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt-z/Source diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile --- a/comms/xlog/Makefile +++ b/comms/xlog/Makefile @@ -1,6 +1,6 @@ PORTNAME= xlog DISTVERSION= 2.0.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= SAVANNAH