From: Jag Talon <jag@aangat.lahat.computer>
Subject: Re: [maintainer update] brandy 1.23.2 -> 1.23.3
To: ports@openbsd.org, Michael McConnell <soruk@eridani.co.uk>
Date: Tue, 06 Aug 2024 14:28:31 -0400

Ah that's good to know I'll switch it back to the previous tarball
source then!

On Tue, 2024-08-06 at 19:24 +0100, Stuart Henderson wrote:
> The MatrixBrandy-1.23.3.tar.xz tarball on Michael's website actually
> has
> about the same contents as MatrixBrandy-1.23.2.tar.xz, I think a
> release
> was built without updating.
> 
> Generally we prefer ports to use intentionally uploaded distfiles
> rather
> than github's autogenerated files (which are not guaranteed to be
> consistent - we've seen problems with this before where tar.gz files
> have changed slightly over time, and sometimes different versions
> available from different github backends around the world).
> 
> 
> On 2024/08/06 14:09, Jag Talon wrote:
> > Forgot to mention that I switched the source from the main website
> > to
> > Github because the tarball on the main site seems to be missing
> > some
> > changes.
> > 
> > I thought it was more reliable to go with Github so I went with
> > that
> > instead I hope that's alright.
> > 
> > On Tue, 6 Aug 2024, Jag Talon wrote:
> > 
> > > Updating Brandy from 1.23.2 to 1.23.3.
> > > 
> > > Upstream included fixes specific to OpenBSD:
> > > - Now using strncmp/snprintf/vsnprintf/strlcpy/strlcat/strncmp
> > > - Brandy doesn't check for new versions with -DBRANDY_NOVERCHECK
> > > - Added the right header files in src/keyboard.c so no need to
> > > patch it.
> > > 
> > > More changes in:
> > > 
> > > http://brandy.matrixnetwork.co.uk/ChangeLog
> > > 
> > > Index: Makefile
> > > =================================================================
> > > ==
> > > RCS file: /cvs/ports/lang/brandy/Makefile,v
> > > diff -u -p -u -r1.8 Makefile
> > > --- Makefile	5 Aug 2024 18:06:01 -0000	1.8
> > > +++ Makefile	6 Aug 2024 17:54:28 -0000
> > > @@ -1,9 +1,8 @@
> > >  COMMENT =	interpreter for BBC Basic (Basic VI)
> > >  
> > > -V =		1.23.2
> > > -DISTNAME =	MatrixBrandy-${V}
> > > +V =		1.23.3
> > > +DIST_TUPLE =	github soruk42 MatrixBrandy V${V} .
> > >  PKGNAME =	brandy-${V}
> > > -EXTRACT_SUFX =	.tar.xz
> > >  
> > >  CATEGORIES =	lang
> > >  
> > > @@ -15,13 +14,14 @@ PERMIT_PACKAGE =	Yes
> > >  
> > >  WANTLIB += SDL X11 c m pthread
> > >  
> > > -SITES
> > > =		http://brandy.matrixnetwork.co.uk/releases/
> > > -
> > >  LIB_DEPENDS +=	devel/sdl
> > >  USE_GMAKE =	Yes
> > >  
> > >  # since we disable git
> > >  CFLAGS +=	-DBRANDY_RELEASE
> > > +
> > > +# disable version checking at startup
> > > +CFLAGS +=	-DBRANDY_NOVERCHECK
> > >  
> > >  CFLAGS +=	`sdl-config --cflags` -DDEFAULT_IGNORE -Wall
> > >  LDFLAGS +=	`sdl-config --libs` -lm -pthread -
> > > L${X11BASE}/lib/ -lX11
> > > Index: distinfo
> > > =================================================================
> > > ==
> > > RCS file: /cvs/ports/lang/brandy/distinfo,v
> > > diff -u -p -u -r1.2 distinfo
> > > --- distinfo	5 Aug 2024 18:04:38 -0000	1.2
> > > +++ distinfo	6 Aug 2024 17:54:28 -0000
> > > @@ -1,2 +1,2 @@
> > > -SHA256 (MatrixBrandy-1.23.2.tar.xz) =
> > > CI8WhMIBtzn6MObxvjlDNGNitQjbMpUWoZWN9tAXyQA=
> > > -SIZE (MatrixBrandy-1.23.2.tar.xz) = 461888
> > > +SHA256 (soruk42-MatrixBrandy-V1.23.3.tar.gz) =
> > > M7kWKJRERbzLDXG0V4Xen9edN1+ZC/NOb37gukqsF6w=
> > > +SIZE (soruk42-MatrixBrandy-V1.23.3.tar.gz) = 630987
> > > Index: patches/patch-src_keyboard_c
> > > =================================================================
> > > ==
> > > RCS file: patches/patch-src_keyboard_c
> > > diff -N patches/patch-src_keyboard_c
> > > --- patches/patch-src_keyboard_c	5 Aug 2024 18:04:38 -
> > > 0000	1.1
> > > +++ /dev/null	1 Jan 1970 00:00:00 -0000
> > > @@ -1,11 +0,0 @@
> > > -Index: src/keyboard.c
> > > ---- src/keyboard.c.orig
> > > -+++ src/keyboard.c
> > > -@@ -108,6 +108,7 @@
> > > - **
> > > - */
> > > - 
> > > -+#include <sys/select.h>
> > > - #include <stdio.h>
> > > - #include <string.h>
> > > - #include <unistd.h>
> > > 
> > 

-- 
he/him
jagtalon.net
weirder.earth/@jag