- Update to Smalltalk 3.2,

  http://smalltalk.gnu.org/news/gnu-smalltalk-3-2

5 files changed, 23 insertions, 270 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 906aeb39210a..85186a7f8027 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	3.1
-PORTREVISION=	3
+PORTVERSION=	3.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU Smalltalk
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		gawk:${PORTSDIR}/lang/gawk
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 		execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		cairo.2:${PORTSDIR}/graphics/cairo
@@ -39,9 +39,10 @@ CONFIGURE_ARGS=	--enable-generational-gc=no \
 		--with-gmp=no
 USE_LDCONFIG=	yes
 PLIST_SUB=	VERSION="${PORTVERSION}"
+PORTDATA=	*
 
 MAN1=		gst.1 gst-load.1 gst-package.1 gst-sunit.1 gst-config.1 \
-		gst-convert.1 gst-doc.1
+		gst-convert.1 gst-doc.1 gst-profile.1
 MLINKS=		gst-load.1 gst-reload.1
 INFO=		gst gst-base gst-libs
 
@@ -96,8 +97,6 @@ post-patch:
 post-build:
 	@${SED} -e 's|@bindir@|${PREFIX}/bin|g' \
 		${WRKSRC}/gst-mode.el.in > ${WRKSRC}/gst-mode.el
-	@${SED} -e 's|@lispdir@|${PREFIX}/share/emacs/site-lisp|g' \
-		${WRKSRC}/smalltalk-mode.el.in > ${WRKSRC}/smalltalk-mode.el
 
 post-install:
 	@${MKDIR} ${DATADIR}/gtk
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 79d1727a89b2..99370e24815b 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,3 +1,3 @@
-MD5 (smalltalk-3.1.tar.gz) = fb4630a86fc47c893cf9eb9adccd4851
-SHA256 (smalltalk-3.1.tar.gz) = af964929ba81d133c1fe4a9479fad8c8e21a9449bc2c0b2c48b1e51c8ee43eed
-SIZE (smalltalk-3.1.tar.gz) = 5282705
+MD5 (smalltalk-3.2.tar.gz) = 11377713c5b1822304f58c5f6ceca6f5
+SHA256 (smalltalk-3.2.tar.gz) = a13753e427b3f4f4efb3cf8073a924f63ff295af6be3772357e7f7137e0711e3
+SIZE (smalltalk-3.2.tar.gz) = 5823196
diff --git a/lang/smalltalk/files/patch-libgst_Makefile.in b/lang/smalltalk/files/patch-libgst_Makefile.in
index 645aacc15e1b..690123fe5821 100644
--- a/lang/smalltalk/files/patch-libgst_Makefile.in
+++ b/lang/smalltalk/files/patch-libgst_Makefile.in
@@ -1,11 +1,11 @@
---- libgst/Makefile.in.orig	2008-05-16 12:56:06.000000000 +0200
-+++ libgst/Makefile.in	2008-05-16 12:56:15.000000000 +0200
-@@ -333,7 +333,7 @@
- CLEANFILES = genprims$(EXEEXT) genbc$(EXEEXT) genvm$(EXEEXT)
- 
+--- libgst/Makefile.in.orig	2010-05-02 11:02:28.000000000 +0200
++++ libgst/Makefile.in	2010-05-02 11:02:31.000000000 +0200
+@@ -378,7 +378,7 @@
  # definitions for libgst.la
--libgst_la_LIBADD = $(top_builddir)/lib-src/library.la \
-+libgst_la_LIBADD = $(top_builddir)/lib-src/library.la -lexecinfo \
- 	$(LIBSIGSEGV) $(LIBFFI) $(LIBSNPRINTFV) $(LIBREADLINE) $(LIBGMP) \
-	$(LIBTHREAD)
+ libgst_la_LIBADD = $(top_builddir)/lib-src/library.la $(SOCKET_LIBS) \
+ 	$(LIBSIGSEGV) $(LIBFFI) $(LIBSNPRINTFV) $(LIBREADLINE) $(LIBLTDL) \
+-	$(LIBGMP) $(LIBTHREAD)
++	$(LIBGMP) $(LIBTHREAD) -lexecinfo
  
