pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/squeak Update Squeak to 3.9-8.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/26096881a7b5
branches:  trunk
changeset: 537639:26096881a7b5
user:      bad <bad%pkgsrc.org@localhost>
date:      Sat Jan 12 23:30:38 2008 +0000

description:
Update Squeak to 3.9-8.
Based on patches by Brian de Alwis in PR pkg/37522.
Don't include aio.h in patch-ak, it is not needed.
Don't require bash for npsqueakrun yet.  There is more work to do to
make the nsqueak plugin work.

Changes since 3.6-3:

*2006-10-10*    3.9-8 released. <release/RELEASE_NOTES_3.9-8> ALSA support
for Linux. Problems with iconv() fixed on Solaris.
*2006-04-24*    3.9-7 released. <release/RELEASE_NOTES_3.9-7>
Modifications to the mechanism the VM uses to relinquish the processor
for very short intervals to avoid high CPU loads while idling.
UUIDPlugin is now external to prevent the VM failing to run when libuuid
is missing or uncooperative. AioPlugin is bundled. Aliases are resolved
in path names on OS X.
*2006-04-19*    3.9-4 released. <release/RELEASE_NOTES_3.9-4> KeyUp events
are no longer reported for autorepeats under X11. Improvements to socket
latency. Security plugin now obeys SQUEAK_USERDIR if set. OSProcess and
XDisplayControl plugins updated from current distributions and bundled.
The 3.9 Unix VMs are now fully compatible with Croquet and will run both
Squeak and Croquet images. Additional plugins required for Croquet are
now supported and bundled in both source and binary releases:
CroquetPlugin, FloatMathPlugin and UUIDPlugin.
*2004-04-06*    3.7-7 released. <release/RELEASE_NOTES_3.7-7>
Documentation updated to reflect recent organisational changes. 'gnuify'
no longer requires gawk. Obscure bug in socket option lookup fixed.
NPSqueak changes from Bert (SQUEAK_USERDIR environment variable
overrides 'My Squeak', plus several bug fixes). Event code updated for
recent changes to event structures. README, manual page, and how-to
documentation updated and revised. Instructions for SVN checkout added.
'Easy build' route for checked-out SVN repository sources added. Browser
plugin now supports imageName and failureUrl attributes within <embed
...> tag. Preliminary support for XDND-based drag-and-drop (Gnome, KDE,
etc.) in the X11 display driver. New flag '-glxdebug <n>' prints OpenGL
diagnostics in X11 display driver. Interpreter should no longer crash
when loading image segments into memory above the 2GB boundary (thanks
to Ned Konz). Additional checks for bad external data in SocketPlugin.
Less inappropriate noise when probing for external plugins. Problems
preventing more than one external plugin from loading in Mac OS X fixed.

diffstat:

 lang/squeak/Makefile         |  29 ++++++++++++++++-------------
 lang/squeak/PLIST            |  35 +++++++++++++++++++----------------
 lang/squeak/distinfo         |  29 ++++++++++++++---------------
 lang/squeak/patches/patch-ab |  14 +++++++-------
 lang/squeak/patches/patch-ad |  14 +++++++-------
 lang/squeak/patches/patch-ag |  18 +++++++++---------
 lang/squeak/patches/patch-ah |  16 ++++++++--------
 lang/squeak/patches/patch-ak |   8 ++++----
 lang/squeak/patches/patch-am |  40 ++++++++++++++++++++++++++++++++++++++++
 lang/squeak/patches/patch-an |  13 +++++++++++++
 10 files changed, 137 insertions(+), 79 deletions(-)

diffs (truncated from 351 to 300 lines):

diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/Makefile
--- a/lang/squeak/Makefile      Sat Jan 12 22:44:10 2008 +0000
+++ b/lang/squeak/Makefile      Sat Jan 12 23:30:38 2008 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.33 2007/12/12 20:42:34 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2008/01/12 23:30:38 bad Exp $
 #
 
-DISTNAME=      Squeak-3.6-3
-PKGNAME=       squeak-3.6.3
-PKGREVISION=   2
+DISTNAME=      Squeak-3.9-8
+PKGNAME=       squeak-3.9.8
 CATEGORIES=    lang
