Update to 3.2.5 and fix broken build.

pkgsrc changes:
 - use paxctl during the build to avoid crashes
 - depend directly on pcre
 - fix some pkglint

Upstream changes:
 - Add Delay>>#value:onTimeoutDo: as an easy way to timeout an operation.
 - Improve Delay and millisecondClock behavior across image save and restore.
   millisecondClockValue is guaranteed to be monotonic across image save, and
   delays are restarted when the image is restored.
 - DateTime>>#today will return midnight of the current timezone.
 - DateTime has a new method #asLocal.
 - DateTime>>#readFrom: can read more time formats.
 - Time resolution is now based on nanoseconds.
 - Absolute-time delays (Delay>>#untilMilliseconds:) are precise and not
   anymore converted to relative-time delays.
 - package.xml files support a <dir> tag, like <dir name="Foo">.  It can
   be used to make package.xml clearer for large packages.
 - MethodDictionary is now thread-safe.
 - String>>#% supports string keys, like %(string).  They can be used
   when the argument of #% is a Dictionary or LookupTable.  Note that
   the keys of the dictionary must be Strings, not Symbols.
 - Socket fixes including reporting of EndOfStream on broken pipes and
   connection resets.
 - Fix the FileDescriptor finalization code to close open descriptors.
 - The system file descriptor of FileDescriptor is set to nil on image
   restore.
 - The asynchronous event notification has been rewritten.  The old
   version could fail when many file descriptors became available at
   the same time.
 - DBD-Postgres gained support to bind parameters on queries and various
   fixes to allow to resume images that use Postgres.
 - Images created with gst-remote can now be resumed.
 - Add #system:withArguments: to avoid using #system: with #% to add
   arguments.
 - Added Integer>>#printPaddedWith:to:.
 - Added CharacterArray>>#withShellEscapes
 - Added Collection>>#includesAllOf:
 - Stream>>#fold: works correctly.
 - 64-bit integer types are available using CLongLong and CULongLong.
 - gst-blox and gst-browser understand the -i/--rebuild-image option.
 - GObject errors show backtraces.
 - Improvements to multiarch support.
 - CType objects implement #= and #hash, so they can now be used as keys
   in a dictionary.
 - Floating-point numbers are printed more accurately in some rare cases.
 - Some optimization of OrderedCollection and SortedCollection
 - Selectors starting with an underscore are treated as keyword messages.
 - A new function gst_uint_to_oop is in libgst, and uintToOOP is also
   provided by the VMProxy.
 - Growing the heap is working again.
 - Various bugfixes.
 - GNU Smalltalk does not run anymore on i386 hardware, an i486 is needed.
 - Slightly faster garbage collection.

6 files changed, 53 insertions, 32 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index d68d8def682..4f4b71649c6 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2017/11/30 16:45:28 adam Exp $
+# $NetBSD: Makefile,v 1.99 2017/12/29 03:56:42 dholland Exp $
 
-DISTNAME=	smalltalk-3.2.4
-PKGREVISION=	32
+DISTNAME=	smalltalk-3.2.5
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
 
@@ -48,7 +47,7 @@ LIBS+=	-lexecinfo
 post-extract:
 	sed -e "s/long double/double/g" -e "s/1.0L/1.0/g" -e  "s/0.0L/0.0/g" \
 	-e "s/LDBL_EPSILON/DBL_EPSILON/g" -e "s/truncl/trunc/g" \
-	${WRKSRC:Q}/lib-src/truncl.c > ${WRKSRC:Q}/lib-src/trunc.c
+	${WRKSRC}/lib-src/truncl.c > ${WRKSRC}/lib-src/trunc.c
 	sed -e "s/long double/float/g" -e "s/1.0L/1.0F/g" -e  "s/0.0L/0.0F/g" \
 	-e "s/LDBL_EPSILON/FLT_EPSILON/g" -e "s/truncl/truncf/g" \
 	${WRKSRC}/lib-src/truncl.c > ${WRKSRC}/lib-src/truncf.c
@@ -62,6 +61,7 @@ post-extract:
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/libsigsegv/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index 74decc288be..2badbbfabf6 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2014/12/27 00:13:28 dholland Exp $
+@comment $NetBSD: PLIST,v 1.25 2017/12/29 03:56:42 dholland Exp $
 bin/gst
 bin/gst-blox
 bin/gst-browser
@@ -26,9 +26,9 @@ ${PLIST.gdbm}lib/smalltalk/gdbm.la
 ${PLIST.gtk}lib/smalltalk/gst-gtk.la
 ${PLIST.opengl}lib/smalltalk/gstglut.la
 ${PLIST.opengl}lib/smalltalk/gstopengl.la
-${PLIST.sdl}lib/smalltalk/sdl.la
 lib/smalltalk/i18n.la
 lib/smalltalk/iconv.la
+${PLIST.sdl}lib/smalltalk/sdl.la
 lib/smalltalk/zlib.la
 libexec/smalltalk/gnutls-wrapper
 libexec/smalltalk/vfs/deb
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 8a4f9af0282..677eddb6d8c 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.27 2015/12/29 23:34:55 dholland Exp $
+$NetBSD: distinfo,v 1.28 2017/12/29 03:56:42 dholland Exp $
 
-SHA1 (smalltalk-3.2.4.tar.gz) = 6b164e145c1118ad74770bb15614478d47f55523
-RMD160 (smalltalk-3.2.4.tar.gz) = d8ca6b888311a70748071ff4024e31adeb0a920f
-SHA512 (smalltalk-3.2.4.tar.gz) = 0854e95fb29c79a9844304651e9b2e3997ced88d7f1a704345f72aedfbae1562df0a2a2cc92ed7909e0ce22e275bb37d1592fe16079e3895cd8b79f3212cea3e
-Size (smalltalk-3.2.4.tar.gz) = 5877496 bytes
-SHA1 (patch-ae) = aa64f95b4aec8117655ebd7fe07a6c0ffa7018fe
-SHA1 (patch-ah) = eaa03cf41f1c30acd1762cb6389dfe0157ce551b
+SHA1 (smalltalk-3.2.5.tar.gz) = 4dd77b769131527add276ded01666e089da3b8b1
+RMD160 (smalltalk-3.2.5.tar.gz) = 04cc87b31e8288fc6a8ce756612d40d91ce40cde
+SHA512 (smalltalk-3.2.5.tar.gz) = 385e5fba2acb8870759e5178282210c09c45685d0cf776bc50f4ed10c9afacf9164547ba8099ea3ed9a92a2a253aa9c2b011a7a9f2dff47ea9cfdf3b42029ebc
+Size (smalltalk-3.2.5.tar.gz) = 5779293 bytes
+SHA1 (patch-ae) = 0de0e6bed47d32e1c3088100c153054461e4f33b
+SHA1 (patch-ah) = ff72f65fe5e8aa71a729898525b756ca59b78767
+SHA1 (patch-libgst_cint.c) = 51354b41f8edde0e42abcd5f8d0246d4f1025c6e
 SHA1 (patch-libgst_input.c) = 06168ed6decd6d42838e76ada81717e3f599d733
 SHA1 (patch-snprintfv_snprintfv_format.c) = 03eed55ade8f78ae1cf73b82df9d18629314945b
diff --git a/lang/smalltalk/patches/patch-ae b/lang/smalltalk/patches/patch-ae
index 5c0de379107..47b9d3ce6cf 100644
--- a/lang/smalltalk/patches/patch-ae
+++ b/lang/smalltalk/patches/patch-ae
@@ -1,21 +1,10 @@
-$NetBSD: patch-ae,v 1.6 2014/12/27 00:13:28 dholland Exp $
+$NetBSD: patch-ae,v 1.7 2017/12/29 03:56:42 dholland Exp $
 
-- add more functions to check for (XXX: why is half the line duplicated?)
 - update for readline API changes
 
---- configure.orig	2011-03-21 18:12:58.000000000 +0000
+--- configure.orig	2013-04-08 05:52:20.000000000 +0000
 +++ configure
-@@ -16069,7 +16069,8 @@ fi
- 
- for ac_func in putenv strdup strerror strsignal mkstemp getpagesize \
- 	getdtablesize strstr ftruncate floorl ceill sqrtl frexpl ldexpl asinl \
--	acosl atanl logl expl tanl sinl cosl powl truncl lrintl truncf lrintf \
-+	acosl atanl logl expl tanl sinl cosl truncl lrintl truncf lrintf \
-+	acosl atanl logl expl tanl sinl cosl powl trunc truncf truncl lrintl strsep strpbrk \
-         lrint trunc strsep strpbrk symlink mkdtemp
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-@@ -17737,7 +17738,7 @@ main()
+@@ -19012,7 +19012,7 @@ main()
  {
    rl_bind_key ('\t', rl_insert);
    /* This is missing in BSD libedit!  */
diff --git a/lang/smalltalk/patches/patch-ah b/lang/smalltalk/patches/patch-ah
index 87d66999393..fbd04f0fe91 100644
--- a/lang/smalltalk/patches/patch-ah
+++ b/lang/smalltalk/patches/patch-ah
@@ -1,10 +1,12 @@
-$NetBSD: patch-ah,v 1.4 2011/04/30 11:46:15 asau Exp $
+$NetBSD: patch-ah,v 1.5 2017/12/29 03:56:42 dholland Exp $
 
-Link against pthreads.
+- Link against pthreads.
+- Run paxctl +am after linking gst and gst-tool so they don't crash
+when subsequently run during the build.
 
---- Makefile.in.orig	2011-03-21 21:12:57.000000000 +0300
-+++ Makefile.in	2011-04-28 21:10:54.000000000 +0400
-@@ -525,14 +525,14 @@
+--- Makefile.in.orig	2013-04-08 05:52:22.000000000 +0000
++++ Makefile.in
+@@ -561,14 +561,14 @@ AM_CPPFLAGS = -I$(top_srcdir)/libgst -I$
  	-DCMD_XZIP="\"$(XZIP)\"" -DCMD_INSTALL="\"$(INSTALL)\"" \
  	-DCMD_LN_S="\"$(LN_S)\"" $(RELOC_CPPFLAGS) $(am__append_4)
  gst_SOURCES = main.c
@@ -22,3 +24,15 @@ Link against pthreads.
  winewrapper_SOURCES = winewrapper.c
  GST_EXTRA_TOOLS = gst-reload gst-sunit gst-blox gst-package gst-convert \
  	gst-doc gst-remote gst-profile gst-browser
+@@ -696,9 +696,11 @@ clean-noinstPROGRAMS:
+ gst$(EXEEXT): $(gst_OBJECTS) $(gst_DEPENDENCIES) $(EXTRA_gst_DEPENDENCIES) 
+ 	@rm -f gst$(EXEEXT)
+ 	$(gst_LINK) $(gst_OBJECTS) $(gst_LDADD) $(LIBS)
++	paxctl +am .libs/gst || true
+ gst-tool$(EXEEXT): $(gst_tool_OBJECTS) $(gst_tool_DEPENDENCIES) $(EXTRA_gst_tool_DEPENDENCIES) 
+ 	@rm -f gst-tool$(EXEEXT)
+ 	$(gst_tool_LINK) $(gst_tool_OBJECTS) $(gst_tool_LDADD) $(LIBS)
++	paxctl +am .libs/gst-tool || true
+ winewrapper$(EXEEXT): $(winewrapper_OBJECTS) $(winewrapper_DEPENDENCIES) $(EXTRA_winewrapper_DEPENDENCIES) 
+ 	@rm -f winewrapper$(EXEEXT)
+ 	$(LINK) $(winewrapper_OBJECTS) $(winewrapper_LDADD) $(LIBS)
diff --git a/lang/smalltalk/patches/patch-libgst_cint.c b/lang/smalltalk/patches/patch-libgst_cint.c
new file mode 100644
index 00000000000..5c38b1daa76
--- /dev/null
+++ b/lang/smalltalk/patches/patch-libgst_cint.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-libgst_cint.c,v 1.1 2017/12/29 03:56:42 dholland Exp $
+
+Need to declare environ these days to use it (properly this should
+be made to work some other way)... this may require refinement or
+ifdefs.
+
+--- libgst/cint.c~	2013-03-23 19:56:26.000000000 +0000
++++ libgst/cint.c
+@@ -396,6 +396,8 @@ my_putenv (const char *str)
+   return (putenv (clone));
+ }
+ 
++extern char **environ;
++
+ static char **
+ get_environ (void)
+ {