Index | Thread | Search

From:
Stuart Cassoff <exokoide@yahoo.ca>
Subject:
Re: [UPDATE] comms/hamlib
To:
OpenBSD Ports <ports@openbsd.org>
Date:
Mon, 8 Dec 2025 10:10:22 -0500

Download raw body.

Thread
Fresh patch, with improvements.


Stu


Update to 4.6.5.


If Hamlib configure finds libgd, it will configure itself to build
supplemental documentation that is ultimately never built or installed.
Explicitly disable for improved build consistency.

Configure option --with-rpc-backends was removed in v3.0 (2015).
Configure option --with-cxx-binding is on by default.

Make Tcl and Python tests work.

Move examples into examples dir and make them easily runnable.



diff -Nurp /usr/ports/comms/hamlib/Makefile ./Makefile
--- /usr/ports/comms/hamlib/Makefile	Wed Nov 19 15:31:09 2025
+++ ./Makefile	Mon Dec  8 07:29:13 2025
@@ -2,10 +2,7 @@ COMMENT-main=	radio/rotator control library
 COMMENT-python=	Python bindings for hamlib
 COMMENT-tcl=	Tcl bindings for hamlib
 
-VERSION=	4.6.4
-REVISION=	1
-REVISION-main=	2
-REVISION-tcl=	2
+VERSION=	4.6.5
 
 DISTNAME=	hamlib-${VERSION}
 CATEGORIES=	comms hamradio
@@ -33,7 +30,7 @@ cWANTLIB=		m pthread usb-1.0
 WANTLIB-main=		${cWANTLIB} ${COMPILER_LIBCXX} \
 			c curses iconv perl readline xml2 z
 WANTLIB-python=		${cWANTLIB} hamlib iconv intl util ${MODPY_WANTLIB}
-WANTLIB-tcl=		${cWANTLIB} hamlib ${MODTCL_WANTLIB}
+WANTLIB-tcl=		${cWANTLIB} hamlib ${MODTCL_WANTLIB} z
 
 LIB_DEPENDS-main=	textproc/libxml \
 			devel/libusb1 \
@@ -52,24 +49,36 @@ RUN_DEPENDS-tcl=	${MODTCL_RUN_DEPENDS}
 SITES=			https://github.com/Hamlib/Hamlib/releases/download/${VERSION}/
 
 MAKE_FLAGS=		tcldir=${MODTCL_TCLDIR}/hamlib
+FAKE_FLAGS=		exampledir=${PREFIX}/share/examples/hamlib
 
 CONFIGURE_STYLE=	gnu
 
-CONFIGURE_ARGS=		--with-cxx-binding \
-			--with-perl-binding \
-			--with-rpc-backends \
-			--with-tcl-binding \
+CONFIGURE_ARGS=		--with-perl-binding \
 			--with-python-binding \
+			--with-tcl-binding \
 			--with-tcl=${MODTCL_LIBDIR} \
 			--with-xml-support \
