Update to pForth version 27.

Assume maintainership.


Changes since version 21:

V27
    - Fixed REPOSITION-FILE FILE-SIZE and FILE-POSITION.
      They used to use single precision offset. Now use double as specified.
    - Delete object directories in Makefile clean.
    - Fixed "Issue 4: Filehandle remains locked upon INCLUDE error".
      http://code.google.com/p/pforth/issues/detail?id=4&can=1
    - Fixed scrambled HISTORY on 64-bit systems. Was using CELL+ but really needed 4 +.
    - Fixed floating point input. Now accepts "1E" as 1.0. Was Issue #2.
    - Fixed lots of warning and made code compatible with C89 and ANSI. Uses -pedantic.
    - Use fseek and ftell on WIN32 instead of fseeko and ftello.
    - Makefile is now more standard. Builds in same dir as Makefile. Uses CFLAGS etc.
    - Add support for console IO with _WATCOMC_
    - Internal CStringToForth and ForthStringToC now take a destination size for safety.
    - Run units tests for CStringToForth and ForthStringToC if PF_UNIT_TESTS is defined.

V26  5/20/2010
    - 64-bit support for M* UM/MOD etc by Aleksej Saushev. Thanks Aleksej!

V25  5/19/2010
    - Added 64-bit CELL support contributed by Aleksej Saushev. Thanks Aleksej!
    - Added "-x c" to Makefile CCOPTS to prevent confusion with C++
	- Allow space after -d command line option.
	- Restore normal tty mode if pForth dictionary loading fails.

V24 2/20/09
	- Fixed Posix IO on Mac. ?TERMINAL was always returning true.
	- ACCCEPT now emits a space at end of line before output.
	- Fixed RESIZE because it was returning the wrong address.

V23 8/4/2008
	- Removed -v option from mkdir in build/unix/Makefile. It was not supported on FreeBSD.
	  Thank you Alexsej Saushev for reporting this.

V23  7/20/2008
    - Reorganized for Google Code project.

V22  (unreleased)
    - Added command line history and cursor control words.
	- Sped up UM* and M* by a factor of 3. Thanks to Steve Green for suggested algorithm.
	- Modified ACCEPT so that a line at the end of a file that does NOT have a line
	    terminator will now be processed.
	- Use _getch(), _putch(), and _kbhit() so that KEY, EMIT and ?TERMINAL will work on PC.
	- Fixed  : foo { -- } 55 ;  - Was entering local frame but not exiting. Now prints error.
    - Redefined MAKE_ID to protect it from 16 bit ints
    - John Providenza says "If you split local variables onto 2 lines, PForth crashes." Fixed. Also allow \
    - Fixed float evaluation in EVALUATE in "quit.fth".
    - Flush register cache for ffColon and ffSemiColon to prevent stack warnings from ;

6 files changed, 41 insertions, 150 deletions

diff --git a/lang/pforth/DESCR b/lang/pforth/DESCR
index 3b1002d8279..82cff404583 100644
--- a/lang/pforth/DESCR
+++ b/lang/pforth/DESCR
@@ -2,17 +2,12 @@ PForth is an ANSI style Forth designed to be portable across many
 platforms.  The 'P' in pForth stands for "Portable". PForth is based
 on a Forth kernel written in ANSI standard 'C'.
 
-PForth has been designed with portability as the primary design
-goal. As a result, pForth avoids any fancy UNIX calls. pForth also
-avoids using any clever and original ways of constructing the Forth
+PForth has been designed with portability as the primary design goal.
+As a result, pForth avoids any fancy Unix calls. pForth also avoids
+using any clever and original ways of constructing the Forth
 dictionary. It just compiles its kernel from ANSI compatible 'C' code
-then loads ANS compatible Forth code to build the dictionary. Very
-boring but very likely to work on almost any platform.
+then loads ANS compatible Forth code to build the dictionary.
+Very boring but very likely to work on almost any platform.
 
