Tom Murphy wrote:
> On Sun, Dec 12, 2021 at 10:32:29AM +0000, Stuart Henderson wrote:
> > Please put them in LIB_DEPENDS/WANTLIB with the annotation in the comment.
> > What they're doing is not safe/reliable because it relies on the library ABI
> > not changing. Adding as a LIB_DEPENDS ensures that yquake is updated when
> > required due to any incompatible changes to the libraries.
>
> OK here's a new patch.
>
> 1. Removes the patch that removes execinfo (since execinfo is in base
> now, it's OK to keep it.)
> 2. Adds curl and openal to WANTLIB and keeps them in LIB_DEPENDS with
> a comment that they are dlopen(3)'d.
>
> Thanks,
> Tom
OK sdk@ with a better comment that makes it clear that the
lib-depends-check error is intended.
Index: games/yquake2/Makefile
===================================================================
RCS file: /home/cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- games/yquake2/Makefile 7 Jan 2021 22:20:25 -0000 1.23
+++ games/yquake2/Makefile 12 Dec 2021 11:24:21 -0000
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
COMMENT= Yamagi Quake II
N= yquake2
-V= 7.45
+V= 8.00
PKGNAME= ${N}-${V}
DISTNAME= quake2-${V}
CATEGORIES= games
@@ -17,8 +17,10 @@ EXTRACT_SUFX= .tar.xz
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += GL SDL2 c curl m openal pthread
+WANTLIB += GL SDL2 c curl execinfo m openal
+# Libraries loaded with dlopen(3)
+# Extra: curl.26 openal.4
LIB_DEPENDS= audio/openal \
devel/sdl2 \
net/curl
Index: games/yquake2/distinfo
===================================================================
RCS file: /home/cvs/ports/games/yquake2/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- games/yquake2/distinfo 7 Jan 2021 22:20:25 -0000 1.10
+++ games/yquake2/distinfo 12 Dec 2021 11:19:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
-SIZE (quake2-7.45.tar.xz) = 1997816
+SHA256 (quake2-8.00.tar.xz) = YNjRD8K011uWElGZDk2QM1cZSnMhC8HkKSTt74h9DrI=
+SIZE (quake2-8.00.tar.xz) = 2086776
Index: games/yquake2/patches/patch-Makefile
===================================================================
RCS file: games/yquake2/patches/patch-Makefile
diff -N games/yquake2/patches/patch-Makefile
--- games/yquake2/patches/patch-Makefile 7 Jan 2021 22:20:26 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2021/01/07 22:20:26 thfr Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -452,11 +452,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
- release/quake2 : LDFLAGS += -lexecinfo
- endif
-
--ifeq ($(YQ2_OSTYPE), OpenBSD)
--release/quake2 : CFLAGS += -DHAVE_EXECINFO
--release/quake2 : LDFLAGS += -lexecinfo
--endif
--
- ifeq ($(YQ2_OSTYPE), Haiku)
- release/quake2 : CFLAGS += -DHAVE_EXECINFO
- release/quake2 : LDFLAGS += -lexecinfo
