From b9b4b280ebc61fe288e747ed460be8038ec931e6 Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Wed, 15 Nov 2023 19:55:53 +0000
Subject: [PATCH] use -std=c++14 for base-clang to unbreak with clang16

---
 java/jlint/Makefile               |  2 +
 java/jlint/patches/patch-Makefile | 96 ++++++++++++++++++++++++++++---
 2 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/java/jlint/Makefile b/java/jlint/Makefile
index 8c15b8f9d60..707237da2c8 100644
--- a/java/jlint/Makefile
+++ b/java/jlint/Makefile
@@ -11,10 +11,12 @@ PERMIT_PACKAGE=	Yes
 WANTLIB=		c z m ${COMPILER_LIBCXX}
 
 COMPILER =		base-clang ports-gcc base-gcc
+CXXFLAGS_base-clang =	-std=c++14
 
 SITES=		${SITE_SOURCEFORGE:=jlint/}
 
 MAKE_ENV+=	CC="${CC}" CPP="${CXX}" \
+		CXXFLAGS="${CXXFLAGS}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
 		INSTALL_DATA="${INSTALL_DATA}"
diff --git a/java/jlint/patches/patch-Makefile b/java/jlint/patches/patch-Makefile
index 50516118cf6..7e2bd067555 100644
--- a/java/jlint/patches/patch-Makefile
+++ b/java/jlint/patches/patch-Makefile
@@ -1,5 +1,6 @@
---- Makefile.orig	Wed Jan 14 17:23:41 2004
-+++ Makefile	Thu Mar 26 19:02:54 2009
+Index: Makefile
+--- Makefile.orig
++++ Makefile
 @@ -3,8 +3,8 @@
  # Makefile for Unix and GNU/Linux with gcc/g++ compiler
  # Edit here:
@@ -11,16 +12,17 @@
  
  # Hints:
  # if you use egcs-2.90.* version of GCC please add option -fno-exceptions 
-@@ -20,7 +20,7 @@ CPP=g++
+@@ -20,7 +20,8 @@ CPP=g++
  
  # Optimized version
  
 -CFLAGS = -c -Wall -O2 -g
 +CFLAGS += -c
++CXXFLAGS += -c
  # -DSLIST removed because it wouldn't compile under gcc 3.x
  # add -DHASH_TABLE for extra speed (may sometimes produce inconsistent results)
  
-@@ -28,7 +28,8 @@ CFLAGS = -c -Wall -O2 -g
+@@ -28,7 +29,8 @@ CFLAGS = -c -Wall -O2 -g
  #CFLAGS = -c -Wall -O2 -g -DSLIST -DNDEBUG
  
  # link zlib the compression/decompression library. used for decompressing jar files
@@ -30,7 +32,7 @@
  
  # Directory to place executables
  INSTALL_DIR=/usr/local/bin
-@@ -52,7 +53,7 @@ antic.o: antic.c
+@@ -52,7 +54,7 @@ antic.o: antic.c
  	$(CC) $(CFLAGS) antic.c
  
  antic: antic.o
@@ -39,7 +41,7 @@
  
  clean: 
  	rm -f  *.o *.exe core *~ *.his *.class jlint antic manual.{html,pdf,aux,cp,fn,ky,log,pg,toc,tp,vr} jlint_3.0.{aux,dvi,log,toc}
-@@ -103,10 +104,11 @@ test-zip:
+@@ -103,10 +105,11 @@ test-zip:
  
  
  install:
@@ -55,7 +57,7 @@
  
  
  # --> automatically generated dependencies follow; do not remove this line.
-@@ -120,7 +122,7 @@ jlint: \
+@@ -120,7 +123,7 @@ jlint: \
  	locks.o \
  	message_node.o \
  	method_desc.o
@@ -64,3 +66,83 @@
  
  access_desc.o: access_desc.cc \
  	access_desc.hh \
+@@ -143,7 +146,7 @@ access_desc.o: access_desc.cc \
+ 	callee_desc.hh \
+ 	local_context.hh \
+ 	string_pool.hh
+-	$(CPP) $(CFLAGS) access_desc.cc
++	$(CPP) $(CXXFLAGS) access_desc.cc
+ 
+ callee_desc.o: callee_desc.cc \
+ 	callee_desc.hh \
+@@ -166,7 +169,7 @@ callee_desc.o: callee_desc.cc \
+ 	local_context.hh \
+ 	access_desc.hh \
+ 	string_pool.hh
+-	$(CPP) $(CFLAGS) callee_desc.cc
++	$(CPP) $(CXXFLAGS) callee_desc.cc
+ 
+ class_desc.o: class_desc.cc \
+ 	class_desc.hh \
+@@ -189,7 +192,7 @@ class_desc.o: class_desc.cc \
+ 	local_context.hh \
+ 	access_desc.hh \
+ 	string_pool.hh
+-	$(CPP) $(CFLAGS) class_desc.cc
++	$(CPP) $(CXXFLAGS) class_desc.cc
+ 
+ graph.o: graph.cc \
+ 	graph.hh \
+@@ -212,7 +215,7 @@ graph.o: graph.cc \
+ 	utf_string.hh \
+ 	message_node.hh \
+ 	overridden_method.hh
+-	$(CPP) $(CFLAGS) graph.cc
++	$(CPP) $(CXXFLAGS) graph.cc
+ 
+ jlint.o: jlint.cc \
+ 	jlint.hh \
+@@ -236,7 +239,7 @@ jlint.o: jlint.cc \
+ 	functions.hh \
+ 	inlines.hh \
+ 	locks.hh
+-	$(CPP) $(CFLAGS) jlint.cc
++	$(CPP) $(CXXFLAGS) jlint.cc
+ 
+ local_context.o: local_context.cc \
+ 	local_context.hh \
+@@ -259,7 +262,7 @@ local_context.o: local_context.cc \
+ 	locks.hh \
+ 	graph.hh \
+ 	overridden_method.hh
+-	$(CPP) $(CFLAGS) local_context.cc
++	$(CPP) $(CXXFLAGS) local_context.cc
+ 
+ locks.o: locks.cc \
+ 	locks.hh \
+@@ -271,7 +274,7 @@ locks.o: locks.cc \
+ 	utf_string.hh \
+ 	functions.hh \
+ 	message_node.hh
+-	$(CPP) $(CFLAGS) locks.cc
++	$(CPP) $(CXXFLAGS) locks.cc
+ 
+ message_node.o: message_node.cc \
+ 	message_node.hh \
+@@ -279,7 +282,7 @@ message_node.o: message_node.cc \
+ 	types.hh \
+ 	jlint.d \
+ 	jlint.msg
+-	$(CPP) $(CFLAGS) message_node.cc
++	$(CPP) $(CXXFLAGS) message_node.cc
+ 
+ method_desc.o: method_desc.cc \
+ 	method_desc.hh \
+@@ -302,6 +305,6 @@ method_desc.o: method_desc.cc \
+ 	message_node.hh \
+ 	graph.hh \
+ 	overridden_method.hh
+-	$(CPP) $(CFLAGS) method_desc.cc
++	$(CPP) $(CXXFLAGS) method_desc.cc
+ 
+ # --> end of automatically generated dependencies; do not remove this line.