Upgrade to 2.0.6.

PR:		ports/44115
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

8 files changed, 48 insertions, 185 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 6c9c2f2e5af0..976b7a9331b9 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		gdbm.2:${PORTSDIR}/databases/gdbm
+		gdbm.2:${PORTSDIR}/databases/gdbm \
+		gmp.6:${PORTSDIR}/math/libgmp4
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
@@ -22,8 +23,7 @@ GNU_CONFIGURE=	yes
 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
+		MAKEINFO="makeinfo --no-split"
 
 MAN1=		gst.1
 
@@ -48,4 +48,8 @@ pre-patch:
 	@${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/examples/modules/gdbm.c
 
+pre-build:
+	@cd ${WRKSRC}/snprintfv && ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
+
 .include <bsd.port.mk>
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index b049a167a41e..308dd85bf1da 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1 +1 @@
-MD5 (smalltalk-2.0.1.tar.gz) = 4eba018117597839b96e58290ef1b1e6
+MD5 (smalltalk-2.0.6.tar.gz) = c2b7c1190181d02360ac98afcdab6b6e
diff --git a/lang/smalltalk/files/patch-Makefile b/lang/smalltalk/files/patch-Makefile
new file mode 100644
index 000000000000..34afaee5b0da
--- /dev/null
+++ b/lang/smalltalk/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.in.bak	Tue Sep 10 18:17:27 2002
++++ Makefile.in	Sun Oct 13 01:00:49 2002
+@@ -146,7 +146,7 @@
+ AUTOMAKE_OPTIONS = gnu 1.6
+ ACLOCAL_AMFLAGS = -I config
+ 
+-SUBDIRS = lib-src libltdl snprintfv lightning libgst xml net \
++SUBDIRS = lib-src libltdl lightning libgst xml net \
+ 	i18n config unsupported kernel compiler sunit tcp \
+ 	examples blox vfs . tests doc
+ 
diff --git a/lang/smalltalk/files/patch-doc::gst-base.texi b/lang/smalltalk/files/patch-doc::gst-base.texi
deleted file mode 100644
index f505e0ff68f4..000000000000
--- a/lang/smalltalk/files/patch-doc::gst-base.texi
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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
deleted file mode 100644
index 84271a5ff14a..000000000000
--- a/lang/smalltalk/files/patch-doc::gst-libs.texi
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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
deleted file mode 100644
index f130a8f96cc8..000000000000
--- a/lang/smalltalk/files/patch-doc::gst.texi
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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-snprintfv::configure b/lang/smalltalk/files/patch-snprintfv::configure
new file mode 100644
index 000000000000..87747ffeab6a
--- /dev/null
+++ b/lang/smalltalk/files/patch-snprintfv::configure
@@ -0,0 +1,23 @@
+--- snprintfv/configure.orig	Tue Sep 10 18:02:44 2002
++++ snprintfv/configure	Sun Oct 13 02:01:04 2002
+@@ -10549,12 +10549,6 @@
+     fi
+     if test x$ac_cv_header_limits_h = xyes; then
+       echo '#include <limits.h>' >> $tmpfile
+-    elif test x$ac_cv_header_values_h = xyes; then
+-      cat >> $tmpfile << '_EOF_'
+-#ifndef MAXINT
+-#  include <values.h>
+-#endif /* MAXINT */
+-_EOF_
+     fi
+     if test x$ac_cv_header_string_h = xyes; then
+       echo '#include <string.h>' >> $tmpfile
+@@ -10571,6 +10565,7 @@
+       echo '#include <stdint.h>' >> $tmpfile
+     fi
+     if test x$ac_cv_type_intmax_t = xno; then
++      cat >> $tmpfile << '_EOF_'
+ #if __GNUC__ >= 2
+ typedef long long intmax_t;
+ typedef unsigned long long uintmax_t;
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index 870a00890f39..e4eb5c245ad3 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -157,6 +157,9 @@ share/smalltalk/kernel/FileDescr.st
 share/smalltalk/kernel/FileSegment.st
 share/smalltalk/kernel/FileStream.st
 share/smalltalk/kernel/Float.st
+share/smalltalk/kernel/FloatD.st
+share/smalltalk/kernel/FloatE.st
+share/smalltalk/kernel/FloatQ.st
 share/smalltalk/kernel/Fraction.st
 share/smalltalk/kernel/HashedColl.st
 share/smalltalk/kernel/IdentDict.st
@@ -273,6 +276,8 @@ share/smalltalk/vfs/utar
 share/smalltalk/vfs/uzip
 share/smalltalk/vfs/uzoo
 share/smalltalk/xml/XML.st
+share/smalltalk/xml/XPath.st
+share/smalltalk/xml/XSL.st
 @dirrm share/smalltalk/xml
 @dirrm share/smalltalk/vfs
 @dirrm share/smalltalk/tcp