upgrade to 2.0.1

PR:		39986
Submitted by:	Ports Fury

7 files changed, 257 insertions, 29 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index c55660d1c4f9..6c9c2f2e5af0 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,19 +6,24 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	1.95.13.a
+PORTVERSION=	2.0.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/a/}
 
 MAINTAINER=	ports@FreeBSD.org
 
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
+		gdbm.2:${PORTSDIR}/databases/gdbm
+
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO='makeinfo --no-split'
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MAKEINFO='makeinfo --no-split'
+CONFIGURE_ARGS=	--without-gmp
 
 MAN1=		gst.1
 
@@ -34,10 +39,13 @@ PLIST_SUB+=		TCLTK="@comment "
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/gst.info*
+	@${RM} -f ${WRKSRC}/doc/gst-base.info*
+	@${RM} -f ${WRKSRC}/doc/gst-libs.info*
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} -e \
-		's| -release \$$(VERSION)| -avoid-version|g'
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/libltdl/ltdl.c
+		's|-release [\$$][(]VERSION[)]|-avoid-version|g'
+	@${REINPLACE_CMD} -e \
+		's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/examples/modules/gdbm.c
 
 .include <bsd.port.mk>
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index d18c189f1f82..b049a167a41e 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1 +1 @@
-MD5 (smalltalk-1.95.13a.tar.gz) = 0870c6bce59d1e97a2fdcf7caf802c2e
+MD5 (smalltalk-2.0.1.tar.gz) = 4eba018117597839b96e58290ef1b1e6
diff --git a/lang/smalltalk/files/patch-doc::gst-base.texi b/lang/smalltalk/files/patch-doc::gst-base.texi
new file mode 100644
index 000000000000..f505e0ff68f4
--- /dev/null
+++ b/lang/smalltalk/files/patch-doc::gst-base.texi
@@ -0,0 +1,60 @@
+--- doc/gst-base.texi.orig	Fri Jun 14 06:37:01 2002
++++ doc/gst-base.texi	Thu Jun 27 06:28:55 2002
+@@ -87,7 +87,6 @@
+      * Base classes: (gst-base).             The GNU Smalltalk base classes.
+ @end direntry
+ 
+-@copying
+ This file documents GNU Smalltalk Version @value{VERSION}.
+ It was last updated on @value{UPDATED}.
+ 
+@@ -103,7 +102,6 @@
+ 
+ There are no Cover Texts and no Invariant Sections; this text, along
+ with its equivalent in the printed manual, constitutes the Title Page.
+-@end copying
+ 
+ @titlepage
+ @title @sc{gnu} Smalltalk Library Reference
+@@ -115,7 +113,19 @@
+ @comment  The following two commands start the copyright page.
+ @page
+ @vskip 0pt plus 1filll
+-@insertcopying
++Copyright @copyright{} 1988-92, 1994-95, 1999-2001 Free Software Foundation, Inc.
++
++This document is released under the terms of the @sc{gnu} Free Documentation
++License as published by the Free Software Foundation; either version 1.1, or
++(at your option) any later version.
++
++You should have received a copy of the @sc{gnu} Free Documentation License
++along with @sc{gnu} Smalltalk; see the file @file{COPYING.DOC}.  If not,
++write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
++MA 02111-1307, USA.  
++
++There are no Cover Texts and no Invariant Sections; this text, along with
++its equivalent in the Info documentation, constitutes the Title Page.
+ @end titlepage
+ 
+ @node Top, , , (DIR)
+@@ -125,7 +135,19 @@
+ This document describes the class libraries that are distributed
+ together with the @gst{} programming language.
+ 
+-@insertcopying
++Copyright @copyright{} 1988-92, 1994-95, 1999-2001 Free Software Foundation, Inc.
++
++This document is released under the terms of the @sc{gnu} Free Documentation
++License as published by the Free Software Foundation; either version 1.1, or
++(at your option) any later version.
++
++You should have received a copy of the @sc{gnu} Free Documentation License
++along with @sc{gnu} Smalltalk; see the file @file{COPYING.DOC}.  If not,
++write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
++MA 02111-1307, USA.  
++
++There are no Cover Texts and no Invariant Sections; this text, along with
++its equivalent in the Info documentation, constitutes the Title Page.
+ @end ifnottex
+ 
+ @menu
diff --git a/lang/smalltalk/files/patch-doc::gst-libs.texi b/lang/smalltalk/files/patch-doc::gst-libs.texi
new file mode 100644
index 000000000000..84271a5ff14a
--- /dev/null
+++ b/lang/smalltalk/files/patch-doc::gst-libs.texi
@@ -0,0 +1,60 @@
+--- doc/gst-libs.texi.orig	Fri Jun 14 06:37:01 2002
++++ doc/gst-libs.texi	Thu Jun 27 06:22:24 2002
+@@ -87,7 +87,6 @@
+      * Libraries: (gst-libs).                The GNU Smalltalk class libraries.
+ @end direntry
+ 
+-@copying
+ This file documents GNU Smalltalk Version @value{VERSION}.
+ It was last updated on @value{UPDATED}.
+ 
+@@ -103,7 +102,6 @@
+ 
+ There are no Cover Texts and no Invariant Sections; this text, along
+ with its equivalent in the printed manual, constitutes the Title Page.
+-@end copying
+ 
+ @setchapternewpage odd
+ 
+@@ -117,7 +115,19 @@
+ @comment  The following two commands start the copyright page.
+ @page
+ @vskip 0pt plus 1filll
+-@insertcopying
++Copyright @copyright{} 1988-92, 1994-95, 1999-2001 Free Software Foundation, Inc.
++
++This document is released under the terms of the @sc{gnu} Free Documentation
++License as published by the Free Software Foundation; either version 1.1, or
++(at your option) any later version.
++
++You should have received a copy of the @sc{gnu} Free Documentation License
++along with @sc{gnu} Smalltalk; see the file @file{COPYING.DOC}.  If not,
++write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
++MA 02111-1307, USA.  
++
++There are no Cover Texts and no Invariant Sections; this text, along with
++its equivalent in the Info documentation, constitutes the Title Page.
+ @end titlepage
+ 
+ @node Top, , , (DIR)
+@@ -127,7 +137,19 @@
+ This document describes the class libraries that are distributed
+ together with the @gst{} programming language.
+ 
+-@insertcopying
++Copyright @copyright{} 1988-92, 1994-95, 1999-2001 Free Software Foundation, Inc.
++
++This document is released under the terms of the @sc{gnu} Free Documentation
++License as published by the Free Software Foundation; either version 1.1, or
++(at your option) any later version.
++
++You should have received a copy of the @sc{gnu} Free Documentation License
++along with @sc{gnu} Smalltalk; see the file @file{COPYING.DOC}.  If not,
++write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
++MA 02111-1307, USA.  
++
++There are no Cover Texts and no Invariant Sections; this text, along with
++its equivalent in the Info documentation, constitutes the Title Page.
+ @end ifnottex
+ 
+ @menu
diff --git a/lang/smalltalk/files/patch-doc::gst.texi b/lang/smalltalk/files/patch-doc::gst.texi
new file mode 100644
index 000000000000..f130a8f96cc8
--- /dev/null
+++ b/lang/smalltalk/files/patch-doc::gst.texi
@@ -0,0 +1,60 @@
+--- doc/gst.texi.orig	Fri Jun 21 22:32:31 2002
++++ doc/gst.texi	Thu Jun 27 04:11:24 2002
+@@ -77,7 +77,6 @@
+      * GNU Smalltalk: (gst).                 The GNU Smalltalk environment.
+ @end direntry
+ 
+-@copying
+ This file documents GNU Smalltalk Version @value{VERSION}.
+ It was last updated on @value{UPDATED}.
+ 
+@@ -93,7 +92,6 @@
+ 
+ There are no Cover Texts and no Invariant Sections; this text, along
+ with its equivalent in the printed manual, constitutes the Title Page.
+-@end copying
+ 
+ @titlepage
+ @title @sc{gnu} Smalltalk User's Guide
+@@ -105,7 +103,19 @@
+ @comment  The following two commands start the copyright page.
+ @page
+ @vskip 0pt plus 1filll
+-@insertcopying
++Copyright @copyright{} 1988-92, 1994-95, 1999-2001 Free Software Foundation, Inc.
++
++This document is released under the terms of the @sc{gnu} Free Documentation
++License as published by the Free Software Foundation; either version 1.1, or
++(at your option) any later version.
++
++You should have received a copy of the @sc{gnu} Free Documentation License
++along with @sc{gnu} Smalltalk; see the file @file{COPYING.DOC}.  If not,
++write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
++MA 02111-1307, USA.  
++
++There are no Cover Texts and no Invariant Sections; this text, along with
++its equivalent in the Info documentation, constitutes the Title Page.
+ @end titlepage
+ 
+ @node Top, , , (DIR)
+@@ -115,7 +125,19 @@
+ This document describes installing and operating the @gst{}
+ programming language.
+ 
+-@insertcopying
++Copyright @copyright{} 1988-92, 1994-95, 1999-2001 Free Software Foundation, Inc.
++
++This document is released under the terms of the @sc{gnu} Free Documentation
++License as published by the Free Software Foundation; either version 1.1, or
++(at your option) any later version.
++
++You should have received a copy of the @sc{gnu} Free Documentation License
++along with @sc{gnu} Smalltalk; see the file @file{COPYING.DOC}.  If not,
++write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
++MA 02111-1307, USA.  
++
++There are no Cover Texts and no Invariant Sections; this text, along with
++its equivalent in the Info documentation, constitutes the Title Page.
+ 
+ @end ifnottex
+ 
diff --git a/lang/smalltalk/files/patch-ltmain.sh b/lang/smalltalk/files/patch-ltmain.sh
index e5e0c61703c6..18b8bb044f94 100644
--- a/lang/smalltalk/files/patch-ltmain.sh
+++ b/lang/smalltalk/files/patch-ltmain.sh
@@ -1,5 +1,5 @@
---- ltmain.sh.orig	Thu Apr 26 19:21:26 2001
-+++ ltmain.sh	Fri Nov  2 02:58:37 2001
+--- config/ltmain.sh.orig	Fri Jun 14 06:37:06 2002
++++ config/ltmain.sh	Thu Jun 27 01:04:35 2002
 @@ -961,6 +961,7 @@
  	;;
  
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index 6a6472013eba..870a00890f39 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -3,6 +3,12 @@ bin/gst-config
 bin/gst-package
 include/gst.h
 include/gstpub.h