+ libgst_la_DEPENDENCIES = $(top_builddir)/lib-src/library.la $(LIBSNPRINTFV)
+ libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
diff --git a/lang/smalltalk/files/patch-sincosl.c b/lang/smalltalk/files/patch-sincosl.c
deleted file mode 100644
index 105018ce616e..000000000000
--- a/lang/smalltalk/files/patch-sincosl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/sincosl.c.orig	Tue Oct  3 17:28:31 2006
-+++ lib-src/sincosl.c	Tue Oct  3 17:28:33 2006
-@@ -228,7 +228,7 @@
-    Computed using gmp.
-  */
- 
--const long double sincosl_table[] = {
-+static const long double sincosl_table[] = {
- 
- /* x =  1.48437500000000000000000000000000000e-01L 3ffc3000000000000000000000000000 */
- /* cos(x) = 0.fd2f5320e1b790209b4dda2f98f79caaa7b873aff1014b0fbc5243766d03cb006bc837c4358 */
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index 9d978de979ba..bf29304c2e01 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -1,10 +1,12 @@
 bin/gst
 bin/gst-blox
+bin/gst-browser
 bin/gst-config
 bin/gst-convert
 bin/gst-doc
 bin/gst-load
 bin/gst-package
+bin/gst-profile
 bin/gst-reload
 bin/gst-remote
 bin/gst-sunit
@@ -26,6 +28,10 @@ lib/smalltalk/digest-%%VERSION%%.so
 lib/smalltalk/digest.a
 lib/smalltalk/digest.la
 lib/smalltalk/digest.so
+lib/smalltalk/expat-%%VERSION%%.so
+lib/smalltalk/expat.a
+lib/smalltalk/expat.la
+lib/smalltalk/expat.so
 lib/smalltalk/gdbm-%%VERSION%%.so
 lib/smalltalk/gdbm.a
 lib/smalltalk/gdbm.la
@@ -51,10 +57,6 @@ lib/smalltalk/sdl-%%VERSION%%.so
 lib/smalltalk/sdl.a
 lib/smalltalk/sdl.la
 lib/smalltalk/sdl.so
-lib/smalltalk/sockets-%%VERSION%%.so
-lib/smalltalk/sockets.a
-lib/smalltalk/sockets.la
-lib/smalltalk/sockets.so
 lib/smalltalk/zlib-%%VERSION%%.so
 lib/smalltalk/zlib.a
 lib/smalltalk/zlib.la
@@ -77,243 +79,6 @@ share/aclocal/gst-package.m4
 share/aclocal/snprintfv.m4
 share/emacs/site-lisp/gst-mode.el
 share/emacs/site-lisp/smalltalk-mode.el
-%%DATADIR%%/Blox.star
-%%DATADIR%%/BloxTK.star
-%%DATADIR%%/Browser.star
-%%DATADIR%%/CParser.star
-%%DATADIR%%/Cairo.star
-%%DATADIR%%/CairoSDL.star
-%%DATADIR%%/ClassPublisher.star
-%%DATADIR%%/Compiler.star
-%%DATADIR%%/Complex.star
-%%DATADIR%%/Continuations.star
-%%DATADIR%%/DBD-MySQL.star
-%%DATADIR%%/DBD-PostgreSQL.star
-%%DATADIR%%/DBD-SQLite.star
-%%DATADIR%%/DBI.star
-%%DATADIR%%/DebugTools.star
-%%DATADIR%%/DhbNumericalMethods.star
-%%DATADIR%%/Digest.star
-%%DATADIR%%/GDBM.star
-%%DATADIR%%/GLUT.star
-%%DATADIR%%/GNUPlot.star
-%%DATADIR%%/Glorp.star
-%%DATADIR%%/I18N.star
-%%DATADIR%%/Iconv.star
-%%DATADIR%%/Java.star
-%%DATADIR%%/LibSDL.star
-%%DATADIR%%/LibSDL_GL.star
-%%DATADIR%%/LibSDL_image.star
-%%DATADIR%%/LibSDL_mixer.star
-%%DATADIR%%/LibSDL_sound.star
-%%DATADIR%%/LibSDL_ttf.star
-%%DATADIR%%/Magritte-Seaside.star
-%%DATADIR%%/Magritte.star
-%%DATADIR%%/NCurses.star
-%%DATADIR%%/NetClients.star
-%%DATADIR%%/OpenGL.star
-%%DATADIR%%/Parser.star
-%%DATADIR%%/ROE.star
-%%DATADIR%%/SUnit.star
-%%DATADIR%%/Seaside-Core.star
-%%DATADIR%%/Seaside-Development.star
-%%DATADIR%%/Seaside-Examples.star
-%%DATADIR%%/Seaside.star
-%%DATADIR%%/Sockets.star
-%%DATADIR%%/Sport.star
-%%DATADIR%%/Swazoo.star
-%%DATADIR%%/VFSAddOns.star
-%%DATADIR%%/WebServer.star
-%%DATADIR%%/XML-DOM.star
-%%DATADIR%%/XML-SAXDriver.star
-%%DATADIR%%/XML-SAXParser.star
-%%DATADIR%%/XML-XMLNodeBuilder.star
-%%DATADIR%%/XML-XMLParser.star
-%%DATADIR%%/XPath.star
-%%DATADIR%%/XSL.star
-%%DATADIR%%/ZLib.star
-%%DATADIR%%/examples/Bench.st
-%%DATADIR%%/examples/CairoBlit.st
-%%DATADIR%%/examples/CairoDemo.st
-%%DATADIR%%/examples/Case.st
-%%DATADIR%%/examples/DeltaBlue.st
-%%DATADIR%%/examples/Dinner.st
-%%DATADIR%%/examples/EditStream.st
-%%DATADIR%%/examples/Gen2.st
-%%DATADIR%%/examples/Gen3.st
-%%DATADIR%%/examples/GenClasses.st
-%%DATADIR%%/examples/JSON.st
-%%DATADIR%%/examples/LazyCollection.st
-%%DATADIR%%/examples/Lisp.st
-%%DATADIR%%/examples/Man.st
-%%DATADIR%%/examples/MemUsage.st
-%%DATADIR%%/examples/Methods.st
-%%DATADIR%%/examples/MiniDebugger.st
-%%DATADIR%%/examples/PipeStream.st
-%%DATADIR%%/examples/Prolog.st
-%%DATADIR%%/examples/PrtHier.st
-%%DATADIR%%/examples/Queens.st
-%%DATADIR%%/examples/README
-%%DATADIR%%/examples/RegExp.st
-%%DATADIR%%/examples/Richards.st
-%%DATADIR%%/examples/SortCriter.st
-%%DATADIR%%/examples/Sync.st
-%%DATADIR%%/examples/Tetris.st
-%%DATADIR%%/examples/Timer.st
-%%DATADIR%%/examples/TokenStream.st
-%%DATADIR%%/examples/Tokenizer.st
-%%DATADIR%%/examples/pepe.sed
-%%DATADIR%%/examples/shell
-%%DATADIR%%/examples/xml.sed
-%%DATADIR%%/gtk/.keep_me
-%%DATADIR%%/kernel/AbstNamespc.st
-%%DATADIR%%/kernel/AnsiDates.st
-%%DATADIR%%/kernel/AnsiExcept.st
-%%DATADIR%%/kernel/Array.st
-%%DATADIR%%/kernel/ArrayColl.st
-%%DATADIR%%/kernel/Association.st
-%%DATADIR%%/kernel/Autoload.st
-%%DATADIR%%/kernel/Bag.st
-%%DATADIR%%/kernel/Behavior.st
-%%DATADIR%%/kernel/BindingDict.st
-%%DATADIR%%/kernel/BlkClosure.st
-%%DATADIR%%/kernel/BlkContext.st
-%%DATADIR%%/kernel/Boolean.st
-%%DATADIR%%/kernel/Builtins.st
-%%DATADIR%%/kernel/ByteArray.st
-%%DATADIR%%/kernel/CCallable.st
-%%DATADIR%%/kernel/CCallback.st
-%%DATADIR%%/kernel/CFuncs.st
-%%DATADIR%%/kernel/CObject.st
-%%DATADIR%%/kernel/CStruct.st
-%%DATADIR%%/kernel/CType.st
-%%DATADIR%%/kernel/CallinProcess.st
-%%DATADIR%%/kernel/CharArray.st
-%%DATADIR%%/kernel/Character.st
-%%DATADIR%%/kernel/Class.st
-%%DATADIR%%/kernel/ClassDesc.st
-%%DATADIR%%/kernel/Collection.st
-%%DATADIR%%/kernel/CompildCode.st
-%%DATADIR%%/kernel/CompildMeth.st
-%%DATADIR%%/kernel/CompiledBlk.st
-%%DATADIR%%/kernel/ContextPart.st
-%%DATADIR%%/kernel/Continuation.st
-%%DATADIR%%/kernel/DLD.st
-%%DATADIR%%/kernel/Date.st
-%%DATADIR%%/kernel/DeferBinding.st
-%%DATADIR%%/kernel/Delay.st
-%%DATADIR%%/kernel/Dictionary.st
-%%DATADIR%%/kernel/DirMessage.st
-%%DATADIR%%/kernel/Directory.st
-%%DATADIR%%/kernel/ExcHandling.st
-%%DATADIR%%/kernel/False.st
-%%DATADIR%%/kernel/File.st
-%%DATADIR%%/kernel/FileDescr.st
-%%DATADIR%%/kernel/FilePath.st
-%%DATADIR%%/kernel/FileSegment.st
-%%DATADIR%%/kernel/FileStream.st
-%%DATADIR%%/kernel/Float.st
-%%DATADIR%%/kernel/FloatD.st
-%%DATADIR%%/kernel/FloatE.st
-%%DATADIR%%/kernel/FloatQ.st
-%%DATADIR%%/kernel/Fraction.st
-%%DATADIR%%/kernel/Generator.st
-%%DATADIR%%/kernel/Getopt.st
-%%DATADIR%%/kernel/HashedColl.st
-%%DATADIR%%/kernel/HomedAssoc.st
-%%DATADIR%%/kernel/IdentDict.st
-%%DATADIR%%/kernel/IdentitySet.st
-%%DATADIR%%/kernel/Integer.st
-%%DATADIR%%/kernel/Interval.st
-%%DATADIR%%/kernel/Iterable.st
-%%DATADIR%%/kernel/LargeInt.st
-%%DATADIR%%/kernel/Link.st
-%%DATADIR%%/kernel/LinkedList.st
-%%DATADIR%%/kernel/LookupKey.st
-%%DATADIR%%/kernel/LookupTable.st
-%%DATADIR%%/kernel/Magnitude.st
-%%DATADIR%%/kernel/MappedColl.st
-%%DATADIR%%/kernel/Memory.st
-%%DATADIR%%/kernel/Message.st
-%%DATADIR%%/kernel/Metaclass.st
-%%DATADIR%%/kernel/MethodDict.st
-%%DATADIR%%/kernel/MethodInfo.st
-%%DATADIR%%/kernel/MthContext.st
-%%DATADIR%%/kernel/Namespace.st
-%%DATADIR%%/kernel/Number.st
-%%DATADIR%%/kernel/ObjDumper.st
-%%DATADIR%%/kernel/ObjMemory.st
-%%DATADIR%%/kernel/Object.st
-%%DATADIR%%/kernel/OrderColl.st
-%%DATADIR%%/kernel/OtherArrays.st
-%%DATADIR%%/kernel/PkgLoader.st
-%%DATADIR%%/kernel/Point.st
-%%DATADIR%%/kernel/PosStream.st
-%%DATADIR%%/kernel/ProcEnv.st
-%%DATADIR%%/kernel/ProcSched.st
-%%DATADIR%%/kernel/Process.st
-%%DATADIR%%/kernel/RWStream.st
-%%DATADIR%%/kernel/Random.st
-%%DATADIR%%/kernel/ReadStream.st
-%%DATADIR%%/kernel/Rectangle.st
-%%DATADIR%%/kernel/RecursionLock.st
-%%DATADIR%%/kernel/Regex.st
-%%DATADIR%%/kernel/RootNamespc.st
-%%DATADIR%%/kernel/RunArray.st
-%%DATADIR%%/kernel/ScaledDec.st
-%%DATADIR%%/kernel/Security.st
-%%DATADIR%%/kernel/Semaphore.st
-%%DATADIR%%/kernel/SeqCollect.st
-%%DATADIR%%/kernel/Set.st
-%%DATADIR%%/kernel/SharedQueue.st
-%%DATADIR%%/kernel/SmallInt.st
-%%DATADIR%%/kernel/SortCollect.st
-%%DATADIR%%/kernel/Stream.st
-%%DATADIR%%/kernel/StreamOps.st
-%%DATADIR%%/kernel/String.st
-%%DATADIR%%/kernel/SymLink.st
-%%DATADIR%%/kernel/Symbol.st
-%%DATADIR%%/kernel/SysDict.st
-%%DATADIR%%/kernel/Time.st
-%%DATADIR%%/kernel/Transcript.st
-%%DATADIR%%/kernel/True.st
-%%DATADIR%%/kernel/URL.st
-%%DATADIR%%/kernel/UndefObject.st
-%%DATADIR%%/kernel/UniChar.st
-%%DATADIR%%/kernel/UniString.st
-%%DATADIR%%/kernel/VFS.st
-%%DATADIR%%/kernel/VFSZip.st
-%%DATADIR%%/kernel/ValueAdapt.st
-%%DATADIR%%/kernel/VarBinding.st
-%%DATADIR%%/kernel/WeakObjects.st
-%%DATADIR%%/kernel/WriteStream.st
-%%DATADIR%%/packages.xml
-%%DATADIR%%/scripts/Browser.st
-%%DATADIR%%/scripts/Convert.st
-%%DATADIR%%/scripts/GenDoc.st
-%%DATADIR%%/scripts/Load.st
-%%DATADIR%%/scripts/Package.st
-%%DATADIR%%/scripts/Remote.st
-%%DATADIR%%/scripts/Test.st
-%%DATADIR%%/unsupported/CPP-test.st
-%%DATADIR%%/unsupported/CParseType-test.st
-%%DATADIR%%/unsupported/CString.st
-%%DATADIR%%/unsupported/DLD.st
-%%DATADIR%%/unsupported/Interr.st
-%%DATADIR%%/unsupported/Process.st
-%%DATADIR%%/unsupported/Profile.st
-%%DATADIR%%/unsupported/Sorting.st
-%%DATADIR%%/unsupported/echo.st
-%%DATADIR%%/unsupported/market.st
-%%DATADIR%%/unsupported/resolve.st
-%%DATADIR%%/unsupported/t.st
-%%DATADIR%%/unsupported/torture.st
-@dirrm %%DATADIR%%/unsupported
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/kernel
-@dirrm %%DATADIR%%/gtk
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%
 @dirrm lib/smalltalk
 @dirrm libexec/smalltalk/vfs
 @dirrm libexec/smalltalk