-MASTER_SITES=  http://squeakvm.org/unix/release/
-DISTFILES=     Squeak-3.6-3.src.tar.gz Squeak-3.6-5429.image.tar.gz
-DISTFILES+=    Squeak-3.sources.tar.gz
+MASTER_SITES=  http://ftp.squeak.org/3.9/unix-linux/
+DISTFILES=     Squeak-3.9-8.src.tar.gz
+DISTFILES+=    Squeak3.9-final-7067.zip
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://squeakvm.org/unix/
@@ -17,7 +16,7 @@
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_TOOLS+=    automake14
+USE_TOOLS+=    automake14 gmake gzip
 
 AUTOCONF_REQD= 2.57
 AUTOMAKE_REQD= 1.4.6
@@ -29,21 +28,25 @@
 
 ONLY_FOR_PLATFORM=     NetBSD-*-*
 
-SQUEAK_CHANGES= ${DISTNAME}/usr/local/lib/squeak/Squeak3.6-5429.changes.gz
-SQUEAK_IMAGE=  ${DISTNAME}/usr/local/lib/squeak/Squeak3.6-5429.image.gz
-SQUEAK_SOURCES=        Squeak-3/usr/local/lib/squeak/SqueakV3.sources
+SQUEAK_CHANGES= Squeak3.9-final-7067/Squeak3.9-final-7067.changes.gz
+SQUEAK_IMAGE=  Squeak3.9-final-7067/Squeak3.9-final-7067.image.gz
+SQUEAK_SOURCES=        Squeak3.9-final-7067/SqueakV39.sources
 
 INSTALLATION_DIRS=     bin lib/squeak
 INSTALL_ENV+=  ROOT=${DESTDIR:Q}
 
