- Update to 3.6-3

- Change MAINTAINER to submitter

PR:		ports/66618
Submitted by:	Chris Burkert

12 files changed, 229 insertions, 413 deletions

diff --git a/lang/squeak3/Makefile b/lang/squeak3/Makefile
index 9b56115c2e4e..8259ed569c45 100644
--- a/lang/squeak3/Makefile
+++ b/lang/squeak3/Makefile
@@ -5,99 +5,172 @@
 # $FreeBSD$
 #
 
-PORTNAME=	squeak
-PORTVERSION=	3.5
-PORTREVISION=	2
-CATEGORIES=	lang
-MASTER_SITES=	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.5/ \
-		http://www-sor.inria.fr/~piumarta/squeak/unix/release/ \
-		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/3.4/unix-linux/ \
-		ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.4/unix-linux/
-DISTNAME=	Squeak-${SQUEAK_VERSION}.src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC} ${SQUEAK_IMAGE_SRC}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	roland.jesse@gmx.net
-COMMENT=	Full Smalltalk 80 with portability to UNIX, Mac, and Windows
-
-# Don't set USE_ZIP as this breaks EXTRACT_CMD, EXTRACT_SUFX, and what not.
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
-SQUEAK_VERSION=	3.4-1
-SQUEAK_IMAGE_VERSION=	3.5
-SQUEAK_PATCHNR=	5180
-SQUEAK_SRC=	SqueakV3.sources.gz
-SQUEAK_IMAGE_SRC=	Squeak${SQUEAK_IMAGE_VERSION}-${SQUEAK_PATCHNR}.zip
-SQUEAK_IMAGE=	Squeak${SQUEAK_IMAGE_VERSION}-${SQUEAK_PATCHNR}.image \
-		Squeak${SQUEAK_IMAGE_VERSION}-${SQUEAK_PATCHNR}.changes
-
-WRKSRC=		${WRKDIR}/Squeak-${SQUEAK_VERSION}
-MAN1=		inisqueak.1 squeak.1
-USE_XLIB=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-HAS_CONFIGURE=	yes
-LDCONFIG_DIRS=	${PREFIX}/share/squeak/${SQUEAK_VERSION}
+##################################################
+PORTNAME=		squeak3
+PORTVERSION=		3.6
+CATEGORIES=		lang
+VMVERSION=		3.6-3
+IMAGEVERSION=		3.6
+PATCHNUMBER=		5429
+
+##################################################
+MASTER_SITES=		ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/ \
+			ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/unix-linux/ \
+			ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/3.6/ \
+			ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/3.6/unix-linux/ \
+			http://www-sor.inria.fr/~piumarta/squeak/unix/release/ \
+
+DISTFILES=		Squeak-${VMVERSION}.src.tar.gz \
+			Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip \
+			Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip \
+			SqueakV3.sources.gz
+
+DIST_SUBDIR=		squeak
+EXTRACT_ONLY=		Squeak-${VMVERSION}.src.tar.gz
+
+##################################################
+MAINTAINER=		chris@chrisburkert.de
+COMMENT=		Full Smalltalk 80 with portability to UNIX, Mac, and Windows.
+
+##################################################
+ONLY_FOR_ARCHS= 	i386 sparc64
+MAN1=			inisqueak.1 squeak.1
+USE_XLIB=		yes
+USE_GMAKE=		yes
+USE_REINPLACE=		yes
+HAS_CONFIGURE=		yes
+
+# Don't set USE_ZIP as this breaks EXTRACT_CMD.
+BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
+
+# shared Libaries are to be installed in:
+LDCONFIG_DIRS=		${PREFIX}/share/squeak/${VMVERSION}
+
+FILES_TO_GZIP=		Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.image \
+			Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.changes \
+			Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.image \
+			Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.changes
+
+##################################################
+# Configure and Build
+WRKSRC=			${WRKDIR}/Squeak-${VMVERSION}
 CONFIGURE_WRKSRC=	${WRKSRC}/build
-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
 CONFIGURE_SCRIPT=	../platforms/unix/config/configure
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/share \
+			--without-quartz
 # don't pass "-s" to install to avoid trying to strip a shell script
-CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}"
-BUILD_WRKSRC=	${WRKSRC}/build
-DIST_SUBDIR=	squeak
+CONFIGURE_ENV=
 
-.ifdef (WITHOUT_AUDIO)
-CONFIGURE_ARGS+=	--without-audio
+##################################################
+# Knobs
+.if defined(WITH_RFB) && (${WITH_RFB}=="no")
+CONFIGURE_ARGS+=        --without-rfb
+.endif
+
+.if defined(WITH_NPSQUEAK) && (${WITH_NPSQUEAK}=="no")
+CONFIGURE_ARGS+=        --without-npsqueak
+PLIST_NPSQUEAK=         "@comment feature not wanted - "
+.else
+PLIST_NPSQUEAK=
+.endif
+
+.if defined(WITH_X) && (${WITH_X}=="no")
+CONFIGURE_ARGS+=        --without-x
+PLIST_X=		"@comment feature not wanted - "
 .else
-LIB_DEPENDS+=		audio.2:${PORTSDIR}/audio/nas
-CONFIGURE_ARGS+=	--with-audio=nas
+CONFIGURE_ARGS+=        --with-x
+PLIST_X=
 .endif
 
-.ifdef (WITH_MMX)
-CONFIGURE_ARGS+=	--enable-mpg-mmx
+.if defined(WITH_MPG_MMX) && (${WITH_MPG_MMX}=="yes")
+CONFIGURE_ARGS+=        --enable-mpg-mmx
 .endif
 
-MAKEFILE=	Makefile
 .ifdef (CC)
-MAKE_ARGS+=	CC=${CC}
+MAKE_ARGS+=		CC="${CC}"
 .endif
