git: 5515fdf0500f - 2022Q1 - print/libotf: add X11 option and fix otfview build

The branch 2022Q1 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5515fdf0500f7176f509b825f41fa0caed7c2020

commit 5515fdf0500f7176f509b825f41fa0caed7c2020
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-02 09:02:12 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-15 02:16:13 +0000

    print/libotf: add X11 option and fix otfview build
    
    PR:             260873
    Approved by:    Nikola Lečić (maintainer)
    
    (cherry picked from commit 360ad16edd05b0c135063dd40e9f6ae292120d56)
---
 print/libotf/Makefile  | 12 ++++++++++--
 print/libotf/pkg-plist |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/print/libotf/Makefile b/print/libotf/Makefile
index b95867c9fd6b..9e913d48892d 100644
--- a/print/libotf/Makefile
+++ b/print/libotf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libotf
 DISTVERSION=	0.9.16
+PORTREVISION=	1
 CATEGORIES=	print devel textproc
 MASTER_SITES=	SAVANNAH/m17n
 
@@ -13,10 +14,17 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-USES=		autoreconf pathfix pkgconfig libtool:keepla xorg
+USES=		autoreconf pathfix pkgconfig libtool:keepla
 GNU_CONFIGURE=	yes
-USE_XORG=	ice sm x11 xaw xt xmu
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=X11
+OPTIONS_SUB=	yes
+
+X11_USES=		localbase xorg
+X11_USE=		XORG=ice,sm,x11,xaw,xt,xmu
+X11_CONFIGURE_WITH=	x
+
 .include <bsd.port.mk>
diff --git a/print/libotf/pkg-plist b/print/libotf/pkg-plist
index e1bb97bc1e3b..b0a7f5000598 100644
--- a/print/libotf/pkg-plist
+++ b/print/libotf/pkg-plist
@@ -2,6 +2,7 @@ bin/libotf-config
 bin/otfdump
 bin/otflist
 bin/otftobdf
+%%X11%%bin/otfview
 include/otf.h
 lib/libotf.a
 lib/libotf.la