git: 421142eba77d - main - games/xboing: Fix build with llvm15
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 10 Jun 2023 17:14:24 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=421142eba77d3b6cd1bf5e13d29aa1cf8fb8b3f4
commit 421142eba77d3b6cd1bf5e13d29aa1cf8fb8b3f4
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-10 17:07:17 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-10 17:14:08 +0000
games/xboing: Fix build with llvm15
- Refactor deprecated @exec/@unexec
- Pet portclippy
---
games/xboing/Makefile | 9 ++++++++-
games/xboing/pkg-plist | 6 ++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index a383275e5d93..d0d91a532bb4 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,6 +1,6 @@
PORTNAME= xboing
PORTVERSION= 2.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}${PORTVERSION}
@@ -12,6 +12,7 @@ LICENSE= MIT
USES= cpe imake xorg
USE_XORG= xpm xext x11
+
WRKSRC= ${WRKDIR}/xboing
OPTIONS_DEFINE=SOUND
@@ -20,6 +21,12 @@ OPTIONS_SUB=yes
SOUND_MAKE_ENV= WITHOUT_AUDIO=True
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+= -Wno-error=int-conversion
+.endif
+
post-install:
${RM} ${STAGEDIR}${PREFIX}/lib/X11/xboing/.xboing.scr
diff --git a/games/xboing/pkg-plist b/games/xboing/pkg-plist
index 1d0b9c211507..d83669a7a0d0 100644
--- a/games/xboing/pkg-plist
+++ b/games/xboing/pkg-plist
@@ -130,8 +130,6 @@ man/man1/xboing.1.gz
%%SOUND%%lib/X11/xboing/sounds/wzzz2.au
%%SOUND%%lib/X11/xboing/sounds/youagod.au
lib/X11/xboing/problems.doc
-@exec touch %D/lib/X11/xboing/.xboing.scr
-@exec chown root:games %D/lib/X11/xboing/.xboing.scr
-@exec chmod 664 %D/lib/X11/xboing/.xboing.scr
-@unexec if test ! -s %D/lib/X11/xboing/.xboing.scr ; then rm -f %D/lib/X11/xboing/.xboing.scr ; fi
+@postexec touch %D/lib/X11/xboing/.xboing.scr
+@rmtry(root,games,664) lib/X11/xboing/.xboing.scr
@dir(root,games,775) lib/X11/xboing