9 files changed, 90 insertions, 147 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index a9653b78ea59..86297f8fdff2 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,19 +6,26 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	1.8.1
+PORTVERSION=	1.95.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	smalltalk
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+ALL_TARGET=	all optimize
 
 MAN1=		gst.1
 
-# Set all-target to test the stuff
-ALL_TARGET=	optimize info check
+pre-patch:
+	@${PERL} -pi -e 's| install-data-local||g' ${WRKSRC}/kernel/Makefile.in
+
+pre-build:
+	${RM} ${WRKSRC}/docs/gst.info*
+
+post-install:
+	@cd ${PREFIX}/share/gnu-smalltalk && ${PREFIX}/bin/gst -Vi dummyFile
 
 .include <bsd.port.mk>
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 31e675864d2c..80ef69362de9 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1 +1 @@
-MD5 (smalltalk-1.8.1.tar.gz) = 4cd917d21f315614361224aafae5c8a3
+MD5 (smalltalk-1.95.1.tar.gz) = 3495cfb86f6a96f3bab47c8a1f41dd86
diff --git a/lang/smalltalk/files/patch-aa b/lang/smalltalk/files/patch-aa
index d2324a2f64af..b7e56afb64cc 100644
--- a/lang/smalltalk/files/patch-aa
+++ b/lang/smalltalk/files/patch-aa
@@ -1,8 +1,8 @@
---- lib/lex.c.orig	Mon Feb 21 19:05:50 2000
-+++ lib/lex.c	Sat Mar 25 21:43:17 2000
-@@ -50,6 +50,9 @@
- 
+--- libgst/lex.c.orig	Wed Dec 27 18:43:24 2000
++++ libgst/lex.c	Sat Feb 10 10:11:18 2001
+@@ -52,6 +52,9 @@
  #include <stdio.h>
+ #include <ctype.h>
  #include <math.h>
 +#if defined(__FreeBSD__)
 +#include <floatingpoint.h>
@@ -10,7 +10,7 @@
  
  #ifdef HAVE_READLINE
  #include <readline/readline.h>
-@@ -735,6 +738,9 @@
+@@ -764,6 +767,9 @@
    if (isNegative) {
      num = -num;
    }
