git: 246d74ac73f9 - 2023Q1 - graphics/gifsicle: flavorize (x11 as default and nox11)

The branch 2023Q1 has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=246d74ac73f92320514e87bb3c0d77ba21ed58fd

commit 246d74ac73f92320514e87bb3c0d77ba21ed58fd
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2023-02-15 00:11:06 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2023-02-15 00:18:22 +0000

    graphics/gifsicle: flavorize (x11 as default and nox11)
    
    It turns out there are conflicting interests between desktop and
    server users of this port. Flavoring the port will solve the issue by
    creating packages with x11 dependency and without.
    
    PR:             259715, 269274
    Reported by:    kennedy.greg@gmail.com, 0mp
    Reviewed by:    0mp
    MFH:            2023Q1
    
    (cherry picked from commit 9fa9c432290140ad4668da46934b93767a53bf07)
---
 graphics/gifsicle/Makefile | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 04df2b73d050..b136a88d4440 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	gifsicle
 PORTVERSION=	1.93
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.lcdf.org/gifsicle/
+MASTER_SITES=	https://www.lcdf.org/gifsicle/
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Manipulates GIF images and animations
@@ -14,6 +14,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_mips=		fails to build: undefined reference to '__sync_add_and_fetch_4'
 BROKEN_mips64=		fails to build: undefined reference to '__sync_add_and_fetch_4'
 
+FLAVORS=		x11 nox11
+FLAVOR?=		${FLAVORS:[1]}
+nox11_PKGNAMESUFFIX=	-nox11
+
 USES=		cpe
 
 CPE_VENDOR=	gifsicle_project
@@ -24,14 +28,19 @@ PORTDOCS=	NEWS.md README.md
 PLIST_FILES=	bin/gifdiff bin/gifsicle \
 		man/man1/gifdiff.1.gz man/man1/gifsicle.1.gz
 
-OPTIONS_DEFINE=		DOCS X11
-OPTIONS_DEFAULT=	X11
-
-X11_USES=		xorg
-X11_USE=		xorg=x11
-X11_CONFIGURE_ENABLE=	gifview
-X11_CONFIGURE_WITH=	x
-X11_PLIST_FILES=	bin/gifview man/man1/gifview.1.gz
+.if ${FLAVOR} == x11
+USES+=			xorg
+USE_XORG=		x11
+CONFIGURE_ARGS=		--enable-gifview \
+			--with-x
+PLIST_FILES+=		bin/gifview \
+			man/man1/gifview.1.gz
+CONFLICTS_INSTALL=	gifsicle-nox11
+.else
+CONFLICTS_INSTALL=	gifsicle
+.endif
+
+OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}