+@unexec install-info --delete %D/info/gst-base.info %D/info/dir
+info/gst-base.info
+@exec install-info %D/info/gst-base.info %D/info/dir
+@unexec install-info --delete %D/info/gst-libs.info %D/info/dir
+info/gst-libs.info
+@exec install-info %D/info/gst-libs.info %D/info/dir
 @unexec install-info --delete %D/info/gst.info %D/info/dir
 info/gst.info
 @exec install-info %D/info/gst.info %D/info/dir
@@ -10,17 +16,23 @@ lib/libgst.a
 lib/libgst.la
 %%TCLTK%%lib/smalltalk/blox-tk.la
 %%TCLTK%%lib/smalltalk/blox-tk.so
+lib/smalltalk/gdbm.la
+lib/smalltalk/gdbm.so
+lib/smalltalk/i18n.la
+lib/smalltalk/i18n.so
 lib/smalltalk/md5.la
 lib/smalltalk/md5.so
 lib/smalltalk/regex.la
 lib/smalltalk/regex.so
 lib/smalltalk/tcp.la
 lib/smalltalk/tcp.so
+share/aclocal/gst.m4
 share/smalltalk/Load.st
 share/smalltalk/Reload.st
 share/smalltalk/blox/BrowShell.st
 share/smalltalk/blox/BrowserMain.st
 share/smalltalk/blox/ClassBrow.st
