From nobody Mon Jan 03 18:11:15 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 CB40A191A91E; Mon, 3 Jan 2022 18:11:15 +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 4JSP2C3tkJz3C7v; Mon, 3 Jan 2022 18:11:15 +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 653871D50; Mon, 3 Jan 2022 18:11:15 +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 203IBFvn009026; Mon, 3 Jan 2022 18:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203IBFav009025; Mon, 3 Jan 2022 18:11:15 GMT (envelope-from git) Date: Mon, 3 Jan 2022 18:11:15 GMT Message-Id: <202201031811.203IBFav009025@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: 8e996ba49e37 - main - games/SpaceCadetPinball: Update to 2.0.1 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: 8e996ba49e37fed8a4b42d554f6aabdc1b17a3ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641233475; 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=8OBaa1k9q3hjWAtbQmnDFZmi0C68Xj48DqBiDuStY08=; b=k8brZHBFPkyfa5qP3vfwWGBtJKnJpxq9o8ws1QD0SK8iZ3iC1KNth7CRe7IHDKVaYRdbCv QVNNFMYHZX7PDQ7UB4XZ1fFBGQtRwOUnCCNH6+XfzoxLgR45F2JiFN/D0nt5LohnZ2HAMl nvN0q3QF3HyI92pN5ZIqfY82QYIcAtT4ShsDCQyNBzrtUUjUQGvTDlapTuaUJrw+JUdfZO zQFD2e37b+YLrUew3WXtirUw7LN6Coboa+05+yABeCYQQt0//qEwyBD1OeI3KAzA3ry54x 6eQBjfu3rYDFNSUVQGclKsijFZEMDO0Q9lSKLpn7gP7Bpm9UtZGDfoi2M4Avmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641233475; a=rsa-sha256; cv=none; b=OhnOl517OhQSgiCYmEnC0/zYdkZKSw0Y5ot0u4BhbotOHEZV2pKqt0VCFQQxzFF9A9lCHz F/ntKGOuqPUjy8AEZUXnv/FB3ZDmCp7Y9K4W74TavRN01fh4IF2Arqq/6cbLgKEnr5fHLE j7l7nhgcpyASw0HRhkQ6qOk78ZN3K38wM4NXnhrGpz09zYhN7nMgV+IhUtWPxC4ocVJVse SorE2GGXG3/EyU4+UTFY3uXvdBf8SYpUMa9EBPRiqPKQUaLp+vhYCjyvNCxbtIQ8gCd472 1Q2T6ZgMXOKb4LrdwaBDC+LAhez/uhl/qM4mwsrzVo8OWJB6eyGLrCTzSV11vw== 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=8e996ba49e37fed8a4b42d554f6aabdc1b17a3ea commit 8e996ba49e37fed8a4b42d554f6aabdc1b17a3ea Author: Neel Chauhan AuthorDate: 2022-01-03 17:31:09 +0000 Commit: Neel Chauhan CommitDate: 2022-01-03 18:11:12 +0000 games/SpaceCadetPinball: Update to 2.0.1 --- games/SpaceCadetPinball/Makefile | 2 +- games/SpaceCadetPinball/distinfo | 6 +++--- games/SpaceCadetPinball/files/patch-CMakeLists.txt | 25 +++++++++++++++------- .../files/patch-SpaceCadetPinball_winmain.cpp | 11 ---------- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/games/SpaceCadetPinball/Makefile b/games/SpaceCadetPinball/Makefile index a5d67bd2d8a9..bb476f4fc480 100644 --- a/games/SpaceCadetPinball/Makefile +++ b/games/SpaceCadetPinball/Makefile @@ -1,5 +1,5 @@ PORTNAME= SpaceCadetPinball -PORTVERSION= 2.0 +PORTVERSION= 2.0.1 DISTVERSIONPREFIX= Release_ CATEGORIES= games diff --git a/games/SpaceCadetPinball/distinfo b/games/SpaceCadetPinball/distinfo index 83191bb3100d..ae8fd7bccbf0 100644 --- a/games/SpaceCadetPinball/distinfo +++ b/games/SpaceCadetPinball/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635784957 -SHA256 (k4zmu2a-SpaceCadetPinball-Release_2.0_GH0.tar.gz) = 619f66e4ba185979218772bf84c11e97cd44cd84adcc818c88aa9f2c2c8b4316 -SIZE (k4zmu2a-SpaceCadetPinball-Release_2.0_GH0.tar.gz) = 933826 +TIMESTAMP = 1641229815 +SHA256 (k4zmu2a-SpaceCadetPinball-Release_2.0.1_GH0.tar.gz) = 7b71815339c86a428d3569a5235c6ece0e2d4ff1d8025984ede6f772ca4f5423 +SIZE (k4zmu2a-SpaceCadetPinball-Release_2.0.1_GH0.tar.gz) = 1882629 diff --git a/games/SpaceCadetPinball/files/patch-CMakeLists.txt b/games/SpaceCadetPinball/files/patch-CMakeLists.txt index b5954264b6f8..4bd7abecdb39 100644 --- a/games/SpaceCadetPinball/files/patch-CMakeLists.txt +++ b/games/SpaceCadetPinball/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2021-10-10 14:13:43 UTC +--- CMakeLists.txt.orig 2021-12-29 06:46:09 UTC +++ CMakeLists.txt @@ -24,8 +24,10 @@ set(SDL2_BUILDING_LIBRARY ON) @@ -12,19 +12,28 @@ get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) foreach(dir ${dirs}) message(STATUS "Include dir='${dir}'") -@@ -197,6 +199,8 @@ target_precompile_headers(SpaceCadetPinball - ) +@@ -201,6 +203,8 @@ endif() target_link_libraries(SpaceCadetPinball ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY}) -+ -+install(TARGETS SpaceCadetPinball DESTINATION bin) ++install(TARGETS SpaceCadetPinball DESTINATION bin) ++ # On Windows, copy DLL to output if(WIN32) -@@ -213,4 +217,4 @@ 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() -\ No newline at end of file -+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() diff --git a/games/SpaceCadetPinball/files/patch-SpaceCadetPinball_winmain.cpp b/games/SpaceCadetPinball/files/patch-SpaceCadetPinball_winmain.cpp deleted file mode 100644 index 9784ec56667e..000000000000 --- a/games/SpaceCadetPinball/files/patch-SpaceCadetPinball_winmain.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- SpaceCadetPinball/winmain.cpp.orig 2021-10-14 18:28:42 UTC -+++ SpaceCadetPinball/winmain.cpp -@@ -56,7 +56,7 @@ int winmain::WinMain(LPCSTR lpCmdLine) - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Could not initialize SDL2", SDL_GetError(), nullptr); - return 1; - } -- BasePath = SDL_GetBasePath(); -+ BasePath = SDL_strdup("./"); - - pinball::quickFlag = strstr(lpCmdLine, "-quick") != nullptr; - DatFileName = options::get_string("Pinball Data", pinball::get_rc_string(168, 0));