Update to SqueakVM 4.10.2.2614

Changes are not known, but it incorprorates some NetBSD fixes.

5 files changed, 17 insertions, 50 deletions

diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile
index 775541b3437..f9d239ba881 100644
--- a/lang/squeak-vm/Makefile
+++ b/lang/squeak-vm/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2012/10/23 10:24:08 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/29 07:33:40 asau Exp $
 #
 
-SQUEAK_VERSION=	3.11.3.2135
+SQUEAK_VERSION=	4.10.2.2614
 
 DISTNAME=	Squeak-${SQUEAK_VERSION}-src
 PKGNAME=	squeak-vm-${SQUEAK_VERSION:C/-/./}
-PKGREVISION=	12
 CATEGORIES=	lang
-MASTER_SITES=	http://ftp.squeak.org/3.10/unix-linux/ \
-		http://squeakvm.org/unix/release/
+MASTER_SITES=	http://squeakvm.org/unix/release/ \
+		http://ftp.squeak.org/3.10/unix-linux/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://squeakvm.org/unix/
diff --git a/lang/squeak-vm/PLIST b/lang/squeak-vm/PLIST
index 1282b7ab475..e6b85b60995 100644
--- a/lang/squeak-vm/PLIST
+++ b/lang/squeak-vm/PLIST
@@ -1,19 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2011/12/17 12:45:17 marino Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/29 07:33:40 asau Exp $
 bin/squeak
 bin/squeak.sh
+lib/squeak/${PKGVERSION}/ckformat
 lib/squeak/${PKGVERSION}/so.AioPlugin
 lib/squeak/${PKGVERSION}/so.B3DAcceleratorPlugin
 lib/squeak/${PKGVERSION}/so.ClipboardExtendedPlugin
 ${PLIST.pulse}lib/squeak/${PKGVERSION}/so.DBusPlugin
 lib/squeak/${PKGVERSION}/so.FileCopyPlugin
 lib/squeak/${PKGVERSION}/so.HostWindowPlugin
-lib/squeak/${PKGVERSION}/so.ImmX11Plugin
-lib/squeak/${PKGVERSION}/so.KedamaPlugin
-lib/squeak/${PKGVERSION}/so.KedamaPlugin2
-lib/squeak/${PKGVERSION}/so.MIDIPlugin
 lib/squeak/${PKGVERSION}/so.Mpeg3Plugin
-lib/squeak/${PKGVERSION}/so.OggPlugin
-lib/squeak/${PKGVERSION}/so.PseudoTTYPlugin
+lib/squeak/${PKGVERSION}/so.ScratchPlugin
 lib/squeak/${PKGVERSION}/so.Squeak3D
 lib/squeak/${PKGVERSION}/so.SqueakFFIPrims
 lib/squeak/${PKGVERSION}/so.UUIDPlugin
diff --git a/lang/squeak-vm/distinfo b/lang/squeak-vm/distinfo
index 825a7b656fa..6f27c51a2e2 100644
--- a/lang/squeak-vm/distinfo
+++ b/lang/squeak-vm/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.5 2012/10/20 22:12:30 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/10/29 07:33:40 asau Exp $
 
-SHA1 (squeak/Squeak-3.11.3.2135-src.tar.gz) = cdc033b14e56ea05aa62bcb1686bb73f4347e29f
-RMD160 (squeak/Squeak-3.11.3.2135-src.tar.gz) = abb7dbde7e79f18161842d1451959ad09e7ef3ad
-Size (squeak/Squeak-3.11.3.2135-src.tar.gz) = 3585556 bytes
+SHA1 (squeak/Squeak-4.10.2.2614-src.tar.gz) = bd807730537122b220840b4a89f04a6689f435c2
+RMD160 (squeak/Squeak-4.10.2.2614-src.tar.gz) = 8e8a94ef036aa9ca51ade7683c3c9c8844a56660
+Size (squeak/Squeak-4.10.2.2614-src.tar.gz) = 3297314 bytes
 SHA1 (patch-Cross_plugins_Mpeg3Plugin_libmpeg_audio_layer3.c) = 81539b093c78f88747da97f18f56f38223117a39
 SHA1 (patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_getpicture.c) = 19f0eabfcdc983d5e7c09db9081d0a01fe333798
 SHA1 (patch-Cross_plugins_Mpeg3Plugin_libmpeg_video_idct.c) = 2509f50f51671943df8b989e89a21408b08dbdc9
