From: Volker Schlecht <openbsd-ports@schlecht.dev>
Subject: print/ghostscript/gnu - reduce FLAVORS
To: Matthias Kilian <kili@outback.escape.de>, ports@openbsd.org
Date: Mon, 15 Jul 2024 22:38:34 +0200

>On 2024/07/15 21:29, Matthias Kilian wrote:
>> Slightly offtopic, but do we still need ghostscripts a4 and no_x11
>> FLAVORS?

Moving this to a new thread. I'll look into including the rest of ghostpdl
next.

I'd be very happy to drop -no_x11 and -a4.

ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/ghostscript/Makefile,v
diff -u -p -r1.15 Makefile
--- Makefile	11 Mar 2022 19:51:00 -0000	1.15
+++ Makefile	15 Jul 2024 20:31:51 -0000
@@ -1,10 +1,6 @@
     SUBDIR =
     SUBDIR += gnu
-    SUBDIR += gnu,a4
     SUBDIR += gnu,gtk
-    SUBDIR += gnu,gtk,a4
-    SUBDIR += gnu,no_x11
-    SUBDIR += gnu,no_x11,a4
     SUBDIR += gnu-fonts
 
 .include <bsd.port.subdir.mk>
Index: gnu/Makefile
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
diff -u -p -r1.131 Makefile
--- gnu/Makefile	20 May 2024 10:30:52 -0000	1.131
+++ gnu/Makefile	15 Jul 2024 20:31:51 -0000
@@ -5,6 +5,7 @@ DISTNAME =	ghostscript-${VERSION}
 EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	lang print
 SHARED_LIBS =	gs 18.2
+REVISION =	0
 
 SITES =		https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${VERSION:S/.//g}/
 
@@ -14,7 +15,7 @@ HOMEPAGE =	https://ghostscript.com/
 
 MAINTAINER =	Volker Schlecht <openbsd-ports@schlecht.dev>
 
-FLAVORS =	a4 gtk no_x11
+FLAVORS =	gtk
 FLAVOR?=
 
 FLAVOR_STRING =	${FLAVOR_EXT:S/-/,/g}
@@ -64,28 +65,21 @@ CONFIGURE_ARGS +=	--with-fontpath=${LOCA
 CONFIGURE_ARGS +=	--with-drivers=FILES,PRINTERS,X11
 CONFIGURE_ARGS +=	--mandir=${LOCALBASE}/man
 
-.if ${FLAVOR:Mgtk} && ${FLAVOR:Mno_x11}
-ERRORS +=	"Fatal: Conflicting flavors: ${FLAVOR}"
-.elif ${FLAVOR:Mgtk}
+.if ${FLAVOR:Mgtk}
 LIB_DEPENDS +=	x11/gtk+3
 WANTLIB +=	ICE SM X11 Xext Xt
 WANTLIB +=	atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
 WANTLIB +=	glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0
 WANTLIB +=	pangocairo-1.0
 CONFIGURE_ARGS +=	--enable-gtk
-.elif ${FLAVOR:Mno_x11}
-CONFIGURE_ARGS +=	--disable-dbus
-CONFIGURE_ARGS +=	--disable-gtk
-CONFIGURE_ARGS +=	--without-x
 .else
 WANTLIB +=	ICE SM X11 Xext Xt
 CONFIGURE_ARGS +=	--disable-gtk
 CONFIGURE_ARGS +=	--disable-dbus
 CONFIGURE_ARGS +=	--with-x
 .endif
-.if ${FLAVOR:Ma4}
+
 CFLAGS +=	-DA4
-.endif
 
 # Needed to make the configure script detect libiconv
 CONFIGURE_ENV +=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"