On Sun, Dec 12, 2021 at 10:18:27AM +0100, Stefan Hagen wrote:
> Hi Tom,
>
> This update works for me. The execinfo problem has been discussed
> before. I'm quoting sthen:
>
> > Can it be disabled instead? The backtrace functions are a perennial
> > problem with ports and bulk builds.
> >
> > Software often checks for the headers and functions separately but
> > don't check with -lexecinfo (because they're often in libc), and uses
> > #ifdef HAVE_EXECINFO_H or similar around the #include, and
> > #ifdef HAVE_BACKTRACE or similar around function calls.
> > (yes this is not very sensible, but we do run into it quite often).
>
> So I think we should leave it disabled.
OK I'll leave the execinfo disabled as it was.
> Regarding the libraries. Make lib-depends-check now reports:
> Extra: curl.26 openal.4
>
> But the headers are needed at compile time. I first thought was to add
> them as BUILD_DEPENDS and RUN_DEPENDS. But this then doesn't package
> with errors:
>
> Create /home/dpb/data/packages/amd64/all/yquake2-8.00.tgz
> Missing library for curl>=0.0
> Missing library for openal>=0.0
>
> Therefore I think LIB_DEPENDS is still the correct place, but add a
> comment about these libs being dlopened' and the expected Extra lines.
>
> Best Regards,
> Stefan
Thanks for the info! I looked around other ports and saw they also
had similar comments above LIB_DEPENDS.
Here's an updated diff with the comment, and it also keeps the patch
to keep execinfo disabled as discussed above.
OK?
Thanks,
Tom
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/yquake2/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 7 Jan 2021 22:20:25 -0000 1.23
+++ Makefile 12 Dec 2021 09:26:23 -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,9 @@ EXTRACT_SUFX= .tar.xz
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += GL SDL2 c curl m openal pthread
+WANTLIB += GL SDL2 c curl m openal
+# openal and curl dlopen(3)'d if found
LIB_DEPENDS= audio/openal \
devel/sdl2 \
net/curl
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/yquake2/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 7 Jan 2021 22:20:25 -0000 1.10
+++ distinfo 12 Dec 2021 09:26:23 -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: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/yquake2/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 7 Jan 2021 22:20:26 -0000 1.3
+++ patches/patch-Makefile 12 Dec 2021 09:26:23 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.3 2021/01/0
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -452,11 +452,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
+@@ -505,11 +505,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
release/quake2 : LDFLAGS += -lexecinfo
endif
