From c74f2f245e4a4ce74780f3c5774a540a5b299721 Mon Sep 17 00:00:00 2001 From: asau Date: Thu, 11 Feb 2010 00:58:19 +0000 Subject: Import Squeak VM 3.11.3 revision 2135 as lang/squeak-vm. Squeak is Smalltalk implementation which is direct ancestor of Alan Kay's Smalltalk-80. --- lang/squeak-vm/patches/patch-aa | 12 ++++++++++++ lang/squeak-vm/patches/patch-ab | 12 ++++++++++++ lang/squeak-vm/patches/patch-ac | 14 ++++++++++++++ lang/squeak-vm/patches/patch-ad | 26 ++++++++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 lang/squeak-vm/patches/patch-aa create mode 100644 lang/squeak-vm/patches/patch-ab create mode 100644 lang/squeak-vm/patches/patch-ac create mode 100644 lang/squeak-vm/patches/patch-ad (limited to 'lang/squeak-vm/patches') diff --git a/lang/squeak-vm/patches/patch-aa b/lang/squeak-vm/patches/patch-aa new file mode 100644 index 00000000000..aa73dfcb9bf --- /dev/null +++ b/lang/squeak-vm/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.1.1.1 2010/02/11 00:58:19 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 @@ + COMMAND sh ${bld}/config ${unix}/doc/squeak.1 ${bld}/squeak.1 + ) + ADD_DEPENDENCIES (squeakvm 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-ab b/lang/squeak-vm/patches/patch-ab new file mode 100644 index 00000000000..aaa0a44eb6e --- /dev/null +++ b/lang/squeak-vm/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $ + +Use proper OSS library. +Use proper audio device. + +--- unix/vm-sound-OSS/config.cmake.orig 2009-08-26 22:44:21.000000000 +0400 ++++ unix/vm-sound-OSS/config.cmake 2010-01-24 06:10:44.000000000 +0300 +@@ -1,2 +1,2 @@ +-PLUGIN_REQUIRE_INCLUDE (ALSA_SOUNDLIB alsa/asoundlib.h) +-PLUGIN_REQUIRE_LIBRARY (ASOUND asound) ++PLUGIN_REQUIRE_LIBRARY (ASOUND ossaudio) ++PLUGIN_DEFINITIONS (-DDEVOSSAUDIO=\"${DEVOSSAUDIO}\") diff --git a/lang/squeak-vm/patches/patch-ac b/lang/squeak-vm/patches/patch-ac new file mode 100644 index 00000000000..24def503f37 --- /dev/null +++ b/lang/squeak-vm/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $ + +Make NAS optional. + +--- unix/vm-sound-NAS/config.cmake.orig 2009-08-26 22:42:18.000000000 +0400 ++++ unix/vm-sound-NAS/config.cmake 2010-01-21 05:44:46.000000000 +0300 +@@ -1,2 +1,7 @@ + PLUGIN_REQUIRE_INCLUDE (AUDIO_AUDIO_H audio/audio.h) + PLUGIN_REQUIRE_LIBRARY (AUDIO audio) ++ ++CHECK_LIBRARY_EXISTS (audio AuOpenServer "" HAVE_NAS) ++IF (NOT HAVE_NAS OR without-nas) ++ PLUGIN_DISABLE () ++ENDIF () diff --git a/lang/squeak-vm/patches/patch-ad b/lang/squeak-vm/patches/patch-ad new file mode 100644 index 00000000000..886a1b12b56 --- /dev/null +++ b/lang/squeak-vm/patches/patch-ad @@ -0,0 +1,26 @@ +$NetBSD: patch-ad,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $ + +Allow customization of audio devices. + +--- unix/vm-sound-OSS/sqUnixSoundOSS.c.orig 2008-09-02 22:49:45.000000000 +0400 ++++ unix/vm-sound-OSS/sqUnixSoundOSS.c 2010-02-10 23:13:27.000000000 +0300 +@@ -1172,6 +1172,10 @@ + static int sound_parseArgument(int argc, char **argv) + { + if (!strcmp(argv[0], "-nomixer")) return noSoundMixer= 1; ++ else if (argv[1]) { ++ if (!strcmp(argv[0], "-playback")) {dev_dsp.path = argv[1]; return 2;} ++ if (!strcmp(argv[0], "-capture")) {dev_dsp1.path = argv[1]; return 2;} ++ } + return 0; + } + +@@ -1179,6 +1183,8 @@ + { + printf("\nOSS