From 2572e8798da2d15e37095c4543f273b340dc9af7 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 20 May 2004 18:54:23 +0000
Subject: Convert to buildlink3, and make build with gcc3. Closes PR 25651 by
 Georg Schwarz.

---
 lang/pforth/Makefile         |  3 ++-
 lang/pforth/distinfo         |  4 ++--
 lang/pforth/patches/patch-aa | 18 +++++++++---------
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'lang/pforth')

diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index 1a040981882..e07b5fabb89 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/24 13:51:14 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/20 18:54:23 wiz Exp $
 
 DISTNAME=		pfthpc21
 PKGNAME=		pforth-21
@@ -12,6 +12,7 @@ COMMENT=		Portable ANS-like Forth
 
 WRKSRC=			${WRKDIR}
 USE_GNU_TOOLS+=		make
+USE_BUILDLINK3=		yes
 MAKEFILE=		${WRKSRC}/makefile
 
 NOT_FOR_PLATFORM=	*-*-alpha  #segfaults when running ./pforth during build
diff --git a/lang/pforth/distinfo b/lang/pforth/distinfo
index cd2dba57a09..64eae2d50f8 100644
--- a/lang/pforth/distinfo
+++ b/lang/pforth/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/20 06:53:40 jtb Exp $
+$NetBSD: distinfo,v 1.4 2004/05/20 18:54:23 wiz Exp $
 
 SHA1 (pfthpc21.zip) = 550de4405f593004ff6e957a1c294bd801167e5b
 Size (pfthpc21.zip) = 295565 bytes
-SHA1 (patch-aa) = 09b7fd486721664ff20d0260b43b8dfab727bc15
+SHA1 (patch-aa) = 8e2c5bcde82e078f341db25d12b79e667cf76c54
 SHA1 (patch-ab) = bce3729fabfd196b11562ccdc2e559455e29176e
diff --git a/lang/pforth/patches/patch-aa b/lang/pforth/patches/patch-aa
index 94bfcabeb05..84ff8ffef03 100644
--- a/lang/pforth/patches/patch-aa
+++ b/lang/pforth/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/06/20 06:53:41 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/20 18:54:23 wiz Exp $
 
---- makefile.orig	Mon Apr  6 17:13:12 1998
+--- makefile.orig	1998-04-06 17:13:12.000000000 +0200
 +++ makefile
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ SOURCEDIR = csrc
  OBJECTDIR = objects
  EMBOBJECTDIR = embobjects
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2001/06/20 06:53:41 jtb Exp $
          -fsigned-char \
          -fno-builtin \
          -fno-unroll-loops \
-@@ -26,8 +26,9 @@
+@@ -26,8 +26,9 @@ FULL_WARNINGS =  -O2 \
          -Wmissing-prototypes \
          -Wmissing-declarations
          
@@ -23,12 +23,12 @@ $NetBSD: patch-aa,v 1.2 2001/06/20 06:53:41 jtb Exp $
  
  EMBCCOPTS = -DPF_NO_INIT -DPF_NO_MALLOC -DPF_NO_FILEIO \
      -DPF_NO_CLIB -DPF_STATIC_DIC
-@@ -41,13 +42,13 @@
+@@ -41,13 +42,13 @@ PFTEMP     = ${PFSOURCE:%.c=%.o}
  PFOBJS     = ${PFTEMP:${SOURCEDIR}/%=${OBJECTDIR}/%}
  PFEMBOBJS  = ${PFTEMP:${SOURCEDIR}/%=${EMBOBJECTDIR}/%}
  
 -COMPILE = $(COMPILER) $(CCOPTS) $(CDEFS)
-+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(CDEFS)
++COMPILE = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CDEFS)
  
  ${OBJECTDIR}/%.o:  $(PFINCLUDES)  ${SOURCEDIR}/%.c
 -	$(COMPILE) -O -o ${OBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.2 2001/06/20 06:53:41 jtb Exp $
  
  all: pforth pforth.dic
  
-@@ -62,26 +63,26 @@
+@@ -62,26 +63,26 @@ pffiles:
  	echo ${PFOBJS}
  	echo "EMBEDDED OBJECT FILES ------------------"
  	echo ${PFEMBOBJS}
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.2 2001/06/20 06:53:41 jtb Exp $
  # build pforth by compiling 'C' source
  pforth: $(PFINCLUDES) $(PFOBJS)
 -	$(COMPILER) $(PFOBJS) -lm -o pforth
-+	$(CC) $(PFOBJS) -lm -o pforth
++	$(CXX) $(PFOBJS) -lm -o pforth
  
  # build basic dictionary by running newly built pforth and including system.fth
  pforth.dic: pforth
@@ -69,7 +69,7 @@ $NetBSD: patch-aa,v 1.2 2001/06/20 06:53:41 jtb Exp $
  pfemb: $(PFINCLUDES) $(PFEMBOBJS)
 -	$(COMPILER) $(PFEMBOBJS) -lm -o pfemb
 -	
-+	$(CC) $(PFEMBOBJS) -lm -o pfemb
++	$(CXX) $(PFEMBOBJS) -lm -o pfemb
 +
  clean:
  	rm -f $(PFOBJS) $(PFEMBOBJS) pforth *.dic core ${SOURCEDIR}/pfdicdat.h pfemb
-- 
cgit v1.2.3