From 172222e7e6922fc5a6fdf913c098491f8224ae9b Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Mon, 4 Dec 2023 08:38:04 +0300 Subject: games/alienarena: fix build/packaging client pkgconfig is unconditional build dependency CLIENT require minizip Fix plist without CLIENT PR: 275519 Approved by: maintainer (acm) Reported by: poudriere faiure Sponsored by: Serenity Cybersecurity, LLC --- games/alienarena/Makefile | 7 ++++--- games/alienarena/pkg-plist | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index d928705a8708..118cb2c7f6f7 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -1,5 +1,6 @@ PORTNAME= alienarena DISTVERSION= 7.71.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= games @@ -12,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/../docs/license.txt RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/arena/default.cfg:games/alienarena-data -USES= compiler:c++11-lib desktop-file-utils dos2unix gmake localbase +USES= compiler:c++11-lib desktop-file-utils dos2unix gmake localbase pkgconfig USE_CXXSTD= c++11 USE_GITHUB= yes @@ -25,7 +26,7 @@ MAKE_ENV= WITH_DATADIR=yes WITH_LIBDIR=yes \ DATADIR="${DATADIR}" LIBDIR="${LIBDIR}" # Fix build with clang11 -CFLAGS+= -fcommon +CFLAGS+= -fcommon -Wno-error=int-conversion EXTRACT_AFTER_ARGS= --exclude "data1" SUB_FILES= pkg-message @@ -49,7 +50,7 @@ CLIENT_LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libvorbis.so:audio/libvorbis \ libode.so:devel/ode -CLIENT_USES= gl jpeg openal:soft,alut pkgconfig xorg +CLIENT_USES= gl jpeg openal:soft,alut minizip xorg CLIENT_USE= GL=glu XORG=x11,xxf86dga,xxf86vm LIBDIR= ${PREFIX}/lib/${PORTNAME} diff --git a/games/alienarena/pkg-plist b/games/alienarena/pkg-plist index 4a7209da220c..40b5ad82338f 100644 --- a/games/alienarena/pkg-plist +++ b/games/alienarena/pkg-plist @@ -22,8 +22,8 @@ %%LIBDIR%%/data1/sound %%LIBDIR%%/data1/textures %%LIBDIR%%/data1/vehicles -share/applications/alienarena.desktop -share/icons/hicolor/256x256/apps/alien-arena.png +%%CLIENT%%share/applications/alienarena.desktop +%%CLIENT%%share/icons/hicolor/256x256/apps/alien-arena.png @dir %%LIBDIR%%/data1 @dir %%LIBDIR%%/arena @dir %%LIBDIR%% -- cgit v1.2.3