From: Marc Espie <marc.espie.openbsd@gmail.com>
Subject: conflict marker is broken in gimp-3.2.4
To: ports@openbsd.org
Date: Wed, 24 Jun 2026 21:30:44 +0200

I don't even understand how it still manages to update (more or less) after
we passed from 3.0 to 3.2

I saw some really fun messages while updating my machine today.

Index: Makefile
===================================================================
RCS file: /build/data/openbsd/cvs/ports/graphics/gimp/snapshot/Makefile,v
diff -u -p -r1.39 Makefile
--- Makefile	18 Jun 2026 21:10:31 -0000	1.39
+++ Makefile	24 Jun 2026 19:28:36 -0000
@@ -10,6 +10,7 @@ GIMP_API_V=	3.0
 GIMP_APP_V=	${V:R}
 DISTNAME=	gimp-${V}
 SUBST_VARS +=	GIMP_API_V GIMP_APP_V
+REVISION=	0
 
 .for i in gimp gimpbase gimpcolor gimpconfig gimpmath gimpmodule \
 	gimpthumb gimpui gimpwidgets gimp-scriptfu
Index: pkg/PLIST
===================================================================
RCS file: /build/data/openbsd/cvs/ports/graphics/gimp/snapshot/pkg/PLIST,v
diff -u -p -r1.16 PLIST
--- pkg/PLIST	15 Mar 2026 12:43:33 -0000	1.16
+++ pkg/PLIST	24 Jun 2026 19:28:58 -0000
@@ -1,6 +1,6 @@
 @option no-default-conflict
 @option is-branch
-@conflict gimp->=2.99,<3.1
+@conflict gimp->=2.99,<4
 @bin bin/gimp-${GIMP_APP_V}
 @bin bin/gimp-console-${GIMP_APP_V}
 @bin bin/gimp-script-fu-interpreter-${GIMP_API_V}