From: Stuart Cassoff <exokoide@yahoo.ca>
Subject: Re: Fw: x11/x11vnc: Don't use MODTK_VERSION in substitution.
To: Stuart Henderson <stu@spacehopper.org>
Cc: OpenBSD Ports <ports@openbsd.org>
Date: Tue, 16 Dec 2025 09:38:48 -0500

Ok then, thanks. I'll take the simplest route.


On Tue, 16 Dec 2025, Stuart Henderson wrote:

> Just put whatever contents you want into the file and commit it.
> Practically for this one I would probably do
> 
> cvs di -r1.{3,2} patches/patch-src_gui_c | patch
> 
> or leave it as-is, I don't think there's any problem is there?
> 
> (cvs up -r will set a sticky revision-based tag for the file - not sure
> how that works with commits as I've never tried it - but you don't want
> to do anything too clever with cvs generally)

You're right about that! I tread very carefully with cvs.


> 
> On 2025/12/16 11:32, Stuart Cassoff wrote:
> > I'd appreciate some help with this, thanks.
> > 
> > 
> > ----- Forwarded Message -----
> > From: Stuart Cassoff <exokoide@yahoo.ca>
> > To: OpenBSD Ports <ports@openbsd.org>
> > Sent: Wednesday, December 3, 2025 at 10:48:10 p.m. EST
> > Subject: Re: x11/x11vnc: Don't use MODTK_VERSION in substitution.
> > 
> > Thank you (and sthen@) for the oks.
> > 
> > This last change was a bit of a mistake and overstep
> > in my Tcl cleanup efforts. Sorry about that.
> > 
> > 
> > patch-src_gui_c should be reverted and in the Makefile
> > add MODTK_VERSION to SUBST_VARS. No need for a variable dance.
> > 
> > I'm not sure how to go about reverting.
> > Like this?
> > $ cvs -q -d cvs.openbsd.org:/cvs up -r 1.2 patch-src_gui_c
> > 
> > Then commit?
> > 
> > 
> > Stu
> > 
> > 
> > 
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/x11/x11vnc/Makefile,v
> > diff -u -p -u -p -r1.59 Makefile
> > --- Makefile    24 Nov 2025 21:04:31 -0000    1.59
> > +++ Makefile    4 Dec 2025 03:36:29 -0000
> > @@ -35,9 +35,7 @@ CONFIGURE_ENV +=    ac_cv_header_linux_inpu
> > AUTOCONF_VERSION =    2.69
> > AUTOMAKE_VERSION =    1.15
> > 
> > -SUBST_VARS =        WISH_BIN
> > -
> > -WISH_BIN =        ${MODTK_BIN:T}
> > +SUBST_VARS =        MODTK_VERSION
> > 
> > pre-configure:
> >     ${SUBST_CMD} ${WRKSRC}/src/gui.c
> > 
> > 
> > 
> > 
> > On Tue, 25 Nov 2025, Klemens Nanni wrote:
> > 
> > > 24.11.2025 21:56, Stuart Cassoff пишет:
> > > >
> > > > Ok?
> > > >
> > > >
> > > > On Thu, 20 Nov 2025, Stuart Cassoff wrote:
> > > >
> > > >> A step towards removing MODTK_VERSION from SUBST_VARS.
> > > >> The gui works fine with Tk 8.6. The patch is also a little nicer.
> > > >> $ x11vnc -gui
> > >
> > > OK kn
> > >
> > >
>