-The pForth software code is dedicated to the public domain, and any
-third party may reproduce, distribute and modify the pForth software
-code or any derivative works thereof without any compensation or
-license. The pForth software code is provided on an "as is" basis
-without any warranty of any kind, including, without limitation, the
-implied warranties of merchantability and fitness for a particular
-purpose and their equivalents under the laws of any jurisdiction.
+The pForth software code is distributed under MIT licence with parts
+dedicated to the public domain.
diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index ace417e41b1..9ff298eabec 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -1,45 +1,31 @@
-# $NetBSD: Makefile,v 1.23 2010/02/15 16:41:46 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/11/22 01:25:48 asau Exp $
 
-DISTNAME=		pfthpc21
-PKGNAME=		pforth-21
-PKGREVISION=		2
+DISTNAME=		pforth_v27_20101121
+PKGNAME=		pforth-27
 CATEGORIES=		lang
-MASTER_SITES=		http://www.softsynth.com/pforth/
+MASTER_SITES=		http://pforth.googlecode.com/files/
 EXTRACT_SUFX=		.zip
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		asau@NetBSD.org
 HOMEPAGE=		http://www.softsynth.com/pforth/
 COMMENT=		Portable ANS-like Forth
+LICENSE=		mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}
-USE_LANGUAGES=		c++
-USE_TOOLS+=		gmake
+WRKSRC=			$(WRKDIR)/pforth_v27
+MAKE_FILE=		build/unix/Makefile
+MAKE_FLAGS=		SRCDIR=.
+CPPFLAGS=		-DPF_DEFAULT_DICTIONARY='"$(PREFIX)/lib/pforth/pforth.dic"'
 