diff --git a/lang/smalltalk/files/patch-ad b/lang/smalltalk/files/patch-ad
deleted file mode 100644
index c0b9b095e349..000000000000
--- a/lang/smalltalk/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.defs.in.orig	Thu Jun 29 19:08:33 2000
-+++ Makefile.defs.in	Mon Jul  3 22:04:27 2000
-@@ -35,6 +35,7 @@
- SCHEDULER = cat
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_INFO = @INSTALL_INFO@
- MAKEINFO = @MAKEINFO@
-@@ -73,7 +74,7 @@
- 
- # Program flags
- OPT_LEVEL = 2
--OPT_CFLAGS = -O$(OPT_LEVEL) -DOPTIMIZE
-+OPT_CFLAGS = -DOPTIMIZE
- CDEBUG = @CDEBUG@
- INCLUDES= -I$(srcdir) -I$(srcdir)/lib $(USER_INCLUDES)
- CPPFLAGS = @CPPFLAGS@
diff --git a/lang/smalltalk/files/patch-ae b/lang/smalltalk/files/patch-ae
deleted file mode 100644
index 4d4f55b848b6..000000000000
--- a/lang/smalltalk/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.rules.orig	Thu Jun 29 19:39:26 2000
-+++ Makefile.rules	Mon Jul  3 22:05:39 2000
-@@ -112,8 +112,8 @@
- 
- install:: installdirs optimize
- 	$(INSTALL_PROGRAM) gst$(EXE) $(bindir)/gst$(EXE)
--	$(INSTALL_PROGRAM) gst-config $(bindir)/gst-config
--	$(INSTALL_PROGRAM) gst-package $(bindir)/gst-package
-+	$(INSTALL_SCRIPT) gst-config $(bindir)/gst-config
-+	$(INSTALL_SCRIPT) gst-package $(bindir)/gst-package
- 	$(INSTALL_DATA) lib/gst.h $(includedir)/gst.h
- 	$(INSTALL_DATA) lib/gstpub.h $(includedir)/gstpub.h
- 	$(INSTALL_DATA) gstconf.h $(includedir)/gstconf.h
diff --git a/lang/smalltalk/files/patch-af b/lang/smalltalk/files/patch-af
new file mode 100644
index 000000000000..02292db67c25
--- /dev/null
+++ b/lang/smalltalk/files/patch-af
@@ -0,0 +1,13 @@
+--- configure.orig	Sat Jan 20 22:57:06 2001
++++ configure	Sat Feb 10 15:41:13 2001
+@@ -4360,8 +4360,8 @@
+ #   - speed
+ 
+ CFLAGS_NOOPT="$CFLAGS $CDEBUG"
+-CFLAGS_OPT="$CFLAGS $OPT_CDEBUG $OPT_CFLAGS"
+-CFLAGS="$CFLAGS $CDEBUG $OPT_CFLAGS"
++CFLAGS_OPT="$CFLAGS $OPT_CDEBUG"
++CFLAGS="$CFLAGS $CDEBUG"
+ OPTLEVEL=2
+ 
+ 
diff --git a/lang/smalltalk/files/patch-ag b/lang/smalltalk/files/patch-ag
new file mode 100644
index 000000000000..52bd6e43ffda
--- /dev/null
+++ b/lang/smalltalk/files/patch-ag
@@ -0,0 +1,11 @@
+--- libgst/Makefile.in.orig	Tue Jan 30 22:16:34 2001
++++ libgst/Makefile.in	Thu Feb 15 21:11:12 2001
+@@ -431,7 +431,7 @@
+ install: optimize
+ 
+ optimize:
+-	test -f stamp-optimize || make mostlyclean
++	test -f stamp-optimize || $(MAKE) mostlyclean
+ 	$(MAKE) -q libgst.a || \
+ 	  $(MAKE) libgst.a CFLAGS="$(CFLAGS_OPT)" DEFS="$(DEFS) -DOPTIMIZE"
+ 	echo timestamp> stamp-optimize
diff --git a/lang/smalltalk/files/patch-docs_Makefile.in b/lang/smalltalk/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..698d61026169
--- /dev/null
+++ b/lang/smalltalk/files/patch-docs_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	Wed Feb 21 00:44:16 2001
++++ docs/Makefile.in	Wed Feb 21 00:44:33 2001
+@@ -79,7 +79,7 @@
+ LIBOBJS = @LIBOBJS@
+ LN_S = @LN_S@
+ MAINTAINER = @MAINTAINER@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MODULES = @MODULES@
+ OPTLEVEL = @OPTLEVEL@
+ PACKAGE = @PACKAGE@
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index dbc2b2631a9b..eede78a3c25d 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -1,27 +1,12 @@
-@unexec install-info --delete --info-dir=%D/info %D/info/gst.info
 bin/gst
 bin/gst-config
 bin/gst-package
 include/gst.h
 include/gstconf.h
 include/gstpub.h
+@unexec install-info --delete %D/info/gst.info %D/info/dir
 info/gst.info
-info/gst.info-1
-info/gst.info-10
-info/gst.info-11
-info/gst.info-12
-info/gst.info-13
-info/gst.info-14
-info/gst.info-15
-info/gst.info-16
-info/gst.info-2
-info/gst.info-3
-info/gst.info-4
-info/gst.info-5
-info/gst.info-6
-info/gst.info-7
-info/gst.info-8
-info/gst.info-9
+@exec install-info %D/info/gst.info %D/info/dir
 lib/libgst.a
 share/gnu-smalltalk/Load.st
 share/gnu-smalltalk/Reload.st
