From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: comms/hamlib-tcl: Fix install location
To: Stuart Cassoff <exokoide@yahoo.ca>
Cc: OpenBSD Ports <ports@openbsd.org>
Date: Sat, 15 Nov 2025 17:48:06 +0000

the contents look alright, but the diff is mangled.

On 2025/11/15 17:31, Stuart Cassoff wrote:
> Hi,
> 
> I didn't realize (or forgot) that you ok'd this.
> Thanks for the update to hamlib 4.6.4!
> 
> Here's a new version of the patch, with two changes from last time:
> - Don't install unneeded hamlib.la and hamlib.so (a symlink to the real lib).
> - MODTCL_VERSION=8.6
> 
> 
> Stu
> 
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/comms/hamlib/Makefile,v
> diff -u -p -u -p -r1.55 Makefile
> --- Makefile    1 Nov 2025 11:16:40 -0000    1.55
> +++ Makefile    15 Nov 2025 17:06:17 -0000
> @@ -5,6 +5,8 @@ COMMENT-tcl=    Tcl bindings for hamlib
> VERSION=    4.6.4
> REVISION=    1
> REVISION-main=    2
> +REVISION-tcl=    2
> +
> DISTNAME=    hamlib-${VERSION}
> CATEGORIES=    comms hamradio
> 
> @@ -18,6 +20,8 @@ HOMEPAGE=    https://hamlib.github.io/
> MODULES=    lang/python \
>         lang/tcl
> 
> +MODTCL_VERSION=    8.6
> +
> # GPLv2/LGPLv2.1
> PERMIT_PACKAGE=    Yes
> 
> @@ -47,6 +51,8 @@ RUN_DEPENDS-tcl=    ${MODTCL_RUN_DEPENDS}
> 
> SITES=            https://github.com/Hamlib/Hamlib/releases/download/${VERSION}/
> 
> +MAKE_FLAGS=        tcldir=${MODTCL_TCLDIR}/hamlib
> +
> CONFIGURE_STYLE=    gnu
> 
> CONFIGURE_ARGS=        --with-cxx-binding \
> @@ -64,5 +70,6 @@ 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}
> 
> .include <bsd.port.mk>
> Index: pkg/PLIST-tcl
> ===================================================================
> RCS file: /cvs/ports/comms/hamlib/pkg/PLIST-tcl,v
> diff -u -p -u -p -r1.6 PLIST-tcl
> --- pkg/PLIST-tcl    22 Jul 2025 11:08:15 -0000    1.6
> +++ pkg/PLIST-tcl    15 Nov 2025 17:06:17 -0000
> @@ -1,6 +1,3 @@
> -lib/tcl${MODTCL_VERSION}/
> -lib/tcl${MODTCL_VERSION}/Hamlib/
> -@so lib/tcl${MODTCL_VERSION}/Hamlib/hamlibtcl-4.6.so
> -lib/tcl${MODTCL_VERSION}/Hamlib/hamlibtcl.la
> -@so lib/tcl${MODTCL_VERSION}/Hamlib/hamlibtcl.so
> -lib/tcl${MODTCL_VERSION}/Hamlib/pkgIndex.tcl
> +lib/tcl/hamlib/
> +@so lib/tcl/hamlib/hamlibtcl-4.6.so
> +lib/tcl/hamlib/pkgIndex.tcl
> 
> 
> 
> 
> 
> 
> On Tuesday, January 21, 2025 at 02:51:02 p.m. EST, Stuart Henderson <stu@spacehopper.org> wrote: 
> 
> 
> 
> 
> 
> ok
> 
> On 2025/01/21 15:48, Stuart Cassoff wrote:
> > re: https://marc.info/?l=openbsd-ports&m=173689418603440&w=2
> > 
> > With this fix, Tcl can now find the package.
> > 
> > 
> > Stu
> > 
> > 
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/comms/hamlib/Makefile,v
> > diff -u -p -u -p -r1.51 Makefile
> > --- Makefile    21 Dec 2024 11:37:40 -0000    1.51
> > +++ Makefile    20 Jan 2025 20:52:25 -0000
> > @@ -8,7 +8,7 @@ CATEGORIES=    comms hamradio
> > 
> > REVISION-main=    1
> > REVISION-python=3
> > -REVISION-tcl=    1
> > +REVISION-tcl=    2
> > 
> > MULTI_PACKAGES=    -main -python -tcl
> > 
> > @@ -48,6 +48,8 @@ RUN_DEPENDS-python=    ${MODPY_RUN_DEPENDS}
> > RUN_DEPENDS-tcl=    ${MODTCL_RUN_DEPENDS}
> > 
> > SITES=            ${SITE_SOURCEFORGE:=hamlib/}
> > +
> > +MAKE_FLAGS =        tcldir=${MODTCL_TCLDIR}/hamlib
> > 
> > CONFIGURE_STYLE=    autoreconf
> > AUTOCONF_VERSION=    2.69
> > Index: pkg/PLIST-tcl
> > ===================================================================
> > RCS file: /cvs/ports/comms/hamlib/pkg/PLIST-tcl,v
> > diff -u -p -u -p -r1.5 PLIST-tcl
> > --- pkg/PLIST-tcl    11 Mar 2022 18:26:27 -0000    1.5
> > +++ pkg/PLIST-tcl    20 Jan 2025 20:52:25 -0000
> > @@ -1,6 +1,5 @@
> > -lib/tcl${MODTCL_VERSION}/
> > -lib/tcl${MODTCL_VERSION}/Hamlib/
> > -@so lib/tcl${MODTCL_VERSION}/Hamlib/hamlibtcl-4.4.so
> > -lib/tcl${MODTCL_VERSION}/Hamlib/hamlibtcl.la
> > -@so lib/tcl${MODTCL_VERSION}/Hamlib/hamlibtcl.so
> > -lib/tcl${MODTCL_VERSION}/Hamlib/pkgIndex.tcl
> > +lib/tcl/hamlib/
> > +@so lib/tcl/hamlib/hamlibtcl-4.4.so
> > +lib/tcl/hamlib/hamlibtcl.la
> > +@so lib/tcl/hamlib/hamlibtcl.so
> > +lib/tcl/hamlib/pkgIndex.tcl
> 
>