+
 .ifdef (CFLAGS)
-MAKE_ARGS+=	CCFLAGS="${CFLAGS}"
+MAKE_ARGS+=		CCFLAGS="${CFLAGS}"
 .endif
 
+PLIST_SUB=              IMAGEVERSION=${IMAGEVERSION}\
+			PATCHNUMBER=${PATCHNUMBER}\
+			VMVERSION=${VMVERSION}\
+			PLIST_NPSQUEAK=${PLIST_NPSQUEAK}\
+			PLIST_X=${PLIST_X}
+
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
-.endif
+##################################################
+pre-everything::
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} " ------------------------- Please note: -------------------------"
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} "  Squeak has the following tunable options:"
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} "    WITH_MPG_MMX=      [yes|no]  MMX support (MPG plugin)"
+	@${ECHO_MSG} "                            ^^   (default: disabled)"
+	@${ECHO_MSG} "    WITH_NPSQUEAK=     [yes|no]  browser plugin support"
+	@${ECHO_MSG} "                        ^^^      (default: enabled)"
+	@${ECHO_MSG} "    WITH_RFB=          [yes|no]  remote frame buffer support"
+	@${ECHO_MSG} "                        ^^^      (default: enabled)"
+	@${ECHO_MSG} "    WITH_X=            [yes|no]  X Windows support"
+	@${ECHO_MSG} "                        ^^^      (default: enabled)"
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} "  additional make arguments"
+	@${ECHO_MSG} "    CC=<aString>"
+	@${ECHO_MSG} "    CFLAGS=<aString>"
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} " ------------------ Thanks for your attention! ------------------"
+	@${ECHO_MSG} " "
 
+##################################################
 pre-configure:
-	@${MKDIR} ${BUILD_WRKSRC}
-	@cd ${WRKSRC}/platforms/unix/npsqueak && ${REINPLACE_CMD} -e 's|include|include -I${X11BASE}/include|g' Makefile
+	@${MKDIR} ${CONFIGURE_WRKSRC}
+	@cd ${WRKSRC}/platforms/unix/npsqueak && \
+		${REINPLACE_CMD} -e 's|include|include -I${X11BASE}/include|g' Makefile
 
+##################################################
 post-configure:
-# PREFIX safeness
 	@${REINPLACE_CMD} -E \
 		-e s'|^(prefix).*$$|\1=${PREFIX}|' \
 		-e s'|^(docdir).*$$|\1=${DOCSDIR}|' \
-		${CONFIGURE_WRKSRC}/${MAKEFILE}
+		${CONFIGURE_WRKSRC}/Makefile
 
+##################################################
 post-install:
-	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${SQUEAK_SRC} ${PREFIX}/share/squeak/)
-	(cd ${PREFIX}/share/squeak && ${EXTRACT_CMD} -d ${SQUEAK_SRC})
-	(cd ${PREFIX}/share/squeak && unzip -x ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_IMAGE_SRC})
-.for file in ${SQUEAK_IMAGE}
-	(cd ${PREFIX}/share/squeak && ${GZIP_CMD} ${file})
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} SqueakV3.sources.gz ${PREFIX}/share/squeak/)
+	(cd ${PREFIX}/share/squeak && ${EXTRACT_CMD} -d SqueakV3.sources.gz)
+	(cd ${DISTDIR}/${DIST_SUBDIR} && unzip -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip -d ${WRKDIR})
+	(cd ${DISTDIR}/${DIST_SUBDIR} && unzip -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip -d ${WRKDIR})
+	(cd ${WRKDIR} && ${INSTALL_DATA} ReadMe.txt ${PREFIX}/share/squeak/)
+.for file in ${FILES_TO_GZIP}
+	(cd ${WRKDIR} && ${GZIP_CMD} ${file} && ${INSTALL_DATA} ${file}.gz ${PREFIX}/share/squeak/)
 .endfor
-# install inisqueak and change the build in version number on the fly
-	${SED} \
-		-e 's|VERSION=3.4-5170|VERSION=3.5-5180|' \
-		-e 's|IMAGE=squeak|IMAGE=Squeak3.5-5180|' \
-		-e 's|CHANGES=squeak|CHANGES=Squeak3.5-5180|' \
-		${WRKSRC}/build/inisqueak > ${PREFIX}/bin/inisqueak
+	${SED}	-e 's|VERSION=3.5-5180|VERSION=${IMAGEVERSION}-${PATCHNUMBER}|' \
+		-e 's|IMAGE=Squeak3.5-5180|IMAGE=Squeak${IMAGEVERSION}-${PATCHNUMBER}|' \
+		-e 's|CHANGES=Squeak3.5-5180|CHANGES=Squeak${IMAGEVERSION}-${PATCHNUMBER}|' \
+		${WRKSRC}/build/inisqueak > ${WRKSRC}/build/inisqueak.tmp
+	${INSTALL_SCRIPT} ${WRKSRC}/build/inisqueak.tmp ${PREFIX}/bin/inisqueak
 	${CHMOD} 755 ${PREFIX}/bin/inisqueak
-	${STRIP_CMD} ${PREFIX}/share/squeak/${SQUEAK_VERSION}/squeak
-	${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} " ------------------------- Please note: -------------------------"
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} "  In order to be able to make use of squeak you need to have an"
+	@${ECHO_MSG} "    image and a changes file in your working directory as well"
+	@${ECHO_MSG} "    as access to a source file. This is easy by using inisqueak."
+	@${ECHO_MSG} "    Please see the inisqueak(1) manpage for details."
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} "  Make sure you have the following values in your environment"
+	@${ECHO_MSG} "    variables:"
+	@${ECHO_MSG} "    PATH:            ${PREFIX}/bin"
+	@${ECHO_MSG} "    LD_LIBRARY_PATH: ${PREFIX}/lib"
+	@${ECHO_MSG} "                     ${PREFIX}/share/squeak/${VMVERSION}"
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} " ------------------ Thanks for your attention! ------------------"
+	@${ECHO_MSG} " "
 
 .include <bsd.port.post.mk>
