Sat Jan 12 23:30:39 2008 UTC ()
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.


(bad)
diff -r1.33 -r1.34 pkgsrc/lang/squeak/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/squeak/PLIST
diff -r1.10 -r1.11 pkgsrc/lang/squeak/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/squeak/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/lang/squeak/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/lang/squeak/patches/patch-ag
diff -r1.1 -r1.2 pkgsrc/lang/squeak/patches/patch-ah
diff -r1.1 -r1.2 pkgsrc/lang/squeak/patches/patch-ak
diff -r0 -r1.1 pkgsrc/lang/squeak/patches/patch-am
diff -r0 -r1.1 pkgsrc/lang/squeak/patches/patch-an

cvs diff -r1.33 -r1.34 pkgsrc/lang/squeak/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/squeak/Makefile 2007/12/12 20:42:34 1.33
+++ pkgsrc/lang/squeak/Makefile 2008/01/12 23:30:38 1.34
@@ -1,59 +1,62 @@ @@ -1,59 +1,62 @@
1# $NetBSD: Makefile,v 1.33 2007/12/12 20:42:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2008/01/12 23:30:38 bad Exp $
2# 2#
3 3
4DISTNAME= Squeak-3.6-3 4DISTNAME= Squeak-3.9-8
5PKGNAME= squeak-3.6.3 5PKGNAME= squeak-3.9.8
6PKGREVISION= 2 
7CATEGORIES= lang 6CATEGORIES= lang
8MASTER_SITES= http://squeakvm.org/unix/release/ 7MASTER_SITES= http://ftp.squeak.org/3.9/unix-linux/
9DISTFILES= Squeak-3.6-3.src.tar.gz Squeak-3.6-5429.image.tar.gz 8DISTFILES= Squeak-3.9-8.src.tar.gz
10DISTFILES+= Squeak-3.sources.tar.gz 9DISTFILES+= Squeak3.9-final-7067.zip
11 10
12MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://squeakvm.org/unix/ 12HOMEPAGE= http://squeakvm.org/unix/
14COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows 13COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows
15 14
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20USE_TOOLS+= automake14 19USE_TOOLS+= automake14 gmake gzip
21 20
22AUTOCONF_REQD= 2.57 21AUTOCONF_REQD= 2.57
23AUTOMAKE_REQD= 1.4.6 22AUTOMAKE_REQD= 1.4.6
24 23
25BUILD_DIRS= ${WRKDIR}/build 24BUILD_DIRS= ${WRKDIR}/build
26CONFIGURE_DIRS= ${WRKDIR}/build 25CONFIGURE_DIRS= ${WRKDIR}/build
27CONFIGURE_SCRIPT= ${WRKSRC}/platforms/unix/config/configure 26CONFIGURE_SCRIPT= ${WRKSRC}/platforms/unix/config/configure
28DIST_SUBDIR= squeak 27DIST_SUBDIR= squeak
29 28
30ONLY_FOR_PLATFORM= NetBSD-*-* 29ONLY_FOR_PLATFORM= NetBSD-*-*
31 30
32SQUEAK_CHANGES= ${DISTNAME}/usr/local/lib/squeak/Squeak3.6-5429.changes.gz 31SQUEAK_CHANGES= Squeak3.9-final-7067/Squeak3.9-final-7067.changes.gz
33SQUEAK_IMAGE= ${DISTNAME}/usr/local/lib/squeak/Squeak3.6-5429.image.gz 32SQUEAK_IMAGE= Squeak3.9-final-7067/Squeak3.9-final-7067.image.gz
34SQUEAK_SOURCES= Squeak-3/usr/local/lib/squeak/SqueakV3.sources 33SQUEAK_SOURCES= Squeak3.9-final-7067/SqueakV39.sources
35 34
36INSTALLATION_DIRS= bin lib/squeak 35INSTALLATION_DIRS= bin lib/squeak
37INSTALL_ENV+= ROOT=${DESTDIR:Q} 36INSTALL_ENV+= ROOT=${DESTDIR:Q}
38 37
 38post-extract:
 39 ${GZIP_CMD} ${WRKDIR}/${SQUEAK_IMAGE:S/.gz$//W}
 40 ${GZIP_CMD} ${WRKDIR}/${SQUEAK_CHANGES:S/.gz$//W}
 41
39pre-configure: 42pre-configure:
40 cd ${WRKSRC}/platforms/unix/config \ 43 cd ${WRKSRC}/platforms/unix/config \
41 && ${SETENV} PATH=${PREFIX}/bin:${PATH} ${MAKE} configure 44 && ${SETENV} PATH=${PREFIX}/bin:${PATH} ${MAKE} configure
42 ${MKDIR} ${CONFIGURE_DIRS} 45 ${MKDIR} ${CONFIGURE_DIRS}
43 46
44post-install: 47post-install:
45 ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES} ${DESTDIR}${PREFIX}/lib/squeak/ 48 ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES}.gz ${DESTDIR}${PREFIX}/lib/squeak/
46 ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE} ${DESTDIR}${PREFIX}/lib/squeak/ 49 ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE}.gz ${DESTDIR}${PREFIX}/lib/squeak/
47 ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${DESTDIR}${PREFIX}/lib/squeak/ 50 ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${DESTDIR}${PREFIX}/lib/squeak/
48 cd ${DESTDIR}${PREFIX}/lib/squeak \ 51 cd ${DESTDIR}${PREFIX}/lib/squeak \
49 && ${LN} -s ${SQUEAK_CHANGES:C/.*\///} squeak.changes.gz \ 52 && ${LN} -s ${SQUEAK_CHANGES:C/.*\///} squeak.changes.gz \
50 && ${LN} -s ${SQUEAK_IMAGE:C/.*\///} squeak.image.gz 53 && ${LN} -s ${SQUEAK_IMAGE:C/.*\///} squeak.image.gz
51 ${INSTALL_SCRIPT} ${WRKDIR}/build/inisqueak ${DESTDIR}${PREFIX}/bin 54 ${INSTALL_SCRIPT} ${WRKDIR}/build/inisqueak ${DESTDIR}${PREFIX}/bin
52 55
53.include "../../mk/bsd.prefs.mk" 56.include "../../mk/bsd.prefs.mk"
54 57
55.if ${MACHINE_ARCH} == i386 58.if ${MACHINE_ARCH} == i386
56CONFIGURE_ARGS+= --enable-mpg-mmx 59CONFIGURE_ARGS+= --enable-mpg-mmx
57.endif 60.endif
58 61
59CONFIGURE_ARGS+= --x-libraries=${X11BASE} 62CONFIGURE_ARGS+= --x-libraries=${X11BASE}

cvs diff -r1.2 -r1.3 pkgsrc/lang/squeak/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/squeak/PLIST 2004/04/26 07:10:16 1.2
+++ pkgsrc/lang/squeak/PLIST 2008/01/12 23:30:38 1.3
@@ -1,31 +1,34 @@ @@ -1,31 +1,34 @@
1@comment $NetBSD: PLIST,v 1.2 2004/04/26 07:10:16 fredb Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/01/12 23:30:38 bad Exp $
2bin/inisqueak 2bin/inisqueak
3bin/squeak 3bin/squeak
4lib/squeak/3.6-3/B3DAcceleratorPlugin 4lib/squeak/3.9-8/AioPlugin
5lib/squeak/3.6-3/UnixOSProcessPlugin 5lib/squeak/3.9-8/B3DAcceleratorPlugin
6lib/squeak/3.6-3/XDisplayControlPlugin 6lib/squeak/3.9-8/PseudoTTYPlugin
7lib/squeak/3.6-3/npsqueak.so 7lib/squeak/3.9-8/Squeak3D
8lib/squeak/3.6-3/npsqueakrun 8lib/squeak/3.9-8/UnixOSProcessPlugin
9lib/squeak/3.6-3/squeak 9lib/squeak/3.9-8/XDisplayControlPlugin
10lib/squeak/3.6-3/vm-display-X11 10lib/squeak/3.9-8/npsqueak.so
11lib/squeak/3.6-3/vm-display-null 11lib/squeak/3.9-8/squeak
12lib/squeak/3.6-3/vm-sound-NAS 12lib/squeak/3.9-8/vm-display-X11
13lib/squeak/3.6-3/vm-sound-NetBSD 13lib/squeak/3.9-8/vm-display-null
14lib/squeak/3.6-3/vm-sound-null 14lib/squeak/3.9-8/vm-sound-NAS
15lib/squeak/Squeak3.6-5429.changes.gz 15lib/squeak/3.9-8/vm-sound-${OPSYS}
16lib/squeak/Squeak3.6-5429.image.gz 16lib/squeak/3.9-8/vm-sound-null
17lib/squeak/SqueakV3.sources 17lib/squeak/Squeak3.9-final-7067.changes.gz
 18lib/squeak/Squeak3.9-final-7067.image.gz
 19lib/squeak/SqueakV39.sources
18lib/squeak/npsqueakregister 20lib/squeak/npsqueakregister
 21lib/squeak/npsqueakrun
19lib/squeak/squeak.changes.gz 22lib/squeak/squeak.changes.gz
20lib/squeak/squeak.image.gz 23lib/squeak/squeak.image.gz
21man/man1/inisqueak.1 24man/man1/inisqueak.1
22man/man1/squeak.1 25man/man1/squeak.1
23share/doc/squeak/COPYING 26share/doc/squeak/COPYING
24share/doc/squeak/COPYRIGHT 27share/doc/squeak/COPYRIGHT
25share/doc/squeak/LICENSE 28share/doc/squeak/LICENSE
26share/doc/squeak/README.Contributing 29share/doc/squeak/README.Contributing
27share/doc/squeak/README.Keyboard 30share/doc/squeak/README.Keyboard
28share/doc/squeak/README.Sound 31share/doc/squeak/README.Sound
29@dirrm share/doc/squeak 32@dirrm share/doc/squeak
30@dirrm lib/squeak/3.6-3 33@dirrm lib/squeak/3.9-8
31@dirrm lib/squeak 34@dirrm lib/squeak

cvs diff -r1.10 -r1.11 pkgsrc/lang/squeak/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/squeak/distinfo 2005/02/24 09:03:11 1.10
+++ pkgsrc/lang/squeak/distinfo 2008/01/12 23:30:38 1.11
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1$NetBSD: distinfo,v 1.10 2005/02/24 09:03:11 agc Exp $ 1$NetBSD: distinfo,v 1.11 2008/01/12 23:30:38 bad Exp $
2 2
3SHA1 (squeak/Squeak-3.6-3.src.tar.gz) = 9631fd9778bea45bedddc878a7132d46936d8148 3SHA1 (squeak/Squeak-3.9-8.src.tar.gz) = 9d8b88de09b07a6603cea7447cd3cdfe6c23d463
4RMD160 (squeak/Squeak-3.6-3.src.tar.gz) = 61b7758afce0182fd5f7295204854a6636449b49 4RMD160 (squeak/Squeak-3.9-8.src.tar.gz) = d97bc098a3a948edc59c522e8a8baeda97fd9de9
5Size (squeak/Squeak-3.6-3.src.tar.gz) = 2552981 bytes 5Size (squeak/Squeak-3.9-8.src.tar.gz) = 4158596 bytes
6SHA1 (squeak/Squeak-3.6-5429.image.tar.gz) = 60900eafcd755bd1a898758615045b806f27bd48 6SHA1 (squeak/Squeak3.9-final-7067.zip) = 5f6d3c2419f1979bb88f046621a2c7cbf270684c
7RMD160 (squeak/Squeak-3.6-5429.image.tar.gz) = 7d74b7128a833c3ba736d86ccf16c25383406c90 7RMD160 (squeak/Squeak3.9-final-7067.zip) = c2d78cbe0a4b7e4e6cd13a09f80a54e73f28cf8c
8Size (squeak/Squeak-3.6-5429.image.tar.gz) = 7756686 bytes 8Size (squeak/Squeak3.9-final-7067.zip) = 11842207 bytes
9SHA1 (squeak/Squeak-3.sources.tar.gz) = 0a265f5c631970fe39a483967dab39c26304092c 
10RMD160 (squeak/Squeak-3.sources.tar.gz) = 9045f144270fddfc65704cfb73a846bc8635710b 
11Size (squeak/Squeak-3.sources.tar.gz) = 4184537 bytes 
12SHA1 (patch-aa) = fdb5b9c06e02056d1c52344c1e5577ac9d09a5e6 9SHA1 (patch-aa) = fdb5b9c06e02056d1c52344c1e5577ac9d09a5e6
13SHA1 (patch-ab) = ae371a47efb513721b19990ebd2a8ebec78bd89e 10SHA1 (patch-ab) = f0f2383208e48a33eac912d2c84c731a65a4e4b3
14SHA1 (patch-ac) = 38eb12424792eba344c4963132012aa90c70dd8d 11SHA1 (patch-ac) = 38eb12424792eba344c4963132012aa90c70dd8d
15SHA1 (patch-ad) = e70f82454c74ca93f2e448ce055a72130f59dc8f 12SHA1 (patch-ad) = 9acec5fd3cd8677cf3c01aa971a1b882401ed59b
16SHA1 (patch-ae) = 54e06ce67bbe71280e846dfbb81e7ebd6becd3f7 13SHA1 (patch-ae) = 54e06ce67bbe71280e846dfbb81e7ebd6becd3f7
17SHA1 (patch-af) = 41561264023700df277d81f528c9dad42a11e31f 14SHA1 (patch-af) = 41561264023700df277d81f528c9dad42a11e31f
18SHA1 (patch-ag) = e45917200167817c134eb51cf424179569bb7952 15SHA1 (patch-ag) = a84c1ce978f473fde2b96298bb65c500252da479
19SHA1 (patch-ah) = 112dac126b8d18d645c4c83184888412a571f5ec 16SHA1 (patch-ah) = b366ba8454e1bc5f182c51f6b39d7621498ee063
20SHA1 (patch-ai) = 8ca9289dea3484205b65759f2aa052d57d6af2ee 17SHA1 (patch-ai) = 8ca9289dea3484205b65759f2aa052d57d6af2ee
21SHA1 (patch-aj) = 18d81c878ee88bf334e3700d46d66dfa458618d0 18SHA1 (patch-aj) = 18d81c878ee88bf334e3700d46d66dfa458618d0
22SHA1 (patch-ak) = 25cb1f447a6f3c247a301a4a6d02c25028cb1b70 19SHA1 (patch-ak) = fabbf4d71aaa39fb77d2b51a6e0402500d825009
23SHA1 (patch-al) = d58a1800600ff1a124c3db7aa382b085218160f3 20SHA1 (patch-al) = d58a1800600ff1a124c3db7aa382b085218160f3
 21SHA1 (patch-am) = a302a00bceff51e43b2af3299433f710917526c3
 22SHA1 (patch-an) = ab36cdee3ecf1b374ce75780d310596cefe40152

cvs diff -r1.5 -r1.6 pkgsrc/lang/squeak/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/lang/squeak/patches/Attic/patch-ab 2004/04/26 07:10:16 1.5
+++ pkgsrc/lang/squeak/patches/Attic/patch-ab 2008/01/12 23:30:38 1.6
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ab,v 1.5 2004/04/26 07:10:16 fredb Exp $ 1$NetBSD: patch-ab,v 1.6 2008/01/12 23:30:38 bad Exp $
2 2
3--- platforms/unix/config/Makefile.install 2004-04-01 20:17:33.000000000 -0600 3--- platforms/unix/config/Makefile.install.orig 2006-10-10 13:01:45.000000000 -0600
4+++ platforms/unix/config/Makefile.install 2004-04-25 21:38:16.000000000 -0500 4+++ platforms/unix/config/Makefile.install
5@@ -63,7 +63,7 @@ 5@@ -65,7 +65,7 @@ install-doc : squeak.1
6 echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \ 6 echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \
7 $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \ 7 $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \
8 done 8 done
9- gzip -f9 $(ROOT)$(docdir)/* 9- -gzip -f9 $(ROOT)$(docdir)/*
10+ #gzip -f9 $(ROOT)$(docdir)/* 10+ #-gzip -f9 $(ROOT)$(docdir)/*
11 $(MKINSTALLDIRS) $(ROOT)$(mandir)/man1 11 $(MKINSTALLDIRS) $(ROOT)$(mandir)/man1
12 $(INSTALL_DATA) squeak.1 $(ROOT)$(mandir)/man1 12 $(INSTALL_DATA) squeak.1 $(ROOT)$(mandir)/man1
13 rm -f $(ROOT)$(mandir)/man1/inisqueak.1 13 rm -f $(ROOT)$(mandir)/man1/inisqueak.1 $(ROOT)$(mandir)/man1/inisqueak.1.gz

cvs diff -r1.2 -r1.3 pkgsrc/lang/squeak/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/lang/squeak/patches/Attic/patch-ad 2004/04/26 07:10:16 1.2
+++ pkgsrc/lang/squeak/patches/Attic/patch-ad 2008/01/12 23:30:38 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-ad,v 1.2 2004/04/26 07:10:16 fredb Exp $ 1$NetBSD: patch-ad,v 1.3 2008/01/12 23:30:38 bad Exp $
2 2
3--- platforms/unix/config/configure.ac 2004-04-01 06:57:04.000000000 -0600 3--- platforms/unix/config/configure.ac.orig 2006-10-10 13:01:45.000000000 -0600
4+++ platforms/unix/config/configure.ac 2004-04-25 15:08:29.000000000 -0500 4+++ platforms/unix/config/configure.ac
5@@ -161,6 +161,7 @@ 5@@ -178,6 +178,7 @@ AC_HAVE_HEADERS(features.h)
6 AC_HAVE_HEADERS(features.h) 6 AC_HAVE_HEADERS(alloca.h) # SunOS5
7 AC_HEADER_TIME 7 AC_HEADER_TIME
8 AC_HEADER_DIRENT 8 AC_HEADER_DIRENT
9+AC_HAVE_HEADERS(sys/audioio.h) 9+AC_HAVE_HEADERS(sys/audioio.h)
10  10
11 AC_STRUCT_TIMEZONE 11 if test -f "${vmmdir}/vm/interp.h"; then
12  12 AC_DEFINE(HAVE_INTERP_H, 1)

cvs diff -r1.2 -r1.3 pkgsrc/lang/squeak/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/lang/squeak/patches/Attic/patch-ag 2004/04/26 07:10:16 1.2
+++ pkgsrc/lang/squeak/patches/Attic/patch-ag 2008/01/12 23:30:38 1.3
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-ag,v 1.2 2004/04/26 07:10:16 fredb Exp $ 1$NetBSD: patch-ag,v 1.3 2008/01/12 23:30:38 bad Exp $
2 2
3--- platforms/unix/vm/sqUnixCharConv.c 2003-11-18 12:30:32.000000000 -0600 3--- platforms/unix/vm/sqUnixCharConv.c.orig 2007-12-06 18:28:07.000000000 -0600
4+++ platforms/unix/vm/sqUnixCharConv.c 2004-04-25 15:02:13.000000000 -0500 4+++ platforms/unix/vm/sqUnixCharConv.c
5@@ -151,14 +151,18 @@ 5@@ -151,14 +151,18 @@ int convertChars(char *from, int fromLen
6  6
7 typedef char ichar_t; 7 typedef char ichar_t;
8  8
9-#ifdef __sparc 9-#ifdef __sun__
10+#if defined(__sparc) && !defined(__NetBSD__) 10+#if defined(__sun__) && !defined(__NetBSD__) /* is __NetBSD__ necc with __sun__? */
11 void *sqTextEncoding= (void *)"mac"; /* xxxFIXME -> "ISO-8859-15" */  11 void *sqTextEncoding= (void *)"mac"; /* xxxFIXME -> "ISO-8859-15" */
12 void *uxPathEncoding= (void *)"iso"; 12 void *uxPathEncoding= (void *)"iso5";
13 void *uxTextEncoding= (void *)"iso"; 13 void *uxTextEncoding= (void *)"iso5";
14 void *uxXWinEncoding= (void *)"iso"; 14 void *uxXWinEncoding= (void *)"iso5";
15 void *uxUTF8Encoding= (void *)"UTF-8"; 15 void *uxUTF8Encoding= (void *)"UTF-8";
16 #else 16 #else
17+#ifdef __NetBSD__ 17+#ifdef __NetBSD__
18+void *sqTextEncoding= (void *)"ISO-8859-15"; 18+void *sqTextEncoding= (void *)"ISO-8859-15";
19+#else 19+#else
20 void *sqTextEncoding= (void *)"MACINTOSH"; /* xxxFIXME -> "ISO-8859-15" */  20 void *sqTextEncoding= (void *)"MACINTOSH"; /* xxxFIXME -> "ISO-8859-15" */
21+#endif 21+#endif
22 void *uxPathEncoding= (void *)"UTF-8"; 22 void *uxPathEncoding= (void *)"UTF-8";
23 void *uxTextEncoding= (void *)"ISO-8859-15"; 23 void *uxTextEncoding= (void *)"ISO-8859-15";
24 void *uxXWinEncoding= (void *)"ISO-8859-1"; 24 void *uxXWinEncoding= (void *)"ISO-8859-1";

cvs diff -r1.1 -r1.2 pkgsrc/lang/squeak/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/lang/squeak/patches/Attic/patch-ah 2004/04/26 07:10:16 1.1
+++ pkgsrc/lang/squeak/patches/Attic/patch-ah 2008/01/12 23:30:38 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-ah,v 1.1 2004/04/26 07:10:16 fredb Exp $ 1$NetBSD: patch-ah,v 1.2 2008/01/12 23:30:38 bad Exp $
2 2
3--- platforms/unix/vm/sqUnixMain.c 2003-11-23 06:23:43.000000000 -0600 3--- platforms/unix/vm/sqUnixMain.c.orig 2006-10-10 20:38:14.000000000 -0600
4+++ platforms/unix/vm/sqUnixMain.c 2004-04-25 21:29:44.000000000 -0500 4+++ platforms/unix/vm/sqUnixMain.c
5@@ -62,7 +62,7 @@ 5@@ -63,7 +63,7 @@
6 #include <signal.h> 6 #include <signal.h>
7 #include <fcntl.h> 7 #include <fcntl.h>
8  8
9-#if defined(__alpha__) 9-#if defined(__alpha__)
10+#if defined(__alpha__) && !defined(__NetBSD__) 10+#if defined(__alpha__) && !defined(__NetBSD__)
11 # include <sys/sysinfo.h> 11 # include <sys/sysinfo.h>
12 # include <sys/proc.h> 12 # include <sys/proc.h>
13 #endif 13 #endif
14@@ -677,6 +677,7 @@ 14@@ -685,6 +685,7 @@ static struct moduleDescription moduleDe
15 { &soundModule, "sound", "NAS" }, /*** NO DEFAULT ***/ 15 /* defaults */
16 { &displayModule, "display", "Quartz" }, 16 { &displayModule, "display", "Quartz" },
17 { &soundModule, "sound", "MacOSX" }, 17 { &soundModule, "sound", "MacOSX" },
18+ { &soundModule, "sound", "NetBSD" }, 18+ { &soundModule, "sound", "NetBSD" },
19 { &soundModule, "sound", "Sun" }, 19 { &soundModule, "sound", "Sun" },
20 { &soundModule, "sound", "OSS" }, 20 { &soundModule, "sound", "ALSA" },
21 { &soundModule, "sound", "null" }, 21 { &soundModule, "sound", "null" },
22@@ -1275,7 +1276,7 @@ 22@@ -1306,7 +1307,7 @@ int main(int argc, char **argv, char **e
23  23
24 signal(SIGSEGV, sigsegv); 24 signal(SIGSEGV, sigsegv);
25  25
26-#if defined(__alpha__) 26-#if defined(__alpha__)
27+#if defined(__alpha__) && !defined(__NetBSD__) 27+#if defined(__alpha__) && !defined(__NetBSD__)
28 /* disable printing of unaligned access exceptions */ 28 /* disable printing of unaligned access exceptions */
29 { 29 {
30 int buf[2]= { SSIN_UACPROC, UAC_NOPRINT }; 30 int buf[2]= { SSIN_UACPROC, UAC_NOPRINT };

cvs diff -r1.1 -r1.2 pkgsrc/lang/squeak/patches/Attic/patch-ak (expand / switch to unified diff)

--- pkgsrc/lang/squeak/patches/Attic/patch-ak 2004/04/26 07:10:16 1.1
+++ pkgsrc/lang/squeak/patches/Attic/patch-ak 2008/01/12 23:30:38 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ak,v 1.1 2004/04/26 07:10:16 fredb Exp $ 1$NetBSD: patch-ak,v 1.2 2008/01/12 23:30:38 bad Exp $
2 2
3--- platforms/unix/vm-sound-NetBSD/sqUnixSoundNetBSD.c 1969-12-31 18:00:00.000000000 -0600 3--- platforms/unix/vm-sound-NetBSD/sqUnixSoundNetBSD.c.orig 2007-12-06 18:47:09.000000000 -0600
4+++ platforms/unix/vm-sound-NetBSD/sqUnixSoundNetBSD.c 2004-04-25 15:05:47.000000000 -0500 4+++ platforms/unix/vm-sound-NetBSD/sqUnixSoundNetBSD.c
5@@ -0,0 +1,378 @@ 5@@ -0,0 +1,378 @@
6+/* sqUnixSoundNetBSD.c -- sound support for NetBSD 6+/* sqUnixSoundNetBSD.c -- sound support for NetBSD
7+ * 7+ *
8+ * Copyright (C) 1996-2002 Ian Piumarta and other authors/contributors 8+ * Copyright (C) 1996-2002 Ian Piumarta and other authors/contributors
9+ * as listed elsewhere in this file. 9+ * as listed elsewhere in this file.
10+ * All rights reserved. 10+ * All rights reserved.
11+ *  11+ *
12+ * This file is part of Unix Squeak. 12+ * This file is part of Unix Squeak.
13+ *  13+ *
14+ * This file is distributed in the hope that it will be useful, but WITHOUT 14+ * This file is distributed in the hope that it will be useful, but WITHOUT
15+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 15+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
16+ * FITNESS FOR A PARTICULAR PURPOSE. 16+ * FITNESS FOR A PARTICULAR PURPOSE.
17+ *  17+ *
@@ -31,27 +31,27 @@ $NetBSD: patch-ak,v 1.1 2004/04/26 07:10 @@ -31,27 +31,27 @@ $NetBSD: patch-ak,v 1.1 2004/04/26 07:10
31+ * changes these copyright conditions. Read the file `COPYING' in the 31+ * changes these copyright conditions. Read the file `COPYING' in the
32+ * directory `platforms/unix/doc' before proceeding with any such use. 32+ * directory `platforms/unix/doc' before proceeding with any such use.
33+ *  33+ *
34+ * You are not allowed to distribute a modified version of this file 34+ * You are not allowed to distribute a modified version of this file
35+ * under its original name without explicit permission to do so. If 35+ * under its original name without explicit permission to do so. If
36+ * you change it, rename it. 36+ * you change it, rename it.
37+ * 37+ *
38+ * Authors: Ian.Piumarta@inria.fr, Lex Spoon <lex@cc.gatech.edu> and 38+ * Authors: Ian.Piumarta@inria.fr, Lex Spoon <lex@cc.gatech.edu> and
39+ * Frederick Bruckman <fredb@NetBSD.org>. 39+ * Frederick Bruckman <fredb@NetBSD.org>.
40+ * 40+ *
41+ */ 41+ */
42+ 42+
43+#include "sq.h" 43+#include "sq.h"
44+#include "aio.h" 44+#include "sqaio.h"
45+ 45+
46+#include <stdio.h> 46+#include <stdio.h>
47+#include <unistd.h> 47+#include <unistd.h>
48+#include <fcntl.h> 48+#include <fcntl.h>
49+#include <sys/ioctl.h> 49+#include <sys/ioctl.h>
50+#include <sys/audioio.h> 50+#include <sys/audioio.h>
51+#include <errno.h> 51+#include <errno.h>
52+ 52+
53+ 53+
54+/* Globals */ 54+/* Globals */
55+static int auFd= -1; /* open file descriptor on AUDIODEVICE */ 55+static int auFd= -1; /* open file descriptor on AUDIODEVICE */
56+static int fmtStereo; /* whether to use stereo or not */ 56+static int fmtStereo; /* whether to use stereo or not */
57+static int auBlockCount; /* VM's block size, in frames */ 57+static int auBlockCount; /* VM's block size, in frames */

File Added: pkgsrc/lang/squeak/patches/Attic/patch-am
$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
 
 	/* Set up the flock structure parameter for fcntl() */
 
-	fileNo = fileno(sqFile->file);
+	fileNo = fileno((FILE *)sqFile->file);
 	if (exclusive) {
 		lockStruct.l_type = F_WRLCK;
 	} else {
@@ -2897,7 +2897,7 @@ EXPORT(sqInt) primitiveTestLockableFileR
 
 	/* Set up the flock structure parameter for fcntl() */
 
-	fileNo = fileno(sqFile->file);
+	fileNo = fileno((FILE *)sqFile->file);
 	if (exclusive) {
 		lockStruct.l_type = F_WRLCK;
 	} else {
@@ -2957,7 +2957,7 @@ EXPORT(sqInt) primitiveUnixFileNumber(vo
 		return interpreterProxy->primitiveFail();
 	}
 	sqFile = interpreterProxy->arrayValueOf(sqFileOop);
-	fileNo = fileno(sqFile->file);
+	fileNo = fileno((FILE *)sqFile->file);
 	interpreterProxy->pop(2);
 	interpreterProxy->pushInteger(fileNo);
 }
@@ -3001,7 +3001,7 @@ EXPORT(sqInt) primitiveUnlockFileRegion(
 
 	/* Set up the flock structure parameter for fcntl() */
 
-	fileNo = fileno(sqFile->file);
+	fileNo = fileno((FILE *)sqFile->file);
 	lockStruct.l_type = F_UNLCK;
 	lockStruct.l_whence = SEEK_SET;
 	lockStruct.l_start = start;

File Added: pkgsrc/lang/squeak/patches/Attic/patch-an
$NetBSD: patch-an,v 1.1 2008/01/12 23:30:38 bad Exp $

--- platforms/unix/config/inisqueak.in.orig	2006-04-05 19:40:24.000000000 +0200
+++ platforms/unix/config/inisqueak.in
@@ -86,7 +86,7 @@ if test "$1" != ""; then
 fi
 
 SQUEAK=${bindir}/squeak
-SOURCES=SqueakV${MAJOR}.sources
+SOURCES=SqueakV39.sources
 IMAGE=squeak.image.gz
 CHANGES=squeak.changes.gz