pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/squeak Update Unix VM to 3.6-3, and default image...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fdf6973879b6
branches: trunk
changeset: 474204:fdf6973879b6
user: fredb <fredb%pkgsrc.org@localhost>
date: Mon Apr 26 07:10:16 2004 +0000
description:
Update Unix VM to 3.6-3, and default image to 3.6-5429. Many improvements
and enhancements since 3.0. Notably, display and sound plugins can now be
selected at run-time, and support is added for character set conversion.
This package also contains a driver for NetBSD native audio, by yours truly.
OSS audio requires a newer interface than NetBSD emulation supports, so that
doesn't build anymore on NetBSD, though it may with third party drivers. NAS
builds on NetBSD, but doesn't work. There are new display drivers which build
selectively on linux and MacOS, and a new audio driver for MacOS. I'm marking
this package ONLY_FOR_PLATFORM=NetBSD-*-*, though, mainly because the static
PLIST that the package presently has can't reflect any of that.
This closes PR pkg/17950.
diffstat:
lang/squeak/Makefile | 74 ++++---
lang/squeak/PLIST | 46 ++--
lang/squeak/distinfo | 36 ++-
lang/squeak/patches/patch-aa | 38 +---
lang/squeak/patches/patch-ab | 76 +-------
lang/squeak/patches/patch-ac | 28 +--
lang/squeak/patches/patch-ad | 30 +--
lang/squeak/patches/patch-ae | 32 +--
lang/squeak/patches/patch-af | 72 +------
lang/squeak/patches/patch-ag | 122 ++-----------
lang/squeak/patches/patch-ah | 30 +++
lang/squeak/patches/patch-ai | 36 ++++
lang/squeak/patches/patch-aj | 17 +
lang/squeak/patches/patch-ak | 383 +++++++++++++++++++++++++++++++++++++++++++
lang/squeak/patches/patch-al | 18 ++
lang/squeak/patches/patch-ba | 13 -
16 files changed, 657 insertions(+), 394 deletions(-)
diffs (truncated from 1152 to 300 lines):
diff -r 0dab0f38a9d8 -r fdf6973879b6 lang/squeak/Makefile
--- a/lang/squeak/Makefile Mon Apr 26 06:58:28 2004 +0000
+++ b/lang/squeak/Makefile Mon Apr 26 07:10:16 2004 +0000
@@ -1,49 +1,59 @@
-# $NetBSD: Makefile,v 1.24 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/26 07:10:16 fredb Exp $
#
-DISTNAME= Squeak-3.0
-PKGNAME= squeak-3.0
+DISTNAME= Squeak-3.6-3
+PKGNAME= squeak-3.6.3
CATEGORIES= lang
-MASTER_SITES= ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.0/platform-independent/
-MASTER_SITES+= ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.0/unix-linux/src/
-MASTER_SITES+= ftp://ftp.inria.fr/INRIA/Projects/SOR/users/piumarta/squeak/
-DISTFILES= ReadMe.txt.gz Squeak3.0-3552.zip SqueakV3.sources.gz
-DISTFILES+= ${DISTNAME}-src${EXTRACT_SUFX}
+MASTER_SITES= http://www-sor.inria.fr/~piumarta/squeak/unix/release/
+DISTFILES= Squeak-3.6-3.src.tar.gz Squeak-3.6-5429.image.tar.gz
+DISTFILES+= Squeak-3.sources.tar.gz
MAINTAINER= fredb%NetBSD.org@localhost
-HOMEPAGE= http://www.squeak.org/
+HOMEPAGE= http://www-sor.inria.fr/~piumarta/squeak/
COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows
-BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
-WRKSRC= ${WRKDIR}/Squeak-3.0/build
GNU_CONFIGURE= yes
+USE_BUILDLINK3= yes
USE_LIBTOOL= yes
USE_X11= yes
-CPPFLAGS+= -DNETBSD_OSS_HACK
-DIST_SUBDIR= squeak
-EXTRACT_ONLY= ${DISTNAME}-src${EXTRACT_SUFX}
+AUTOCONF_REQD>= 2.57
+AUTOMAKE_REQD= 1.4.6
-CONFIGURE_SCRIPT= ${WRKSRC}/../src/unix/configure
-LTCONFIG_OVERRIDE= ${WRKSRC}/../src/unix/ltconfig
+BUILD_DIRS= ${WRKDIR}/build
+CONFIGURE_DIRS= ${WRKDIR}/build
+CONFIGURE_SCRIPT= ${WRKSRC}/platforms/unix/config/configure
+DIST_SUBDIR= squeak
+INSTALLATION_DIRS= ${WRKDIR}/build
-post-extract:
-.for f in ReadMe.txt.gz SqueakV3.sources.gz
- ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f} > ${WRKDIR}/${f:C/.gz//}
-.endfor
- cd ${WRKDIR} && \
- ${LOCALBASE}/bin/unzip ${DISTDIR}/${DIST_SUBDIR}/Squeak3.0-3552.zip
- ${MKDIR} ${WRKSRC}
+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
+
+pre-configure:
+ cd ${WRKSRC}/platforms/unix/config \
+ && ${SETENV} PATH=${PREFIX}/bin:${PATH} ${MAKE} configure
+ ${MKDIR} ${CONFIGURE_DIRS}
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/squeak/3.0
-.for f in ReadMe.txt SqueakV3.sources
- ${INSTALL_DATA} ${WRKDIR}/${f} ${PREFIX}/share/squeak/
-.endfor
-.for f in Squeak3.0.changes Squeak3.0.image
- ${INSTALL_DATA} ${WRKDIR}/${f} \
- ${PREFIX}/share/squeak/3.0/${f}
-.endfor
+ ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES} ${PREFIX}/lib/squeak/
+ ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE} ${PREFIX}/lib/squeak/
+ ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${PREFIX}/lib/squeak/
+ cd ${PREFIX}/lib/squeak \
+ && ${LN} -s ${SQUEAK_CHANGES:C/.*\///} squeak.changes.gz \
+ && ${LN} -s ${SQUEAK_IMAGE:C/.*\///} squeak.image.gz
+ ${INSTALL_SCRIPT} ${INSTALLATION_DIRS}/inisqueak ${PREFIX}/bin/
+
+.include "../../mk/bsd.prefs.mk"
+.if ${MACHINE_ARCH} == i386
+CONFIGURE_ARGS+= --enable-mpg-mmx
+.endif
+
+.include "../../mk/autoconf.mk"
+.include "../../mk/automake.mk"
+.include "../../audio/nas/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 0dab0f38a9d8 -r fdf6973879b6 lang/squeak/PLIST
--- a/lang/squeak/PLIST Mon Apr 26 06:58:28 2004 +0000
+++ b/lang/squeak/PLIST Mon Apr 26 07:10:16 2004 +0000
@@ -1,27 +1,31 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:25:02 zuntum Exp $
-bin/squeak
+@comment $NetBSD: PLIST,v 1.2 2004/04/26 07:10:16 fredb Exp $
bin/inisqueak
-lib/squeak/3.0/squeak
-lib/squeak/3.0/inisqueak
-lib/squeak/3.0/squeak.map
-lib/squeak/3.0/Profiler.a
-lib/squeak/3.0/Profiler.la
-lib/squeak/3.0/Profiler.so
-lib/squeak/3.0/System.a
-lib/squeak/3.0/System.la
-lib/squeak/3.0/System.so
+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/npsqueakregister
+lib/squeak/squeak.changes.gz
+lib/squeak/squeak.image.gz
+man/man1/inisqueak.1
man/man1/squeak.1
-share/doc/squeak/BUILD.UnixSqueak
share/doc/squeak/COPYING
share/doc/squeak/COPYRIGHT
share/doc/squeak/LICENSE
-share/doc/squeak/README.CodingStandards
-share/squeak/ReadMe.txt
-share/squeak/SqueakV3.sources
-share/squeak/3.0/Squeak3.0.changes
-share/squeak/3.0/Squeak3.0.image
-@dirrm lib/squeak/3.0
+share/doc/squeak/README.Contributing
+share/doc/squeak/README.Keyboard
+share/doc/squeak/README.Sound
+@dirrm share/doc/squeak
+@dirrm lib/squeak/3.6-3
@dirrm lib/squeak
-@dirrm share/doc/squeak
-@dirrm share/squeak/3.0
-@dirrm share/squeak
diff -r 0dab0f38a9d8 -r fdf6973879b6 lang/squeak/distinfo
--- a/lang/squeak/distinfo Mon Apr 26 06:58:28 2004 +0000
+++ b/lang/squeak/distinfo Mon Apr 26 07:10:16 2004 +0000
@@ -1,18 +1,20 @@
-$NetBSD: distinfo,v 1.8 2002/10/02 22:00:09 dillo Exp $
+$NetBSD: distinfo,v 1.9 2004/04/26 07:10:16 fredb Exp $
-SHA1 (squeak/ReadMe.txt.gz) = e632f908e576d8ccbf8386a1b94689e261a2aec7
-Size (squeak/ReadMe.txt.gz) = 6513 bytes
-SHA1 (squeak/Squeak3.0-3552.zip) = ffa356344ef7a9b14de4b4e449a4e8d97b04580d
-Size (squeak/Squeak3.0-3552.zip) = 4868994 bytes
-SHA1 (squeak/SqueakV3.sources.gz) = 7e992d801856ef57565fca34f8af324495dcd871
-Size (squeak/SqueakV3.sources.gz) = 3476504 bytes
-SHA1 (squeak/Squeak-3.0-src.tar.gz) = 231cc39c8dceafea270da1652ced83ec769a0bb5
-Size (squeak/Squeak-3.0-src.tar.gz) = 745258 bytes
-SHA1 (patch-aa) = 5b88ea010030c20a8712e1cc71e12adc1ae267c0
-SHA1 (patch-ab) = c58b921df217fca2221893a6b017cbc7aba28bbe
-SHA1 (patch-ac) = 035cb8f3d00619de7b2c638168834ac6da2aaad8
-SHA1 (patch-ad) = b9b9b99da74429a4a42e7ff5ecc632c0dfe61648
-SHA1 (patch-ae) = c1714d9dbeeb7a86cfda350c567d29431616e281
-SHA1 (patch-af) = 8fc7494c1182ff9a55ae26aaa389e94e52c9f6c7
-SHA1 (patch-ag) = 42fc9206783c74b948915ddcee93aa5eed929323
-SHA1 (patch-ba) = eae0e8c40b14e3e04b278b1b841c4c89ddebea7b
+SHA1 (squeak/Squeak-3.6-3.src.tar.gz) = 9631fd9778bea45bedddc878a7132d46936d8148
+Size (squeak/Squeak-3.6-3.src.tar.gz) = 2552981 bytes
+SHA1 (squeak/Squeak-3.6-5429.image.tar.gz) = 60900eafcd755bd1a898758615045b806f27bd48
+Size (squeak/Squeak-3.6-5429.image.tar.gz) = 7756686 bytes
+SHA1 (squeak/Squeak-3.sources.tar.gz) = 0a265f5c631970fe39a483967dab39c26304092c
+Size (squeak/Squeak-3.sources.tar.gz) = 4184537 bytes
+SHA1 (patch-aa) = fdb5b9c06e02056d1c52344c1e5577ac9d09a5e6
+SHA1 (patch-ab) = ae371a47efb513721b19990ebd2a8ebec78bd89e
+SHA1 (patch-ac) = 38eb12424792eba344c4963132012aa90c70dd8d
+SHA1 (patch-ad) = e70f82454c74ca93f2e448ce055a72130f59dc8f
+SHA1 (patch-ae) = 54e06ce67bbe71280e846dfbb81e7ebd6becd3f7
+SHA1 (patch-af) = 41561264023700df277d81f528c9dad42a11e31f
+SHA1 (patch-ag) = e45917200167817c134eb51cf424179569bb7952
+SHA1 (patch-ah) = 112dac126b8d18d645c4c83184888412a571f5ec
+SHA1 (patch-ai) = 8ca9289dea3484205b65759f2aa052d57d6af2ee
+SHA1 (patch-aj) = 18d81c878ee88bf334e3700d46d66dfa458618d0
+SHA1 (patch-ak) = 25cb1f447a6f3c247a301a4a6d02c25028cb1b70
+SHA1 (patch-al) = d58a1800600ff1a124c3db7aa382b085218160f3
diff -r 0dab0f38a9d8 -r fdf6973879b6 lang/squeak/patches/patch-aa
--- a/lang/squeak/patches/patch-aa Mon Apr 26 06:58:28 2004 +0000
+++ b/lang/squeak/patches/patch-aa Mon Apr 26 07:10:16 2004 +0000
@@ -1,30 +1,12 @@
-$NetBSD: patch-aa,v 1.4 2001/05/16 02:27:53 fredb Exp $
+$NetBSD: patch-aa,v 1.5 2004/04/26 07:10:16 fredb Exp $
---- ../src/unix/Makefile.in.orig Mon Feb 12 16:59:20 2001
-+++ ../src/unix/Makefile.in
-@@ -71,7 +71,7 @@
- datadir= @datadir@
- mandir= @mandir@
+--- platforms/unix/config/Makefile 2002-06-05 00:17:14.000000000 -0500
++++ platforms/unix/config/Makefile 2004-04-25 15:13:34.000000000 -0500
+@@ -1,6 +1,6 @@
+ configure : .force
+ ./mkacinc > acplugins.m4
+- aclocal
++ aclocal-1.4
+ autoconf
+ rm acplugins.m4
--docdir= $(prefix)/doc/squeak-$(VERSION)
-+docdir= $(prefix)/share/doc/squeak
- sqlibdir= $(libdir)/squeak
- vsqlibdir= $(sqlibdir)/$(VERSION)
- sqdatadir= $(datadir)/squeak
-@@ -92,6 +92,7 @@
- INSTALL= @INSTALL@
- INSTALL_PROG= @INSTALL_PROGRAM@
- INSTALL_DATA= @INSTALL_DATA@
-+INSTALL_SCRIPT= @INSTALL_SCRIPT@
-
- UNINSTALL= $(SHELL) $(utldir)/uninstall
-
-@@ -218,7 +219,7 @@
- $(MKINSTALLDIRS) $(DESTDIR)$(vsqlibdir)
- $(INSTALL_PROG) squeak $(DESTDIR)$(vsqlibdir)
- # test -x j3 && $(INSTALL_PROG) squeak $(DESTDIR)$(vsqlibdir)
-- $(INSTALL_PROG) inisqueak $(DESTDIR)$(vsqlibdir)
-+ $(INSTALL_SCRIPT) inisqueak $(DESTDIR)$(vsqlibdir)
- $(INSTALL_DATA) squeak.map $(DESTDIR)$(vsqlibdir)
- $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- ( path=`$(utldir)/relpath $(bindir) $(vsqlibdir)`; \
diff -r 0dab0f38a9d8 -r fdf6973879b6 lang/squeak/patches/patch-ab
--- a/lang/squeak/patches/patch-ab Mon Apr 26 06:58:28 2004 +0000
+++ b/lang/squeak/patches/patch-ab Mon Apr 26 07:10:16 2004 +0000
@@ -1,65 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2001/05/16 02:27:53 fredb Exp $
+$NetBSD: patch-ab,v 1.5 2004/04/26 07:10:16 fredb Exp $
---- ../src/unix/sqUnixSound.c.orig Thu Feb 8 11:27:04 2001
-+++ ../src/unix/sqUnixSound.c
-@@ -70,9 +70,16 @@
- # include <fcntl.h>
- # include <sys/time.h>
- # include <sys/ioctl.h>
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+#ifdef NETBSD_OSS_HACK
-+#include <sys/audioio.h>
-+#endif
-+#else
- # include <sys/soundcard.h>
-+#endif
-
--# if !defined(OPEN_SOUND_SYSTEM) && !defined(__FreeBSD__)
-+# if !defined(OPEN_SOUND_SYSTEM) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- # warning:
- # warning: sys/soundcard.h did not define OPEN_SOUND_SYSTEM
- # warning: SOUND SUPPORT DISABLED
-@@ -274,6 +279,34 @@
-
- int snd_AvailableSpace(void)
- {
-+#ifdef NETBSD_OSS_HACK
-+/*
-+ This is to work around a bug in NetBSD-1.5.1 and earlier, in which
-+ the SNDCTL_DSP_GETOSPACE(&buf_info) ioctl was not handled properly.
-+ The correct information is always available via the native audio
-+ driver, so use that instead.
-+*/
-+ struct audio_info info;
-+ int freeBlocks;
-+
-+ if (auFd == -1) return -1;
-+
-+ if (ioctl(auFd, AUDIO_GETINFO, &info) < 0) {
-+ perror("ioctl(AUDIO_GETINFO)");
-+ return 0;
-+ }
-+
-+ /* Make certain we have one, full hardware block free. */
-+ freeBlocks = info.hiwat - (info.play.seek + info.blocksize - 1)/info.blocksize;
-+ if (freeBlocks > 0)
-+ {
-+ return info.blocksize;
-+ }
-+ else
-+ {
-+ auSemaWaiting= true;
-+ return 0;
-+#else
- audio_buf_info info;
- if (auFd == -1)
- return -1;
-@@ -294,6 +326,7 @@
- else
Home |
Main Index |
Thread Index |
Old Index