CVS commit: pkgsrc/emulators/marduk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jun 26 17:13:02 UTC 2023

Modified Files:
        pkgsrc/emulators/marduk: Makefile distinfo
        pkgsrc/emulators/marduk/patches: patch-Makefile

Log Message:
marduk: Handle LDFLAGS correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/marduk/Makefile \
    pkgsrc/emulators/marduk/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/marduk/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/emulators/marduk/Makefile
diff -u pkgsrc/emulators/marduk/Makefile:1.1 pkgsrc/emulators/marduk/Makefile:1.2
--- pkgsrc/emulators/marduk/Makefile:1.1        Sat May 20 12:47:47 2023
+++ pkgsrc/emulators/marduk/Makefile    Mon Jun 26 17:13:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/05/20 12:47:47 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/26 17:13:01 jperkin Exp $
 
 # The author has not yet created any tags, but this is what it reports
 # as its version.
@@ -16,6 +16,8 @@ LICENSE=      mit
 
 USE_TOOLS+=    pkg-config
 
+LDFLAGS.SunOS+=        -lsocket
+
 MARDUK_ROMDIR= share/marduk
 
 INSTALLATION_DIRS=     bin ${MARDUK_ROMDIR}
@@ -26,7 +28,7 @@ CPPFLAGS+=    -DROM_PATHSPEC="\"${PREFIX}/$
 CFLAGS+=       ${CPPFLAGS}     # Makefile ignores CPPFLAGS
 
 do-build:
-       cd ${WRKSRC} && ${MAKE} CFLAGS=${CFLAGS:Q}
+       cd ${WRKSRC} && ${MAKE} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/marduk ${DESTDIR}${PREFIX}/bin
Index: pkgsrc/emulators/marduk/distinfo
diff -u pkgsrc/emulators/marduk/distinfo:1.1 pkgsrc/emulators/marduk/distinfo:1.2
--- pkgsrc/emulators/marduk/distinfo:1.1        Sat May 20 12:47:47 2023
+++ pkgsrc/emulators/marduk/distinfo    Mon Jun 26 17:13:01 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2023/05/20 12:47:47 thorpej Exp $
+$NetBSD: distinfo,v 1.2 2023/06/26 17:13:01 jperkin Exp $
 
 BLAKE2s (marduk-0.26e-7cf954b7f9681daafa7240f49b7860f6f2107898.tar.gz) = 175b7a8ad33282e6a34d6cc3db3166173f2639ee74eeaca6c7fcf2a02365a5a3
 SHA512 (marduk-0.26e-7cf954b7f9681daafa7240f49b7860f6f2107898.tar.gz) = 
abb364821abb457fe3eeedb975c812b170f5e41ab0bbc19b4184a055097c620c90f208ed49df5d801ec7f2d3557eabf61cf54e118145c1ca5b80cabd9744eb8b
 Size (marduk-0.26e-7cf954b7f9681daafa7240f49b7860f6f2107898.tar.gz) = 48799 bytes
-SHA1 (patch-Makefile) = 0e667cb949fbfe782e090786e34e7fd18fcabf07
+SHA1 (patch-Makefile) = 8cf4c1b9f44e1e9f54b02858c7850bb3f1a49b0e
 SHA1 (patch-disk.c) = a56d1cc888464545b2eb1819f3fa7294c3fb006c
 SHA1 (patch-main.c) = e45240edf8b625ea47ad164a660a1b501f109054

Index: pkgsrc/emulators/marduk/patches/patch-Makefile
diff -u pkgsrc/emulators/marduk/patches/patch-Makefile:1.1 pkgsrc/emulators/marduk/patches/patch-Makefile:1.2
--- pkgsrc/emulators/marduk/patches/patch-Makefile:1.1  Sat May 20 12:47:47 2023
+++ pkgsrc/emulators/marduk/patches/patch-Makefile      Mon Jun 26 17:13:01 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2023/05/20 12:47:47 thorpej Exp $
+$NetBSD: patch-Makefile,v 1.2 2023/06/26 17:13:01 jperkin Exp $
 
 Use SDL2 and GTK+-3.0 Cflags / Libs only when building files that need them.
 
@@ -15,7 +15,7 @@ Use SDL2 and GTK+-3.0 Cflags / Libs only
  
  marduk:       dasm80.o disk.o emu2149.o main.o modem.o tms9918.o tms_util.o z80.o
 -      $(CC) $(CFLAGS) -o marduk dasm80.o disk.o emu2149.o main.o modem.o tms9918.o tms_util.o z80.o $(LIBS)
-+      $(CC) $(CFLAGS) -o marduk dasm80.o disk.o emu2149.o main.o modem.o tms9918.o tms_util.o z80.o `sdl2-config --libs` `pkg-config gtk+-3.0 --libs`
++      $(CC) $(CFLAGS) -o marduk dasm80.o disk.o emu2149.o main.o modem.o tms9918.o tms_util.o z80.o $(LDFLAGS) `sdl2-config --libs` `pkg-config gtk+-3.0 --libs`
  
  dasm80.o:     dasm80.c z80.h
        $(CC) $(CFLAGS) -c -o dasm80.o dasm80.c