Make lclint compile again. Patches from Hiramatsu Yoshifumi via pkg/15092.

4 files changed, 40 insertions, 10 deletions

diff --git a/devel/lclint/Makefile b/devel/lclint/Makefile
index 73d369cc321..94cc6939ab7 100644
--- a/devel/lclint/Makefile
+++ b/devel/lclint/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/08/20 02:53:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/12/30 13:38:06 wiz Exp $
 #
 
 VERSION=	2.5q
 DISTNAME=	lclint-${VERSION}.src
+PKGNAME=	lclint-${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://lclint.cs.virginia.edu/
 
@@ -16,7 +17,4 @@ USE_GMAKE=	YES
 GNU_CONFIGURE=  YES
 PLIST_SUBST+=	VERSION=${VERSION}
 
-do-build:
-	cd ${WRKSRC}; unset CFLAGS CPPFLAGS; ${MAKE_PROGRAM}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lclint/distinfo b/devel/lclint/distinfo
index d9bef6eafa1..26f8f3cb922 100644
--- a/devel/lclint/distinfo
+++ b/devel/lclint/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/08/20 02:40:45 hubertf Exp $
+$NetBSD: distinfo,v 1.4 2001/12/30 13:38:06 wiz Exp $
 
 SHA1 (lclint-2.5q.src.tar.gz) = 907e91d78f844c8c63a615dda477a25a74e62374
 Size (lclint-2.5q.src.tar.gz) = 1573297 bytes
-SHA1 (patch-aa) = d6904c92442bafcaffbd55df7ca014c4b36e71e7
+SHA1 (patch-aa) = dedb20a754c687050c1dedf1f710832b416c2157
 SHA1 (patch-ab) = a7015a6c0d5acad0354eb826b89774f098faaace
+SHA1 (patch-ac) = 989be6f79323fe59a853565c0645ef254a8ee1f7
diff --git a/devel/lclint/patches/patch-aa b/devel/lclint/patches/patch-aa
index 933ea7e1cb2..c7cc5900f86 100644
--- a/devel/lclint/patches/patch-aa
+++ b/devel/lclint/patches/patch-aa
@@ -1,7 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/09 15:24:24 mjl Exp $
-
---- Makefile.in.orig	Fri Feb  9 15:02:31 2001
-+++ Makefile.in	Fri Feb  9 15:03:32 2001
+$NetBSD: patch-aa,v 1.2 2001/12/30 13:38:07 wiz Exp $
+--- Makefile.in.orig	Thu Jul 27 11:19:17 2000
++++ Makefile.in	Sat Dec 29 03:39:46 2001
 @@ -37,10 +37,10 @@
  ### 
  
@@ -15,6 +14,24 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/02/09 15:24:24 mjl Exp $
  
  ### directory for lclint binary
  INSTALLDIR = @installdir@/bin
+@@ -160,7 +160,7 @@
+ 	setenv LINKFLAGS '$(LINKFLAGS)' ; \
+ 	setenv DEFAULT_LARCHPATH '".:$(LIBDIR)"' ; \
+ 	setenv DEFAULT_LCLIMPORTDIR '"$(IMPORTSDIR)"' ; \
+-	$(MAKE) -e localconstants ; $(MAKE) -e
++	$(MAKE) localconstants ; $(MAKE)
+ else
+ 	cd src ; CC='$(CC)'; export CC; CCOPT='$(CCOPT)'; \
+ 	BISON='$(BISON)' ; export BISON; FLEX='$(FLEX)'; export FLEX; \
+@@ -169,7 +169,7 @@
+ 	DEFAULT_LARCHPATH='".:$(LIBDIR)/"' ; export DEFAULT_LARCHPATH ;\
+ 	LINKFLAGS='$(LINKFLAGS)'; export LINK_FLAGS; \
+ 	DEFAULT_LCLIMPORTDIR='"$(IMPORTSDIR)"' ; export DEFAULT_LCLIMPORTDIR ;\
+-	$(MAKE) -e localconstants ; $(MAKE) -e
++	$(MAKE) localconstants ; $(MAKE)
+ endif
+ 	@echo '// '
+ 	@echo '//  Run: '$(MAKE)' test to check'
 @@ -227,14 +227,14 @@
  dolibraries:
  	@echo '//  Installing libraries in '$(LIBDIR)
diff --git a/devel/lclint/patches/patch-ac b/devel/lclint/patches/patch-ac
new file mode 100644
index 00000000000..e162abaaf4c
--- /dev/null
+++ b/devel/lclint/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2001/12/30 13:38:07 wiz Exp $
+--- src/Makefile.sys.orig	Sat Dec 29 03:48:26 2001
++++ src/Makefile.sys	Sat Dec 29 03:48:37 2001
+@@ -47,8 +47,8 @@
+ DEBUGFLAGS = -DYYDEBUG=1 -DYYIMPURE=1 # don't change this
+ 
+ #BISON = /usr/bin/bison
+-BISON = /af10/evans/bison-1.28/bin/bison
+-FLEX = /usr/bin/flex
++#BISON = /af10/evans/bison-1.28/bin/bison
++#FLEX = /usr/bin/flex
+ 
+ ### bison flags
+