-NOT_FOR_PLATFORM=	${LP64PLATFORMS}
-
-INSTALLATION_DIRS=	bin
-
-post-extract:
-	${MKDIR} ${WRKSRC}/objects
-
-post-patch:
-	${MV} ${WRKSRC}/csrc/pf_main.c ${WRKSRC}/csrc/pf_main.c.dist
-	${SED} -e 's:@PREFIX@:${PREFIX}:g' ${WRKSRC}/csrc/pf_main.c.dist \
-	> ${WRKSRC}/csrc/pf_main.c
+INSTALLATION_DIRS=	bin lib/pforth share/doc/pforth share/pforth share/pforth/utils
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pforth ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pforth
 	${INSTALL_DATA} ${WRKSRC}/pforth.dic ${DESTDIR}${PREFIX}/lib/pforth
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/pforth
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/docs/* 		\
-		${DESTDIR}${PREFIX}/share/doc/pforth/
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pforth
-	${INSTALL_DATA} ${WRKSRC}/*.fth ${DESTDIR}${PREFIX}/share/pforth/
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pforth/utils
-	${INSTALL_DATA}  ${WRKSRC}/utils/*.fth				\
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DESTDIR}${PREFIX}/share/doc/pforth/
+	${INSTALL_DATA} ${WRKSRC}/fth/*.fth ${DESTDIR}${PREFIX}/share/pforth/
+	${INSTALL_DATA}  ${WRKSRC}/fth/utils/*.fth			\
 		${DESTDIR}${PREFIX}/share/pforth/utils/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/pforth/PLIST b/lang/pforth/PLIST
index 0a76074dcc9..e5edecd4cd4 100644
--- a/lang/pforth/PLIST
+++ b/lang/pforth/PLIST
@@ -1,23 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2009/08/29 18:53:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/11/22 01:25:48 asau Exp $
 bin/pforth
 lib/pforth/pforth.dic
-share/doc/pforth/README.txt
-share/doc/pforth/pf_ref.htm
-share/doc/pforth/pf_todo.txt
-share/doc/pforth/pf_tut.htm
-share/doc/pforth/pfmanual.txt
+share/doc/pforth/readme.txt
 share/pforth/ansilocs.fth
 share/pforth/bench.fth
-share/pforth/bloop.fth
 share/pforth/c_struct.fth
 share/pforth/case.fth
-share/pforth/catch.fth
-share/pforth/checkit.fth
 share/pforth/condcomp.fth
 share/pforth/coretest.fth
 share/pforth/filefind.fth
 share/pforth/floats.fth
 share/pforth/forget.fth
+share/pforth/history.fth
+share/pforth/loadhist.fth
 share/pforth/loadp4th.fth
 share/pforth/locals.fth
 share/pforth/math.fth
@@ -26,18 +21,27 @@ share/pforth/misc1.fth
 share/pforth/misc2.fth
 share/pforth/numberio.fth
 share/pforth/private.fth
-share/pforth/quit.fth
+share/pforth/savedicd.fth
 share/pforth/see.fth
 share/pforth/siev.fth
 share/pforth/smart_if.fth
 share/pforth/strings.fth
 share/pforth/system.fth
 share/pforth/t_alloc.fth
+share/pforth/t_case.fth
 share/pforth/t_corex.fth
 share/pforth/t_floats.fth
+share/pforth/t_include.fth
+share/pforth/t_load.fth
+share/pforth/t_load_defer.fth
+share/pforth/t_load_pairs.fth
+share/pforth/t_load_semi.fth
+share/pforth/t_load_undef.fth
 share/pforth/t_locals.fth
+share/pforth/t_nolf.fth
 share/pforth/t_strings.fth
 share/pforth/t_tools.fth
+share/pforth/termio.fth
 share/pforth/tester.fth
 share/pforth/trace.fth
 share/pforth/tut.fth
@@ -45,6 +49,5 @@ share/pforth/utils/clone.fth
 share/pforth/utils/dump_struct.fth
 share/pforth/utils/load_file.fth
 share/pforth/utils/make_all256.fth
-share/pforth/utils/savedicd.fth
 share/pforth/utils/trace.fth
 share/pforth/wordslik.fth
diff --git a/lang/pforth/distinfo b/lang/pforth/distinfo
index 9b6f6c09e5f..416132753d5 100644
--- a/lang/pforth/distinfo
+++ b/lang/pforth/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2009/08/25 11:56:35 wiz Exp $
+$NetBSD: distinfo,v 1.7 2010/11/22 01:25:48 asau Exp $
 
-SHA1 (pfthpc21.zip) = 550de4405f593004ff6e957a1c294bd801167e5b
-RMD160 (pfthpc21.zip) = cd5ab920efad2098351be98f86955d0e10ea61b2
-Size (pfthpc21.zip) = 295565 bytes
-SHA1 (patch-aa) = 7e875a466fb4577457120bf4165adb9339a20193
-SHA1 (patch-ab) = bce3729fabfd196b11562ccdc2e559455e29176e
+SHA1 (pforth_v27_20101121.zip) = 66b9f3927a877afecca2c303157b7127291802f6
+RMD160 (pforth_v27_20101121.zip) = e39965a79d4845763b6b767f5f7781f0d3758208
+Size (pforth_v27_20101121.zip) = 209538 bytes
+SHA1 (patch-aa) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-ab) = da39a3ee5e6b4b0d3255bfef95601890afd80709
diff --git a/lang/pforth/patches/patch-aa b/lang/pforth/patches/patch-aa
deleted file mode 100644
index 81368a9e140..00000000000
--- a/lang/pforth/patches/patch-aa
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/08/25 11:56:35 wiz Exp $
-
---- Makefile.orig	1998-04-06 17:13:12.000000000 +0200
-+++ Makefile
-@@ -12,7 +12,7 @@ SOURCEDIR = csrc
- OBJECTDIR = objects
- EMBOBJECTDIR = embobjects
- 
--FULL_WARNINGS =  -O2 \
-+FULL_WARNINGS = \
-         -fsigned-char \
-         -fno-builtin \
-         -fno-unroll-loops \
-@@ -26,8 +26,9 @@ FULL_WARNINGS =  -O2 \
-         -Wmissing-prototypes \
-         -Wmissing-declarations
-         
--CCOPTS = -DPF_SUPPORT_FP $(FULL_WARNINGS)
--COMPILER = gcc
-+CFLAGS += -DPF_SUPPORT_FP $(FULL_WARNINGS)
-+
-+CDEFS = -DPF_DIC=\"${PREFIX}/lib/pforth/pforth.dic\"
- 
- EMBCCOPTS = -DPF_NO_INIT -DPF_NO_MALLOC -DPF_NO_FILEIO \
-     -DPF_NO_CLIB -DPF_STATIC_DIC
-@@ -41,13 +42,13 @@ PFTEMP     = ${PFSOURCE:%.c=%.o}
- PFOBJS     = ${PFTEMP:${SOURCEDIR}/%=${OBJECTDIR}/%}
- PFEMBOBJS  = ${PFTEMP:${SOURCEDIR}/%=${EMBOBJECTDIR}/%}
- 
--COMPILE = $(COMPILER) $(CCOPTS) $(CDEFS)
-+COMPILE = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CDEFS)
- 
- ${OBJECTDIR}/%.o:  $(PFINCLUDES)  ${SOURCEDIR}/%.c
--	$(COMPILE) -O -o ${OBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c
--	
-+	$(COMPILE) -o ${OBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c
-+
- ${EMBOBJECTDIR}/%.o:  $(PFINCLUDES) ${SOURCEDIR}/%.c ${SOURCEDIR}/pfdicdat.h 
--	$(COMPILE) -O -o ${EMBOBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c $(EMBCCOPTS)
-+	$(COMPILE) -o ${EMBOBJECTDIR}/$*.o -c ${SOURCEDIR}/$*.c $(EMBCCOPTS)
- 
- all: pforth pforth.dic
- 
-@@ -62,26 +63,26 @@ pffiles:
- 	echo ${PFOBJS}
- 	echo "EMBEDDED OBJECT FILES ------------------"
- 	echo ${PFEMBOBJS}
--	
-+
- # build pforth by compiling 'C' source
- pforth: $(PFINCLUDES) $(PFOBJS)
--	$(COMPILER) $(PFOBJS) -lm -o pforth
-+	$(CXX) $(PFOBJS) -lm -o pforth
- 
- # build basic dictionary by running newly built pforth and including system.fth
- pforth.dic: pforth
--	pforth -i system.fth
-+	./pforth -i system.fth
- 
- ${SOURCEDIR}/pfdicdat.h: pforth pforth.dic
- 	@(echo 'INCLUDE utils/savedicd.fth'; \
-           echo 'SDAD';         \
-           echo 'bye')                                 | \
--	pforth -dpforth.dic
-+	./pforth -dpforth.dic
- 	cp pfdicdat.h ${SOURCEDIR}
- 
- 
- pfemb: $(PFINCLUDES) $(PFEMBOBJS)
--	$(COMPILER) $(PFEMBOBJS) -lm -o pfemb
--	
-+	$(CXX) $(PFEMBOBJS) -lm -o pfemb
-+
- clean:
- 	rm -f $(PFOBJS) $(PFEMBOBJS) pforth *.dic core ${SOURCEDIR}/pfdicdat.h pfemb
- 
diff --git a/lang/pforth/patches/patch-ab b/lang/pforth/patches/patch-ab
deleted file mode 100644
index 46b727f844a..00000000000
--- a/lang/pforth/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/06/20 06:53:41 jtb Exp $
-
---- csrc/pf_main.c.orig	Tue Mar 31 22:34:50 1998
-+++ csrc/pf_main.c
-@@ -42,7 +42,12 @@
- 
- int main( int argc, char **argv )
- {
-+
-+#ifdef PF_DIC
-+	const char *DicName = PF_DIC;
-+#else
- 	const char *DicName = "pforth.dic";
-+#endif
- 	const char *SourceName = NULL;
- 	char IfInit = FALSE;
- 	char *s;