+share/smalltalk/blox/ClassHierBrow.st
 share/smalltalk/blox/Colors.txt
 share/smalltalk/blox/CtxtInspect.st
 share/smalltalk/blox/DictInspect.st
@@ -32,6 +44,7 @@ share/smalltalk/blox/Menu.st
 share/smalltalk/blox/MethInspect.st
 share/smalltalk/blox/MethSetBrow.st
 share/smalltalk/blox/ModalDialog.st
+share/smalltalk/blox/NamespBrow.st
 share/smalltalk/blox/Notifier.st
 share/smalltalk/blox/PCode.st
 share/smalltalk/blox/PList.st
@@ -52,6 +65,8 @@ share/smalltalk/compiler/Load.st
 share/smalltalk/compiler/STCompLit.st
 share/smalltalk/compiler/STCompiler.st
 share/smalltalk/compiler/STFormatter.st
+share/smalltalk/compiler/STLoader.st
+share/smalltalk/compiler/STLoaderObjs.st
 share/smalltalk/compiler/STParseNodes.st
 share/smalltalk/compiler/STParser.st
 share/smalltalk/compiler/STSymTable.st
@@ -64,7 +79,6 @@ share/smalltalk/examples/Application.st
 share/smalltalk/examples/Bench.st
 share/smalltalk/examples/Buffers.st
 share/smalltalk/examples/Case.st
-share/smalltalk/examples/CompFileSeg.st
 share/smalltalk/examples/Debugger.st
 share/smalltalk/examples/Dinner.st
 share/smalltalk/examples/EditStream.st