-SHA1 (patch-aa) = dfdb3be82288e8bd7658832e8dd91d242d2b97b2
+SHA1 (patch-aa) = 45f8ba1a89e12a4b3fb068049a5d193f8c0d7f9b
 SHA1 (patch-ab) = 019a6b1bc50e3abc500902a45edcd960b7708bf2
 SHA1 (patch-ac) = bad06ae257766407c90a62f5927a53c97ee8072a
 SHA1 (patch-ad) = e426d1de4b496704be08c67d2d2ab61a24735017
 SHA1 (patch-ae) = 73c358e42d153c9e6fe605fa1c77360ad48c6ec3
 SHA1 (patch-af) = 529550d988f5655791942145c79f5448431c04c4
-SHA1 (patch-ag) = 6c435d13b36c5308d516f35d4b3988dfecf2f91b
diff --git a/lang/squeak-vm/patches/patch-aa b/lang/squeak-vm/patches/patch-aa
index aa73dfcb9bf..b9323cba26e 100644
--- a/lang/squeak-vm/patches/patch-aa
+++ b/lang/squeak-vm/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $
+$NetBSD: patch-aa,v 1.2 2012/10/29 07:33:41 asau Exp $
 
 Adapt to hierarchy convention.
 
---- unix/vm/build.cmake.orig	2009-08-31 06:47:51.000000000 +0400
-+++ unix/vm/build.cmake	2010-01-17 04:13:35.000000000 +0300
-@@ -65,4 +65,4 @@
+--- unix/vm/build.cmake.orig	2012-09-17 01:03:14.000000000 +0000
++++ unix/vm/build.cmake
+@@ -90,4 +90,4 @@ ADD_CUSTOM_TARGET (squeak.1
    COMMAND sh ${bld}/config ${unix}/doc/squeak.1 ${bld}/squeak.1
  )
- ADD_DEPENDENCIES (squeakvm squeak.1)
+ ADD_DEPENDENCIES (squeakvm${scriptsuffix} squeak.1)
 -INSTALL (FILES ${bld}/squeak.1 DESTINATION share/man/man1)
 +INSTALL (FILES ${bld}/squeak.1 DESTINATION ${PKGMANDIR}/man1)
diff --git a/lang/squeak-vm/patches/patch-ag b/lang/squeak-vm/patches/patch-ag
deleted file mode 100644
index 1be7743eef4..00000000000
--- a/lang/squeak-vm/patches/patch-ag
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/01/18 15:28:13 asau Exp $
-
-Use uuidgen(2) on NetBSD.
-
---- unix/plugins/UUIDPlugin/sqUnixUUID.c.orig	2009-08-26 22:12:10.000000000 +0400
-+++ unix/plugins/UUIDPlugin/sqUnixUUID.c	2011-01-18 01:02:30.000000000 +0300
-@@ -1,4 +1,8 @@
- #include "config.h"
-+#if defined(__NetBSD__)
-+#include <sys/types.h>
-+#include <sys/uuid.h>
-+#endif
- #include <uuid.h>
- #include "sq.h"
- 
-@@ -15,7 +19,11 @@
- int MakeUUID(char *location)
- {
-   uuid_t uuid;
-+#if defined(__NetBSD__)
-+  uuidgen(&uuid, 1);
-+#else
-   uuid_generate(uuid);
-+#endif
-   memcpy((void *)location, (void *)&uuid, sizeof(uuid));
-   return 1;
- }