head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.16 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.14 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.12 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.10 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.8 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.6 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.4 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.2 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.2.0.10 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.8 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.6 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.4 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.2 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.1.0.14 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.12 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.10 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.8 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.6 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.4 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.2 pkgsrc-2021Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2024.05.11.10.05.15; author nia; state Exp; branches; next 1.2; commitid X3p5CL8Ie6gzaz9F; 1.2 date 2023.01.15.05.36.38; author mrg; state Exp; branches; next 1.1; commitid PVqIgNzNAZEwaB9E; 1.1 date 2021.05.21.15.01.52; author nia; state Exp; branches; next ; commitid sq6ecgTry1KvI1UC; desc @@ 1.3 log @ioquake3: Usability improvements, Darwin support @ text @$NetBSD: patch-Makefile,v 1.2 2023/01/15 05:36:38 mrg Exp $ - Add support for NetBSD-style uname. - Build client on NetBSD. - Pass ARCH_STRING on *BSD so multi-arch support works. https://github.com/ioquake/ioq3/pull/466 - Add -lrt on NetBSD that binutils 2.39 wants. --- Makefile.orig 2019-12-07 13:16:15.000000000 +0000 +++ Makefile @@@@ -6,8 +6,8 @@@@ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' '[:lower:]' | sed -e 's/\//_/g') COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/') -ifeq ($(COMPILE_PLATFORM),sunos) - # Solaris uname and GNU uname differ +ifneq (,$(findstring "$(COMPILE_PLATFORM)", "sunos" "netbsd")) + # Solaris/NetBSD uname and GNU uname differ COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/') endif @@@@ -65,6 +65,10 @@@@ ifeq ($(PLATFORM),mingw64) MINGW=1 endif +ifeq ($(COMPILE_ARCH),i386) + COMPILE_ARCH=x86 +endif + ifeq ($(COMPILE_ARCH),i86pc) COMPILE_ARCH=x86 endif @@@@ -338,7 +342,7 @@@@ MKDIR=mkdir -p EXTRA_FILES= CLIENT_EXTRA_FILES= -ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) +ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "freebsd" "netbsd" "openbsd" "dragonfly" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\" endif @@@@ -531,16 +535,16 @@@@ ifeq ($(PLATFORM),darwin) RENDERER_LIBS += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib else - BASE_CFLAGS += -I/Library/Frameworks/SDL2.framework/Headers - CLIENT_LIBS += -framework SDL2 - RENDERER_LIBS += -framework SDL2 + CLIENT_CFLAGS += $(SDL_CFLAGS) + CLIENT_LIBS += $(SDL_LIBS) + RENDERER_LIBS += $(SDL_LIBS) endif OPTIMIZE = $(OPTIMIZEVM) -ffast-math SHLIBEXT=dylib SHLIBCFLAGS=-fPIC -fno-common - SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) -Wl,-U,_com_altivec + SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) NOTSHLIBCFLAGS=-mdynamic-no-pic @@@@ -712,7 +716,7 @@@@ ifeq ($(PLATFORM),freebsd) # flags BASE_CFLAGS = \ -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON + -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON -DARCH_STRING=\\\"$(ARCH)\\\" CLIENT_CFLAGS += $(SDL_CFLAGS) HAVE_VM_COMPILED = true @@@@ -766,7 +770,7 @@@@ else # ifeq freebsd ifeq ($(PLATFORM),openbsd) BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON + -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON -DARCH_STRING=\\\"$(ARCH)\\\" CLIENT_CFLAGS += $(SDL_CFLAGS) OPTIMIZEVM = -O3 @@@@ -848,13 +852,36 @@@@ ifeq ($(PLATFORM),netbsd) SHLIBLDFLAGS=-shared $(LDFLAGS) THREAD_LIBS=-lpthread - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ + -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" + + CLIENT_LIBS += $(SDL_LIBS) + RENDERER_LIBS = $(SDL_LIBS) + + # optional features/libraries + ifeq ($(USE_OPENAL),1) + ifeq ($(USE_OPENAL_DLOPEN),1) + CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS) + endif + endif + + ifeq ($(USE_CURL),1) + CLIENT_CFLAGS += $(CURL_CFLAGS) + ifeq ($(USE_CURL_DLOPEN),1) + CLIENT_LIBS += $(CURL_LIBS) + endif + endif + + ifeq ($(USE_MUMBLE),1) + CLIENT_LIBS += -lrt + endif ifeq ($(ARCH),x86) HAVE_VM_COMPILED=true endif - - BUILD_CLIENT = 0 + ifeq ($(ARCH),x86_64) + HAVE_VM_COMPILED=true + endif else # ifeq netbsd ############################################################################# @ 1.2 log @link -lrt on netbsd. needed by new binutils. shm_open() is referenced in a direct part of the output, but only visible via being needed via an indirect reference, and this seems to no longer be allowed. @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.1 2021/05/21 15:01:52 nia Exp $ d11 2 a12 2 --- Makefile.orig 2019-12-07 05:16:15.000000000 -0800 +++ Makefile 2023-01-14 18:34:38.285233929 -0800 d24 1 a24 1 @@@@ -65,6 +65,10 @@@@ d35 1 a35 1 @@@@ -338,7 +342,7 @@@@ d44 22 a65 1 @@@@ -712,7 +716,7 @@@@ d74 1 a74 1 @@@@ -766,7 +770,7 @@@@ d83 1 a83 3 @@@@ -846,15 +850,34 @@@@ SHLIBEXT=so SHLIBCFLAGS=-fPIC d85 3 a87 3 - THREAD_LIBS=-lpthread + THREAD_LIBS=-lpthread -lrt + d90 1 a90 2 - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes d107 4 @ 1.1 log @ioquake3: Add generic multi-arch support, avoid bundled dependencies Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ d9 4 a12 2 --- Makefile.orig 2019-12-07 13:16:15.000000000 +0000 +++ Makefile d24 1 a24 1 @@@@ -65,6 +65,10 @@@@ ifeq ($(PLATFORM),mingw64) d35 1 a35 1 @@@@ -338,7 +342,7 @@@@ MKDIR=mkdir -p d44 1 a44 1 @@@@ -712,7 +716,7 @@@@ ifeq ($(PLATFORM),freebsd) d53 1 a53 1 @@@@ -766,7 +770,7 @@@@ else # ifeq freebsd d62 3 a64 1 @@@@ -848,13 +852,32 @@@@ ifeq ($(PLATFORM),netbsd) d66 5 a70 1 THREAD_LIBS=-lpthread a72 3 + BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ + -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" + @