Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: [llvm22] update x11/tkhtml to Alpha17 and fix build
To:
Matthieu Herrb <matthieu@openbsd.org>
Cc:
ports@openbsd.org
Date:
Tue, 16 Jun 2026 03:32:33 +0100

Download raw body.

Thread
On 2026/06/08 22:57, Matthieu Herrb wrote:
> +SITES =		https://github.com/Geballin/tkhtml3/archive/
..
> +WRKDIST =		${WRKDIR}/tkhtml3-${DISTNAME}

these should use GH_* instead, it also gives a better filename for the
downloaded file. replacement Makefile/distinfo diffs below with thia
and a few other small tweaks

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tkhtml/Makefile,v
diff -u -p -r1.15 Makefile
--- Makefile	17 May 2026 19:23:41 -0000	1.15
+++ Makefile	16 Jun 2026 02:28:18 -0000
@@ -1,21 +1,22 @@
 COMMENT =	Tk widget to display HTML/CSS formatted contents
 
-REVISION =	2
-DISTNAME =	tkhtml3-alpha-16
-PKGNAME =	${DISTNAME:S/3-alpha-/-3a/}
+V =		17
+GH_ACCOUNT =	Geballin
+GH_PROJECT =	tkhtml3
+GH_TAGNAME =	Alpha-$V
+PKGNAME =	tkhtml-3a$V
 CATEGORIES =	x11
-HOMEPAGE = 	http://tkhtml.tcl.tk/
-SITES =		${HOMEPAGE}
+HOMEPAGE =	https://github.com/Geballin/tkhtml3/
 
 # BSD
-PERMIT_PACKAGE =		Yes
+PERMIT_PACKAGE =	Yes
+
+WANTLIB +=		X11
 
 MODULES =		x11/tk
 BUILD_DEPENDS =		${MODTK_BUILD_DEPENDS}
 RUN_DEPENDS =		${MODTK_RUN_DEPENDS}
-WANTLIB +=		X11
 
-WRKDIST =		${WRKDIR}/htmlwidget
 USE_GMAKE =		Yes
 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
@@ -27,10 +28,10 @@ CONFIGURE_ARGS =	--libdir=${MODTCL_TCLDI
 			--datadir=${PREFIX}/share/examples
 
 FAKE_FLAGS =		PKG_DIR=tkhtml INSTALL_PROGRAM='$$(INSTALL_DATA)'
-TEST_TARGET =	test
-TEST_IS_INTERACTIVE = X11
-SUBST_VARS =	VER
+TEST_TARGET =		test
+TEST_IS_INTERACTIVE =	X11
 
-VER =		30
+SUBST_VARS =		VER
+VER =			30
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/tkhtml/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo	18 Jan 2015 03:16:02 -0000	1.2
+++ distinfo	16 Jun 2026 02:28:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (tkhtml3-alpha-16.tar.gz) = 1d8FxT7TIFZbxB5mUFVN+lhU+zfRhgCxEDF+qoJVY6g=
-SIZE (tkhtml3-alpha-16.tar.gz) = 838580
+SHA256 (tkhtml3-Alpha-17.tar.gz) = 0t0knDQwb2hl7iVwlWByw2ghIs/FNqxVlc6l3v+aAKA=
+SIZE (tkhtml3-Alpha-17.tar.gz) = 1238570