From nobody Sun Nov 06 18:16:09 2022 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 4N52c970RFz4gmRP; Sun, 6 Nov 2022 18:16:09 +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 4N52c96SF3z3sJG; Sun, 6 Nov 2022 18:16:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667758569; 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=XBB4woR7U/mn6Y150EutSToHbH9ee2vtPtSgb8mgW04=; b=XI85kdtjQknacdquNMbHdjmS7rxeMpeOXFFDaTx7CrR19yyiaieHyAyMsYPV6ycDVimtXA zlMIYwsVLeMPhqUnWTacvLytLporT6gj04fMwPAXLVUZXQhDcKLBjeiAPqeFnQxlqLRj3R yiAq7IcDGwW41DfYPzYBatpbXoRiV3TOCOAIr0rZq1ju//+jg+WAFOll6uzvMDgUJqT77v ZbdT2ywXo1i37NrUQmgpydAF9ANNx/lmZNN8eXPp6ac691zOcs5uD54GBX0G6Lhbrr1Wye M9bXuyZ13oWQ3m0JYdvOD48jpPd7jHu1kZeiZ4aTCSlh1J/aTgKYoBql7d8vLg== 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 4N52c95W0GzWdX; Sun, 6 Nov 2022 18:16:09 +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 2A6IG9ie010355; Sun, 6 Nov 2022 18:16:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6IG9gg010354; Sun, 6 Nov 2022 18:16:09 GMT (envelope-from git) Date: Sun, 6 Nov 2022 18:16:09 GMT Message-Id: <202211061816.2A6IG9gg010354@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 8037c83d39bf - main - games/SpaceCadetPinball: fix installation 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: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8037c83d39bf549795f849506bc5fba109a8fc0c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667758569; 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=XBB4woR7U/mn6Y150EutSToHbH9ee2vtPtSgb8mgW04=; b=Zc6C3iIiDgZWI8WEa+x7XavrBQFib9qiteHPFZ20081tbWaQO1JndAxaaFSMAnu3QdOGCw AQ9agV0zqS7sd4Cv9E7ylEl/pR/PGfdkbgGXjH9G8iO5HBDJythayLyheQBMTGztB/WkVk EIJYoiignhLCpIhUkDa0pPKlatI7yackHUPN04U/JayknWzmTNUy+6NGZ2H9tcL6yifILo k98Ir+/hMxuGP7eyqW1KVsh8+UM8r49K/W6rqRHhdSWizDLGCp+ytj9k9+LC3jIGEZs69m 7t3wbzkUn1QDMQ4BMq1+fRKuQ4rZUJE+Al3zzzBnvZcLXZQw3rvAp8My09wskw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667758569; a=rsa-sha256; cv=none; b=f19TFtPtROF3MTBpAAOC7F/swGT2wd4ubB+TXHrwUy/QRlPWoJ/TITmReqVAIEQEdzvSHo OzF9WvP17JunK7s56amsZg8HCe/NMoNK4rIgFnhMN56J+A8xfYzVNYs8WKHwC4MDqesl+3 le6AtOQJdtdV8HM7Mu1AqyKJVIMYG44Kfqxav6MI1BdqfoJxYwKFDHqRTpW6i6BO7xptwC mkQmebixMVrwj3Vmp9LeCfgPmnbiWPMoOxHIr/GeM7deNPUltJtU5LBny0y7Z1zCClz7Pq lJuPSzoIFFu4kAfUO/oZYG7kjxJi8dgrAjTSEX793C7zYAHmkWBNKbMU63w2FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=8037c83d39bf549795f849506bc5fba109a8fc0c commit 8037c83d39bf549795f849506bc5fba109a8fc0c Author: Dmitry Marakasov AuthorDate: 2022-11-06 18:15:08 +0000 Commit: Neel Chauhan CommitDate: 2022-11-06 18:16:04 +0000 games/SpaceCadetPinball: fix installation PR: 265355 --- games/SpaceCadetPinball/Makefile | 1 + games/SpaceCadetPinball/files/patch-CMakeLists.txt | 39 ++++++++++------------ 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/games/SpaceCadetPinball/Makefile b/games/SpaceCadetPinball/Makefile index 0f72901367cd..16da48297be0 100644 --- a/games/SpaceCadetPinball/Makefile +++ b/games/SpaceCadetPinball/Makefile @@ -1,5 +1,6 @@ PORTNAME= SpaceCadetPinball PORTVERSION= 2.0.1 +PORTREVISION= 1 DISTVERSIONPREFIX= Release_ CATEGORIES= games diff --git a/games/SpaceCadetPinball/files/patch-CMakeLists.txt b/games/SpaceCadetPinball/files/patch-CMakeLists.txt index 4bd7abecdb39..f958334acbad 100644 --- a/games/SpaceCadetPinball/files/patch-CMakeLists.txt +++ b/games/SpaceCadetPinball/files/patch-CMakeLists.txt @@ -1,39 +1,34 @@ --- CMakeLists.txt.orig 2021-12-29 06:46:09 UTC +++ CMakeLists.txt -@@ -24,8 +24,10 @@ set(SDL2_BUILDING_LIBRARY ON) +@@ -23,9 +23,10 @@ endif() + set(SDL2_BUILDING_LIBRARY ON) find_package(SDL2 REQUIRED) - FIND_PACKAGE(SDL2_mixer REQUIRED) +find_package(X11 REQUIRED) -+link_libraries(${X11_LIBRARIES}) + FIND_PACKAGE(SDL2_mixer REQUIRED) -include_directories(${SDL2_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIR}) +include_directories(${SDL2_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIR} ${X11_INCLUDE_DIR}) get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) foreach(dir ${dirs}) message(STATUS "Include dir='${dir}'") -@@ -201,6 +203,8 @@ endif() +@@ -199,7 +200,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.16.0" OR ${CMAK + ) + endif() - target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY}) +-target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY}) ++target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY} ${X11_LIBRARIES}) -+install(TARGETS SpaceCadetPinball DESTINATION bin) -+ # On Windows, copy DLL to output if(WIN32) - list(GET SDL2_LIBRARY -1 SDL2_DLL_PATH) -@@ -216,15 +220,4 @@ if(WIN32) - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SDL2_DLL_PATH}/SDL2.dll" $ - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SDL2_MIXER_DLL_PATH}/SDL2_mixer.dll" $ - ) --endif() -- --if(UNIX AND NOT APPLE) -- include(GNUInstallDirs) -- install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") +@@ -221,8 +222,8 @@ endif() + if(UNIX AND NOT APPLE) + include(GNUInstallDirs) + install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - install(FILES "/Platform/Linux/${PROJECT_NAME}.desktop" DESTINATION "share/applications") - install(FILES "/Platform/Linux/${PROJECT_NAME}.metainfo.xml" DESTINATION "share/metainfo") -- foreach(S 16 32 48 128 192) -- install(FILES "${PROJECT_NAME}/Icon_${S}x${S}.png" DESTINATION -- "share/icons/hicolor/${S}x${S}/apps" RENAME "${PROJECT_NAME}.png") -- endforeach(S) - endif() ++ install(FILES "Platform/Linux/${PROJECT_NAME}.desktop" DESTINATION "share/applications") ++ install(FILES "Platform/Linux/${PROJECT_NAME}.metainfo.xml" DESTINATION "share/metainfo") + foreach(S 16 32 48 128 192) + install(FILES "${PROJECT_NAME}/Icon_${S}x${S}.png" DESTINATION + "share/icons/hicolor/${S}x${S}/apps" RENAME "${PROJECT_NAME}.png")