From nobody Wed Dec 15 13:08:33 2021 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 49DBA18DADFC; Wed, 15 Dec 2021 13:08:34 +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 4JDbCk0Djkz3jFf; Wed, 15 Dec 2021 13:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D1BB91C908; Wed, 15 Dec 2021 13:08:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BFD8XEg030450; Wed, 15 Dec 2021 13:08:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BFD8XKm030449; Wed, 15 Dec 2021 13:08:33 GMT (envelope-from git) Date: Wed, 15 Dec 2021 13:08:33 GMT Message-Id: <202112151308.1BFD8XKm030449@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 89f138370e4c - main - games/{enigma,openspades}: rollback USES=magick for my ports 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89f138370e4c0369985d69b2d283194620773929 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639573714; 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=mz9ah5lnD+VMWk0EDUnhbjqt19r9d02FWNVb8zX2HDA=; b=Y3k6R77YfNsaP3X7R2zHMXM8G/xbncZrMjkhtApBf9UfzrKQaHp4R6Weui+U4qoCMLGDZV 3AqeCsy+TOQzwyDG9kUI6sSaLuPXBtPGxtGrXgem5kNQAO8skyjrWcOGeKqx5yhsNqfM+P i/r6+NlsYbm1bUd8sQdL9uQu/wbhANxiwesJ20qimnPMY7Y1PjfCtNEH36LyvpWghwrpof AcrIiZkVOpPcWntz97DZ1UKL+Me+ebstZRQg4ppjPJPKL9XpKpCXzqHdouwuMq/LpM9bsM B59+7bm5PI3Wj93/ep/R2Sz7Qfr55CbZ+ba0vOgMDVs8+vbrBw3zwU3wCHkVMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639573714; a=rsa-sha256; cv=none; b=lH0nS56EqQUyy9H7NNPmLVD8s0dwvrsvTFYwG9D4jlJq2fjQd/4NMXVTlRB9JZCj6Xb7rm u038xWQVnPlEi3IkQd/sHiB430ebuotiLxe77ksBkNd8oWRqc2E3iLxUqX9hgLwo3sDiBs 6a0CcsFtiI/OFDqEPPN1OG/vtBvUcIOYLq4M6F4IBuXtErr5LRP72dxgQiDX22SFGgSp51 SgTHqDmwuL6F17v1Iowz+m2Zh9r02FUPHMrOuyOLg0z3NPqaXL4ZUZpVqtwFY4i9G9TOiK WJY8ExiqN7Y5sM2UU2drcmd10qWJHSxPZiGMib5mfUI+lodP7taJRIfLiNXCtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=89f138370e4c0369985d69b2d283194620773929 commit 89f138370e4c0369985d69b2d283194620773929 Author: Dmitry Marakasov AuthorDate: 2021-12-15 13:02:44 +0000 Commit: Dmitry Marakasov CommitDate: 2021-12-15 13:02:44 +0000 games/{enigma,openspades}: rollback USES=magick for my ports Roll back pessimization introduced in 45526ec for (my) ports which need *any* version of imagemagick: switch to USES=magick makes them needlessly requre *specific* version/flavor which cause conflicts. --- games/enigma/Makefile | 3 ++- games/openspades/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/games/enigma/Makefile b/games/enigma/Makefile index 9cb448453776..26758c47be45 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -14,12 +14,13 @@ LIB_DEPENDS= libxerces-c.so.3:textproc/xerces-c3 \ libpng.so:graphics/png \ libenet.so:net/enet \ libcurl.so:ftp/curl +BUILD_DEPENDS= convert:graphics/ImageMagick6 USE_GITHUB= yes GH_ACCOUNT= Enigma-Game GH_PROJECT= Enigma -USES= autoreconf:build gettext gmake iconv localbase magick:6,build pkgconfig sdl +USES= autoreconf:build gettext gmake iconv localbase pkgconfig sdl GNU_CONFIGURE= yes USE_SDL= sdl2 image2 mixer2 ttf2 CONFIGURE_ARGS= --with-system-enet diff --git a/games/openspades/Makefile b/games/openspades/Makefile index 48f79b74fc3f..cd5f8606416e 100644 --- a/games/openspades/Makefile +++ b/games/openspades/Makefile @@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= bundles non-portable AngelScript +BUILD_DEPENDS= convert:graphics/ImageMagick6 # for building icons LIB_DEPENDS= libcurl.so:ftp/curl \ libopusfile.so:audio/opusfile @@ -22,7 +23,7 @@ USE_GITHUB= yes GH_ACCOUNT= yvt USES= cmake:insource compiler:c++11-lib desktop-file-utils dos2unix \ - gl gnome magick:6,build openal sdl xorg + gl gnome openal sdl xorg CMAKE_ARGS= -DOPENSPADES_RESOURCES=OFF \ -DOPENSPADES_INSTALL_MAN="man/man6" \ -DOPENSPADES_INSTALL_BINARY="bin" \