Update port to version 1.95.3.

PR:		25554
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 50 insertions, 62 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 86297f8fdff..a41baaa0637 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	1.95.1
+PORTVERSION=	1.95.3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,13 +19,21 @@ ALL_TARGET=	all optimize
 
 MAN1=		gst.1
 
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+post-extract:
+	@${RM} ${WRKSRC}/doc/gst.info*
+
 pre-patch:
-	@${PERL} -pi -e 's| install-data-local||g' ${WRKSRC}/kernel/Makefile.in
+	@${PERL} -pi -e 's|-lregex|-lgnuregex|g ; \
+		 s|\$$\OPT_CFLAGS||g' ${WRKSRC}/configure
 
-pre-build:
-	${RM} ${WRKSRC}/docs/gst.info*
+	@find ${WRKSRC} -name 'Makefile.in' | xargs ${PERL} -pi -e \
+		's|examples lib-src|lib-src examples|g ; \
+		 s|make mostlyclean|\$$\(MAKE\) mostlyclean|g ; \
+		 s|\@MAKEINFO\@|\@MAKEINFO\@ --no-split|g'
 
 post-install:
-	@cd ${PREFIX}/share/gnu-smalltalk && ${PREFIX}/bin/gst -Vi dummyFile
+	${INSTALL_DATA} ${WRKSRC}/libgst/libgst.a ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 80ef69362de..b8f8ceb723b 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1 +1 @@
-MD5 (smalltalk-1.95.1.tar.gz) = 3495cfb86f6a96f3bab47c8a1f41dd86
+MD5 (smalltalk-1.95.3.tar.gz) = 1a5cb8b6f4e6f7de2e4d2563cb5b1c9c
diff --git a/lang/smalltalk/files/patch-af b/lang/smalltalk/files/patch-af
deleted file mode 100644
index 02292db67c2..00000000000
--- a/lang/smalltalk/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 52bd6e43ffd..00000000000
--- a/lang/smalltalk/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 698d6102616..00000000000
--- a/lang/smalltalk/files/patch-docs_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 eede78a3c25..5813175529f 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -2,22 +2,21 @@ 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
 @exec install-info %D/info/gst.info %D/info/dir
 lib/libgst.a
+lib/gnu-smalltalk/libregex-%%VERSION%%.so
+lib/gnu-smalltalk/libregex.a
+lib/gnu-smalltalk/libregex.la
+lib/gnu-smalltalk/libregex.so
+lib/gnu-smalltalk/libtcp-%%VERSION%%.so
+lib/gnu-smalltalk/libtcp.a
+lib/gnu-smalltalk/libtcp.la
+lib/gnu-smalltalk/libtcp.so
 share/gnu-smalltalk/Load.st
 share/gnu-smalltalk/Reload.st
-share/gnu-smalltalk/blox/BB-Run.st
-share/gnu-smalltalk/blox/BBrowser.st
-share/gnu-smalltalk/blox/Blox.st
-share/gnu-smalltalk/blox/BloxBasic.st
-share/gnu-smalltalk/blox/BloxCanvas.st
-share/gnu-smalltalk/blox/BloxExtend.st
-share/gnu-smalltalk/blox/BloxText.st
-share/gnu-smalltalk/blox/BloxWidgets.st
 share/gnu-smalltalk/blox/BrowShell.st
 share/gnu-smalltalk/blox/BrowserMain.st
 share/gnu-smalltalk/blox/ClassBrow.st
@@ -42,6 +41,12 @@ 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/blox/tk/Blox.st
+share/gnu-smalltalk/blox/tk/BloxBasic.st
+share/gnu-smalltalk/blox/tk/BloxCanvas.st
+share/gnu-smalltalk/blox/tk/BloxExtend.st
+share/gnu-smalltalk/blox/tk/BloxText.st
+share/gnu-smalltalk/blox/tk/BloxWidgets.st
 share/gnu-smalltalk/compiler/Load.st
 share/gnu-smalltalk/compiler/STCompLit.st
 share/gnu-smalltalk/compiler/STCompiler.st
@@ -81,6 +86,9 @@ 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/modules/gdbm-c.st
+share/gnu-smalltalk/examples/modules/gdbm.st
+share/gnu-smalltalk/examples/modules/regex.st
 share/gnu-smalltalk/examples/shell
 share/gnu-smalltalk/gst.im
 share/gnu-smalltalk/i18n/Collation.st