+post-extract:
+       ${GZIP_CMD} ${WRKDIR}/${SQUEAK_IMAGE:S/.gz$//W}
+       ${GZIP_CMD} ${WRKDIR}/${SQUEAK_CHANGES:S/.gz$//W}
+
 pre-configure:
        cd ${WRKSRC}/platforms/unix/config                              \
            && ${SETENV} PATH=${PREFIX}/bin:${PATH} ${MAKE} configure
        ${MKDIR} ${CONFIGURE_DIRS}
 
 post-install:
-       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES} ${DESTDIR}${PREFIX}/lib/squeak/
-       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE} ${DESTDIR}${PREFIX}/lib/squeak/
+       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES}.gz ${DESTDIR}${PREFIX}/lib/squeak/
+       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE}.gz ${DESTDIR}${PREFIX}/lib/squeak/
        ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${DESTDIR}${PREFIX}/lib/squeak/
        cd ${DESTDIR}${PREFIX}/lib/squeak                                               \
            && ${LN} -s ${SQUEAK_CHANGES:C/.*\///} squeak.changes.gz    \
diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/PLIST
--- a/lang/squeak/PLIST Sat Jan 12 22:44:10 2008 +0000
+++ b/lang/squeak/PLIST Sat Jan 12 23:30:38 2008 +0000
@@ -1,21 +1,24 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/26 07:10:16 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/01/12 23:30:38 bad Exp $
 bin/inisqueak
 bin/squeak
-lib/squeak/3.6-3/B3DAcceleratorPlugin
-lib/squeak/3.6-3/UnixOSProcessPlugin
-lib/squeak/3.6-3/XDisplayControlPlugin
-lib/squeak/3.6-3/npsqueak.so
-lib/squeak/3.6-3/npsqueakrun
-lib/squeak/3.6-3/squeak
-lib/squeak/3.6-3/vm-display-X11
-lib/squeak/3.6-3/vm-display-null
-lib/squeak/3.6-3/vm-sound-NAS
-lib/squeak/3.6-3/vm-sound-NetBSD
-lib/squeak/3.6-3/vm-sound-null
-lib/squeak/Squeak3.6-5429.changes.gz
-lib/squeak/Squeak3.6-5429.image.gz
-lib/squeak/SqueakV3.sources
+lib/squeak/3.9-8/AioPlugin
+lib/squeak/3.9-8/B3DAcceleratorPlugin
+lib/squeak/3.9-8/PseudoTTYPlugin
+lib/squeak/3.9-8/Squeak3D
+lib/squeak/3.9-8/UnixOSProcessPlugin
+lib/squeak/3.9-8/XDisplayControlPlugin
+lib/squeak/3.9-8/npsqueak.so
+lib/squeak/3.9-8/squeak
+lib/squeak/3.9-8/vm-display-X11
+lib/squeak/3.9-8/vm-display-null
+lib/squeak/3.9-8/vm-sound-NAS
+lib/squeak/3.9-8/vm-sound-${OPSYS}
+lib/squeak/3.9-8/vm-sound-null
+lib/squeak/Squeak3.9-final-7067.changes.gz
+lib/squeak/Squeak3.9-final-7067.image.gz
+lib/squeak/SqueakV39.sources
 lib/squeak/npsqueakregister
+lib/squeak/npsqueakrun
 lib/squeak/squeak.changes.gz
 lib/squeak/squeak.image.gz
 man/man1/inisqueak.1
@@ -27,5 +30,5 @@
 share/doc/squeak/README.Keyboard
 share/doc/squeak/README.Sound
 @dirrm share/doc/squeak
-@dirrm lib/squeak/3.6-3
+@dirrm lib/squeak/3.9-8
 @dirrm lib/squeak
diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/distinfo
--- a/lang/squeak/distinfo      Sat Jan 12 22:44:10 2008 +0000
+++ b/lang/squeak/distinfo      Sat Jan 12 23:30:38 2008 +0000
@@ -1,23 +1,22 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 09:03:11 agc Exp $
+$NetBSD: distinfo,v 1.11 2008/01/12 23:30:38 bad Exp $
 
-SHA1 (squeak/Squeak-3.6-3.src.tar.gz) = 9631fd9778bea45bedddc878a7132d46936d8148
-RMD160 (squeak/Squeak-3.6-3.src.tar.gz) = 61b7758afce0182fd5f7295204854a6636449b49
-Size (squeak/Squeak-3.6-3.src.tar.gz) = 2552981 bytes
-SHA1 (squeak/Squeak-3.6-5429.image.tar.gz) = 60900eafcd755bd1a898758615045b806f27bd48
-RMD160 (squeak/Squeak-3.6-5429.image.tar.gz) = 7d74b7128a833c3ba736d86ccf16c25383406c90
-Size (squeak/Squeak-3.6-5429.image.tar.gz) = 7756686 bytes
-SHA1 (squeak/Squeak-3.sources.tar.gz) = 0a265f5c631970fe39a483967dab39c26304092c
-RMD160 (squeak/Squeak-3.sources.tar.gz) = 9045f144270fddfc65704cfb73a846bc8635710b
-Size (squeak/Squeak-3.sources.tar.gz) = 4184537 bytes
+SHA1 (squeak/Squeak-3.9-8.src.tar.gz) = 9d8b88de09b07a6603cea7447cd3cdfe6c23d463
+RMD160 (squeak/Squeak-3.9-8.src.tar.gz) = d97bc098a3a948edc59c522e8a8baeda97fd9de9
+Size (squeak/Squeak-3.9-8.src.tar.gz) = 4158596 bytes
+SHA1 (squeak/Squeak3.9-final-7067.zip) = 5f6d3c2419f1979bb88f046621a2c7cbf270684c
+RMD160 (squeak/Squeak3.9-final-7067.zip) = c2d78cbe0a4b7e4e6cd13a09f80a54e73f28cf8c
+Size (squeak/Squeak3.9-final-7067.zip) = 11842207 bytes
 SHA1 (patch-aa) = fdb5b9c06e02056d1c52344c1e5577ac9d09a5e6
-SHA1 (patch-ab) = ae371a47efb513721b19990ebd2a8ebec78bd89e
+SHA1 (patch-ab) = f0f2383208e48a33eac912d2c84c731a65a4e4b3
 SHA1 (patch-ac) = 38eb12424792eba344c4963132012aa90c70dd8d
-SHA1 (patch-ad) = e70f82454c74ca93f2e448ce055a72130f59dc8f
+SHA1 (patch-ad) = 9acec5fd3cd8677cf3c01aa971a1b882401ed59b
 SHA1 (patch-ae) = 54e06ce67bbe71280e846dfbb81e7ebd6becd3f7
 SHA1 (patch-af) = 41561264023700df277d81f528c9dad42a11e31f
-SHA1 (patch-ag) = e45917200167817c134eb51cf424179569bb7952
-SHA1 (patch-ah) = 112dac126b8d18d645c4c83184888412a571f5ec
+SHA1 (patch-ag) = a84c1ce978f473fde2b96298bb65c500252da479
+SHA1 (patch-ah) = b366ba8454e1bc5f182c51f6b39d7621498ee063
 SHA1 (patch-ai) = 8ca9289dea3484205b65759f2aa052d57d6af2ee
 SHA1 (patch-aj) = 18d81c878ee88bf334e3700d46d66dfa458618d0
-SHA1 (patch-ak) = 25cb1f447a6f3c247a301a4a6d02c25028cb1b70
+SHA1 (patch-ak) = fabbf4d71aaa39fb77d2b51a6e0402500d825009
 SHA1 (patch-al) = d58a1800600ff1a124c3db7aa382b085218160f3
+SHA1 (patch-am) = a302a00bceff51e43b2af3299433f710917526c3
+SHA1 (patch-an) = ab36cdee3ecf1b374ce75780d310596cefe40152
diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/patches/patch-ab
--- a/lang/squeak/patches/patch-ab      Sat Jan 12 22:44:10 2008 +0000
+++ b/lang/squeak/patches/patch-ab      Sat Jan 12 23:30:38 2008 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2004/04/26 07:10:16 fredb Exp $
+$NetBSD: patch-ab,v 1.6 2008/01/12 23:30:38 bad Exp $
 
---- platforms/unix/config/Makefile.install     2004-04-01 20:17:33.000000000 -0600
-+++ platforms/unix/config/Makefile.install     2004-04-25 21:38:16.000000000 -0500
-@@ -63,7 +63,7 @@
+--- platforms/unix/config/Makefile.install.orig        2006-10-10 13:01:45.000000000 -0600
++++ platforms/unix/config/Makefile.install
+@@ -65,7 +65,7 @@ install-doc : squeak.1
          echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \
          $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \
        done
--      gzip -f9 $(ROOT)$(docdir)/*
-+      #gzip -f9 $(ROOT)$(docdir)/*
+-      -gzip -f9 $(ROOT)$(docdir)/*
++      #-gzip -f9 $(ROOT)$(docdir)/*
        $(MKINSTALLDIRS) $(ROOT)$(mandir)/man1
        $(INSTALL_DATA) squeak.1 $(ROOT)$(mandir)/man1
-       rm -f $(ROOT)$(mandir)/man1/inisqueak.1
+       rm -f $(ROOT)$(mandir)/man1/inisqueak.1 $(ROOT)$(mandir)/man1/inisqueak.1.gz
diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/patches/patch-ad
--- a/lang/squeak/patches/patch-ad      Sat Jan 12 22:44:10 2008 +0000
+++ b/lang/squeak/patches/patch-ad      Sat Jan 12 23:30:38 2008 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.2 2004/04/26 07:10:16 fredb Exp $
+$NetBSD: patch-ad,v 1.3 2008/01/12 23:30:38 bad Exp $
 
---- platforms/unix/config/configure.ac 2004-04-01 06:57:04.000000000 -0600
-+++ platforms/unix/config/configure.ac 2004-04-25 15:08:29.000000000 -0500
-@@ -161,6 +161,7 @@
- AC_HAVE_HEADERS(features.h)
+--- platforms/unix/config/configure.ac.orig    2006-10-10 13:01:45.000000000 -0600
++++ platforms/unix/config/configure.ac
+@@ -178,6 +178,7 @@ AC_HAVE_HEADERS(features.h)
+ AC_HAVE_HEADERS(alloca.h) # SunOS5
  AC_HEADER_TIME
  AC_HEADER_DIRENT
 +AC_HAVE_HEADERS(sys/audioio.h)
  
- AC_STRUCT_TIMEZONE
- 
+ if test -f "${vmmdir}/vm/interp.h"; then
+   AC_DEFINE(HAVE_INTERP_H, 1)
diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/patches/patch-ag
--- a/lang/squeak/patches/patch-ag      Sat Jan 12 22:44:10 2008 +0000
+++ b/lang/squeak/patches/patch-ag      Sat Jan 12 23:30:38 2008 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.2 2004/04/26 07:10:16 fredb Exp $
+$NetBSD: patch-ag,v 1.3 2008/01/12 23:30:38 bad Exp $
 
---- platforms/unix/vm/sqUnixCharConv.c 2003-11-18 12:30:32.000000000 -0600
-+++ platforms/unix/vm/sqUnixCharConv.c 2004-04-25 15:02:13.000000000 -0500
-@@ -151,14 +151,18 @@
+--- platforms/unix/vm/sqUnixCharConv.c.orig    2007-12-06 18:28:07.000000000 -0600
++++ platforms/unix/vm/sqUnixCharConv.c
+@@ -151,14 +151,18 @@ int convertChars(char *from, int fromLen
  
  typedef char ichar_t;
  
--#ifdef __sparc
-+#if defined(__sparc) && !defined(__NetBSD__)
+-#ifdef __sun__
++#if defined(__sun__) && !defined(__NetBSD__)  /* is __NetBSD__ necc with __sun__? */
  void *sqTextEncoding= (void *)"mac";          /* xxxFIXME -> "ISO-8859-15" */ 
- void *uxPathEncoding= (void *)"iso";
- void *uxTextEncoding= (void *)"iso";
- void *uxXWinEncoding= (void *)"iso";
+ void *uxPathEncoding= (void *)"iso5";
+ void *uxTextEncoding= (void *)"iso5";
+ void *uxXWinEncoding= (void *)"iso5";
  void *uxUTF8Encoding= (void *)"UTF-8";
  #else
 +#ifdef __NetBSD__
diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/patches/patch-ah
--- a/lang/squeak/patches/patch-ah      Sat Jan 12 22:44:10 2008 +0000
+++ b/lang/squeak/patches/patch-ah      Sat Jan 12 23:30:38 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/04/26 07:10:16 fredb Exp $
+$NetBSD: patch-ah,v 1.2 2008/01/12 23:30:38 bad Exp $
 
---- platforms/unix/vm/sqUnixMain.c     2003-11-23 06:23:43.000000000 -0600
-+++ platforms/unix/vm/sqUnixMain.c     2004-04-25 21:29:44.000000000 -0500
-@@ -62,7 +62,7 @@
+--- platforms/unix/vm/sqUnixMain.c.orig        2006-10-10 20:38:14.000000000 -0600
++++ platforms/unix/vm/sqUnixMain.c
+@@ -63,7 +63,7 @@
  #include <signal.h>
  #include <fcntl.h>
  
@@ -11,15 +11,15 @@
  # include <sys/sysinfo.h>
  # include <sys/proc.h>
  #endif
-@@ -677,6 +677,7 @@
-   { &soundModule,   "sound",   "NAS"    },    /*** NO DEFAULT ***/
+@@ -685,6 +685,7 @@ static struct moduleDescription moduleDe
+   /* defaults */
    { &displayModule, "display", "Quartz" },
    { &soundModule,   "sound",   "MacOSX" },
 +  { &soundModule,   "sound",   "NetBSD" },
    { &soundModule,   "sound",   "Sun"    },
-   { &soundModule,   "sound",   "OSS"    },
+   { &soundModule,   "sound",   "ALSA"   },
    { &soundModule,   "sound",   "null"   },
-@@ -1275,7 +1276,7 @@
+@@ -1306,7 +1307,7 @@ int main(int argc, char **argv, char **e
  
    signal(SIGSEGV, sigsegv);
  
diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/patches/patch-ak
--- a/lang/squeak/patches/patch-ak      Sat Jan 12 22:44:10 2008 +0000
+++ b/lang/squeak/patches/patch-ak      Sat Jan 12 23:30:38 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1 2004/04/26 07:10:16 fredb Exp $
+$NetBSD: patch-ak,v 1.2 2008/01/12 23:30:38 bad Exp $
 
---- platforms/unix/vm-sound-NetBSD/sqUnixSoundNetBSD.c 1969-12-31 18:00:00.000000000 -0600
-+++ platforms/unix/vm-sound-NetBSD/sqUnixSoundNetBSD.c 2004-04-25 15:05:47.000000000 -0500
+--- platforms/unix/vm-sound-NetBSD/sqUnixSoundNetBSD.c.orig    2007-12-06 18:47:09.000000000 -0600
++++ platforms/unix/vm-sound-NetBSD/sqUnixSoundNetBSD.c
 @@ -0,0 +1,378 @@
 +/* sqUnixSoundNetBSD.c -- sound support for NetBSD
 + *
@@ -41,7 +41,7 @@
 + */
 +
 +#include "sq.h"
-+#include "aio.h"
++#include "sqaio.h"
 +
 +#include <stdio.h>
 +#include <unistd.h>
diff -r dc6f78dc669d -r 26096881a7b5 lang/squeak/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/squeak/patches/patch-am      Sat Jan 12 23:30:38 2008 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-am,v 1.1 2008/01/12 23:30:38 bad Exp $
+
+--- platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c.orig  2007-12-06 19:11:42.000000000 -0600
++++ platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
+@@ -1870,7 +1870,7 @@ EXPORT(sqInt) primitiveLockFileRegion(vo
+ 



Home | Main Index | Thread Index | Old Index