@@ -57,28 +42,10 @@ share/gnu-smalltalk/blox/StrcInspect.st
 share/gnu-smalltalk/blox/View.st
 share/gnu-smalltalk/blox/bear.gif
 share/gnu-smalltalk/blox/test.st
-share/gnu-smalltalk/cint/CDeclNode.st
-share/gnu-smalltalk/cint/CExpressionNode.st
-share/gnu-smalltalk/cint/CPP.st
-share/gnu-smalltalk/cint/CPStrConc.st
-share/gnu-smalltalk/cint/CPStrUnq.st
-share/gnu-smalltalk/cint/CParseType.st
-share/gnu-smalltalk/cint/CSymbol.st
-share/gnu-smalltalk/cint/CSymbolTable.st
-share/gnu-smalltalk/cint/CTok.st
-share/gnu-smalltalk/cint/CToken.st
-share/gnu-smalltalk/cint/CTreeBuilder.st
-share/gnu-smalltalk/cint/CollapsedStream.st
-share/gnu-smalltalk/cint/ExpansionStream.st
-share/gnu-smalltalk/cint/ExpansionStreamStack.st
-share/gnu-smalltalk/cint/LineStream.st
-share/gnu-smalltalk/cint/LineTokenStream.st
-share/gnu-smalltalk/cint/README
-share/gnu-smalltalk/cint/StreamStack.st
 share/gnu-smalltalk/compiler/Load.st
-share/gnu-smalltalk/compiler/README
 share/gnu-smalltalk/compiler/STCompLit.st
 share/gnu-smalltalk/compiler/STCompiler.st
+share/gnu-smalltalk/compiler/STFormatter.st
 share/gnu-smalltalk/compiler/STParseNodes.st
 share/gnu-smalltalk/compiler/STParser.st
 share/gnu-smalltalk/compiler/STSymTable.st
@@ -89,7 +56,6 @@ share/gnu-smalltalk/compiler/StartCompiler.st
 share/gnu-smalltalk/examples/Application.st
 share/gnu-smalltalk/examples/Bench.st
 share/gnu-smalltalk/examples/Buffers.st
-share/gnu-smalltalk/examples/CStream.st
 share/gnu-smalltalk/examples/Case.st
 share/gnu-smalltalk/examples/CompFileSeg.st
 share/gnu-smalltalk/examples/DBFile.st
@@ -97,7 +63,6 @@ share/gnu-smalltalk/examples/Debugger.st
 share/gnu-smalltalk/examples/Dinner.st
 share/gnu-smalltalk/examples/EditStream.st
 share/gnu-smalltalk/examples/GenClasses.st
-share/gnu-smalltalk/examples/IndStream.st
 share/gnu-smalltalk/examples/Lisp.st
 share/gnu-smalltalk/examples/MemUsage.st
 share/gnu-smalltalk/examples/Prolog.st
@@ -110,43 +75,28 @@ share/gnu-smalltalk/examples/RandomInt.st
 share/gnu-smalltalk/examples/RecursLit.st
 share/gnu-smalltalk/examples/RegExp.st
 share/gnu-smalltalk/examples/Richards.st
+share/gnu-smalltalk/examples/SortCriter.st
 share/gnu-smalltalk/examples/Timer.st
 share/gnu-smalltalk/examples/Tokenizer.st
 share/gnu-smalltalk/examples/Watchdog.st
 share/gnu-smalltalk/examples/blox/Man.st
 share/gnu-smalltalk/examples/blox/Tetris.st
