supermodel: Use CC/CFLAGS/CXXFLAGS/LDFLAGS.

[nia <nia%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%NetBSD.org@localhost>
Pushed By:	nee
Date:		Sun Apr 28 17:18:26 2019 +0100
Changeset:	2128d2d80c47776ec07ff9e69ada0782c940abe2

Modified Files:
	supermodel/distinfo
	supermodel/patches/patch-Makefiles_Makefile.SDL.UNIX.GCC

Log Message:
supermodel: Use CC/CFLAGS/CXXFLAGS/LDFLAGS.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2128d2d80c47776ec07ff9e69ada0782c940abe2

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

diffstat:
 supermodel/distinfo                                |  2 +-
 .../patches/patch-Makefiles_Makefile.SDL.UNIX.GCC  | 34 ++++++++++++++++------
 2 files changed, 26 insertions(+), 10 deletions(-)

diffs:
diff --git a/supermodel/distinfo b/supermodel/distinfo
index ef3b6cb643..3cb55fd6a4 100644
--- a/supermodel/distinfo
+++ b/supermodel/distinfo
@@ -3,5 +3,5 @@ $NetBSD: distinfo,v 1.3 2012/12/20 14:30:46 othyro Exp $
 SHA1 (Supermodel_0.2a_Src.zip) = 0ad2348708cf5792ff727ff85bf36b5b51cc3c2f
 RMD160 (Supermodel_0.2a_Src.zip) = 14955e324410ba793f28132fc6e1d7f595a77e15
 Size (Supermodel_0.2a_Src.zip) = 1029004 bytes
-SHA1 (patch-Makefiles_Makefile.SDL.UNIX.GCC) = 1d6b4882d43c9c78c175a1e7c70b69b0d3611b32
+SHA1 (patch-Makefiles_Makefile.SDL.UNIX.GCC) = b22c8a250ea1c774e972f74dc11ef7e64a4ca512
 SHA1 (patch-Src_Pkgs_ioapi.h) = 4f9560ffdd0b76d032aaf4a798b4d9ad8582e3b4
diff --git a/supermodel/patches/patch-Makefiles_Makefile.SDL.UNIX.GCC b/supermodel/patches/patch-Makefiles_Makefile.SDL.UNIX.GCC
index 75b26ff8cb..c451e62cf4 100644
--- a/supermodel/patches/patch-Makefiles_Makefile.SDL.UNIX.GCC
+++ b/supermodel/patches/patch-Makefiles_Makefile.SDL.UNIX.GCC
@@ -17,22 +17,38 @@ Add missing dependencies, and fix CFLAGS and LDFLAGS for GL and GLU.
  # SDL
  #
  SDL_CFLAGS = `sdl-config --cflags`
-@@ -67,10 +73,10 @@ OUTFILE = $(BIN_DIR)/Supermodel
+@@ -65,12 +71,10 @@ OUTFILE = $(BIN_DIR)/Supermodel
+ # Compiler and Linker
+ ###############################################################################
  
- CC = gcc
- LD = gcc
+-CC = gcc
+-LD = gcc
 -COMPILER_FLAGS = $(SDL_CFLAGS) -ISrc/ -ISrc/OSD/SDL/ -ISrc/Pkgs/ -c -Wall -O3
-+COMPILER_FLAGS = $(GLU_CFLAGS) $(SDL_CFLAGS) -ISrc/ -ISrc/OSD/SDL/ -ISrc/Pkgs/ -c -Wall -O3
- CFLAGS = $(COMPILER_FLAGS)
- CPPFLAGS = $(COMPILER_FLAGS)
+-CFLAGS = $(COMPILER_FLAGS)
+-CPPFLAGS = $(COMPILER_FLAGS)
 -LFLAGS = -o $(OUTFILE) $(SDL_LIBFLAGS) -lGL -lGLU -lz -lm -lstdc++
-+LFLAGS = -o $(OUTFILE) $(GLU_LIBFLAGS) $(SDL_LIBFLAGS) -lGL -lGLU -lz -lm -lstdc++
++COMPILER_FLAGS = $(GLU_CFLAGS) $(SDL_CFLAGS) -ISrc/ -ISrc/OSD/SDL/ -ISrc/Pkgs/ -c -Wall
++CFLAGS += $(COMPILER_FLAGS)
++CPPFLAGS = $(CXXFLAGS) $(COMPILER_FLAGS) -std=c++98
++LFLAGS = $(LDFLAGS) -o $(OUTFILE) $(GLU_LIBFLAGS) $(SDL_LIBFLAGS) -lGL -lGLU -lz -lm -lstdc++
  
  #
  # Build options...
-@@ -138,7 +144,7 @@ $(OBJ_DIR)/m68kmake: Src/CPU/68K/Musashi
+@@ -116,7 +120,7 @@ endif
+ # Targets
+ #
+ all:	$(BIN_DIR) $(OBJ_DIR) $(OBJ)
+-	$(LD) $(OBJ_LIBS) $(OBJ) $(LFLAGS)
++	$(CC) $(OBJ_LIBS) $(OBJ) $(LFLAGS)
+ 
+ $(BIN_DIR):
+ 	mkdir $(BIN_DIR) 
+@@ -136,9 +140,9 @@ clean:	
+ #
+ $(OBJ_DIR)/m68kmake: Src/CPU/68K/Musashi/m68kmake.c
  	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kmake.o
- 	$(LD) $(OBJ_DIR)/m68kmake.o -o $(OBJ_DIR)/m68kmake
+-	$(LD) $(OBJ_DIR)/m68kmake.o -o $(OBJ_DIR)/m68kmake
++	$(CC) $(OBJ_DIR)/m68kmake.o -o $(OBJ_DIR)/m68kmake
  	
 -$(OBJ_DIR)/m68kops.h: $(OBJ_DIR)/m68kmake Src/CPU/68K/Musashi/m68k_in.c
 +$(OBJ_DIR)/m68kops.h $(OBJ_DIR)/m68kopnz.c $(OBJ_DIR)/m68kopdm.c $(OBJ_DIR)/m68kopac.c $(OBJ_DIR)/m68kops.c: $(OBJ_DIR)/m68kmake Src/CPU/68K/Musashi/m68k_in.c