diff --git a/lang/squeak3/distinfo b/lang/squeak3/distinfo
index b2939ae41ffd..addd5ae5208c 100644
--- a/lang/squeak3/distinfo
+++ b/lang/squeak3/distinfo
@@ -1,6 +1,8 @@
-MD5 (squeak/Squeak-3.4-1.src.tar.gz) = 780af1cf1cdc8d44c1ce30a527bdd508
-SIZE (squeak/Squeak-3.4-1.src.tar.gz) = 1890889
+MD5 (squeak/Squeak-3.6-3.src.tar.gz) = cb8ab95fa9d840f5b04868f99600e018
+SIZE (squeak/Squeak-3.6-3.src.tar.gz) = 2552981
+MD5 (squeak/Squeak3.6-5429-basic.zip) = 0269db8b85b1042825f689da8bb0f583
+SIZE (squeak/Squeak3.6-5429-basic.zip) = 5667283
+MD5 (squeak/Squeak3.6-5429-full.zip) = 9a35fa39f2338d26a721564472d4d933
+SIZE (squeak/Squeak3.6-5429-full.zip) = 7837139
 MD5 (squeak/SqueakV3.sources.gz) = 7dc6b3840e6bc1e5f81e3717fb46d2c3
 SIZE (squeak/SqueakV3.sources.gz) = 3476504
