CVS commit: pkgsrc/games/ccleste

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May  7 10:13:14 UTC 2024

Modified Files:
        pkgsrc/games/ccleste: distinfo options.mk
        pkgsrc/games/ccleste/patches: patch-Makefile

Log Message:
ccleste: fix build on darwin


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/ccleste/distinfo \
    pkgsrc/games/ccleste/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/ccleste/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/ccleste/distinfo
diff -u pkgsrc/games/ccleste/distinfo:1.1 pkgsrc/games/ccleste/distinfo:1.2
--- pkgsrc/games/ccleste/distinfo:1.1   Tue May  7 08:40:19 2024
+++ pkgsrc/games/ccleste/distinfo       Tue May  7 10:13:14 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2024/05/07 08:40:19 nia Exp $
+$NetBSD: distinfo,v 1.2 2024/05/07 10:13:14 nia Exp $
 
 BLAKE2s (ccleste-1.4.0.tar.gz) = 0522734715f088f954605dac66007a62c896878ec398f07a5bd771c4c96be08e
 SHA512 (ccleste-1.4.0.tar.gz) = 29b4e052dee7dfb1fed2cfbeebc7d76b5a199b62360e59441844fa2295e1772afd0fd7a572b78e25573e7c176f27be6c8e22836b02d00938aa7e20bc589da926
 Size (ccleste-1.4.0.tar.gz) = 1537733 bytes
-SHA1 (patch-Makefile) = 3405f9fe6962464200f53bb5fb4b7e672e45fba7
+SHA1 (patch-Makefile) = b31ee94b0970c79d7d232651075ef3155e3801f2
Index: pkgsrc/games/ccleste/options.mk
diff -u pkgsrc/games/ccleste/options.mk:1.1 pkgsrc/games/ccleste/options.mk:1.2
--- pkgsrc/games/ccleste/options.mk:1.1 Tue May  7 08:40:19 2024
+++ pkgsrc/games/ccleste/options.mk     Tue May  7 10:13:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/05/07 08:40:19 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/05/07 10:13:14 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ccleste
 
@@ -17,12 +17,14 @@ PKG_SUGGESTED_OPTIONS=              sdl2
 
 .if !empty(PKG_OPTIONS:Msdl2)
 MAKE_FLAGS+=   SDL_VER=2
+LDFLAGS.Darwin+=       -lSDL2main
 .  include "../../audio/SDL2_mixer/buildlink3.mk"
 .  include "../../devel/SDL2/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)
-MAKE_FLAGS+=   SDL_VER=1
+MAKE_FLAGS+=           SDL_VER=1
+LDFLAGS.Darwin+=       -lSDLmain
 .  include "../../audio/SDL_mixer/buildlink3.mk"
 .  include "../../devel/SDL/buildlink3.mk"
 .endif

Index: pkgsrc/games/ccleste/patches/patch-Makefile
diff -u pkgsrc/games/ccleste/patches/patch-Makefile:1.1 pkgsrc/games/ccleste/patches/patch-Makefile:1.2
--- pkgsrc/games/ccleste/patches/patch-Makefile:1.1     Tue May  7 08:40:19 2024
+++ pkgsrc/games/ccleste/patches/patch-Makefile Tue May  7 10:13:14 2024
@@ -1,10 +1,23 @@
-$NetBSD: patch-Makefile,v 1.1 2024/05/07 08:40:19 nia Exp $
+$NetBSD: patch-Makefile,v 1.2 2024/05/07 10:13:14 nia Exp $
 
 Honour pkgsrc CFLAGS/LDFLAGS.
+Use sdl2-config --libs to fix cocoa linking on Darwin.
 
 --- Makefile.orig      2021-11-24 14:25:50.000000000 +0000
 +++ Makefile
-@@ -14,8 +14,8 @@ else
+@@ -4,18 +4,18 @@ SDL_VER?=2
+ 
+ ifeq ($(SDL_VER),2)
+       SDL_CONFIG=sdl2-config
+-      SDL_LD=-lSDL2 -lSDL2_mixer
++      SDL_LD=$$(sdl2-config --libs) -lSDL2_mixer
+ else
+ ifeq ($(SDL_VER),1)
+       SDL_CONFIG=sdl-config
+-      SDL_LD=-lSDL -lSDL_mixer
++      SDL_LD=$$(sdl-config --libs) -lSDL_mixer
+ else
+       SDL_CONFIG=$(error "invalid SDL version '$(SDL_VER)'. possible values are '1' and '2'")
  endif
  endif