4 files changed, 140 insertions, 68 deletions

diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile
index 8b60ba207d8e..c67c6fd8a71e 100644
--- a/lang/pfe/Makefile
+++ b/lang/pfe/Makefile
@@ -6,30 +6,33 @@
 #
 
 PORTNAME=	pfe
-PORTVERSION=	0.32.94
-PORTREVISION=	1
+PORTVERSION=	0.33.70
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of ANSI Forth
 
 LATEST_LINK=	pfe-devel
 
-USE_AUTOTOOLS=	libtool:15
+USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
-USE_GNOME=	gnometarget lthack
+USE_GCC=	4.2+
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	pfe/configure
+MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 
-MAN1=		pfe.1 pfe-config.1
+MAN1=		pfe.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
+.if ${ARCH} == "i386" && ${OSVERSION} < 700000
+CFLAGS+=	-fno-builtin-strcat -fno-builtin-strlen
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
+		 s|-O$$opt_level||g' ${WRKSRC}/pfe/configure
+
 .include <bsd.port.post.mk>
diff --git a/lang/pfe/distinfo b/lang/pfe/distinfo
index 660a3b5f423b..e72aad4758f0 100644
--- a/lang/pfe/distinfo
+++ b/lang/pfe/distinfo
@@ -1,3 +1,3 @@
-MD5 (pfe-0.32.94.tar.gz) = bdc666bf88d2aa407e35611af893a55c
-SHA256 (pfe-0.32.94.tar.gz) = 3ee2dadf17d3f0201dfcc902103b66aebdba37345a5159766d68a4263a5ad29f
-SIZE (pfe-0.32.94.tar.gz) = 1426995
+MD5 (pfe-0.33.70.tar.bz2) = 0d13a1a9852f3c5e46262a9d5d3b60a6
+SHA256 (pfe-0.33.70.tar.bz2) = bf21aa5dc11e49fe3e0b160fffdb9275cc0c9bef7689e9ebc3db82fe1cca0378
+SIZE (pfe-0.33.70.tar.bz2) = 1924001
diff --git a/lang/pfe/files/patch-pfe::configure b/lang/pfe/files/patch-pfe::configure
deleted file mode 100644
index 905d4d4d10bc..000000000000
--- a/lang/pfe/files/patch-pfe::configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- pfe/configure.orig	Tue Mar  4 07:04:06 2003
-+++ pfe/configure	Sat Aug  7 18:44:13 2004
-@@ -11693,10 +11693,10 @@
- GCC_WARN="" ; OPTIM="" ; DEBUG=""
- echo "$as_me:11694: checking optimize level \"$WITHVAL_OPT\" is..." >&5
- echo $ECHO_N "checking optimize level \"$WITHVAL_OPT\" is...... $ECHO_C" >&6
--CFLAGS=`echo " $CFLAGS " | sed -e 's/ -O[0-9]* / /'`
-+CFLAGS=`echo " $CFLAGS "`
- opt_level="$WITHVAL_OPT"
- if test "$GCC" = "yes" ; then
--   OPTIM="-O$opt_level"
-+   OPTIM=""
-    if test "$with_sbr_call_threading" != "yes" ; then
- 
- cat >>confdefs.h <<\EOF
diff --git a/lang/pfe/pkg-plist b/lang/pfe/pkg-plist
index cf73d2fe0c14..174d5d8a4653 100644
--- a/lang/pfe/pkg-plist
+++ b/lang/pfe/pkg-plist
@@ -1,26 +1,38 @@
 bin/pfe
-bin/pfe-config
+bin/pfe-exec
+bin/pfe-exec-forth
+bin/pfe-forth
+include/pfe/_config.h
+include/pfe/_target.h
+include/pfe/assembler-ext.h
 include/pfe/block-ext.h
 include/pfe/block-mix.h
 include/pfe/block-sub.h
 include/pfe/cdecl-ext.h
+include/pfe/chain-ext.h
 include/pfe/chainlist-ext.h
+include/pfe/complex-ext.h
 include/pfe/config.h
 include/pfe/core-ext.h
 include/pfe/core-mix.h
 include/pfe/core-sub.h
 include/pfe/debug-ext.h
+include/pfe/def-cell.h
 include/pfe/def-comp.h
 include/pfe/def-config.h
 include/pfe/def-const.h
+include/pfe/def-gcc.h
+include/pfe/def-limits.h
 include/pfe/def-macro.h
 include/pfe/def-paths.h
 include/pfe/def-pth.h
+include/pfe/def-regmacro.h
 include/pfe/def-regs.h
+include/pfe/def-regth.h
 include/pfe/def-restore.h
+include/pfe/def-sbrcode.h
 include/pfe/def-types.h
 include/pfe/def-words.h
-include/pfe/def-xtra.h
 include/pfe/dict-comp.h
 include/pfe/dict-sub.h
 include/pfe/double-ext.h
@@ -28,11 +40,13 @@ include/pfe/double-mix.h
 include/pfe/double-sub.h
 include/pfe/dstrings-ext.h
 include/pfe/edit-ext.h
