git: 851a0e0c4432 - main - graphics/xpaint: use openjpeg15 includes in Right Way (tm)

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Fri, 18 Feb 2022 09:34:58 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=851a0e0c44321523e044fef72343e204c8e52c85

commit 851a0e0c44321523e044fef72343e204c8e52c85
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-02-18 09:01:34 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-02-18 09:01:34 +0000

    graphics/xpaint: use openjpeg15 includes in Right Way (tm)
    
    Sponsored by:   Netzkommune GmbH
---
 graphics/xpaint/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 9f9ba078c310..ce60f52c3274 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xpaint
 PORTVERSION=	2.9.10.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
@@ -16,18 +16,18 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2 \
 		libjbig.so:graphics/jbigkit \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libXaw3dxft.so:x11-toolkits/libxaw3dxft
 RUN_DEPENDS=	psselect:print/psutils \
 		bash:shells/bash
 
 GNU_CONFIGURE=	yes
-USES=		ghostscript:run jpeg libtool:build pkgconfig shebangfix \
-		tar:bzip2 xorg
-USE_XORG=	xft xmu xpm
+USES=		ghostscript:run jpeg libtool:build localbase:ldflags \
+		pkgconfig shebangfix tar:bzip2 xorg
+USE_XORG=	ice sm x11 xext xft xmu xpm xt
 SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/openjpeg-1.5
 MAKE_ENV+=	RM="${RM}"
 
 post-patch: