On 2026/06/12 16:52, Stefan Sperling wrote:
> mergesiteset automates upgrades of custom siteXY.tgz sets to a
> different release of OpenBSD.
> 
> Modifications made to base system files are merged using merge(1).
> Merge conflicts can be resolved in a text editor or with sdiff(1),
> in a way similar to sysmerge(8).
> 
> Required OpenBSD installation sets will be downloaded and verified
> automatically. Root privileges are not required. Regardless, file
> permissions and ownership are preserved in the generated archive.
> 
> I have been using this script for some time now when upgrading
> systems which carry custom changes in files that are part of the
> base system.
> It works a bit like sysmerge(8), but unlike sysmerge it can be used
> to prepare files destined for a different OpenBSD machine.
> 
> Since this script might help others who have local changes applied
> across multiple systems, I propose to add this script to the ports tree.
> I am hosting a public Git repository in case others want to help and
> make submit improvements.
> 
> See https://chirpysoft.be/mergesiteset/ for more information.
> 
> ok to import?

please drop CONFIGURE_STYLE=none, it does nothing.

I ran out of time waiting for the files to download but
TEST_IS_INTERACTIVE only makes sense if it's really interactive. If
it's just due to needing network then a comment is useful but not more
really. However I would point at a mirror which can serve the required
files if run by a user with network access.

--- Makefile.orig	Fri Jun 12 15:39:18 2026
+++ Makefile	Fri Jun 12 16:56:03 2026
@@ -16,16 +16,13 @@ SITES =		https://chirpysoft.be/mergesiteset/releases/
 RUN_DEPENDS =	archivers/libarchive
 TEST_DEPENDS =	${RUN_DEPENDS}
 
-CONFIGURE_STYLE = none
+NO_BUILD =		Yes
 
+FAKE_FLAGS =	DESTDIR=
+
 # Tests download installation sets from the internet and need a mirror
 # which serves OpenBSD 7.4, 7.5, and 7.6.
-TEST_IS_INTERACTIVE =		Yes
-
-NO_BUILD =		Yes
-
 TEST_TARGET =		regress
-
-FAKE_FLAGS =	DESTDIR=
+TEST_FLAGS =		MIRROR=http://ftp.eu.openbsd.org/pub/OpenBSD
 
 .include <bsd.port.mk>