- Update to version 2.1.5

PR:		59581
Submitted by:	Ports Fury

4 files changed, 25 insertions, 37 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 6aa1f72d60d6..572ead2be392 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smalltalk
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,33 +23,30 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
-CONFIGURE_ARGS=	--without-gmp
+CONFIGURE_ARGS=	--disable-gtk --without-emacs --without-gmp
 
 MAN1=		gst.1
+INFO=		gst gst-base gst-libs
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 .if defined(WITH_TCLTK)
-LIB_DEPENDS+=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.3 \
-			--with-tk=${LOCALBASE}/lib/tk8.3
+LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
+			--with-tk=${LOCALBASE}/lib/tk8.4
 PLIST_SUB+=	TCLTK=""
-CPPFLAGS+=	-I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3
 .else
 CONFIGURE_ARGS+=	--with-tcl=no
 PLIST_SUB+=	TCLTK="@comment "
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/gst.info*
-	@${RM} -f ${WRKSRC}/doc/gst-base.info*
-	@${RM} -f ${WRKSRC}/doc/gst-libs.info*
+	@${RM} -f ${WRKSRC}/doc/*.info*
 
 post-patch:
 	@${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@EMACS@|no|g ; \
-		 s|-release [$$][(]VERSION[)]|-avoid-version|g'
+		's|-release $$(VERSION)|-avoid-version|g'
 	@${REINPLACE_CMD} -e \
 		's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/examples/gdbm.c
 
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 4d3943ab7add..68ed2d3d77fc 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1 +1 @@
-MD5 (smalltalk-2.1.4.tar.gz) = 6499ce6324d1a0e762451329fefe84f1
+MD5 (smalltalk-2.1.5.tar.gz) = ce993e99f7f3f65958840e4be7a3036e
diff --git a/lang/smalltalk/files/patch-ltmain.sh b/lang/smalltalk/files/patch-ltmain.sh
index 18b8bb044f94..f7bed659751f 100644
--- a/lang/smalltalk/files/patch-ltmain.sh
+++ b/lang/smalltalk/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- config/ltmain.sh.orig	Fri Jun 14 06:37:06 2002
-+++ config/ltmain.sh	Thu Jun 27 01:04:35 2002
-@@ -961,6 +961,7 @@
+--- 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)
@@ -8,13 +8,3 @@
  	avoid_version=yes
  	continue
  	;;
-@@ -2424,6 +2425,9 @@
- 	    ;;
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
-+	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
- 	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index 164321d30698..b164c5c95520 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -4,15 +4,6 @@ bin/gst-package
 include/gst.h
 include/gstpub.h
 include/sigsegv.h
-@unexec install-info --delete %D/info/gst-base.info %D/info/dir
-info/gst-base.info
-@exec install-info %D/info/gst-base.info %D/info/dir
-@unexec install-info --delete %D/info/gst-libs.info %D/info/dir
-info/gst-libs.info
-@exec install-info %D/info/gst-libs.info %D/info/dir
-@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/libgst.la
 %%TCLTK%%lib/smalltalk/blox-tk.la
@@ -33,8 +24,6 @@ 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
@@ -129,6 +118,18 @@ share/smalltalk/examples/regex.st
 share/smalltalk/examples/shell
 share/smalltalk/examples/xml.sed
 share/smalltalk/gst.im
+share/smalltalk/gtk/GtkDecl.st
+share/smalltalk/gtk/GtkImpl.st
+share/smalltalk/gtk/Libs.st
+share/smalltalk/gtk/MoreFuncs.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
@@ -379,13 +380,13 @@ 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
 @exec mkdir -p %D/include/snprintfv