Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Aug 2023 18:53:55 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: ec698dcda7b9 - main - games/miscom: Fix build with llvm16
Message-ID:  <202308021853.372IrtXC084526@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=ec698dcda7b9b4817fbb083a8e06629482553e02

commit ec698dcda7b9b4817fbb083a8e06629482553e02
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-08-02 17:14:58 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-08-02 18:53:44 +0000

    games/miscom: Fix build with llvm16
    
    - Utilize DOCSDIR/DATADIR macros where possible
    
    Approved by:    portmgr (blanket)
    Sponsored by:   The FreeBSD Foundation
---
 games/miscom/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/games/miscom/Makefile b/games/miscom/Makefile
index 450b0956f562..60634644454d 100644
--- a/games/miscom/Makefile
+++ b/games/miscom/Makefile
@@ -30,14 +30,20 @@ OPTIONS_DEFINE=	DOCS
 CFLAGS+=	-DSOUNDSDIR='\"${DATADIR}\"' -DSOUND_SUPPORT -DMORE_SOUNDBUF
 .endif
 
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/miscom ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/miscom.6 ${STAGEDIR}${PREFIX}/man/man6
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/miscom
-	${INSTALL_DATA} ${WRKSRC}/sounds/* ${STAGEDIR}${PREFIX}/share/miscom
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/miscom
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/sounds/* ${STAGEDIR}${DATADIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in COPYING ChangeLog README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/share/doc/miscom
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>



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