Changes 2.1.9:

o   DLD can open the C library (2.1.6).
o   Fix bug in compilation of ##() expression where the expression
    evaluates to an integer (2.1.8).
o   Fix bug in #next: on sockets (2.1.6).
o   Fix crash when accessing an ill-formed namespace from Smalltalk code
    (2.1.8).
o   Fixes to the JIT compiler (2.1.8).
o   Improvements to Gtk+ bindings (2.1.9).
o   libltdl is no longer configured in a separate subdirectory (2.1.6).
o   Portability improvements (2.1.8).
o   Updated to Automake 1.8, Libtool 1.5 (CVS checkout on 2003-08-01),
    Autoconf 2.59a, snprintfv 1.1 (2.1.6).
o   Updates to Emacs mode (2.1.6).

5 files changed, 52 insertions, 50 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index ea34bde093f..bde62626dbe 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,41 +1,38 @@
-# $NetBSD: Makefile,v 1.29 2004/10/15 12:03:53 tv Exp $
+# $NetBSD: Makefile,v 1.30 2004/11/19 13:01:46 adam Exp $
 
-DISTNAME=		smalltalk-2.1.4
-PKGREVISION=		2
-CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_GNU:=smalltalk/}
+DISTNAME=	smalltalk-2.1.9
+CATEGORIES=	lang
+MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.smalltalk.org/versions/GNUSmalltalk.html
-COMMENT=		GNU Smalltalk: A smalltalk-80 implementation
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.smalltalk.org/versions/GNUSmalltalk.html
+COMMENT=	GNU Smalltalk: A smalltalk-80 implementation
 
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
 
 USE_BUILDLINK3=		YES
-USE_GNU_TOOLS+=		make
+USE_GNU_TOOLS+=		awk make
 USE_GNU_READLINE=	YES
 USE_LIBTOOL=		YES
-
-INFO_FILES=		gst-base.info gst-libs.info gst.info
-
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib
 CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}/lib
+CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/share/emacs/site-lisp
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}/lib
-CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
-CONFIGURE_ARGS+=	--without-glib --without-gtk
-CONFIGURE_ARGS+=	--with-lispdir=${PREFIX}/share/emacs/site-lisp
-CONFIGURE_ENV+=		CFLAGS="-O2 -fsigned-char"
+#CONFIGURE_ARGS+=	--without-glib --without-gtk
+#CONFIGURE_ENV+=		CFLAGS="-O2 -fsigned-char"
 
+INFO_FILES=		gst-base.info gst-libs.info gst.info
 TEST_TARGET=		check
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../lang/tcl83/buildlink3.mk"
-.include "../../x11/tk83/buildlink3.mk"
-.include "../../databases/gdbm/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index 1e7f7f59fbc..fa1022d3957 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/11/19 13:01:46 adam Exp $
 bin/gst
 bin/gst-config
 bin/gst-package
@@ -8,19 +8,17 @@ include/sigsegv.h
 lib/libgst.la
 lib/smalltalk/blox-tk.la
 lib/smalltalk/gdbm.la
+lib/smalltalk/gst-gtk.la
 lib/smalltalk/i18n.la
+lib/smalltalk/libc.la
 lib/smalltalk/md5.la
 lib/smalltalk/regex.la
 lib/smalltalk/tcp.la
 man/man1/gst.1
 share/aclocal/gst.m4
 share/aclocal/snprintfv.m4
-share/emacs/site-lisp/gst-mode.el
-share/emacs/site-lisp/smalltalk-mode.el
 share/smalltalk/Load.st
 share/smalltalk/Reload.st
-share/smalltalk/blox-gtk/GtkDecl.st
-share/smalltalk/blox-gtk/proof.st
 share/smalltalk/blox-tk/Blox.st
 share/smalltalk/blox-tk/BloxBasic.st
 share/smalltalk/blox-tk/BloxCanvas.st
@@ -115,6 +113,21 @@ share/smalltalk/examples/regex.st
 share/smalltalk/examples/shell
 share/smalltalk/examples/xml.sed
 share/smalltalk/gst.im
+share/smalltalk/gtk/Enums.st
+share/smalltalk/gtk/Funcs.st
+share/smalltalk/gtk/GtkDecl.st
+share/smalltalk/gtk/GtkImpl.st
+share/smalltalk/gtk/MoreFuncs.st
+share/smalltalk/gtk/MoreStructs.st
+share/smalltalk/gtk/Structs.st
+share/smalltalk/gtk/Types.st
+share/smalltalk/gtk/example_arrow.st
+share/smalltalk/gtk/example_aspectframe.st
+share/smalltalk/gtk/example_buttonbox.st
+share/smalltalk/gtk/example_entry.st
+share/smalltalk/gtk/example_eventbox.st
+share/smalltalk/gtk/example_hello.st
+share/smalltalk/gtk/example_tictactoe.st
 share/smalltalk/i18n/ChangeLog
 share/smalltalk/i18n/Collation.st
 share/smalltalk/i18n/Expression.st
@@ -365,16 +378,16 @@ share/smalltalk/xml/XSL.st
 @dirrm share/smalltalk/net
 @dirrm share/smalltalk/kernel
 @dirrm share/smalltalk/i18n
