From nobody Wed Jan 18 23:16:39 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 4Ny1qC3mQnz2v37x; Wed, 18 Jan 2023 23:16:39 +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 4Ny1qC3FZJz4MfQ; Wed, 18 Jan 2023 23:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674083799; 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=c29BDbDfjk6Z74vHcbQ0BvlQXr3CpW0qLG+hw9DKWg4=; b=egeP3Fv0aPz0T+/qR8sOJWP03B0DNQFsHDaGwKY0hSh//ogQlTckSbDez85RNhb2RcLT9p nCWS3T7Hq7InZFlwenu7cPMjCGAdPLZlIeoo5MWyqGhJQW0kPtA8qLCi/hkUc3Z+kwndi/ afMCsKKyPMG+exbs3D5Gsn6Z51NNmDwU3ghXNiZ7YqcJ+Q6ezXRLZ7zsDjY7YyYZnx792N rNzTwrcM2VG2ehHw6b2Q++Dy4it9pCbPFJxhavDDXN8HODJrPnfJB8T944/Jm5pd6RPHnL zH1Ec/zmOJ2WU6Eg1K38a4vAJvonTCh/XEI6kNtK0iuiZcLFtbKQMkbKwh3bpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674083799; 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=c29BDbDfjk6Z74vHcbQ0BvlQXr3CpW0qLG+hw9DKWg4=; b=GlPtK4YiD6CNC3c41LEXxvDFJVjKQsLNRhFRwxWwUmf7wYWOpd/6IgkhkjpgsLY7uD8TLl aqCU/XNSVlPD32oh0sHOASYBDGxmTWDcIahBJoUwlCFZS7w4svY4ZQsSNPA9e3rAWXGUnv 27qcq0sgzUeeV6Q5INMt2mpN6DP/i1MOPtWbo+IoMX56QrLmRJdwWTOYCFsKPzPmiRtlBi eGEkgiJ+YWG16p7i3vTn4yOeeRMAAlcaYirCXoGt0sUVTJE7JM0Myo8tK917UZ/F5GecEw aOs27KfhDQRfkciUK76cNm3BFWutcJihO7ztjITw4hCi+DNlb0Vn+6XkSv7rlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674083799; a=rsa-sha256; cv=none; b=bIK8xRFPuEhS7Oi8m4X5qNPvRw8+QS5RyRn/NAjBjqXxbA14+P5T/iDoz+C/+JuMZDJKSg TPxh736FGgTKr1nLgQ9cenj3YNEq4lpm5Sc8atvVBe7hw71sPYAd11KArs6boZUalUc6tM Aks1/I7NbMwRyG1iUkxO8mj3dQ9ZQiZ21WKQVCjVg7ZEi9ScZene8+msPwdxOXWe4pEqgA KFfZeyutiV2KnDgPG4SPo43Sktmvavb9NtMP76LtPfvd6Ljtla6fkKKiWs08JxfWbMI652 V2ky3UEREPqb3HID5szIOeSRG6CM8GD7X4wZZ35/A6uBpSyJFbTf3xIuaNQO7g== 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 4Ny1qC27fvzTm2; Wed, 18 Jan 2023 23:16:39 +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 30INGdIv027255; Wed, 18 Jan 2023 23:16:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30INGdh8027254; Wed, 18 Jan 2023 23:16:39 GMT (envelope-from git) Date: Wed, 18 Jan 2023 23:16:39 GMT Message-Id: <202301182316.30INGdh8027254@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 024e0ebe9fb1 - main - games/ecwolf: update to 1.4.0 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 024e0ebe9fb1870edbddf51604deb26d01381864 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=024e0ebe9fb1870edbddf51604deb26d01381864 commit 024e0ebe9fb1870edbddf51604deb26d01381864 Author: Piotr Kubaj AuthorDate: 2023-01-18 23:15:03 +0000 Commit: Piotr Kubaj CommitDate: 2023-01-18 23:16:10 +0000 games/ecwolf: update to 1.4.0 Changelog: https://maniacsvault.net/ecwolf/wiki/Version_history#2023 --- games/ecwolf/Makefile | 5 ++--- games/ecwolf/distinfo | 6 +++--- games/ecwolf/files/patch-src_CMakeLists.txt | 24 ---------------------- games/ecwolf/files/patch-src_thingdef_thingdef.cpp | 11 ---------- games/ecwolf/files/patch-src_wl__iwad__picker.cpp | 24 ++++++++-------------- 5 files changed, 13 insertions(+), 57 deletions(-) diff --git a/games/ecwolf/Makefile b/games/ecwolf/Makefile index a0d0b0cb0f09..721b8d1b4afa 100644 --- a/games/ecwolf/Makefile +++ b/games/ecwolf/Makefile @@ -1,6 +1,5 @@ PORTNAME= ecwolf -PORTVERSION= 1.3.3 -PORTREVISION= 1 +PORTVERSION= 1.4.0 DISTVERSIONSUFFIX= -src CATEGORIES= games MASTER_SITES= http://maniacsvault.net/ecwolf/files/ecwolf/1.x/ @@ -18,7 +17,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ USES= cmake compiler:c++11-lang gnome jpeg localbase:ldflags \ pkgconfig sdl tar:xz USE_GNOME= cairo gdkpixbuf2 gtk20 -USE_SDL= mixer sdl +USE_SDL= mixer2 net2 sdl2 SUB_FILES= ecwolf pkg-message SUB_LIST= PORTNAME=${PORTNAME} diff --git a/games/ecwolf/distinfo b/games/ecwolf/distinfo index 5b5043826d77..af4083739aea 100644 --- a/games/ecwolf/distinfo +++ b/games/ecwolf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534522946 -SHA256 (ecwolf-1.3.3-src.tar.xz) = 346b519745f399256463a7cf56d84c1315b1436c95e3a28aa287fc268ed96de9 -SIZE (ecwolf-1.3.3-src.tar.xz) = 7641476 +TIMESTAMP = 1674060889 +SHA256 (ecwolf-1.4.0-src.tar.xz) = 49c1b8c787c0a5a58e100b4e9ea7ef0af1a20b5d7d40491ae0d77e0485ebbb21 +SIZE (ecwolf-1.4.0-src.tar.xz) = 14703808 diff --git a/games/ecwolf/files/patch-src_CMakeLists.txt b/games/ecwolf/files/patch-src_CMakeLists.txt deleted file mode 100644 index 7c788ddb318e..000000000000 --- a/games/ecwolf/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ ---- src/CMakeLists.txt.orig 2019-01-29 16:31:24 UTC -+++ src/CMakeLists.txt -@@ -40,9 +40,9 @@ else(GPL) - set(EXTRA_LIBRARIES) - endif(GPL) - --find_package(SDL REQUIRED) --find_package(SDL_mixer REQUIRED) --include_directories(${SDLMIXER_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) -+pkg_search_module(SDL REQUIRED sdl sdl) -+pkg_search_module(SDLMIXER REQUIRED SDL_mixer) -+include_directories(${SDLMIXER_INCLUDE_DIRS} ${SDL_INCLUDE_DIRS}/SDL ${ZLIB_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) - - check_function_exists(stricmp STRICMP_EXISTS) - check_function_exists(strnicmp STRNICMP_EXISTS) -@@ -320,7 +320,7 @@ else(NOT ANDROID) - endif(NOT ANDROID) - - add_dependencies(ecwolf lzma gdtoa revision_check) --target_link_libraries(ecwolf ${EXTRA_LIBRARIES} ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES} ${JPEG_LIBRARIES} lzma gdtoa) -+target_link_libraries(ecwolf ${EXTRA_LIBRARIES} ${SDL_LIBRARIES} ${SDLMIXER_LIBRARIES} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES} ${JPEG_LIBRARIES} lzma gdtoa) - set_target_properties(ecwolf PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR}) - - # Install diff --git a/games/ecwolf/files/patch-src_thingdef_thingdef.cpp b/games/ecwolf/files/patch-src_thingdef_thingdef.cpp deleted file mode 100644 index 4803dfc469a6..000000000000 --- a/games/ecwolf/files/patch-src_thingdef_thingdef.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/thingdef/thingdef.cpp.orig 2020-08-24 18:22:35 UTC -+++ src/thingdef/thingdef.cpp -@@ -283,7 +283,7 @@ static const struct ExpressionFunction - { "random", TypeHierarchy::INT, 2, true, ExprRandom }, - { "sin", TypeHierarchy::FLOAT, 1, false, ExprSin }, - -- { NULL, 0, false, NULL } -+ { NULL, 0, false, false } - }; - - //////////////////////////////////////////////////////////////////////////////// diff --git a/games/ecwolf/files/patch-src_wl__iwad__picker.cpp b/games/ecwolf/files/patch-src_wl__iwad__picker.cpp index 4feb03eab1be..540d78e84d0c 100644 --- a/games/ecwolf/files/patch-src_wl__iwad__picker.cpp +++ b/games/ecwolf/files/patch-src_wl__iwad__picker.cpp @@ -1,19 +1,11 @@ ---- src/wl_iwad_picker.cpp.orig 2018-08-17 16:43:51 UTC +--- src/wl_iwad_picker.cpp.orig 2023-01-18 23:02:12 UTC +++ src/wl_iwad_picker.cpp -@@ -1,6 +1,7 @@ - // From ZDoom! - - #include +@@ -27,6 +27,8 @@ void TXT_PickWad(TXT_UNCAST_ARG(widget), int wad) + int I_PickIWad_Cocoa (WadStuff *wads, int numwads, bool showwin, int defaultiwad); + #elif defined(__ANDROID__) + int I_PickIWad_Android (WadStuff *wads, int numwads, bool showwin, int defaultiwad); ++#elif defined(__FreeBSD__) +#include + #endif - #include "zdoomsupport.h" - -@@ -227,7 +228,7 @@ int I_PickIWad (WadStuff *wads, int numwads, bool show - const char *str; - if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0) - { -- FString cmd("kdialog --title \""GAMESIG" "DOTVERSIONSTR": Select an IWAD to use\"" -+ FString cmd("kdialog --title \"" GAMESIG " " DOTVERSIONSTR ": Select an IWAD to use\"" - " --menu \"" GAMENAME " found more than one IWAD\n" - "Select from the list below to determine which one to use:\""); - + #ifndef NO_GTK