-MD5 (squeak/Squeak3.5-5180.zip) = d9ca0657278fe5d5dba18aa799b0db30
-SIZE (squeak/Squeak3.5-5180.zip) = 6520043
diff --git a/lang/squeak3/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h b/lang/squeak3/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h
new file mode 100644
index 000000000000..ac04be2c3c10
--- /dev/null
+++ b/lang/squeak3/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h
@@ -0,0 +1,7 @@
+--- platforms/Cross/plugins/DropPlugin/DropPlugin.h.orig	Thu May 13 16:07:09 2004
++++ platforms/Cross/plugins/DropPlugin/DropPlugin.h	Thu May 13 16:05:52 2004
+@@ -10,3 +10,4 @@
+ int sqSecFileAccessCallback(void *);
+ void sqSetNumberOfDropFiles(int numberOfFiles);
+ void sqSetFileInformation(int dropIndex, void *dropFile);
++
diff --git a/lang/squeak3/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h b/lang/squeak3/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h
new file mode 100644
index 000000000000..d1f69cfbbd48
--- /dev/null
+++ b/lang/squeak3/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h
@@ -0,0 +1,10 @@
+--- platforms/Cross/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.h.orig	Thu May 13 16:09:52 2004
++++ platforms/Cross/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.h	Thu May 13 16:10:08 2004
+@@ -14,4 +14,5 @@
+ void error_exit (j_common_ptr cinfo);
+ GLOBAL(void) jpeg_mem_src (j_decompress_ptr cinfo, char * pSourceData, unsigned sourceDataSize);
+ GLOBAL(int) jpeg_mem_src_newLocationOfData (j_decompress_ptr cinfo, char * pSourceData, unsigned sourceDataSize);
+-GLOBAL(void) jpeg_mem_dest (j_compress_ptr cinfo, char * pDestination, unsigned *pDestinationSize);
+\ No newline at end of file
++GLOBAL(void) jpeg_mem_dest (j_compress_ptr cinfo, char * pDestination, unsigned *pDestinationSize);
++
diff --git a/lang/squeak3/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c b/lang/squeak3/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c
new file mode 100644
index 000000000000..a20e88f8d371
--- /dev/null
+++ b/lang/squeak3/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c
@@ -0,0 +1,10 @@
+--- platforms/Cross/plugins/JPEGReadWriter2Plugin/jmemdatasrc.c.orig	Thu May 13 16:25:49 2004
++++ platforms/Cross/plugins/JPEGReadWriter2Plugin/jmemdatasrc.c	Thu May 13 16:25:58 2004
+@@ -198,4 +198,5 @@
+   src->actualPos = pSourceData + offset;
+ 
+   return((src->actualPos + src->bytesLeft) == (pSourceData + sourceDataSize));
+-}
+\ No newline at end of file
++}
++
diff --git a/lang/squeak3/files/patch-platforms::Cross::plugins::Mpeg3Plugin::libmpeg::video::output.c b/lang/squeak3/files/patch-platforms::Cross::plugins::Mpeg3Plugin::libmpeg::video::output.c
deleted file mode 100644
index f5fa1f0bd1a1..000000000000
--- a/lang/squeak3/files/patch-platforms::Cross::plugins::Mpeg3Plugin::libmpeg::video::output.c
+++ /dev/null
@@ -1,290 +0,0 @@
---- platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/output.c.orig	Sun Aug 31 20:43:57 2003
-+++ platforms/Cross/plugins/Mpeg3Plugin/libmpeg/video/output.c	Sun Aug 31 20:45:36 2003
-@@ -261,38 +261,38 @@
- 		unsigned long v, 
- 		unsigned long *output)
- {
--asm("
--/* Output will be 0x00rrggbb with the 00 trailing so this can also be used */
--/* for bgr24. */
--	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */
--	movd (%1), %%mm1;          /* Load u    0x00000000000000cr */
--	movq %%mm0, %%mm3;         /* Copy y to temp */
--	psllq $16, %%mm1;          /* Shift u   0x0000000000cr0000 */
--	movd (%2), %%mm2;          /* Load v    0x00000000000000cb */
--	psllq $16, %%mm3;          /* Shift y */
--	movq %%mm1, %%mm4;         /* Copy u to temp */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */
--	psllq $16, %%mm4;          /* Shift u */
--	movq %%mm2, %%mm5;         /* Copy v to temp */
--	psllq $16, %%mm3;          /* Shift y  */
--	por %%mm4, %%mm1;          /* Overlay new u byte 0x000000cr00cr0000 */
--	psllq $16, %%mm5;          /* Shift v  */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */
--	por %%mm5, %%mm2;          /* Overlay new v byte 0x0000000000cb00cb */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x000000uu00uu0000 mm2: 0x0000000000vv00vv */
-- 	psubw _mpeg3_MMX_U_80, %%mm1;    /* Subtract 128 from u 0x000000uu00uu0000 */
-- 	pmullw _mpeg3_MMX_U_COEF, %%mm1; /* Multiply u coeffs 0x0000uuuuuuuu0000 */
-- 	psllw $6, %%mm0;                /* Shift y coeffs 0x0000yyy0yyy0yyy0 */
-- 	psubw _mpeg3_MMX_V_80, %%mm2;    /* Subtract 128 from v 0x0000000000cb00cb */
-- 	pmullw _mpeg3_MMX_V_COEF, %%mm2; /* Multiply v coeffs 0x0000crcrcrcrcrcr */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x0000uuuuuuuu0000 mm2: 0x00000000vvvvvvvv */
--	paddsw %%mm1, %%mm0;        /* Add u to result */
--	paddsw %%mm2, %%mm0;        /* Add v to result 0x0000rrrrggggbbbb */
--	psraw $6, %%mm0;           /* Demote precision */
--	packuswb %%mm0, %%mm0;     /* Pack into ARGB 0x0000000000rrggbb */
--	movd %%mm0, (%3);          /* Store output */
-+asm(" \
-+/* Output will be 0x00rrggbb with the 00 trailing so this can also be used */ \
-+/* for bgr24. */ \
-+	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */ \
-+	movd (%1), %%mm1;          /* Load u    0x00000000000000cr */\
-+	movq %%mm0, %%mm3;         /* Copy y to temp */\
-+	psllq $16, %%mm1;          /* Shift u   0x0000000000cr0000 */\
-+	movd (%2), %%mm2;          /* Load v    0x00000000000000cb */\
-+	psllq $16, %%mm3;          /* Shift y */\
-+	movq %%mm1, %%mm4;         /* Copy u to temp */\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */\
-+	psllq $16, %%mm4;          /* Shift u */\
-+	movq %%mm2, %%mm5;         /* Copy v to temp */\
-+	psllq $16, %%mm3;          /* Shift y  */\
-+	por %%mm4, %%mm1;          /* Overlay new u byte 0x000000cr00cr0000 */\
-+	psllq $16, %%mm5;          /* Shift v  */\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */\
-+	por %%mm5, %%mm2;          /* Overlay new v byte 0x0000000000cb00cb */\
-+\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x000000uu00uu0000 mm2: 0x0000000000vv00vv */\
-+ 	psubw _mpeg3_MMX_U_80, %%mm1;    /* Subtract 128 from u 0x000000uu00uu0000 */\
-+ 	pmullw _mpeg3_MMX_U_COEF, %%mm1; /* Multiply u coeffs 0x0000uuuuuuuu0000 */\
-+ 	psllw $6, %%mm0;                /* Shift y coeffs 0x0000yyy0yyy0yyy0 */\
-+ 	psubw _mpeg3_MMX_V_80, %%mm2;    /* Subtract 128 from v 0x0000000000cb00cb */\
-+ 	pmullw _mpeg3_MMX_V_COEF, %%mm2; /* Multiply v coeffs 0x0000crcrcrcrcrcr */\
-+\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x0000uuuuuuuu0000 mm2: 0x00000000vvvvvvvv */\
-+	paddsw %%mm1, %%mm0;        /* Add u to result */\
-+	paddsw %%mm2, %%mm0;        /* Add v to result 0x0000rrrrggggbbbb */\
-+	psraw $6, %%mm0;           /* Demote precision */\
-+	packuswb %%mm0, %%mm0;     /* Pack into ARGB 0x0000000000rrggbb */\
-+	movd %%mm0, (%3);          /* Store output */\
- 	"
- :
- : "r" (&y), "r" (&u), "r" (&v), "r" (output));
-@@ -303,39 +303,39 @@
- 		unsigned long v, 
- 		unsigned long *output)
- {
--asm("
--/* Output will be 0x00rrggbb with the 00 trailing so this can also be used */
--/* for bgr24. */
--	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */
--	psubsw _mpeg3_MMX_601_Y_DIFF, %%mm0;      /* Subtract 16 from y */
--	movd (%1), %%mm1;          /* Load u    0x00000000000000cr */
--	movq %%mm0, %%mm3;         /* Copy y to temp */
--	psllq $16, %%mm1;          /* Shift u   0x0000000000cr0000 */
--	movd (%2), %%mm2;          /* Load v    0x00000000000000cb */
--	psllq $16, %%mm3;          /* Shift y */
--	movq %%mm1, %%mm4;         /* Copy u to temp */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */
--	psllq $16, %%mm4;          /* Shift u */
--	movq %%mm2, %%mm5;         /* Copy v to temp */
--	psllq $16, %%mm3;          /* Shift y  */
--	por %%mm4, %%mm1;          /* Overlay new u byte 0x000000cr00cr0000 */
--	psllq $16, %%mm5;          /* Shift v  */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */
--	por %%mm5, %%mm2;          /* Overlay new v byte 0x0000000000cb00cb */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x000000uu00uu0000 mm2: 0x0000000000vv00vv */
--	pmullw _mpeg3_MMX_601_Y_COEF, %%mm0; /* Scale and shift y coeffs */
--	psubw _mpeg3_MMX_U_80, %%mm1;     /* Subtract 128 from u 0x000000uu00uu0000 */
-- 	pmullw _mpeg3_MMX_U_COEF, %%mm1;  /* Multiply u coeffs 0x0000uuuuuuuu0000 */
--	psubw _mpeg3_MMX_V_80, %%mm2;     /* Subtract 128 from v 0x0000000000cb00cb */
-- 	pmullw _mpeg3_MMX_V_COEF, %%mm2;  /* Multiply v coeffs 0x0000crcrcrcrcrcr */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x0000uuuuuuuu0000 mm2: 0x00000000vvvvvvvv */
--	paddsw %%mm1, %%mm0;        /* Add u to result */
--	paddsw %%mm2, %%mm0;        /* Add v to result 0x0000rrrrggggbbbb */
--	psraw $6, %%mm0;           /* Demote precision */
--	packuswb %%mm0, %%mm0;     /* Pack into ARGB 0x0000000000rrggbb */
--	movd %%mm0, (%3);          /* Store output */
-+asm("\
-+/* Output will be 0x00rrggbb with the 00 trailing so this can also be used */\
-+/* for bgr24. */\
-+	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */\
-+	psubsw _mpeg3_MMX_601_Y_DIFF, %%mm0;      /* Subtract 16 from y */\
-+	movd (%1), %%mm1;          /* Load u    0x00000000000000cr */\
-+	movq %%mm0, %%mm3;         /* Copy y to temp */\
-+	psllq $16, %%mm1;          /* Shift u   0x0000000000cr0000 */\
-+	movd (%2), %%mm2;          /* Load v    0x00000000000000cb */\
-+	psllq $16, %%mm3;          /* Shift y */\
-+	movq %%mm1, %%mm4;         /* Copy u to temp */\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */\
-+	psllq $16, %%mm4;          /* Shift u */\
-+	movq %%mm2, %%mm5;         /* Copy v to temp */\
-+	psllq $16, %%mm3;          /* Shift y  */\
-+	por %%mm4, %%mm1;          /* Overlay new u byte 0x000000cr00cr0000 */\
-+	psllq $16, %%mm5;          /* Shift v  */\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */\
-+	por %%mm5, %%mm2;          /* Overlay new v byte 0x0000000000cb00cb */\
-+\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x000000uu00uu0000 mm2: 0x0000000000vv00vv */\
-+	pmullw _mpeg3_MMX_601_Y_COEF, %%mm0; /* Scale and shift y coeffs */\
-+	psubw _mpeg3_MMX_U_80, %%mm1;     /* Subtract 128 from u 0x000000uu00uu0000 */\
-+ 	pmullw _mpeg3_MMX_U_COEF, %%mm1;  /* Multiply u coeffs 0x0000uuuuuuuu0000 */\
-+	psubw _mpeg3_MMX_V_80, %%mm2;     /* Subtract 128 from v 0x0000000000cb00cb */\
-+ 	pmullw _mpeg3_MMX_V_COEF, %%mm2;  /* Multiply v coeffs 0x0000crcrcrcrcrcr */\
-+\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x0000uuuuuuuu0000 mm2: 0x00000000vvvvvvvv */\
-+	paddsw %%mm1, %%mm0;        /* Add u to result */\
-+	paddsw %%mm2, %%mm0;        /* Add v to result 0x0000rrrrggggbbbb */\
-+	psraw $6, %%mm0;           /* Demote precision */\
-+	packuswb %%mm0, %%mm0;     /* Pack into ARGB 0x0000000000rrggbb */\
-+	movd %%mm0, (%3);          /* Store output */\
- 	"
- :
- : "r" (&y), "r" (&u), "r" (&v), "r" (output));
-@@ -351,38 +351,38 @@
- 		unsigned long v, 
- 		unsigned long *output)
- {
--asm("
--/* Output will be 0x00bbggrr with the 00 trailing so this can also be used */
--/* for rgb24. */
--	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */
--	movd (%1), %%mm1;          /* Load v    0x00000000000000vv */
--	movq %%mm0, %%mm3;         /* Copy y to temp */
--	psllq $16, %%mm1;          /* Shift v   0x0000000000vv0000 */
--	movd (%2), %%mm2;          /* Load u    0x00000000000000uu */
--	psllq $16, %%mm3;          /* Shift y */
--	movq %%mm1, %%mm4;         /* Copy v to temp */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */
--	psllq $16, %%mm4;          /* Shift v */
--	movq %%mm2, %%mm5;         /* Copy u to temp */
--	psllq $16, %%mm3;          /* Shift y  */
--	por %%mm4, %%mm1;          /* Overlay new v byte 0x000000vv00vv0000 */
--	psllq $16, %%mm5;          /* Shift u  */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */
--	por %%mm5, %%mm2;          /* Overlay new u byte 0x0000000000uu00uu */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x000000vv00vv0000 mm2: 0x0000000000uu00uu */
-- 	psubw _mpeg3_MMX_V_80_RGB, %%mm1;    /* Subtract 128 from v 0x000000vv00vv0000 */
-- 	pmullw _mpeg3_MMX_V_COEF_RGB, %%mm1; /* Multiply v coeffs 0x0000vvvvvvvv0000 */
-- 	psllw $6, %%mm0;                /* Shift y coeffs 0x0000yyy0yyy0yyy0 */
-- 	psubw _mpeg3_MMX_U_80_RGB, %%mm2;    /* Subtract 128 from u 0x0000000000uu00uu */
-- 	pmullw _mpeg3_MMX_U_COEF_RGB, %%mm2; /* Multiply u coeffs 0x0000uuuuuuuuuuuu */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x0000vvvvvvvv0000 mm2: 0x00000000uuuuuuuu */
--	paddsw %%mm1, %%mm0;        /* Add v to result */
--	paddsw %%mm2, %%mm0;        /* Add u to result 0x0000bbbbggggrrrr */
--	psraw $6, %%mm0;           /* Demote precision */
--	packuswb %%mm0, %%mm0;     /* Pack into RGBA 0x0000000000bbggrr */
--	movd %%mm0, (%3);          /* Store output */
-+asm("\
-+/* Output will be 0x00bbggrr with the 00 trailing so this can also be used */\
-+/* for rgb24. */\
-+	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */\
-+	movd (%1), %%mm1;          /* Load v    0x00000000000000vv */\
-+	movq %%mm0, %%mm3;         /* Copy y to temp */\
-+	psllq $16, %%mm1;          /* Shift v   0x0000000000vv0000 */\
-+	movd (%2), %%mm2;          /* Load u    0x00000000000000uu */\
-+	psllq $16, %%mm3;          /* Shift y */\
-+	movq %%mm1, %%mm4;         /* Copy v to temp */\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */\
-+	psllq $16, %%mm4;          /* Shift v */\
-+	movq %%mm2, %%mm5;         /* Copy u to temp */\
-+	psllq $16, %%mm3;          /* Shift y  */\
-+	por %%mm4, %%mm1;          /* Overlay new v byte 0x000000vv00vv0000 */\
-+	psllq $16, %%mm5;          /* Shift u  */\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */\
-+	por %%mm5, %%mm2;          /* Overlay new u byte 0x0000000000uu00uu */\
-+\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x000000vv00vv0000 mm2: 0x0000000000uu00uu */\
-+ 	psubw _mpeg3_MMX_V_80_RGB, %%mm1;    /* Subtract 128 from v 0x000000vv00vv0000 */\
-+ 	pmullw _mpeg3_MMX_V_COEF_RGB, %%mm1; /* Multiply v coeffs 0x0000vvvvvvvv0000 */\
-+ 	psllw $6, %%mm0;                /* Shift y coeffs 0x0000yyy0yyy0yyy0 */\
-+ 	psubw _mpeg3_MMX_U_80_RGB, %%mm2;    /* Subtract 128 from u 0x0000000000uu00uu */\
-+ 	pmullw _mpeg3_MMX_U_COEF_RGB, %%mm2; /* Multiply u coeffs 0x0000uuuuuuuuuuuu */\
-+\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x0000vvvvvvvv0000 mm2: 0x00000000uuuuuuuu */\
-+	paddsw %%mm1, %%mm0;        /* Add v to result */\
-+	paddsw %%mm2, %%mm0;        /* Add u to result 0x0000bbbbggggrrrr */\
-+	psraw $6, %%mm0;           /* Demote precision */\
-+	packuswb %%mm0, %%mm0;     /* Pack into RGBA 0x0000000000bbggrr */\
-+	movd %%mm0, (%3);          /* Store output */\
- 	"
- :
- : "r" (&y), "r" (&v), "r" (&u), "r" (output));
-@@ -393,39 +393,39 @@
- 		unsigned long v, 
- 		unsigned long *output)
- {
--asm("
--/* Output will be 0x00bbggrr with the 00 trailing so this can also be used */
--/* for rgb24. */
--	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */
--	psubsw _mpeg3_MMX_601_Y_DIFF, %%mm0;      /* Subtract 16 from y */
--	movd (%1), %%mm1;          /* Load v    0x00000000000000vv */
--	movq %%mm0, %%mm3;         /* Copy y to temp */
--	psllq $16, %%mm1;          /* Shift v   0x0000000000vv0000 */
--	movd (%2), %%mm2;          /* Load u    0x00000000000000uu */
--	psllq $16, %%mm3;          /* Shift y */
--	movq %%mm1, %%mm4;         /* Copy v to temp */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */
--	psllq $16, %%mm4;          /* Shift v */
--	movq %%mm2, %%mm5;         /* Copy u to temp */
--	psllq $16, %%mm3;          /* Shift y  */
--	por %%mm4, %%mm1;          /* Overlay new v byte 0x000000vv00vv0000 */
--	psllq $16, %%mm5;          /* Shift u  */
--	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */
--	por %%mm5, %%mm2;          /* Overlay new u byte 0x0000000000uu00uu */
--
--/* mm0: 0x000000yy00yy00yy     mm1: 0x000000vv00vv0000     mm2: 0x0000000000uu00uu */
--	pmullw _mpeg3_MMX_601_Y_COEF, %%mm0;     /* Scale y coeffs */
-- 	psubw _mpeg3_MMX_V_80_RGB, %%mm1;    /* Subtract 128 from v 0x000000vv00vv0000 */
-- 	pmullw _mpeg3_MMX_V_COEF_RGB, %%mm1; /* Multiply v coeffs 0x0000vvvvvvvv0000 */
-- 	psubw _mpeg3_MMX_U_80_RGB, %%mm2;    /* Subtract 128 from u 0x0000000000uu00uu */
-- 	pmullw _mpeg3_MMX_U_COEF_RGB, %%mm2; /* Multiply u coeffs 0x0000uuuuuuuuuuuu */
--
--/* mm0: 0x000000yy00yy00yy mm1: 0x0000vvvvvvvv0000 mm2: 0x00000000uuuuuuuu */
--	paddsw %%mm1, %%mm0;        /* Add v to result */
--	paddsw %%mm2, %%mm0;        /* Add u to result 0x0000bbbbggggrrrr */
--	psraw $6, %%mm0;           /* Demote precision */
--	packuswb %%mm0, %%mm0;     /* Pack into RGBA 0x0000000000bbggrr */
--	movd %%mm0, (%3);          /* Store output */
-+asm("\
-+/* Output will be 0x00bbggrr with the 00 trailing so this can also be used */\
-+/* for rgb24. */\
-+	movd (%0), %%mm0;          /* Load y   0x00000000000000yy */\
-+	psubsw _mpeg3_MMX_601_Y_DIFF, %%mm0;      /* Subtract 16 from y */\
-+	movd (%1), %%mm1;          /* Load v    0x00000000000000vv */\
-+	movq %%mm0, %%mm3;         /* Copy y to temp */\
-+	psllq $16, %%mm1;          /* Shift v   0x0000000000vv0000 */\
-+	movd (%2), %%mm2;          /* Load u    0x00000000000000uu */\
-+	psllq $16, %%mm3;          /* Shift y */\
-+	movq %%mm1, %%mm4;         /* Copy v to temp */\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x0000000000yy00yy */\
-+	psllq $16, %%mm4;          /* Shift v */\
-+	movq %%mm2, %%mm5;         /* Copy u to temp */\
-+	psllq $16, %%mm3;          /* Shift y  */\
-+	por %%mm4, %%mm1;          /* Overlay new v byte 0x000000vv00vv0000 */\
-+	psllq $16, %%mm5;          /* Shift u  */\
-+	por %%mm3, %%mm0;          /* Overlay new y byte 0x000000yy00yy00yy */\
-+	por %%mm5, %%mm2;          /* Overlay new u byte 0x0000000000uu00uu */\
-+\
-+/* mm0: 0x000000yy00yy00yy     mm1: 0x000000vv00vv0000     mm2: 0x0000000000uu00uu */\
-+	pmullw _mpeg3_MMX_601_Y_COEF, %%mm0;     /* Scale y coeffs */\
-+ 	psubw _mpeg3_MMX_V_80_RGB, %%mm1;    /* Subtract 128 from v 0x000000vv00vv0000 */\
-+ 	pmullw _mpeg3_MMX_V_COEF_RGB, %%mm1; /* Multiply v coeffs 0x0000vvvvvvvv0000 */\
-+ 	psubw _mpeg3_MMX_U_80_RGB, %%mm2;    /* Subtract 128 from u 0x0000000000uu00uu */\
-+ 	pmullw _mpeg3_MMX_U_COEF_RGB, %%mm2; /* Multiply u coeffs 0x0000uuuuuuuuuuuu */\
-+\
-+/* mm0: 0x000000yy00yy00yy mm1: 0x0000vvvvvvvv0000 mm2: 0x00000000uuuuuuuu */\
-+	paddsw %%mm1, %%mm0;        /* Add v to result */\
-+	paddsw %%mm2, %%mm0;        /* Add u to result 0x0000bbbbggggrrrr */\
-+	psraw $6, %%mm0;           /* Demote precision */\
-+	packuswb %%mm0, %%mm0;     /* Pack into RGBA 0x0000000000bbggrr */\
-+	movd %%mm0, (%3);          /* Store output */\
- 	"
- :
- : "r" (&y), "r" (&v), "r" (&u), "r" (output));
diff --git a/lang/squeak3/files/patch-platforms::unix::config::configure b/lang/squeak3/files/patch-platforms::unix::config::configure
index ff4bc0e28148..38f45aa494ec 100644
--- a/lang/squeak3/files/patch-platforms::unix::config::configure
+++ b/lang/squeak3/files/patch-platforms::unix::config::configure
@@ -1,17 +1,10 @@
---- platforms/unix/config/configure.orig	Tue Jul  1 18:53:26 2003
-+++ platforms/unix/config/configure	Tue Jul  1 19:03:44 2003
-@@ -9852,7 +9852,12 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #line 9853 "configure"
- #include "confdefs.h"
--main(){ double d= 1.0; return *(int *)&d == 0;}
-+int main(void)
-+{
-+	union { double d; int i[ sizeof(double) / sizeof(int) ]; } d;
-+	d.d = 1.0;
-+	return d.i[0] == 0;
-+}
- _ACEOF
- rm -f conftest$ac_exeext
- if { (eval echo "$as_me:9858: \"$ac_link\"") >&5
-
+--- platforms/unix/config/configure.orig	Mon May 10 10:54:48 2004
++++ platforms/unix/config/configure	Mon May 10 10:54:15 2004
+@@ -23526,6 +23526,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/soundcard.h>
++#define OPEN_SOUND_SYSTEM
+ int
+ main ()
+ {
diff --git a/lang/squeak3/files/patch-openpty-h b/lang/squeak3/files/patch-platforms::unix::plugins::PseudoTTYPlugin::openpty.h
index 36dd49bcd97b..36dd49bcd97b 100644
--- a/lang/squeak3/files/patch-openpty-h
+++ b/lang/squeak3/files/patch-platforms::unix::plugins::PseudoTTYPlugin::openpty.h
diff --git a/lang/squeak3/files/patch-platforms::unix::vm-sound-OSS::acinclude.m4 b/lang/squeak3/files/patch-platforms::unix::vm-sound-OSS::acinclude.m4
new file mode 100644
index 000000000000..3fb9e7e023a1
--- /dev/null
+++ b/lang/squeak3/files/patch-platforms::unix::vm-sound-OSS::acinclude.m4
@@ -0,0 +1,11 @@
+--- platforms/unix/vm-sound-OSS/acinclude.m4.orig	Mon May 10 10:18:03 2004
++++ platforms/unix/vm-sound-OSS/acinclude.m4	Mon May 10 10:18:22 2004
+@@ -1,7 +1,7 @@
+ # -*- sh -*-
+ 
+ AC_MSG_CHECKING([for Open Sound System])
+-AC_TRY_COMPILE([#include <sys/soundcard.h>],[OPEN_SOUND_SYSTEM;],[
++AC_TRY_COMPILE([#include <sys/soundcard.h>],[EV_SEQ_LOCAL;],[
+   AC_MSG_RESULT(yes)
+ ],[
+   AC_MSG_RESULT(no)
diff --git a/lang/squeak3/pkg-descr b/lang/squeak3/pkg-descr
index 3cbd7d51ec71..c451fd6794a0 100644
--- a/lang/squeak3/pkg-descr
+++ b/lang/squeak3/pkg-descr
@@ -1,21 +1,24 @@
-Squeak is an implementation of the Smalltalk programming
-environment; it includes among other things:
+Squeak is an open, highly-portable Smalltalk-80 implementation whose
+virtual machine is written entirely in Smalltalk, making it easy to
+debug, analyze, and change; it includes among other things:
     * a rapid-turn-around Smalltalk-80 compiler,
     * a caching-JIT run-time virtual machine (with full source in
       Smalltalk),
     * large class libraries with portable data and GUI models, and
-    * an integrated development environment with coding tools, GUI
-      construction.
+    * an integrated development environment with powerful coding
+      tools and GUI construction tools.
 
-Squeak was developed at Apple Labs and Walt Disney and has been ported
-to a variety of computers (including most flavors of UNIX and
-Windows). Compared to other Smalltalk systems, Squeak has 4 important
-features:
+Squeak was developed at Apple Labs, Walt Disney and has been ported
+to a variety of computers (including most flavors of UNIX and Windows).
+Compared to other Smalltalk systems, Squeak has 4 important features:
     * Portability (to Mac, Windows, WinCE, and many flavors of UNIX);
     * Speed (it uses native C for compute-intensive code);
     * Price (free, including all source code and the right to distribute
       applications!); and
     * Sophistication (full Smalltalk-80 language, libraries, and tools).
 
+Squeak comes under an open source license, meaning that you can
+download and use it for free.
+
 WWW: http://www.squeak.org/ (Squeak project)
      http://www-sor.inria.fr/~piumarta/squeak/ (Unix Squeak)
diff --git a/lang/squeak3/pkg-message b/lang/squeak3/pkg-message
deleted file mode 100644
index 3a4835522211..000000000000
--- a/lang/squeak3/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
---------------- Please note: ---------------
-Make sure you have ${PREFIX}/bin in your PATH and
-${PREFIX}/lib as well as ${PREFIX}/share/squeak/3.4-1
-in your LD_LIBRARY_PATH.
-
-In order to be able to make use of squeak you need
-to have an image and a changes file in your working
-directory as well as access to a source file.
-Please see the inisqueak(1) manpage for details.
---------------- Thanks for listening. ---------------
diff --git a/lang/squeak3/pkg-plist b/lang/squeak3/pkg-plist
index 23faa23b7496..41859a89eb44 100644
--- a/lang/squeak3/pkg-plist
+++ b/lang/squeak3/pkg-plist
@@ -1,23 +1,30 @@
 bin/inisqueak
 bin/squeak
-share/doc/squeak/COPYING
-share/doc/squeak/COPYRIGHT
-share/doc/squeak/LICENSE
-share/doc/squeak/README.Contributing
-share/doc/squeak/README.Keyboard
-share/doc/squeak/README.Sound
-share/squeak/3.4-1/B3DAcceleratorPlugin.la
-share/squeak/3.4-1/B3DAcceleratorPlugin.so
-share/squeak/3.4-1/PseudoTTYPlugin.la
-share/squeak/3.4-1/PseudoTTYPlugin.so
-share/squeak/3.4-1/npsqueak.so
-share/squeak/3.4-1/npsqueakrun
-share/squeak/3.4-1/squeak
+share/doc/squeak/COPYING.gz
+share/doc/squeak/COPYRIGHT.gz
+share/doc/squeak/LICENSE.gz
+share/doc/squeak/README.Contributing.gz
+share/doc/squeak/README.Keyboard.gz
+share/doc/squeak/README.Sound.gz
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+%%PLIST_X%%share/squeak/%%VMVERSION%%/B3DAcceleratorPlugin
+share/squeak/%%VMVERSION%%/UnixOSProcessPlugin
+%%PLIST_X%%share/squeak/%%VMVERSION%%/XDisplayControlPlugin
+%%PLIST_NPSQUEAK%%share/squeak/%%VMVERSION%%/npsqueak.so
+%%PLIST_NPSQUEAK%%share/squeak/%%VMVERSION%%/npsqueakrun
+share/squeak/%%VMVERSION%%/squeak
+%%PLIST_X%%share/squeak/%%VMVERSION%%/vm-display-X11
+share/squeak/%%VMVERSION%%/vm-display-null
+share/squeak/%%VMVERSION%%/vm-sound-OSS
+share/squeak/%%VMVERSION%%/vm-sound-null
 share/squeak/ReadMe.txt
-share/squeak/Squeak3.5-5180.changes.gz
-share/squeak/Squeak3.5-5180.image.gz
+share/squeak/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-basic.changes.gz
+share/squeak/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-basic.image.gz
+share/squeak/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-full.changes.gz
+share/squeak/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-full.image.gz
 share/squeak/SqueakV3.sources
-share/squeak/npsqueakregister
-@dirrm share/squeak/3.4-1
+%%PLIST_NPSQUEAK%%share/squeak/npsqueakregister
+@dirrm share/squeak/%%VMVERSION%%
 @dirrm share/squeak
 @dirrm share/doc/squeak