From nobody Thu Jan 12 02:50:33 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 4NspvF2q4Jz2pTrC; Thu, 12 Jan 2023 02:50:33 +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 4NspvF2L9yz4Qh0; Thu, 12 Jan 2023 02:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673491833; 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=9l0zgm6wyDYyE8kGqBYU1Q+4v01MOFbTn5kugSyrga4=; b=Fn/DgiLPFoAgW1NRm9/cFIhY3BcGYwya5sUONbZF1TWrT/v29XRMSxFylfEhn38D6WUHB9 35O9E9xsDSHtt/0Ik3PbqfW/+gJlebIgKeDI1jt19gqwWRa35cRZqfNW45tSQpT+EA2GGI zoZ0lf9J7rZzwnVCWD3EA4FXuwJg1woOdiv14bKklrVpxQNWaj0JjQ5i8C9+/MhKUnWeQx g9oW6GVhLHGxlb6si7nOMBve5t6wNb3AGjAFF9zlkOpNfKv14VCUUoYmHZLBdP/PSUnobh w055nMG/0k5CTNasblENISeNnlrzWNuajCnDPgsBk1l+Cnx0DAPFYAshggNZHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673491833; 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=9l0zgm6wyDYyE8kGqBYU1Q+4v01MOFbTn5kugSyrga4=; b=mz0we8KnPqQNKCbngyr1iDqO1MIxYmJ1J3qg8gMqsyNG1DSRmvsZA6kVm6aUtfKtfeam38 df2xieLw1wvzlwGkxZnCySWTvcc147SNa/T5Y6xakI0dakcpY4z7/e13Ba4+ypt4K57s0Q HrmzcUWADhSDMCaP+4UdH6wrnKDT0tUPwYlA5ieSAUxPQhUj1ISsA3KeOWX09owN5gfLP+ QsxYQ5HmQy8JdIt6sJoOunpcvQqpRjt1KTWp7d4eA/rSU/CIxMgSjtoUOWkqaFOPiWyMgC wshKPpyHZ2o8/4OBz28TeY4fdHp2YfBgYwTFyA0RAB42nYuNfmiWADQD013jsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673491833; a=rsa-sha256; cv=none; b=jM7WglWAdgO+uVNX1kmtvfIWiytxqg4wA+Sy82xihoqGPUrNCG7V6r9VWTVCHTChyhxjNx 4aZU8sMheIUKibev6FW3wK9nyRT3BZC1Psz5eCu07NprtKMg5L9P1vonzkWEtzs1msiDIH KtAJ/Wu7t2PdWdtBgMywF0J1Rm6GSIWlf5zkmzrr8fBZ2OvS9qTNJlsJKUckdPWHZ3oTRh eR6IQBjuDJ7+k4y24U+D4YrawpG3X6DF+tjUBokJdDTyiKDbhdoPnUHCD8kxpHwYNZxhKT Ja5bsWh5ysJZ+4HxlkgLTiuLtsPFZeLkh/E4jwi48Yq0f8NU1JRZgzOrA4W4vg== 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 4NspvF1Nhkz1BYh; Thu, 12 Jan 2023 02:50: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 30C2oXHW088057; Thu, 12 Jan 2023 02:50:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30C2oXRM088056; Thu, 12 Jan 2023 02:50:33 GMT (envelope-from git) Date: Thu, 12 Jan 2023 02:50:33 GMT Message-Id: <202301120250.30C2oXRM088056@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: fec8825b7240 - main - games/doomlegacy: update Doom Legacy to version 1.48.12 (rev 1643) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fec8825b724037d21d160618b314b66be29e4d3c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=fec8825b724037d21d160618b314b66be29e4d3c commit fec8825b724037d21d160618b314b66be29e4d3c Author: Alexey Dokuchaev AuthorDate: 2023-01-12 02:44:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-01-12 02:44:44 +0000 games/doomlegacy: update Doom Legacy to version 1.48.12 (rev 1643) Now have to unset SVN_ENABLE so that run-time SVN revision reporting works, and rename one patch file to match modern naming conventions. Reported by: portscout --- games/doomlegacy/Makefile | 7 ++--- games/doomlegacy/distinfo | 10 +++---- games/doomlegacy/files/patch-src_Makefile | 35 ++++++++++++++-------- ...ch-sdl+i_system.c => patch-src_sdl_i__system.c} | 7 +++-- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile index a82eae835a0f..1c6bfec78050 100644 --- a/games/doomlegacy/Makefile +++ b/games/doomlegacy/Makefile @@ -1,6 +1,5 @@ PORTNAME= doomlegacy -PORTVERSION= 1.48.8 -PORTREVISION= 1 +PORTVERSION= 1.48.12 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${DISTVERSION:S,_,%20,}/ @@ -18,7 +17,7 @@ USES= gl gmake sdl tar:bzip2 USE_GL= gl glu USE_SDL= mixer sdl -PLIST_FILES= bin/${PORTNAME} share/doom/legacy.wad +PLIST_FILES= bin/${PORTNAME} share/doom/dogs.wad share/doom/legacy.wad PORTDOCS= * OPTIONS_DEFINE= DOCS @@ -53,7 +52,7 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/doomlegacy ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DMDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${PORTVERSION}/legacy.wad \ + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${PORTVERSION}_common/*.wad \ ${STAGEDIR}${DMDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) diff --git a/games/doomlegacy/distinfo b/games/doomlegacy/distinfo index e7ec6a58d27a..cab7521daea2 100644 --- a/games/doomlegacy/distinfo +++ b/games/doomlegacy/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1609626982 -SHA256 (doomlegacy_1.48.8_source.tar.bz2) = 67040b18891e885331806e7e167193dc45fcdad8779052ce5a95f087dba5b766 -SIZE (doomlegacy_1.48.8_source.tar.bz2) = 2451682 -SHA256 (doomlegacy_1.48.8_common.zip) = 1b019edc875f744a682dfb6493c83a568fce87cd94e312f79f02ed82c4b1e49c -SIZE (doomlegacy_1.48.8_common.zip) = 1011350 +TIMESTAMP = 1671410365 +SHA256 (doomlegacy_1.48.12_source.tar.bz2) = 8378e69730ae8fa57596b0c78d24d158618b90dabe9597793b5bd077324b5c44 +SIZE (doomlegacy_1.48.12_source.tar.bz2) = 2572064 +SHA256 (doomlegacy_1.48.12_common.zip) = 94cec77e7674b4c80d3f05812335918030056b33889c08d0389c6fffa28f368b +SIZE (doomlegacy_1.48.12_common.zip) = 1055689 diff --git a/games/doomlegacy/files/patch-src_Makefile b/games/doomlegacy/files/patch-src_Makefile index 863617217c3f..d94cf2bc29f3 100644 --- a/games/doomlegacy/files/patch-src_Makefile +++ b/games/doomlegacy/files/patch-src_Makefile @@ -1,7 +1,16 @@ ---- src/Makefile.orig 2018-07-16 09:17:06 UTC +--- src/Makefile.orig 2022-12-18 00:00:15 UTC +++ src/Makefile -@@ -554,8 +554,10 @@ LIBS:= - LDFLAGS:= +@@ -234,7 +234,7 @@ OPTLEV=-O3 + # Developers with svn can enable this to have svn revision number in executable. + # Causes compile error message otherwise. + # Until can find test for presence of svn, this is best that can be done. +-SVN_ENABLE=1 ++#SVN_ENABLE=1 + + # This Makefile may be invoked from within the src directory, + # or invoked from the Main Makefile with SRC=. +@@ -610,8 +610,10 @@ endif + OPTINC:= INSTALL_SUPPL:= -CFLAGS:= @@ -12,16 +21,16 @@ ifdef ARCH # if does not have leading -march, -mcpu, -mtune, or similar. ifeq ($(filter -march% -mcpu% -mtune% -m%, $(strip $(ARCH))),) -@@ -598,7 +600,7 @@ ifeq ($(SMIF), SDL) - # default is Linux, for all unix SDL - EXENAME:=doomlegacy - LDFLAGS+=-L/usr/X11R6/lib -- LIBS+=-lGL -lGLU -lm -+ LIBS+=-lGL -lGLU -lm -lipx - # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have - # the GLU libraries in an X11 directory. - # -lm is needed for pow, powf, and other MATH1 functions. -@@ -1001,11 +1003,11 @@ ifdef DEBUG +@@ -770,7 +772,7 @@ ifeq ($(SMIF), SDL) + # default is Linux, for all unix SDL + EXENAME:=doomlegacy + LDFLAGS+=-L/usr/X11R6/lib +- LIBS+=-lGL -lGLU -lm ++ LIBS+=-lGL -lGLU -lm -lipx + # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have + # the GLU libraries in an X11 directory. + # -lm is needed for pow, powf, and other MATH1 functions. +@@ -1305,11 +1307,11 @@ ifdef DEBUG else # build a normal optimized version #CFLAGS+=-O3 diff --git a/games/doomlegacy/files/patch-sdl+i_system.c b/games/doomlegacy/files/patch-src_sdl_i__system.c similarity index 67% rename from games/doomlegacy/files/patch-sdl+i_system.c rename to games/doomlegacy/files/patch-src_sdl_i__system.c index 975d4f5a3e6a..fbd6b7a03be8 100644 --- a/games/doomlegacy/files/patch-sdl+i_system.c +++ b/games/doomlegacy/files/patch-src_sdl_i__system.c @@ -1,11 +1,12 @@ ---- src/sdl/i_system.c.orig 2014-05-16 20:11:49 UTC +--- src/sdl/i_system.c.orig 2022-12-18 00:00:15 UTC +++ src/sdl/i_system.c -@@ -508,6 +508,8 @@ void I_SysInit(void) +@@ -932,6 +932,9 @@ void I_SysInit(void) // Enable unicode key conversion SDL_EnableUNICODE(1); ++ + // Enable key auto repeat + SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); + #endif // Initialize the joystick subsystem. - I_JoystickInit();