-share/gnu-smalltalk/examples/gdbm/gdbm.st
-share/gnu-smalltalk/examples/mixed/BigExpr.st
-share/gnu-smalltalk/examples/mixed/CInt.st
-share/gnu-smalltalk/examples/mixed/CPP-test.st
-share/gnu-smalltalk/examples/mixed/CParseT1.st
-share/gnu-smalltalk/examples/mixed/CParseT2.st
-share/gnu-smalltalk/examples/mixed/CParseT3.st
-share/gnu-smalltalk/examples/mixed/CString.st
-share/gnu-smalltalk/examples/mixed/Compiler.st
-share/gnu-smalltalk/examples/mixed/DLD.st
-share/gnu-smalltalk/examples/mixed/Extensn.st
-share/gnu-smalltalk/examples/mixed/IfError.st
-share/gnu-smalltalk/examples/mixed/Interr.st
-share/gnu-smalltalk/examples/mixed/ParseErr.st
-share/gnu-smalltalk/examples/mixed/Process1.st
-share/gnu-smalltalk/examples/mixed/Process2.st
-share/gnu-smalltalk/examples/mixed/Profile.st
-share/gnu-smalltalk/examples/mixed/Sorting.st
-share/gnu-smalltalk/examples/mixed/a.st
-share/gnu-smalltalk/examples/mixed/ba.st
-share/gnu-smalltalk/examples/mixed/binary.c
-share/gnu-smalltalk/examples/mixed/bug.st
-share/gnu-smalltalk/examples/mixed/bug2.st
-share/gnu-smalltalk/examples/mixed/bug4.st
-share/gnu-smalltalk/examples/mixed/er2.st
-share/gnu-smalltalk/examples/mixed/market.st
-share/gnu-smalltalk/examples/mixed/resolve.st
-share/gnu-smalltalk/examples/mixed/self.st
-share/gnu-smalltalk/examples/mixed/t.st
-share/gnu-smalltalk/examples/mixed/torture.st
 share/gnu-smalltalk/examples/shell
 share/gnu-smalltalk/gst.im
+share/gnu-smalltalk/i18n/Collation.st
+share/gnu-smalltalk/i18n/GetText.st
+share/gnu-smalltalk/i18n/Load.st
+share/gnu-smalltalk/i18n/Locale.st
+share/gnu-smalltalk/i18n/Numbers.st
+share/gnu-smalltalk/i18n/Set-0208.st
+share/gnu-smalltalk/i18n/Set-BIG5.st
+share/gnu-smalltalk/i18n/Set-EUC.st
+share/gnu-smalltalk/i18n/Set-GB.st
+share/gnu-smalltalk/i18n/Set-SBCS.st
+share/gnu-smalltalk/i18n/Set-SJIS.st
+share/gnu-smalltalk/i18n/Times.st
+share/gnu-smalltalk/kernel/AnsiDates.st
+share/gnu-smalltalk/kernel/AnsiExcept.st
 share/gnu-smalltalk/kernel/Array.st
 share/gnu-smalltalk/kernel/ArrayColl.st
 share/gnu-smalltalk/kernel/Association.st
@@ -159,7 +109,6 @@ share/gnu-smalltalk/kernel/Boolean.st
 share/gnu-smalltalk/kernel/Browser.st
 share/gnu-smalltalk/kernel/Builtins.st
 share/gnu-smalltalk/kernel/ByteArray.st
-share/gnu-smalltalk/kernel/ByteMemory.st
 share/gnu-smalltalk/kernel/ByteStream.st
 share/gnu-smalltalk/kernel/CFuncs.st
 share/gnu-smalltalk/kernel/CObject.st
@@ -220,6 +169,7 @@ share/gnu-smalltalk/kernel/ReadStream.st
 share/gnu-smalltalk/kernel/Rectangle.st
 share/gnu-smalltalk/kernel/RootNamespc.st
 share/gnu-smalltalk/kernel/RunArray.st
+share/gnu-smalltalk/kernel/ScaledDec.st
 share/gnu-smalltalk/kernel/Semaphore.st
 share/gnu-smalltalk/kernel/SeqCollect.st
 share/gnu-smalltalk/kernel/Set.st
@@ -238,7 +188,6 @@ share/gnu-smalltalk/kernel/True.st
 share/gnu-smalltalk/kernel/UndefObject.st
 share/gnu-smalltalk/kernel/ValueAdapt.st
 share/gnu-smalltalk/kernel/WeakObjects.st