+@dirrm share/smalltalk/gtk
 @dirrm share/smalltalk/examples/modules
 @dirrm share/smalltalk/examples
 @dirrm share/smalltalk/db
 @dirrm share/smalltalk/compiler
 @dirrm share/smalltalk/browser
 @dirrm share/smalltalk/blox-tk
-@dirrm share/smalltalk/blox-gtk
 @dirrm share/smalltalk
+@dirrm lib/smalltalk
+@dirrm include/snprintfv
 @unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
-@dirrm lib/smalltalk
 @exec ${MKDIR} %D/include/snprintfv
-@dirrm include/snprintfv
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 6e5393eef6e..70a3ffea988 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2004/04/18 18:41:19 snj Exp $
+$NetBSD: distinfo,v 1.11 2004/11/19 13:01:46 adam Exp $
 
-SHA1 (smalltalk-2.1.4.tar.gz) = d56be692ca3041e9686df20f1d051be5f79513bb
-Size (smalltalk-2.1.4.tar.gz) = 3422094 bytes
-SHA1 (patch-aa) = 324882a6b25e31edf3b1e3fb7743b731160d7067
-SHA1 (patch-ab) = 9c63774baf798d6ce73bd45c0f1829bb59a8632b
+SHA1 (smalltalk-2.1.9.tar.gz) = e068f993d2fba93138e68c23c73e357541ade416
+Size (smalltalk-2.1.9.tar.gz) = 3354139 bytes
+SHA1 (patch-aa) = 84d2cd463aee940ca123c5de2aab43d6a1d25582
+SHA1 (patch-ab) = 43421fda6d712d581f10bb37c3e79b9203e51757
diff --git a/lang/smalltalk/patches/patch-aa b/lang/smalltalk/patches/patch-aa
index 411e5c2de90..6b473c07a27 100644
--- a/lang/smalltalk/patches/patch-aa
+++ b/lang/smalltalk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2004/04/18 18:41:19 snj Exp $
+$NetBSD: patch-aa,v 1.8 2004/11/19 13:01:46 adam Exp $
 
---- libgst/Makefile.in.orig	2003-07-09 09:51:53.000000000 -0700
-+++ libgst/Makefile.in	2004-04-18 11:26:16.000000000 -0700
-@@ -102,7 +102,7 @@ LIBTCLTK = @LIBTCLTK@
+--- libgst/Makefile.in.orig	2004-10-02 13:29:53.000000000 +0000
++++ libgst/Makefile.in
+@@ -202,7 +202,7 @@ LIBTCLTK = @LIBTCLTK@
  # This switch is not included in libtool 1.4, but it is included in
  # libtool 1.5; I have plugged it back in libtool 1.4, so that it is
  # upwards compatible.
@@ -11,11 +11,3 @@ $NetBSD: patch-aa,v 1.7 2004/04/18 18:41:19 snj Exp $
  LIGHTNING_MAIN_FALSE = @LIGHTNING_MAIN_FALSE@
  LIGHTNING_MAIN_TRUE = @LIGHTNING_MAIN_TRUE@
  LN_S = @LN_S@
-@@ -212,7 +212,6 @@ libgst_la_LIBADD = $(top_builddir)/lib-s
- 
- libgst_la_LDFLAGS = -version-info $(VERSION_INFO)
- libgst_la_DEPENDENCIES = $(top_builddir)/lib-src/library.la $(LIBSIGSEGV) \
--	@LIBLTDL@ @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
- 
- 
- libgst_la_SOURCES = \
diff --git a/lang/smalltalk/patches/patch-ab b/lang/smalltalk/patches/patch-ab
index 5695d9533f3..94a1fc81125 100644
--- a/lang/smalltalk/patches/patch-ab
+++ b/lang/smalltalk/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.6 2003/07/02 22:35:38 jtb Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/19 13:01:46 adam Exp $
 
---- Makefile.in.orig
+--- Makefile.in.orig	2004-10-02 13:29:43.000000000 +0000
 +++ Makefile.in
-@@ -111,7 +111,7 @@
- LIBGMP = @LIBGMP@
+@@ -215,7 +215,7 @@ LIBGMP = @LIBGMP@
  LIBICONV = @LIBICONV@
  LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
 -LIBREADLINE = @LIBREADLINE@
 +LIBREADLINE = @LIBREADLINE@ -lreadline -ltermcap
  LIBS = @LIBS@
  LIBSNPRINTFV = @LIBSNPRINTFV@
  LIBTCLTK = @LIBTCLTK@
-@@ -216,7 +216,7 @@
+@@ -319,7 +319,7 @@ noinst_DATA = gst.im
+ dist_noinst_DATA = smalltalk-mode.el.in gst-mode.el.in
  bin_SCRIPTS = gst-package gst-config
- 
  gst_SOURCES = main.c
 -gst_LDADD = libgst/libgst.la @ICON@
 +gst_LDADD = libgst/libgst.la $(LIBGMP) $(LIBLTDL) $(LIBREADLINE) $(LIBSNPRINTFV)