-			--without-indi
+			--without-indi \
+			--disable-html-matrix
+
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+# The -rpaths in the Tcl and Python libs point to their install dirs.
+# These libs won't load from the build dir without help.
+TEST_ENV=		LD_LIBRARY_PATH=./.libs
+
+pre-configure:
+	@${MODTCL_TCLSH_ADJ} ${WRKSRC}/bindings/tcltest.tcl.in
+
+pre-test:
+	ln -sf ${MODTCL_BIN} ${WRKDIR}/bin/tclsh
+
 post-install:
 	rm -f ${PREFIX}/libdata/perl5/site_perl/*-openbsd/perltest.pl \
 		${PREFIX}/libdata/perl5/*-openbsd/perllocal.pod
 	rmdir ${PREFIX}/libdata/perl5/*-openbsd
 	rm -f ${PREFIX}/lib/tcl/hamlib/hamlibtcl.{la,so}
+	chmod 0755 ${PREFIX}/share/examples/hamlib/{perltest.pl,py3test.py,tcltest.tcl}
 
 .include <bsd.port.mk>
diff -Nurp /usr/ports/comms/hamlib/distinfo ./distinfo
--- /usr/ports/comms/hamlib/distinfo	Fri Jul 25 08:45:52 2025
+++ ./distinfo	Thu Dec  4 22:52:35 2025
@@ -1,2 +1,2 @@
-SHA256 (hamlib-4.6.4.tar.gz) = WpLpPoBbImPGPaQAKNZ1gP2hV1K1OJxosjcgPym1krs=
-SIZE (hamlib-4.6.4.tar.gz) = 2923171
+SHA256 (hamlib-4.6.5.tar.gz) = kNbx26WUF8APj0VFExx+/TGTDNDheFmJgKghBCXjhS4=
+SIZE (hamlib-4.6.5.tar.gz) = 2947731
diff -Nurp /usr/ports/comms/hamlib/pkg/PLIST-main ./pkg/PLIST-main
--- /usr/ports/comms/hamlib/pkg/PLIST-main	Fri Jul 25 08:45:52 2025
+++ ./pkg/PLIST-main	Mon Dec  8 08:12:33 2025
@@ -60,7 +60,7 @@ share/doc/hamlib/LICENSE
 share/doc/hamlib/README.betatester
 share/doc/hamlib/README.developer
 share/doc/hamlib/README.md
-share/doc/hamlib/examples/
-share/doc/hamlib/examples/perltest.pl
-share/doc/hamlib/examples/py3test.py
-share/doc/hamlib/examples/tcltest.tcl
+share/examples/hamlib/
+share/examples/hamlib/perltest.pl
+share/examples/hamlib/py3test.py
+share/examples/hamlib/tcltest.tcl
diff -Nurp /usr/ports/comms/hamlib/pkg/PLIST-python ./pkg/PLIST-python
--- /usr/ports/comms/hamlib/pkg/PLIST-python	Fri Mar 11 13:26:27 2022
+++ ./pkg/PLIST-python	Mon Dec  8 08:12:23 2025
@@ -3,4 +3,5 @@ lib/python${MODPY_VERSION}/site-packages/_Hamlib.la
 @so lib/python${MODPY_VERSION}/site-packages/_Hamlib.so
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}Hamlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}Hamlib.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}Hamlib.${MODPY_PYC_MAGIC_TAG}pyc




On Fri, 5 Dec 2025, Stuart Cassoff wrote:

> Bugfix release + 1 new installed file.
> Sorry, I missed the WANTLIB-tcl change from last update.
> 
> 
> Stu
> 
> 
> 
> diff -Nurp /usr/ports/comms/hamlib/Makefile ./Makefile
> --- /usr/ports/comms/hamlib/Makefile	Wed Nov 19 15:31:09 2025
> +++ ./Makefile	Thu Dec  4 23:55:12 2025
> @@ -2,10 +2,7 @@ COMMENT-main=	radio/rotator control library
>  COMMENT-python=	Python bindings for hamlib
>  COMMENT-tcl=	Tcl bindings for hamlib
>  
> -VERSION=	4.6.4
> -REVISION=	1
> -REVISION-main=	2
> -REVISION-tcl=	2
> +VERSION=	4.6.5
>  
>  DISTNAME=	hamlib-${VERSION}
>  CATEGORIES=	comms hamradio
> @@ -33,7 +30,7 @@ cWANTLIB=		m pthread usb-1.0
>  WANTLIB-main=		${cWANTLIB} ${COMPILER_LIBCXX} \
>  			c curses iconv perl readline xml2 z
>  WANTLIB-python=		${cWANTLIB} hamlib iconv intl util ${MODPY_WANTLIB}
> -WANTLIB-tcl=		${cWANTLIB} hamlib ${MODTCL_WANTLIB}
> +WANTLIB-tcl=		${cWANTLIB} hamlib ${MODTCL_WANTLIB} z
>  
>  LIB_DEPENDS-main=	textproc/libxml \
>  			devel/libusb1 \
> diff -Nurp /usr/ports/comms/hamlib/distinfo ./distinfo
> --- /usr/ports/comms/hamlib/distinfo	Fri Jul 25 08:45:52 2025
> +++ ./distinfo	Thu Dec  4 22:52:35 2025
> @@ -1,2 +1,2 @@
> -SHA256 (hamlib-4.6.4.tar.gz) = WpLpPoBbImPGPaQAKNZ1gP2hV1K1OJxosjcgPym1krs=
> -SIZE (hamlib-4.6.4.tar.gz) = 2923171
> +SHA256 (hamlib-4.6.5.tar.gz) = kNbx26WUF8APj0VFExx+/TGTDNDheFmJgKghBCXjhS4=
> +SIZE (hamlib-4.6.5.tar.gz) = 2947731
> diff -Nurp /usr/ports/comms/hamlib/pkg/PLIST-python ./pkg/PLIST-python
> --- /usr/ports/comms/hamlib/pkg/PLIST-python	Fri Mar 11 13:26:27 2022
> +++ ./pkg/PLIST-python	Thu Dec  4 23:49:27 2025
> @@ -3,4 +3,5 @@ lib/python${MODPY_VERSION}/site-packages/_Hamlib.la
>  @so lib/python${MODPY_VERSION}/site-packages/_Hamlib.so
>  lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
>  lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}Hamlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}Hamlib.${MODPY_PYC_MAGIC_TAG}opt-2.pyc
>  lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}Hamlib.${MODPY_PYC_MAGIC_TAG}pyc
> 
>