@@ -82,6 +96,7 @@ share/smalltalk/examples/RecursLit.st
 share/smalltalk/examples/RegExp.st
 share/smalltalk/examples/Richards.st
 share/smalltalk/examples/SortCriter.st
+share/smalltalk/examples/StreamFilter.st
 share/smalltalk/examples/Tokenizer.st
 share/smalltalk/examples/blox/Man.st
 share/smalltalk/examples/blox/Tetris.st
@@ -196,9 +211,39 @@ share/smalltalk/kernel/TokenStream.st
 share/smalltalk/kernel/Transcript.st
 share/smalltalk/kernel/True.st
 share/smalltalk/kernel/UndefObject.st
+share/smalltalk/kernel/VFS.st
 share/smalltalk/kernel/ValueAdapt.st
 share/smalltalk/kernel/WeakObjects.st
 share/smalltalk/kernel/WriteStream.st
+share/smalltalk/net/Base.st
+share/smalltalk/net/ContentHandler.st
+share/smalltalk/net/FTP.st
+share/smalltalk/net/HTTP.st
+share/smalltalk/net/IMAP.st
+share/smalltalk/net/Load.st
+share/smalltalk/net/MIME.st
+share/smalltalk/net/NNTP.st
+share/smalltalk/net/NetServer.st
+share/smalltalk/net/POP.st
+share/smalltalk/net/SMTP.st
+share/smalltalk/net/URIResolver.st
+share/smalltalk/net/URL.st
+share/smalltalk/net/httpd/FileServer.st
+share/smalltalk/net/httpd/Haiku.st
+share/smalltalk/net/httpd/Load.st
+share/smalltalk/net/httpd/WebServer.st
+share/smalltalk/net/httpd/WikiServer.st
+share/smalltalk/net/httpd/edit.jpg
+share/smalltalk/net/httpd/find.jpg
+share/smalltalk/net/httpd/head.jpg
+share/smalltalk/net/httpd/help.jpg
+share/smalltalk/net/httpd/history.jpg
+share/smalltalk/net/httpd/next.jpg
+share/smalltalk/net/httpd/prev.jpg
+share/smalltalk/net/httpd/recent.jpg
+share/smalltalk/net/httpd/rename.jpg
+share/smalltalk/net/httpd/test.st
+share/smalltalk/net/httpd/top.jpg
 share/smalltalk/packages
 share/smalltalk/sunit/SUnit.st
 share/smalltalk/sunit/SUnitPreload.st
@@ -215,30 +260,25 @@ share/smalltalk/tcp/Tests.st
 share/smalltalk/tcp/URL.st
 share/smalltalk/tcp/cfuncs.st
 share/smalltalk/tcp/init.st
-share/smalltalk/web/FileServer.st
-share/smalltalk/web/Haiku.st
-share/smalltalk/web/Load.st
-share/smalltalk/web/NetServer.st
-share/smalltalk/web/WebServer.st
-share/smalltalk/web/WikiServer.st
-share/smalltalk/web/edit.jpg
-share/smalltalk/web/find.jpg
-share/smalltalk/web/head.jpg
-share/smalltalk/web/help.jpg
-share/smalltalk/web/history.jpg
-share/smalltalk/web/next.jpg
-share/smalltalk/web/prev.jpg
-share/smalltalk/web/recent.jpg
-share/smalltalk/web/rename.jpg
-share/smalltalk/web/test.st
-share/smalltalk/web/top.jpg
-share/smalltalk/xml/Id-DOM.st
-share/smalltalk/xml/Id-XWalker.st
+share/smalltalk/vfs/deb
+share/smalltalk/vfs/lslR
+share/smalltalk/vfs/mailfs
+share/smalltalk/vfs/patchfs
+share/smalltalk/vfs/uar
+share/smalltalk/vfs/ucpio
+share/smalltalk/vfs/uha
+share/smalltalk/vfs/ulha
+share/smalltalk/vfs/urar
+share/smalltalk/vfs/utar
+share/smalltalk/vfs/uzip
+share/smalltalk/vfs/uzoo
 share/smalltalk/xml/XML.st
 @dirrm share/smalltalk/xml
-@dirrm share/smalltalk/web
+@dirrm share/smalltalk/vfs
 @dirrm share/smalltalk/tcp
 @dirrm share/smalltalk/sunit
+@dirrm share/smalltalk/net/httpd
+@dirrm share/smalltalk/net
 @dirrm share/smalltalk/kernel
 @dirrm share/smalltalk/i18n
 @dirrm share/smalltalk/examples/modules