@@ -94,6 +102,7 @@ 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/Sets.st
 share/gnu-smalltalk/i18n/Times.st
 share/gnu-smalltalk/kernel/AnsiDates.st
 share/gnu-smalltalk/kernel/AnsiExcept.st
@@ -136,6 +145,7 @@ share/gnu-smalltalk/kernel/FileSegment.st
 share/gnu-smalltalk/kernel/FileStream.st
 share/gnu-smalltalk/kernel/Float.st
 share/gnu-smalltalk/kernel/Fraction.st
+share/gnu-smalltalk/kernel/HashedColl.st
 share/gnu-smalltalk/kernel/IdentDict.st
 share/gnu-smalltalk/kernel/IdentitySet.st
 share/gnu-smalltalk/kernel/Integer.st
@@ -158,6 +168,7 @@ share/gnu-smalltalk/kernel/Number.st
 share/gnu-smalltalk/kernel/ObjDumper.st
 share/gnu-smalltalk/kernel/Object.st
 share/gnu-smalltalk/kernel/OrderColl.st
+share/gnu-smalltalk/kernel/OtherArrays.st
 share/gnu-smalltalk/kernel/PkgLoader.st
 share/gnu-smalltalk/kernel/Point.st
 share/gnu-smalltalk/kernel/PosStream.st
@@ -191,20 +202,18 @@ share/gnu-smalltalk/kernel/WeakObjects.st
 share/gnu-smalltalk/kernel/WriteStream.st
 share/gnu-smalltalk/kernel/initialize.st
 share/gnu-smalltalk/packages
-share/gnu-smalltalk/tcp/AbstractSocket.st
+share/gnu-smalltalk/sunit/SUnit.st
+share/gnu-smalltalk/sunit/SUnitPreload.st
+share/gnu-smalltalk/sunit/SUnitScript.st
+share/gnu-smalltalk/sunit/SUnitTests.st
 share/gnu-smalltalk/tcp/AbstractSocketImpl.st
 share/gnu-smalltalk/tcp/ContentHandler.st
 share/gnu-smalltalk/tcp/Datagram.st
-share/gnu-smalltalk/tcp/DatagramSocket.st
-share/gnu-smalltalk/tcp/DatagramSocketImpl.st
-share/gnu-smalltalk/tcp/IPAddress.st
-share/gnu-smalltalk/tcp/MulticastSocket.st
-share/gnu-smalltalk/tcp/ServerSocket.st
-share/gnu-smalltalk/tcp/Socket.st
-share/gnu-smalltalk/tcp/SocketImpl.st
+share/gnu-smalltalk/tcp/IPSocketImpl.st
+share/gnu-smalltalk/tcp/SocketAddress.st
+share/gnu-smalltalk/tcp/Sockets.st
 share/gnu-smalltalk/tcp/TCP.st
-share/gnu-smalltalk/tcp/TCPSocketImpl.st
-share/gnu-smalltalk/tcp/UDPSocketImpl.st
+share/gnu-smalltalk/tcp/Tests.st
 share/gnu-smalltalk/tcp/URL.st
 share/gnu-smalltalk/tcp/UnixStream.st
 share/gnu-smalltalk/tcp/cfuncs.st
@@ -212,6 +221,7 @@ 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/NetServer.st
 share/gnu-smalltalk/web/WebServer.st
 share/gnu-smalltalk/web/WikiServer.st
 share/gnu-smalltalk/web/edit.jpg
@@ -225,15 +235,20 @@ 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
+share/gnu-smalltalk/xml/Id-DOM.st
+share/gnu-smalltalk/xml/Id-XWalker.st
+share/gnu-smalltalk/xml/XML.st
 @dirrm share/gnu-smalltalk/xml
 @dirrm share/gnu-smalltalk/web
 @dirrm share/gnu-smalltalk/tcp
+@dirrm share/gnu-smalltalk/sunit
 @dirrm share/gnu-smalltalk/kernel
 @dirrm share/gnu-smalltalk/i18n
+@dirrm share/gnu-smalltalk/examples/modules
 @dirrm share/gnu-smalltalk/examples/blox
 @dirrm share/gnu-smalltalk/examples
 @dirrm share/gnu-smalltalk/compiler
+@dirrm share/gnu-smalltalk/blox/tk
 @dirrm share/gnu-smalltalk/blox
 @dirrm share/gnu-smalltalk
+@dirrm lib/gnu-smalltalk