+include/pfe/engine-set.h
 include/pfe/engine-sub.h
 include/pfe/environ-ext.h
 include/pfe/exception-ext.h
 include/pfe/exception-sub.h
 include/pfe/facility-ext.h
+include/pfe/facility-mix.h
 include/pfe/file-ext.h
 include/pfe/file-mix.h
 include/pfe/file-sub.h
@@ -46,6 +60,7 @@ include/pfe/header-ext.h
 include/pfe/header-sub.h
 include/pfe/help-ext.h
 include/pfe/incl-ext.h
+include/pfe/incl-mix.h
 include/pfe/incl-sub.h
 include/pfe/incl-sup.h
 include/pfe/lined.h
@@ -56,13 +71,25 @@ include/pfe/memory-alloc-ext.h
 include/pfe/memory-sub.h
 include/pfe/misc-ext.h
 include/pfe/option-ext.h
+include/pfe/option-set.h
+include/pfe/os-ctype.h
+include/pfe/os-delay.h
+include/pfe/os-setjmp.h
+include/pfe/os-string.h
+include/pfe/p4-gettimeofday.h
 include/pfe/pfe-base.h
+include/pfe/pfe-ext.h
+include/pfe/pfe-mix.h
+include/pfe/pfe-set.h
+include/pfe/pfe-sub.h
+include/pfe/pfe-sup.h
 include/pfe/pfe.h
 include/pfe/posix-ext.h
 include/pfe/search-order-ext.h
 include/pfe/shell-os-ext.h
 include/pfe/signals-ext.h
 include/pfe/smart-go-ext.h
+include/pfe/stackhelp-ext.h
 include/pfe/string-ext.h
 include/pfe/struct-ext.h
 include/pfe/system-ext.h
@@ -72,49 +99,85 @@ include/pfe/tools-ext.h
 include/pfe/tools-mix.h
 include/pfe/tools-sub.h
 include/pfe/useful-ext.h
-include/pfe/utils-sub.h
 include/pfe/version-sub.h
 include/pfe/your-ext.h
-include/pfe-config.h
-include/pfe-target.h
-lib/libpfe-0.so
-lib/libpfe-0.so.32
+lib/libpfe-0-forth.so
+lib/libpfe-0-forth.so.33
 lib/libpfe.a
 lib/libpfe.la
 lib/libpfe.so
-lib/pfe/dstrings.a
-lib/pfe/dstrings.la
-lib/pfe/dstrings.so
-lib/pfe/edit.a
-lib/pfe/edit.la
-lib/pfe/edit.so
-lib/pfe/floating.a
-lib/pfe/floating.la
-lib/pfe/floating.so
-lib/pfe/fpnostack.a
-lib/pfe/fpnostack.la
-lib/pfe/fpnostack.so
-lib/pfe/gforth.a
-lib/pfe/gforth.la
-lib/pfe/gforth.so
-lib/pfe/help.a
-lib/pfe/help.la
-lib/pfe/help.so
-lib/pfe/module.a
-lib/pfe/module.la
-lib/pfe/module.so
-lib/pfe/smart-go.a
-lib/pfe/smart-go.la
-lib/pfe/smart-go.so
-lib/pfe/struct.a
-lib/pfe/struct.la
-lib/pfe/struct.so
-lib/pfe/toolbelt.a
-lib/pfe/toolbelt.la
-lib/pfe/toolbelt.so
-lib/pfe/zchar.a
-lib/pfe/zchar.la
-lib/pfe/zchar.so
+lib/pfe/testmodule1.a
+lib/pfe/testmodule1.la
+lib/pfe/testmodule1.so
+lib/pfe-forth/assembler.a
+lib/pfe-forth/assembler.la
+lib/pfe-forth/assembler.so
+lib/pfe-forth/complex.a
+lib/pfe-forth/complex.la
+lib/pfe-forth/complex.so
+lib/pfe-forth/dstrings.a
+lib/pfe-forth/dstrings.la
+lib/pfe-forth/dstrings.so
+lib/pfe-forth/edit.a
+lib/pfe-forth/edit.la
+lib/pfe-forth/edit.so
+lib/pfe-forth/floating.a
+lib/pfe-forth/floating.la
+lib/pfe-forth/floating.so
+lib/pfe-forth/fpnostack.a
+lib/pfe-forth/fpnostack.la
+lib/pfe-forth/fpnostack.so
+lib/pfe-forth/gforth.a
+lib/pfe-forth/gforth.la
+lib/pfe-forth/gforth.so
+lib/pfe-forth/help.a
+lib/pfe-forth/help.la
+lib/pfe-forth/help.so
+lib/pfe-forth/module.a
+lib/pfe-forth/module.la
+lib/pfe-forth/module.so
+lib/pfe-forth/renamed/libassembler.so
+lib/pfe-forth/renamed/libcomplex.so
+lib/pfe-forth/renamed/libdstrings.so
+lib/pfe-forth/renamed/libedit.so
+lib/pfe-forth/renamed/libfloating.so
+lib/pfe-forth/renamed/libfpnostack.so
+lib/pfe-forth/renamed/libgforth.so
+lib/pfe-forth/renamed/libhelp.so
+lib/pfe-forth/renamed/libmodule.so
+lib/pfe-forth/renamed/libsmart-go.so
+lib/pfe-forth/renamed/libsocket.so
+lib/pfe-forth/renamed/libstackhelp.so
+lib/pfe-forth/renamed/libstruct.so
+lib/pfe-forth/renamed/libstructs.so
+lib/pfe-forth/renamed/libtermcatch.so
+lib/pfe-forth/renamed/libtoolbelt.so
+lib/pfe-forth/renamed/libzchar.so
+lib/pfe-forth/smart-go.a
+lib/pfe-forth/smart-go.la
+lib/pfe-forth/smart-go.so
+lib/pfe-forth/socket.a
+lib/pfe-forth/socket.la
+lib/pfe-forth/socket.so
+lib/pfe-forth/stackhelp.a
+lib/pfe-forth/stackhelp.la
+lib/pfe-forth/stackhelp.so
+lib/pfe-forth/struct.a
+lib/pfe-forth/struct.la
+lib/pfe-forth/struct.so
+lib/pfe-forth/structs.a
+lib/pfe-forth/structs.la
+lib/pfe-forth/structs.so
+lib/pfe-forth/termcatch.a
+lib/pfe-forth/termcatch.la
+lib/pfe-forth/termcatch.so
+lib/pfe-forth/toolbelt.a
+lib/pfe-forth/toolbelt.la
+lib/pfe-forth/toolbelt.so
+lib/pfe-forth/zchar.a
+lib/pfe-forth/zchar.la
+lib/pfe-forth/zchar.so
+libdata/pkgconfig/pfe.pc
 %%DATADIR%%/lib/arrays.4th
 %%DATADIR%%/lib/defer-is.4th
 %%DATADIR%%/lib/doermake.4th
