From nobody Wed Dec 13 10:14:55 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SqrvM4VRwz53XLC; Wed, 13 Dec 2023 10:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SqrvM3vhKz4Pfn; Wed, 13 Dec 2023 10:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702462495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S3Bo9OLOWmhjl1gNUrPrkYuzR76Pgp1q6hMvzDj+yZc=; b=upd0MZN4WnvxNqzvnjYCA5TPxUQxDnEj5sUscKlphStqr/o4Lg/H7dr4P7tLVxknzJdi/A muINRI6sgIhIsQeVrVdB8765QQH2PF9uT5shgHRnvGkKX6vPBMijm1IXUOUaIasbtBsNv7 J1DqA8eedqFwUSrpS0aEG7UewTDFAFzEFfw5vMMM/C95bf4iLV4iqVYEBqTMK1htFGGl6E Qk8L+HfeYUf2vZxkTdkb9wBpB6sVZ1eYuDR8fxC82LIgXnVBeVV/j8kzRfTNZTzLnQ+Oih 9vCCczfKHqQ5wP+OMWYsGUqEhYVdtu+4YrBHUFyZsxeal2dj7b9wLT40lMDeKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702462495; a=rsa-sha256; cv=none; b=OFgTe4lvcMCMtEZYbHyxILT+2e/m8Oo5vG9d/upnQ5oTpnSaZhWlpCPg2kxzfmlp/rOJM2 ALZrZ9YOrlVKAGEW5ODuLNIoekrLuei8GUWajjzEXp4B/0xCZzMVqU4FQNPWCn/uW25nkX XrwqSC7U8mS2hMOTQvCg+RioAurB+VCvNukWFcOms8YbJ0VFyHfWEHI+cnMzr1dfKAdcTK 7Z/mYeYaJx58QjnN5gh8mMgHNxNPpG68gNpmLV40gTguOD62sLp7mZyGHUScyAbqfJvM7r rINZz+tZWRhLERqHJR8unYkSPO9YfnqBY+uim+Ki6O+BnKpTiAYkWr4NMT+JRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702462495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S3Bo9OLOWmhjl1gNUrPrkYuzR76Pgp1q6hMvzDj+yZc=; b=Y6iy9igV9PqQu9Q0IgwV5QPzi01KZ1NzntwAosXACzEU7fXcHIwBXYZiHiSWla80mv6J4K sjDsmsL1i56NBB7JSlcikFcPRz5h3+zKTydr84k5yC8RKnRbg9/1OSgGIMA/L/qhXYNW25 jq1uJndPd5vDLX8ncUjOKVQtolh2L0y0l2aZacOd2b5L2n2XBFRXHbnvnhk+zVMcJltnEy b2dgjzFHb3EQS7iG1socIEl1f9l5QmO4TKmdiwZw93N/chM7mUu9nUtG4HRD8oFOITegZw mCQahnpJ1P4IJ6wZGprQneSdLeLQoV/cg+zw/bqFyfejVx3M76Zf1WxXV323ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SqrvM2zqjztrm; Wed, 13 Dec 2023 10:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BDAEten097747; Wed, 13 Dec 2023 10:14:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDAEtFs097744; Wed, 13 Dec 2023 10:14:55 GMT (envelope-from git) Date: Wed, 13 Dec 2023 10:14:55 GMT Message-Id: <202312131014.3BDAEtFs097744@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 172222e7e692 - main - games/alienarena: fix build/packaging client List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 172222e7e6922fc5a6fdf913c098491f8224ae9b Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=172222e7e6922fc5a6fdf913c098491f8224ae9b commit 172222e7e6922fc5a6fdf913c098491f8224ae9b Author: Dima Panov AuthorDate: 2023-12-04 05:38:04 +0000 Commit: Dima Panov CommitDate: 2023-12-13 10:13:56 +0000 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%%