-share/gnu-smalltalk/kernel/WordMemory.st
 share/gnu-smalltalk/kernel/WriteStream.st
 share/gnu-smalltalk/kernel/initialize.st
 share/gnu-smalltalk/packages
@@ -258,49 +207,33 @@ share/gnu-smalltalk/tcp/TCPSocketImpl.st
 share/gnu-smalltalk/tcp/UDPSocketImpl.st
 share/gnu-smalltalk/tcp/URL.st
 share/gnu-smalltalk/tcp/UnixStream.st
-share/gnu-smalltalk/tcp/init.st
 share/gnu-smalltalk/tcp/cfuncs.st
-share/gnu-smalltalk/test/arrays.ok
-share/gnu-smalltalk/test/arrays.st
-share/gnu-smalltalk/test/blocks.ok
-share/gnu-smalltalk/test/blocks.st
-share/gnu-smalltalk/test/chars.ok
-share/gnu-smalltalk/test/chars.st
-share/gnu-smalltalk/test/classes.ok
-share/gnu-smalltalk/test/classes.st
-share/gnu-smalltalk/test/dates.ok
-share/gnu-smalltalk/test/dates.st
-share/gnu-smalltalk/test/delays.ok
-share/gnu-smalltalk/test/delays.st
-share/gnu-smalltalk/test/do-check
-share/gnu-smalltalk/test/exceptions.ok
-share/gnu-smalltalk/test/exceptions.st
-share/gnu-smalltalk/test/floatmath.ok
-share/gnu-smalltalk/test/floatmath.st
-share/gnu-smalltalk/test/geometry.ok
-share/gnu-smalltalk/test/geometry.st
-share/gnu-smalltalk/test/intmath.ok
-share/gnu-smalltalk/test/intmath.st
-share/gnu-smalltalk/test/objects.ok
-share/gnu-smalltalk/test/objects.st
-share/gnu-smalltalk/test/processes.ok
-share/gnu-smalltalk/test/processes.st
-share/gnu-smalltalk/test/sets.ok
-share/gnu-smalltalk/test/sets.st
-share/gnu-smalltalk/test/strings.ok
-share/gnu-smalltalk/test/strings.st
+share/gnu-smalltalk/tcp/init.st
+share/gnu-smalltalk/web/FileServer.st
+share/gnu-smalltalk/web/Haiku.st
+share/gnu-smalltalk/web/Load.st
+share/gnu-smalltalk/web/WebServer.st
+share/gnu-smalltalk/web/WikiServer.st
+share/gnu-smalltalk/web/edit.jpg
+share/gnu-smalltalk/web/find.jpg
+share/gnu-smalltalk/web/head.jpg
+share/gnu-smalltalk/web/help.jpg
+share/gnu-smalltalk/web/history.jpg
+share/gnu-smalltalk/web/next.jpg
+share/gnu-smalltalk/web/prev.jpg
+share/gnu-smalltalk/web/recent.jpg
+share/gnu-smalltalk/web/rename.jpg
+share/gnu-smalltalk/web/test.st
+share/gnu-smalltalk/web/top.jpg
 share/gnu-smalltalk/xml/DOM.st
 share/gnu-smalltalk/xml/XWalker.st
 @dirrm share/gnu-smalltalk/xml
-@dirrm share/gnu-smalltalk/test
+@dirrm share/gnu-smalltalk/web
 @dirrm share/gnu-smalltalk/tcp
 @dirrm share/gnu-smalltalk/kernel
-@dirrm share/gnu-smalltalk/examples/mixed
-@dirrm share/gnu-smalltalk/examples/gdbm
+@dirrm share/gnu-smalltalk/i18n
 @dirrm share/gnu-smalltalk/examples/blox
 @dirrm share/gnu-smalltalk/examples
 @dirrm share/gnu-smalltalk/compiler
-@dirrm share/gnu-smalltalk/cint
 @dirrm share/gnu-smalltalk/blox
 @dirrm share/gnu-smalltalk
-@exec install-info --info-dir=%D/info %D/info/gst.info