From nobody Wed Nov 22 12:17:24 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 4Sb0cN50Zgz51VBl; Wed, 22 Nov 2023 12:17:24 +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 4Sb0cN4Qthz4FN9; Wed, 22 Nov 2023 12:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700655444; 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=JKuS8xZ38gCHp68ymd7nBDMPvOr4YqbFgyno4mXu8RQ=; b=VC2Wdziq4wBH+u6zZUUoIJO/UapxNcl/34nEGzXvt3nXRZC+vd1tr8haZJSsoIF2URiMxk TPPpZU2jeo/Aqo0yvfAp8Hi40yNNfrgGacTGDsYuZ5Tok5kRCKzpJ/n7kJ18RySE2d00hR 6bhtNQDxKzKD7UeeBC5w8zOwv2K3qO3cjeqE9956hJk1lzjEd7ys5QbkfOWFHSvCV40scs d4LtflGT3cPsbf4fRD18CiORQV3ccjEBxcYsFId75BGRhRJYkWllmZTAm3er9vkNH+Sh3o 1cFf9JcdJJjjLyDU0rV8kAur0+eRn3+fvS4VBa0cthyzy0NlEYsrt9FW8bN5Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700655444; 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=JKuS8xZ38gCHp68ymd7nBDMPvOr4YqbFgyno4mXu8RQ=; b=AENysRZaxK95iw99o6kZ74O96thlZq7QGhW/PeTixef5eP9kdsi091RCjlrg9/gURvJ/WF nfKULo+VWFPI2eOwwxI3qvmmrW+vH4cc2SqfEURqQd0XHpniOGF5NbJ4iOCzIgw3wIghL7 89BDb23YLDL/mOq9dfuQYB/CXq6aNko7aI3T1nybvZ6xQiviTXdtF4j5alyfGTzBDTMGEw Ep9l+K2X/CZh7+ojXG0UqCq6jDAkmkdi3ndGae3udCvTk+e7NLFp5UCQ4kwJLTRyyTFYaJ CHcjp5urkAUJKhj/OX8NE9+xAZvPcwTYyP7Pq5MDWO08tVbSIi+ilyUCtFM1Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700655444; a=rsa-sha256; cv=none; b=sIzB1ZfDXNRzXNVFSNbEmtKNovw0AWCLiJ0FVVYnF9buHG4k4LymIUUOELTFYiB0skxhtK Kmiv2o846OwQYz7wVuAWe5RRGVQL4TcFg+oZRD9DedA1moNU3EG1u+0mty573AwBgMqHP9 Rvd5dgWBVs0wtKYWTHvvCowJWRwAOBzFhLpLZ1MPi2wSsHtlEXVDXhD+Jappxb59kXtgPx 6LxiGY48KiPQcTbxHmAHebyrzoRrMYGk67fRtw71tJpkbd+Foyfj825GR8SYyEXo/oYYXK pE2g/NmFxp8mGgsTObfXB3EwgZ7ZNTVWSVatLsoubIkNOTytjTT7NVLEkkKnRg== 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 4Sb0cN3ShHz3K4; Wed, 22 Nov 2023 12:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AMCHOC6018682; Wed, 22 Nov 2023 12:17:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AMCHOSJ018679; Wed, 22 Nov 2023 12:17:24 GMT (envelope-from git) Date: Wed, 22 Nov 2023 12:17:24 GMT Message-Id: <202311221217.3AMCHOSJ018679@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: eecd094e32a4 - main - games/nehquake: unbreak, undeprecate, and assume maintainership 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: eecd094e32a4fbc24d65197221242c29b83d3200 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=eecd094e32a4fbc24d65197221242c29b83d3200 commit eecd094e32a4fbc24d65197221242c29b83d3200 Author: Alexey Dokuchaev AuthorDate: 2023-11-22 12:16:30 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-11-22 12:16:30 +0000 games/nehquake: unbreak, undeprecate, and assume maintainership Define LICENSE (GPLv2 or later), add missing USE_XORG components, do not allow ``make build'' to succeed when compilation actually fails, bump MAX_PRINTMSG value to accommodate long GL extensions string returned by modern video cards, amend post-install advice. Tested on: 13-STABLE/i386 + ATI Radeon HD 4350 (RV710) --- games/nehquake/Makefile | 23 ++++++++++------ games/nehquake/files/patch-Makefile | 44 ++++++++++++++++++------------ games/nehquake/files/patch-src__glquake.h | 12 ++++++-- games/nehquake/files/patch-src__quakedef.h | 15 ++++++++-- games/nehquake/files/pkg-message.in | 12 ++++++-- 5 files changed, 71 insertions(+), 35 deletions(-) diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile index e6581237db65..e4b1aa120525 100644 --- a/games/nehquake/Makefile +++ b/games/nehquake/Makefile @@ -5,18 +5,16 @@ CATEGORIES= games MASTER_SITES= LOCAL/alepulver DISTNAME= NehQuake-bjp-bin-src.linux -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= Quake engine designed for playing Nehahra -WWW= http://planetquake.com/nehahra/ +WWW= https://quakewiki.org/wiki/Nehahra \ + https://www.quaddicted.com/reviews/nehahra.html -BROKEN_FreeBSD_13= ld: error: duplicate symbol: sb_lines -BROKEN_FreeBSD_14= ld: error: duplicate symbol: sb_lines -DEPRECATED= Fails to build, abandoned upstream and marked broken over a year go -EXPIRATION_DATE=2023-11-30 +LICENSE= GPLv2+ -USES= gl gmake dos2unix tar:bzip2 xorg +USES= gl gmake tar:bzip2 xorg USE_GL= gl -USE_XORG= xxf86dga xxf86vm +USE_XORG= x11 xext xxf86dga xxf86vm OPTIONS_DEFINE= OPTIMIZED_CFLAGS SDL OPTIONS_DEFINE_amd64= X86_ASM @@ -36,7 +34,6 @@ ALL_TARGET= release SUB_FILES= pkg-message .include "${.CURDIR}/../quake-data/Makefile.include" - .include .for f in OPTIMIZED_CFLAGS X86_ASM @@ -47,6 +44,12 @@ MAKE_ENV+= USE_${f}=NO . endif .endfor +post-patch: + @${REINPLACE_CMD} -E '/^int[[:blank:]]+sb_lines;/d' \ + ${WRKSRC}/src/gl_screen.c + @${REINPLACE_CMD} -e '/text\[/s/4096/MAX_PRINTMSG/' \ + ${WRKSRC}/src/sys_linux.c + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/release/nehahra ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MSDL} @@ -55,3 +58,5 @@ do-install: @${MKDIR} ${STAGEDIR}${Q1DIR}/nehahra .include + +PATCH_ARGS+= -l diff --git a/games/nehquake/files/patch-Makefile b/games/nehquake/files/patch-Makefile index a83f9531ab5e..73f03aa0d8c4 100644 --- a/games/nehquake/files/patch-Makefile +++ b/games/nehquake/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat May 27 13:47:34 2006 -+++ Makefile Sat May 27 14:04:12 2006 +--- Makefile.orig 2005-11-10 14:57:23 UTC ++++ Makefile @@ -9,9 +9,9 @@ # @@ -12,7 +12,7 @@ ifneq (,$(findstring libc6,$(shell if [ -e /lib/libc.so.6 ];then echo libc6;fi))) GLIBC=-glibc -@@ -28,32 +28,45 @@ +@@ -28,32 +28,45 @@ NOARCH=noarch MOUNT_DIR=./src @@ -34,26 +34,27 @@ +endif -RELEASE_CFLAGS=$(BASE_CFLAGS) -march=i686 -O2 -ffast-math -funroll-loops \ -+BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp #-Wall -+ +- -fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing +-DEBUG_CFLAGS=$(BASE_CFLAGS) -g ++BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -Wno-implicit-function-declaration + +-LDFLAGS=-lm +ifeq ($(strip $(USE_X86_ASM)),YES) +BASE_CFLAGS+=-Did386 +endif -+ + +-LDFLAGS += -lz -L./src/fmod -Wl,-rpath,. -lfmod +RELEASE_CFLAGS=$(BASE_CFLAGS) -+ + +ifeq ($(strip $(USE_OPTIMIZED_CFLAGS)),YES) +RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing --DEBUG_CFLAGS=$(BASE_CFLAGS) -g ++ -fomit-frame-pointer -fno-strict-aliasing +endif - --LDFLAGS=-lm ++ +DEBUG_CFLAGS=$(BASE_CFLAGS) -g - --LDFLAGS += -lz -L./src/fmod -Wl,-rpath,. -lfmod ++ +LDFLAGS+=-lm -lz - ++ ifeq ($(strip $(BUILD_SDL)),YES) - SDLCFLAGS=$(shell sdl-config --cflags) - SDLLDFLAGS=$(shell sdl-config --libs) @@ -72,7 +73,7 @@ DO_CC=$(CC) $(CFLAGS) -o $@ -c $< DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $< -@@ -70,10 +83,10 @@ +@@ -70,10 +83,10 @@ DO_GL_AS=$(CC) $(CFLAGS) $(GLCFLAGS) -DELF -x assemble ############################################################################# @@ -85,7 +86,16 @@ endif all: -@@ -165,12 +178,15 @@ +@@ -94,7 +107,7 @@ debug: + $(BUILD_DEBUG_DIR)/glquake + $(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)" + +-release: ++release:: + @-mkdir $(BUILD_RELEASE_DIR) \ + $(BUILD_RELEASE_DIR)/glquake + $(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)" +@@ -165,12 +178,15 @@ GLQUAKE_OBJS= \ $(BUILDDIR)/glquake/sys_linux.o \ $(BUILDDIR)/glquake/snd_dma.o \ $(BUILDDIR)/glquake/snd_mem.o \ @@ -103,7 +113,7 @@ GLQUAKE_LNX_OBJS = \ $(BUILDDIR)/glquake/cd_linux.o \ -@@ -182,10 +198,10 @@ +@@ -182,10 +198,10 @@ GLQUAKE_SDL_OBJS = \ GLX_OBJS=$(BUILDDIR)/glquake/gl_vidlinuxglx.o diff --git a/games/nehquake/files/patch-src__glquake.h b/games/nehquake/files/patch-src__glquake.h index dd490a83779f..cfb77303b314 100644 --- a/games/nehquake/files/patch-src__glquake.h +++ b/games/nehquake/files/patch-src__glquake.h @@ -1,6 +1,6 @@ ---- ./src/glquake.h.orig Tue Sep 27 19:06:49 2005 -+++ ./src/glquake.h Tue May 16 17:36:22 2006 -@@ -275,7 +275,6 @@ +--- src/glquake.h.orig 2005-09-27 22:06:49 UTC ++++ src/glquake.h +@@ -275,7 +275,6 @@ extern GLenum gl_Texture1; #define TEXTURE1_SGIS gl_Texture1 #ifndef _WIN32 @@ -8,3 +8,9 @@ #endif typedef void (APIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat); +@@ -289,4 +288,4 @@ void GL_DisableMultitexture(void); + void GL_EnableMultitexture(void); + void GL_LightMaps_f (void); + +-extern bspversion; ++extern int bspversion; diff --git a/games/nehquake/files/patch-src__quakedef.h b/games/nehquake/files/patch-src__quakedef.h index 5e94e1b477ab..e25c9f65d293 100644 --- a/games/nehquake/files/patch-src__quakedef.h +++ b/games/nehquake/files/patch-src__quakedef.h @@ -1,6 +1,15 @@ ---- ./src/quakedef.h.orig Tue Sep 27 13:41:52 2005 -+++ ./src/quakedef.h Tue May 16 17:48:38 2006 -@@ -337,7 +337,7 @@ +--- src/quakedef.h.orig 2005-09-27 16:41:52 UTC ++++ src/quakedef.h +@@ -101,7 +101,7 @@ void VID_UnlockBuffer (void); + #define MAX_MSGLEN 65536 //8192 // max length of a reliable message + #define MAX_DATAGRAM 65536 //3027 // max length of unreliable message + +-#define MAX_PRINTMSG 4096 ++#define MAX_PRINTMSG 16384 + + // + // per-level limits +@@ -337,7 +337,7 @@ void Chase_Reset (void); void Chase_Update (void); extern int bspversion; diff --git a/games/nehquake/files/pkg-message.in b/games/nehquake/files/pkg-message.in index af45234bb45f..6f696193da92 100644 --- a/games/nehquake/files/pkg-message.in +++ b/games/nehquake/files/pkg-message.in @@ -1,9 +1,15 @@ [ { type: install message: <