CVS commit: pkgsrc/emulators/x16-emulator

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jan 16 12:20:00 UTC 2021

Modified Files:
        pkgsrc/emulators/x16-emulator: Makefile distinfo
        pkgsrc/emulators/x16-emulator/patches: patch-Makefile

Log Message:
x16-emulator: Honor CFLAGS/LDFLAGS from environment.

Should help with RPATH issues seen in bulk builds.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/x16-emulator/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/x16-emulator/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/x16-emulator/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/x16-emulator/Makefile
diff -u pkgsrc/emulators/x16-emulator/Makefile:1.4 pkgsrc/emulators/x16-emulator/Makefile:1.5
--- pkgsrc/emulators/x16-emulator/Makefile:1.4  Tue Aug 18 17:57:48 2020
+++ pkgsrc/emulators/x16-emulator/Makefile      Sat Jan 16 12:19:59 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2020/08/18 17:57:48 leot Exp $
+# $NetBSD: Makefile,v 1.5 2021/01/16 12:19:59 nia Exp $
 
 DISTNAME=      x16-emulator-35
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=commanderx16/}
 GITHUB_PROJECT=        x16-emulator

Index: pkgsrc/emulators/x16-emulator/distinfo
diff -u pkgsrc/emulators/x16-emulator/distinfo:1.2 pkgsrc/emulators/x16-emulator/distinfo:1.3
--- pkgsrc/emulators/x16-emulator/distinfo:1.2  Sat Apr 18 22:04:18 2020
+++ pkgsrc/emulators/x16-emulator/distinfo      Sat Jan 16 12:19:59 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2020/04/18 22:04:18 joerg Exp $
+$NetBSD: distinfo,v 1.3 2021/01/16 12:19:59 nia Exp $
 
 SHA1 (x16-emulator-35.tar.gz) = 831e1acb2eecc5edb36f86925f00fabd6abb8321
 RMD160 (x16-emulator-35.tar.gz) = 1b5945db7ba879978bf77e7ad5362a93c9a464c0
 SHA512 (x16-emulator-35.tar.gz) = ec014b6ad13a7631d533b665c7544689629167261ffe0f0941c9381ea8cc6b3803a27deac0d76de7aa2fdae3dc438d8f0abbabe9f55ed0221e7fa0f0d39fbf3c
 Size (x16-emulator-35.tar.gz) = 123338 bytes
-SHA1 (patch-Makefile) = 450a069978bbd940d680437368dd880756879bd1
+SHA1 (patch-Makefile) = 22c6d74e46c085e361900af3f8931ebd842f87c9
 SHA1 (patch-main.c) = db0721d145546dd60ed40b8e9151cd26493e07ad
 SHA1 (patch-rendertext.c) = 81a7e50e7598827addf9aca1f05a22869f2ddeeb

Index: pkgsrc/emulators/x16-emulator/patches/patch-Makefile
diff -u pkgsrc/emulators/x16-emulator/patches/patch-Makefile:1.1 pkgsrc/emulators/x16-emulator/patches/patch-Makefile:1.2
--- pkgsrc/emulators/x16-emulator/patches/patch-Makefile:1.1    Sat Dec 28 19:32:18 2019
+++ pkgsrc/emulators/x16-emulator/patches/patch-Makefile        Sat Jan 16 12:20:00 2021
@@ -1,9 +1,22 @@
-$NetBSD: patch-Makefile,v 1.1 2019/12/28 19:32:18 thorpej Exp $
+$NetBSD: patch-Makefile,v 1.2 2021/01/16 12:20:00 nia Exp $
+
+Honor CFLAGS/LDFLAGS.
 
 Allow the default location of the X16 ROM to be overridden.
 
---- Makefile.orig      2019-12-28 18:52:41.000000000 +0000
+--- Makefile.orig      2019-12-20 20:00:49.000000000 +0000
 +++ Makefile
+@@ -10,8 +10,8 @@ else
+       SDL2CONFIG=sdl2-config
+ endif
+ 
+-CFLAGS=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Iextern/include -Iextern/src
+-LDFLAGS=$(shell $(SDL2CONFIG) --libs) -lm
++CFLAGS+=-std=c99 -Wall $(shell $(SDL2CONFIG) --cflags) -Iextern/include -Iextern/src
++LDFLAGS+=$(shell $(SDL2CONFIG) --libs) -lm
+ 
+ OUTPUT=x16emu
+ 
 @@ -48,6 +48,9 @@ ifneq ("$(wildcard ./rom_labels.h)","")
  HEADERS+=rom_labels.h
  endif