Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Jul 2023 19:58:04 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 681db9df6bae - main - converters/xdeview: Fix build with llvm16
Message-ID:  <202307211958.36LJw41V041221@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=681db9df6bae3fcf0be032e3be44b0eaadd8a189

commit 681db9df6bae3fcf0be032e3be44b0eaadd8a189
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-21 19:21:26 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-21 19:57:52 +0000

    converters/xdeview: Fix build with llvm16
    
    - Utilize USES=localbase
    - Pet portclippy
    
    Sponsored by:   The FreeBSD Foundation
---
 converters/xdeview/Makefile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 5b086633000a..b202f2a2d125 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -14,7 +14,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libuu.so:converters/uulib
 
-USES=		desthack tk
+USES=		desthack localbase:ldflags tk
+
 GNU_CONFIGURE=	yes
 # Explicitly disable Tcl otherwise the configure script picks-up
 # crud from the $PATH like /usr/opt/Simili/tcl/.
@@ -23,17 +24,21 @@ ALL_TARGET=	xdeview
 INSTALL_TARGET=	install-tcl
 
 CPPFLAGS+=	-I${TCL_INCLUDEDIR} -DHAVE_TCL \
-		-I${TK_INCLUDEDIR} -DHAVE_TK \
-		-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib \
-		-lX11 -ltcl${TCL_VER:S/.//} \
+		-I${TK_INCLUDEDIR} -DHAVE_TK
+LDFLAGS+=	-lX11 -ltcl${TCL_VER:S/.//} \
 		-ltk${TCL_VER:S/.//} -lm
 
-PORTDOCS=	*
 PLIST_FILES=	bin/uuwish bin/xdeview man/man1/xdeview.1.gz
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/uuwish
 	${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${STAGEDIR}${MANPREFIX}/man/man1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307211958.36LJw41V041221>