- Update to 2.3.1

PR:		106983
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

4 files changed, 37 insertions, 42 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 00c5e90f7a82..5128ca422746 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	2.2
+PORTVERSION=	2.3.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,9 +26,14 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		ac_cv_prog_EMACS=no
-CONFIGURE_ARGS=	--enable-generational-gc=no --enable-gtk=no \
-		--with-emacs=no --with-gmp=no
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
+		--infodir=${PREFIX}/${INFO_PATH} \
+		--enable-generational-gc=no \
+		--enable-gtk=no \
+		--with-emacs=no \
+		--with-gmp=no
 USE_LDCONFIG=	yes
+PLIST_SUB=	VERSION="${PORTVERSION}"
 
 MAN1=		gst.1
 INFO=		gst gst-base gst-libs
@@ -56,13 +61,15 @@ CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
 PLIST_SUB+=	TCLTK=""
 .endif
 
-post-patch:
-	@${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|-release $$(VERSION)|-avoid-version|g'
-	@${REINPLACE_CMD} -e 's|typedef .*intptr_t;||g ; \
-		 s|typedef .*intmax_t;||g' ${WRKSRC}/configure
+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
+	@${TOUCH} ${DATADIR}/gtk/.keep_me
 	${INSTALL_DATA} ${WRKSRC}/*.el ${PREFIX}/share/emacs/site-lisp
 
 .include <bsd.port.post.mk>
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 52fab2dc1aab..28d2c0ae8b89 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,3 +1,3 @@
-MD5 (smalltalk-2.2.tar.gz) = f092bb42f6cf52b429dba8640f8bf810
-SHA256 (smalltalk-2.2.tar.gz) = ca134253f45bf5e3f34113c8d2a677f7733c464e2c3d75316f05e1d1437541b0
-SIZE (smalltalk-2.2.tar.gz) = 4187113
+MD5 (smalltalk-2.3.1.tar.gz) = 42bd6adc7c84c2d6ca3e6086cb913334
+SHA256 (smalltalk-2.3.1.tar.gz) = f548425d884bdaf9ed457be243bcc836abef5a2f35ee37d930ba32c198c762ce
+SIZE (smalltalk-2.3.1.tar.gz) = 4298106
diff --git a/lang/smalltalk/files/patch-ltmain.sh b/lang/smalltalk/files/patch-ltmain.sh
deleted file mode 100644
index f7bed659751f..000000000000
--- a/lang/smalltalk/files/patch-ltmain.sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/ltmain.sh.orig	Mon Jun  9 16:36:06 2003
-+++ config/ltmain.sh	Sat Nov 22 22:09:24 2003
-@@ -990,6 +990,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index e61bf97d0167..10e4b3d3e8c0 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -9,18 +9,26 @@ include/gstpub.h
 lib/libgst.a
 lib/libgst.la
 lib/libgst.so
-lib/libgst.so.5
+lib/libgst.so.6
+%%TCLTK%%lib/smalltalk/blox-tk-%%VERSION%%.so
+%%TCLTK%%lib/smalltalk/blox-tk.a
 %%TCLTK%%lib/smalltalk/blox-tk.la
 %%TCLTK%%lib/smalltalk/blox-tk.so
+lib/smalltalk/gdbm-%%VERSION%%.so
+lib/smalltalk/gdbm.a
 lib/smalltalk/gdbm.la
 lib/smalltalk/gdbm.so
+lib/smalltalk/i18n-%%VERSION%%.so
+lib/smalltalk/i18n.a
 lib/smalltalk/i18n.la
 lib/smalltalk/i18n.so
 lib/smalltalk/libc.la
+lib/smalltalk/md5-%%VERSION%%.so
+lib/smalltalk/md5.a
 lib/smalltalk/md5.la
 lib/smalltalk/md5.so
-lib/smalltalk/regex.la
-lib/smalltalk/regex.so
+lib/smalltalk/tcp-%%VERSION%%.so
+lib/smalltalk/tcp.a
 lib/smalltalk/tcp.la
 lib/smalltalk/tcp.so
 libdata/pkgconfig/gnu-smalltalk.pc
@@ -28,9 +36,6 @@ share/aclocal/gst.m4
 share/aclocal/snprintfv.m4
 share/emacs/site-lisp/gst-mode.el
 share/emacs/site-lisp/smalltalk-mode.el
-%%DATADIR%%/Load.st
-%%DATADIR%%/Reload.st
-%%DATADIR%%/Test.st
 %%DATADIR%%/blox-gtk/Blox.st
 %%DATADIR%%/blox-gtk/BloxBasic.st
 %%DATADIR%%/blox-gtk/BloxExtend.st
@@ -106,9 +111,11 @@ share/emacs/site-lisp/smalltalk-mode.el
 %%DATADIR%%/examples/Gen2.st
 %%DATADIR%%/examples/GenClasses.st
 %%DATADIR%%/examples/Generator.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/Prolog.st
 %%DATADIR%%/examples/PrtHier.st
@@ -131,24 +138,12 @@ share/emacs/site-lisp/smalltalk-mode.el
 %%DATADIR%%/examples/modules/gdbm-c.st
 %%DATADIR%%/examples/modules/gdbm.st
 %%DATADIR%%/examples/modules/md5.st
-%%DATADIR%%/examples/modules/regex.st
+%%DATADIR%%/examples/ncurses.st
 %%DATADIR%%/examples/pepe.sed
-%%DATADIR%%/examples/regex.st
 %%DATADIR%%/examples/shell
 %%DATADIR%%/examples/xml.sed
 %%DATADIR%%/gst.im
-%%DATADIR%%/gtk/GtkDecl.st
-%%DATADIR%%/gtk/GtkImpl.st
-%%DATADIR%%/gtk/MoreFuncs.st
-%%DATADIR%%/gtk/MoreStructs.st
-%%DATADIR%%/gtk/example_arrow.st
-%%DATADIR%%/gtk/example_aspectframe.st
-%%DATADIR%%/gtk/example_buttonbox.st
-%%DATADIR%%/gtk/example_entry.st
-%%DATADIR%%/gtk/example_eventbox.st
-%%DATADIR%%/gtk/example_hello.st
-%%DATADIR%%/gtk/example_tictactoe.st
-%%DATADIR%%/gtk/example_tree.st
+%%DATADIR%%/gtk/.keep_me
 %%DATADIR%%/i18n/ChangeLog
 %%DATADIR%%/i18n/Collation.st
 %%DATADIR%%/i18n/Expression.st
@@ -250,6 +245,7 @@ share/emacs/site-lisp/smalltalk-mode.el
 %%DATADIR%%/kernel/FloatE.st
 %%DATADIR%%/kernel/FloatQ.st
 %%DATADIR%%/kernel/Fraction.st
+%%DATADIR%%/kernel/Getopt.st
 %%DATADIR%%/kernel/HashedColl.st
 %%DATADIR%%/kernel/HomedAssoc.st
 %%DATADIR%%/kernel/IdentDict.st
@@ -286,6 +282,7 @@ share/emacs/site-lisp/smalltalk-mode.el
 %%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
@@ -307,6 +304,8 @@ share/emacs/site-lisp/smalltalk-mode.el
 %%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/ValueAdapt.st
 %%DATADIR%%/kernel/VarBinding.st
@@ -387,7 +386,6 @@ share/emacs/site-lisp/smalltalk-mode.el
 %%DATADIR%%/unsupported/Sorting.st
 %%DATADIR%%/unsupported/a.st
 %%DATADIR%%/unsupported/ba.st
-%%DATADIR%%/unsupported/binary.c
 %%DATADIR%%/unsupported/bug.st
 %%DATADIR%%/unsupported/bug2.st
 %%DATADIR%%/unsupported/bug4.st