@@ -134,12 +197,20 @@ lib/pfe/zchar.so
 %%DATADIR%%/test/coretest.fs
 %%DATADIR%%/test/dbltest.4th
 %%DATADIR%%/test/dbltest.fs
+%%DATADIR%%/test/deferred-x.4th
+%%DATADIR%%/test/deferred-x.fs
+%%DATADIR%%/test/deferred.fs
 %%DATADIR%%/test/defs.4th
+%%DATADIR%%/test/dstester.fs
+%%DATADIR%%/test/dstrings-test.fs
 %%DATADIR%%/test/environ.4th
 %%DATADIR%%/test/exceptn.4th
 %%DATADIR%%/test/fib.fs
 %%DATADIR%%/test/file.4th
 %%DATADIR%%/test/float.4th
+%%DATADIR%%/test/forth-signal.4th
+%%DATADIR%%/test/fp-stack.4th
+%%DATADIR%%/test/fp-stack.fs
 %%DATADIR%%/test/fpnostack.4th
 %%DATADIR%%/test/hashvocdistri.fs
 %%DATADIR%%/test/intactv.4th
@@ -149,8 +220,13 @@ lib/pfe/zchar.so
 %%DATADIR%%/test/mini-oof.fs
 %%DATADIR%%/test/moof-exm.fs
 %%DATADIR%%/test/moofglos.fs
+%%DATADIR%%/test/number-prefixes.4th
+%%DATADIR%%/test/number-prefixes.fs
+%%DATADIR%%/test/parse-name.4th
+%%DATADIR%%/test/parse-name.fs
 %%DATADIR%%/test/postpone.4th
 %%DATADIR%%/test/postpone.fs
+%%DATADIR%%/test/queryapp.4th
 %%DATADIR%%/test/search-order.4th
 %%DATADIR%%/test/search-order.fs
 %%DATADIR%%/test/siev.fs
@@ -162,14 +238,22 @@ lib/pfe/zchar.so
 %%DATADIR%%/test/stack.4th
 %%DATADIR%%/test/string.4th
 %%DATADIR%%/test/suite.4th
+%%DATADIR%%/test/test-num-prefixes.4th
+%%DATADIR%%/test/test-num-prefixes.fs
+%%DATADIR%%/test/test-num-prefixes2.4th
+%%DATADIR%%/test/test-num-prefixes2.fs
 %%DATADIR%%/test/tester.fs
 %%DATADIR%%/test/trydstrings.fs
 %%DATADIR%%/test/tt.4th
 %%DATADIR%%/test/tt.fs
 %%DATADIR%%/test/wordsets.4th
 %%DATADIR%%/test/wordsets.fs
+%%DATADIR%%/testmodule1.fs
+%%DATADIR%%/testmodule2.fs
 @dirrm %%DATADIR%%/test
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%
+@dirrm lib/pfe-forth/renamed
+@dirrm lib/pfe-forth
 @dirrm lib/pfe
 @dirrm include/pfe