From 79968cbb1829cbf6146b4a96ca1c5871b8ab040e Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 28 Sep 2002 22:30:10 +0000
Subject: [PATCH] Respect CC, CXX, CFLAGS.

---
 java/jlint/Makefile               |  5 +++--
 java/jlint/patches/patch-Makefile | 27 ++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/java/jlint/Makefile b/java/jlint/Makefile
index 244458cb05e..5d1582d10ab 100644
--- a/java/jlint/Makefile
+++ b/java/jlint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2002/03/21 20:57:09 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2002/09/28 22:30:10 naddy Exp $
 
 COMMENT=	"Java program analyzer and checker"
 
@@ -19,7 +19,8 @@ PERMIT_DISTFILES_FTP=  Yes
 
 MASTER_SITES=	${HOMEPAGE}
 
-MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+MAKE_ENV+=	CC="${CC}" CPP="${CXX}" \
+		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 4dd055af534..0c7c1028435 100644
--- a/java/jlint/patches/patch-Makefile
+++ b/java/jlint/patches/patch-Makefile
@@ -1,6 +1,27 @@
---- Makefile.orig	Thu Jun 28 09:42:55 2001
-+++ Makefile	Fri Jun 29 10:08:52 2001
-@@ -65,10 +65,11 @@
+$OpenBSD: patch-Makefile,v 1.2 2002/09/28 22:30:10 naddy Exp $
+--- Makefile.orig	Wed Aug  8 19:38:28 2001
++++ Makefile	Sun Sep 29 00:32:47 2002
+@@ -3,8 +3,8 @@
+ # Makefile for Unix and GNU/Linux with gcc/g++ compiler
+ # Edit here:
+ 
+-CC=gcc
+-CPP=g++
++#CC=gcc
++CPP?=${CXX}
+ 
+ # Hints:
+ # if you use egcs-2.90.* version of GCC please add option -fno-exceptions 
+@@ -18,7 +18,7 @@ CPP=g++
+ 
+ # Optimized version
+ 
+-CFLAGS = -c -Wall -O2 -g -DSLIST
++CFLAGS += -DSLIST -c
+ # add -DHASH_TABLE for extra speed (may sometimes produce inconsistent results)
+ 
+ # Optimized version with switched off asserts
+@@ -65,10 +65,11 @@ zip:
  	cd ..; rm -f jlint-$(VERSION).zip; zip -v jlint-$(VERSION).zip $(DISTFILES) `find jlint-$(VERSION)/jlintwin32 | grep -v CVS`
  
  install: