- Update to 3.9-7

PR:		126298
Submitted by:	Takeshi MUTOH <mutoh@openedu.org> (maintainer)

30 files changed, 178 insertions, 158 deletions

diff --git a/lang/squeak-dev/Makefile b/lang/squeak-dev/Makefile
index b46d32213b6e..98b1bf24d75c 100644
--- a/lang/squeak-dev/Makefile
+++ b/lang/squeak-dev/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		squeak
-PORTVERSION=		3.7
-PORTREVISION=	3
+PORTVERSION=		3.9
 CATEGORIES=		lang
 ##################################################
 MASTER_SITES=		http://www.squeakvm.org/unix/release/ \
@@ -18,13 +17,12 @@ MASTER_SITES=		http://www.squeakvm.org/unix/release/ \
 			ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/ \
 			ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/unix-linux/ \
 			http://www.squeakland.org/installers/:plugin \
-			http://www.squeakland.jp/plugin/installers/:jpplugin \
+			http://squeakland.jp/plugin/installers/:jpplugin \
 			http://squeak.610t.org/patches/:ximpatch
 DISTFILES=		Squeak-${VMVERSION}.src${EXTRACT_SUFX} \
-			Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip \
-			Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip \
+			Squeak${IMAGEVERSION}-${PATCHNUMBER}.zip \
 			SqueakV3.sources.gz \
-			${JAPANESE_PLUGIN_IMAGE}:jpplugin
+			SqueakV39.sources.gz
 EXTRACT_ONLY=		Squeak-${VMVERSION}.src${EXTRACT_SUFX}
 
 ##################################################
@@ -33,18 +31,19 @@ COMMENT=		Full Smalltalk 80 with portability to UNIX, Mac, and Windows
 
 # Don't set USE_ZIP as this breaks EXTRACT_CMD.
 BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=		audio:${PORTSDIR}/audio/nas
+LIB_DEPENDS=		audio:${PORTSDIR}/audio/nas \
+			ffi:${PORTSDIR}/devel/libffi
 
 ##################################################
-VMVERSION=		3.7-7
-IMAGEVERSION=		3.7
-PATCHNUMBER=		5989
+VMVERSION=		3.9-7
+IMAGEVERSION=		3.9-final
+PATCHNUMBER=		7067
+IMAGEDIR=		Squeak${IMAGEVERSION}-${PATCHNUMBER}
 
 ##################################################
 OPTIONS+=		MPG_MMX		"MMX support (MPG plugin)" off
 OPTIONS+=		NPSQUEAK	"browser plugin support" on
 OPTIONS+=		RFB		"remote frame buffer support" on
-OPTIONS+=		FFI		"libffi support" off
 OPTIONS+=		X		"X Windows support" on
 OPTIONS+=		XIM		"XIM support (Implies X)" off
 
@@ -53,7 +52,7 @@ OPTIONS+=		XIM		"XIM support (Implies X)" off
 ##################################################
 XIM_PATCH=		SqueakImmX11Plugin3a${EXTRACT_SUFX}
 PLUGIN_IMAGE=		SqueakPlugin.zip
-JAPANESE_PLUGIN_IMAGE=		SqueakPlugin2005J.zip
+JAPANESE_PLUGIN_IMAGE=		SqueakPlugin2005J2.zip
 
 ##################################################
 DIST_SUBDIR=		squeak
@@ -69,10 +68,8 @@ SHAREMODE=		644
 # 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
+FILES_TO_GZIP=		${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.image \
+			${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.changes
 
 ##################################################
 # Configure and Build
@@ -120,17 +117,9 @@ PLIST_X=
 CONFIGURE_ARGS+=	--enable-mpg-mmx
 .endif
 
-.if defined(WITH_FFI)
-LIB_DEPENDS+=		ffi.2:${PORTSDIR}/devel/libffi
-PLIST_FFI=
-EXT_PLUGINS+=		SqueakFFIPrims
-.else
-CONFIGURE_ARGS+=	--without-ffi
-PLIST_FFI=		"@comment feature not wanted - "
-.endif
-
 .if defined(WITH_XIM)
-DISTFILES+=		${XIM_PATCH}:ximpatch
+DISTFILES+=		${XIM_PATCH}:ximpatch \
+			${JAPANESE_PLUGIN_IMAGE}:jpplugin
 PLIST_XIM=
 WITH_X=			yes
 USE_ICONV=		yes
@@ -156,7 +145,6 @@ PLIST_SUB=		IMAGEVERSION=${IMAGEVERSION}\
 			VMVERSION=${VMVERSION}\
 			PLIST_NPSQUEAK=${PLIST_NPSQUEAK}\
 			PLIST_X=${PLIST_X} \
-			PLIST_FFI=${PLIST_FFI} \
 			PLIST_XIM=${PLIST_XIM}
 
 ##################################################
@@ -175,7 +163,7 @@ post-patch:
 		${PATCH} -S + -p0 < ImmX11.patch
 .endif
 # Fix external plugins
-	@${ECHO_MSG} "EXTERNAL_PLUGINS = B3DAcceleratorPlugin Squeak3D XDisplayControlPlugin ${EXT_PLUGINS}" > ${WRKSRC}/platforms/unix/src/plugins.ext
+	@${ECHO_MSG} "EXTERNAL_PLUGINS = B3DAcceleratorPlugin PseudoTTYPlugin UnixOSProcessPlugin XDisplayControlPlugin Squeak3D AioPlugin ${EXT_PLUGINS}" > ${WRKSRC}/platforms/unix/src/plugins.ext
 
 ##################################################
 pre-configure:
@@ -192,15 +180,16 @@ post-configure:
 post-install:
 	(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_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip -d ${WRKDIR})
-	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip -d ${WRKDIR})
-	(cd ${WRKDIR} && ${INSTALL_DATA} ReadMe.txt ${PREFIX}/share/squeak/)
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} SqueakV39.sources.gz ${PREFIX}/share/squeak/)
+	(cd ${PREFIX}/share/squeak && ${EXTRACT_CMD} -d SqueakV39.sources.gz)
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}.zip -d ${WRKDIR} Squeak${IMAGEVERSION}-${PATCHNUMBER}/*)
 .if defined(WITH_NPSQUEAK)
 	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u ${PLUGIN_IMAGE} -d ${WRKDIR})
 .endif
 .for file in ${FILES_TO_GZIP}
 	(cd ${WRKDIR} && ${GZIP_CMD} ${file} && ${INSTALL_DATA} ${file}.gz ${PREFIX}/share/squeak/)
 .endfor
+	(cd ${WRKDIR} && ${INSTALL_DATA} ${IMAGEDIR}/SqueakV39.sources ${PREFIX}/share/squeak/${VMVERSION})
 	${INSTALL_SCRIPT} ${WRKSRC}/build/inisqueak ${PREFIX}/bin/inisqueak
 	${CHMOD} 755 ${PREFIX}/bin/inisqueak
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/squeak-dev/distinfo b/lang/squeak-dev/distinfo
index 1db764b83dad..522e5f308a7c 100644
--- a/lang/squeak-dev/distinfo
+++ b/lang/squeak-dev/distinfo
@@ -1,21 +1,21 @@
-MD5 (squeak/Squeak-3.7-7.src.tar.gz) = c6b051b745080516c550cab0db1882fc
-SHA256 (squeak/Squeak-3.7-7.src.tar.gz) = 9a41e3245c092115690c055297a9cb94caf1cb79b7faeeff8b923e0822f45234
-SIZE (squeak/Squeak-3.7-7.src.tar.gz) = 2383081
-MD5 (squeak/Squeak3.7-5989-basic.zip) = cf2e63554772ca2f137bb793e8dfadfb
-SHA256 (squeak/Squeak3.7-5989-basic.zip) = 9f009a6d61b2562a6e0f46032fde5957e459197ad3571a4b08eec3fa51f6b1fe
-SIZE (squeak/Squeak3.7-5989-basic.zip) = 9235390
-MD5 (squeak/Squeak3.7-5989-full.zip) = a289c0ff94caf95f93eff7d0759ffc65
-SHA256 (squeak/Squeak3.7-5989-full.zip) = ed5c49cda9be1b70b1fdfa18bdac96b676b0e1337a153f72380bf825cf85ab8e
-SIZE (squeak/Squeak3.7-5989-full.zip) = 12993350
+MD5 (squeak/Squeak-3.9-7.src.tar.gz) = 89ca12f4134dbb26c5d383c566774010
+SHA256 (squeak/Squeak-3.9-7.src.tar.gz) = fbfa95093b32c53b302189f3b8ea08406dd9b133194e91810263d93f42344d0f
+SIZE (squeak/Squeak-3.9-7.src.tar.gz) = 3948315
+MD5 (squeak/Squeak3.9-final-7067.zip) = 30d991c418be1cd9c5d05fb87dea2f19
+SHA256 (squeak/Squeak3.9-final-7067.zip) = 4353a7bd05f2dba23ed735ac3171b32a0935a20ebfce9307cffc4eb9f254e872
+SIZE (squeak/Squeak3.9-final-7067.zip) = 11842207
 MD5 (squeak/SqueakPlugin.zip) = 8a14a482fc0e601fc9c1e702ac52b760
 SHA256 (squeak/SqueakPlugin.zip) = 9442d8f95166db4874800caa21b88551906d9ad66cb9391151d0d24e5022b488
 SIZE (squeak/SqueakPlugin.zip) = 5732659
 MD5 (squeak/SqueakV3.sources.gz) = 7dc6b3840e6bc1e5f81e3717fb46d2c3
 SHA256 (squeak/SqueakV3.sources.gz) = 6d8262b61d5608de36eff5cb930ea8aa588b7402c0a963680b07ff664ba74d02
 SIZE (squeak/SqueakV3.sources.gz) = 3476504
+MD5 (squeak/SqueakV39.sources.gz) = 4fe515af7428dbe69e90126c78255db9
+SHA256 (squeak/SqueakV39.sources.gz) = ac73d415398b0f79e64d01310e15e3af4203be3c97ea8c1154337d98949cf1a0
+SIZE (squeak/SqueakV39.sources.gz) = 4185101
 MD5 (squeak/SqueakImmX11Plugin3a.tar.gz) = 19f232d475bcce36a15be0f0fd726979
 SHA256 (squeak/SqueakImmX11Plugin3a.tar.gz) = 76858ebf5e45adc48cad2cee69312163ea0082b173325ef02e57dd826c6e3bdf
 SIZE (squeak/SqueakImmX11Plugin3a.tar.gz) = 11614
-MD5 (squeak/SqueakPlugin2005J.zip) = 47dafa5fa4c9c60982227a6bf97419f8
-SHA256 (squeak/SqueakPlugin2005J.zip) = a9b5bbc50742fea6172bb0ca99cef1244ce1f75ba46c20569316da3fbe909232
-SIZE (squeak/SqueakPlugin2005J.zip) = 7921994
+MD5 (squeak/SqueakPlugin2005J2.zip) = 057e3355d0d05e810d8629251cbb2838
+SHA256 (squeak/SqueakPlugin2005J2.zip) = 01a6df94213616e70b224710f7a572155a0e13259ffffcd702bd2e618b5ee584
+SIZE (squeak/SqueakPlugin2005J2.zip) = 7973501
diff --git a/lang/squeak-dev/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h b/lang/squeak-dev/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h
deleted file mode 100644
index ac04be2c3c10..000000000000
--- a/lang/squeak-dev/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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/squeak-dev/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h b/lang/squeak-dev/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h
deleted file mode 100644
index d1f69cfbbd48..000000000000
--- a/lang/squeak-dev/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/squeak-dev/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c b/lang/squeak-dev/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c
deleted file mode 100644
index a20e88f8d371..000000000000
--- a/lang/squeak-dev/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/squeak-dev/files/patch-platforms::unix::config::configure b/lang/squeak-dev/files/patch-platforms__unix__config__configure
index 38f45aa494ec..38f45aa494ec 100644
--- a/lang/squeak-dev/files/patch-platforms::unix::config::configure
+++ b/lang/squeak-dev/files/patch-platforms__unix__config__configure
diff --git a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile b/lang/squeak-dev/files/patch-platforms__unix__npsqueak__Makefile
index d5def76a44c7..d5def76a44c7 100644
--- a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile
+++ b/lang/squeak-dev/files/patch-platforms__unix__npsqueak__Makefile
diff --git a/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in b/lang/squeak-dev/files/patch-platforms__unix__npsqueak__npsqueakregister.in
index a7bd917d2677..de93fdadec66 100644
--- a/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in
+++ b/lang/squeak-dev/files/patch-platforms__unix__npsqueak__npsqueakregister.in
@@ -7,7 +7,7 @@
 -BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib"
 -BROWSER_DIRS="/usr/local/lib /usr/lib /opt"
 +BROWSERS="netscape mozilla firefox opera seamonkey"
-+BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib"
++BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib"
  SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins"
  
  ACTION=register
diff --git a/lang/squeak-dev/files/patch-platforms::unix::plugins::PseudoTTYPlugin::openpty.h b/lang/squeak-dev/files/patch-platforms__unix__plugins__PseudoTTYPlugin__openpty.h
index 36dd49bcd97b..36dd49bcd97b 100644
--- a/lang/squeak-dev/files/patch-platforms::unix::plugins::PseudoTTYPlugin::openpty.h
+++ b/lang/squeak-dev/files/patch-platforms__unix__plugins__PseudoTTYPlugin__openpty.h
diff --git a/lang/squeak-dev/files/patch-platforms::unix::plugins::SqueakFFIPrims::Makefile.in b/lang/squeak-dev/files/patch-platforms__unix__plugins__SqueakFFIPrims__Makefile.in
index 3c0fd9e7894e..3c0fd9e7894e 100644
--- a/lang/squeak-dev/files/patch-platforms::unix::plugins::SqueakFFIPrims::Makefile.in
+++ b/lang/squeak-dev/files/patch-platforms__unix__plugins__SqueakFFIPrims__Makefile.in
diff --git a/lang/squeak-dev/files/patch-platforms::unix::plugins::SqueakFFIPrims::ffi-config b/lang/squeak-dev/files/patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config
index 80ded9fb17c9..80ded9fb17c9 100644
--- a/lang/squeak-dev/files/patch-platforms::unix::plugins::SqueakFFIPrims::ffi-config
+++ b/lang/squeak-dev/files/patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config
diff --git a/lang/squeak-dev/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c b/lang/squeak-dev/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c
new file mode 100644
index 000000000000..91518b93b728
--- /dev/null
+++ b/lang/squeak-dev/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c
@@ -0,0 +1,47 @@
+--- platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c.org	Sun Apr 23 16:18:27 2006
++++ platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c	Sun Apr 23 16:20:43 2006
+@@ -1818,7 +1818,7 @@
+ 		return interpreterProxy->primitiveFail();
+ 	}
+ 	sqFile = interpreterProxy->arrayValueOf(sqFileOop);
+-	if ((feof(sqFile->file)) == 0) {
++	if ((feof((FILE *)sqFile->file)) == 0) {
+ 		result = interpreterProxy->falseObject();
+ 	} else {
+ 		result = interpreterProxy->trueObject();
+@@ -1870,7 +1870,7 @@
+ 
+ 	/* 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 @@
+ 
+ 	/* 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 @@
+ 		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 @@
+ 
+ 	/* 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;
diff --git a/lang/squeak-dev/files/patch-platforms::unix::vm-sound-OSS::acinclude.m4 b/lang/squeak-dev/files/patch-platforms__unix__vm-sound-OSS__acinclude.m4
index 3fb9e7e023a1..3fb9e7e023a1 100644
--- a/lang/squeak-dev/files/patch-platforms::unix::vm-sound-OSS::acinclude.m4
+++ b/lang/squeak-dev/files/patch-platforms__unix__vm-sound-OSS__acinclude.m4
diff --git a/lang/squeak-dev/pkg-descr b/lang/squeak-dev/pkg-descr
index ed6e32cc57aa..c451fd6794a0 100644
--- a/lang/squeak-dev/pkg-descr
+++ b/lang/squeak-dev/pkg-descr
@@ -21,4 +21,4 @@ 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.squeakvm.org/unix/ (Unix Squeak)
+     http://www-sor.inria.fr/~piumarta/squeak/ (Unix Squeak)
diff --git a/lang/squeak-dev/pkg-plist b/lang/squeak-dev/pkg-plist
index 03866a82c0ac..c472231b2915 100644
--- a/lang/squeak-dev/pkg-plist
+++ b/lang/squeak-dev/pkg-plist
@@ -10,22 +10,23 @@ bin/squeak
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/Squeak3D
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/XDisplayControlPlugin
 %%PLIST_XIM%%%%DATADIR%%/%%VMVERSION%%/ImmX11Plugin
-%%PLIST_FFI%%%%DATADIR%%/%%VMVERSION%%/SqueakFFIPrims
 %%PLIST_NPSQUEAK%%%%DATADIR%%/%%VMVERSION%%/npsqueak.so
 %%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueakrun
 %%DATADIR%%/%%VMVERSION%%/squeak
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/vm-display-X11
+%%DATADIR%%/%%VMVERSION%%/AioPlugin
+%%DATADIR%%/%%VMVERSION%%/PseudoTTYPlugin
+%%DATADIR%%/%%VMVERSION%%/UnixOSProcessPlugin
 %%DATADIR%%/%%VMVERSION%%/vm-display-null
 %%DATADIR%%/%%VMVERSION%%/vm-sound-NAS
 %%DATADIR%%/%%VMVERSION%%/vm-sound-OSS
 %%DATADIR%%/%%VMVERSION%%/vm-sound-null
-%%DATADIR%%/ReadMe.txt
-%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-basic.changes.gz
-%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-basic.image.gz
-%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-full.changes.gz
-%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-full.image.gz
-%%DATADIR%%/SqueakPlugin.image.gz
+%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%.changes.gz
+%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%.image.gz
+%%PLIST_NPSQUEAK%%%%DATADIR%%/SqueakPlugin.image.gz
 %%DATADIR%%/SqueakV3.sources
+%%DATADIR%%/SqueakV39.sources
+%%DATADIR%%/%%VMVERSION%%/SqueakV39.sources
 %%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueakregister
 @dirrm %%DATADIR%%/%%VMVERSION%%
 @dirrm %%DATADIR%%
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index b46d32213b6e..98b1bf24d75c 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		squeak
-PORTVERSION=		3.7
-PORTREVISION=	3
+PORTVERSION=		3.9
 CATEGORIES=		lang
 ##################################################
 MASTER_SITES=		http://www.squeakvm.org/unix/release/ \
@@ -18,13 +17,12 @@ MASTER_SITES=		http://www.squeakvm.org/unix/release/ \
 			ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/ \
 			ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/${PORTVERSION}/unix-linux/ \
 			http://www.squeakland.org/installers/:plugin \
-			http://www.squeakland.jp/plugin/installers/:jpplugin \
+			http://squeakland.jp/plugin/installers/:jpplugin \
 			http://squeak.610t.org/patches/:ximpatch
 DISTFILES=		Squeak-${VMVERSION}.src${EXTRACT_SUFX} \
-			Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip \
-			Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip \
+			Squeak${IMAGEVERSION}-${PATCHNUMBER}.zip \
 			SqueakV3.sources.gz \
-			${JAPANESE_PLUGIN_IMAGE}:jpplugin
+			SqueakV39.sources.gz
 EXTRACT_ONLY=		Squeak-${VMVERSION}.src${EXTRACT_SUFX}
 
 ##################################################
@@ -33,18 +31,19 @@ COMMENT=		Full Smalltalk 80 with portability to UNIX, Mac, and Windows
 
 # Don't set USE_ZIP as this breaks EXTRACT_CMD.
 BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=		audio:${PORTSDIR}/audio/nas
+LIB_DEPENDS=		audio:${PORTSDIR}/audio/nas \
+			ffi:${PORTSDIR}/devel/libffi
 
 ##################################################
-VMVERSION=		3.7-7
-IMAGEVERSION=		3.7
-PATCHNUMBER=		5989
+VMVERSION=		3.9-7
+IMAGEVERSION=		3.9-final
+PATCHNUMBER=		7067
+IMAGEDIR=		Squeak${IMAGEVERSION}-${PATCHNUMBER}
 
 ##################################################
 OPTIONS+=		MPG_MMX		"MMX support (MPG plugin)" off
 OPTIONS+=		NPSQUEAK	"browser plugin support" on
 OPTIONS+=		RFB		"remote frame buffer support" on
-OPTIONS+=		FFI		"libffi support" off
 OPTIONS+=		X		"X Windows support" on
 OPTIONS+=		XIM		"XIM support (Implies X)" off
 
@@ -53,7 +52,7 @@ OPTIONS+=		XIM		"XIM support (Implies X)" off
 ##################################################
 XIM_PATCH=		SqueakImmX11Plugin3a${EXTRACT_SUFX}
 PLUGIN_IMAGE=		SqueakPlugin.zip
-JAPANESE_PLUGIN_IMAGE=		SqueakPlugin2005J.zip
+JAPANESE_PLUGIN_IMAGE=		SqueakPlugin2005J2.zip
 
 ##################################################
 DIST_SUBDIR=		squeak
@@ -69,10 +68,8 @@ SHAREMODE=		644
 # 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
+FILES_TO_GZIP=		${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.image \
+			${IMAGEDIR}/Squeak${IMAGEVERSION}-${PATCHNUMBER}.changes
 
 ##################################################
 # Configure and Build
@@ -120,17 +117,9 @@ PLIST_X=
 CONFIGURE_ARGS+=	--enable-mpg-mmx
 .endif
 
-.if defined(WITH_FFI)
-LIB_DEPENDS+=		ffi.2:${PORTSDIR}/devel/libffi
-PLIST_FFI=
-EXT_PLUGINS+=		SqueakFFIPrims
-.else
-CONFIGURE_ARGS+=	--without-ffi
-PLIST_FFI=		"@comment feature not wanted - "
-.endif
-
 .if defined(WITH_XIM)
-DISTFILES+=		${XIM_PATCH}:ximpatch
+DISTFILES+=		${XIM_PATCH}:ximpatch \
+			${JAPANESE_PLUGIN_IMAGE}:jpplugin
 PLIST_XIM=
 WITH_X=			yes
 USE_ICONV=		yes
@@ -156,7 +145,6 @@ PLIST_SUB=		IMAGEVERSION=${IMAGEVERSION}\
 			VMVERSION=${VMVERSION}\
 			PLIST_NPSQUEAK=${PLIST_NPSQUEAK}\
 			PLIST_X=${PLIST_X} \
-			PLIST_FFI=${PLIST_FFI} \
 			PLIST_XIM=${PLIST_XIM}
 
 ##################################################
@@ -175,7 +163,7 @@ post-patch:
 		${PATCH} -S + -p0 < ImmX11.patch
 .endif
 # Fix external plugins
-	@${ECHO_MSG} "EXTERNAL_PLUGINS = B3DAcceleratorPlugin Squeak3D XDisplayControlPlugin ${EXT_PLUGINS}" > ${WRKSRC}/platforms/unix/src/plugins.ext
+	@${ECHO_MSG} "EXTERNAL_PLUGINS = B3DAcceleratorPlugin PseudoTTYPlugin UnixOSProcessPlugin XDisplayControlPlugin Squeak3D AioPlugin ${EXT_PLUGINS}" > ${WRKSRC}/platforms/unix/src/plugins.ext
 
 ##################################################
 pre-configure:
@@ -192,15 +180,16 @@ post-configure:
 post-install:
 	(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_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip -d ${WRKDIR})
-	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip -d ${WRKDIR})
-	(cd ${WRKDIR} && ${INSTALL_DATA} ReadMe.txt ${PREFIX}/share/squeak/)
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} SqueakV39.sources.gz ${PREFIX}/share/squeak/)
+	(cd ${PREFIX}/share/squeak && ${EXTRACT_CMD} -d SqueakV39.sources.gz)
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u Squeak${IMAGEVERSION}-${PATCHNUMBER}.zip -d ${WRKDIR} Squeak${IMAGEVERSION}-${PATCHNUMBER}/*)
 .if defined(WITH_NPSQUEAK)
 	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u ${PLUGIN_IMAGE} -d ${WRKDIR})
 .endif
 .for file in ${FILES_TO_GZIP}
 	(cd ${WRKDIR} && ${GZIP_CMD} ${file} && ${INSTALL_DATA} ${file}.gz ${PREFIX}/share/squeak/)
 .endfor
+	(cd ${WRKDIR} && ${INSTALL_DATA} ${IMAGEDIR}/SqueakV39.sources ${PREFIX}/share/squeak/${VMVERSION})
 	${INSTALL_SCRIPT} ${WRKSRC}/build/inisqueak ${PREFIX}/bin/inisqueak
 	${CHMOD} 755 ${PREFIX}/bin/inisqueak
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/squeak/distinfo b/lang/squeak/distinfo
index 1db764b83dad..522e5f308a7c 100644
--- a/lang/squeak/distinfo
+++ b/lang/squeak/distinfo
@@ -1,21 +1,21 @@
-MD5 (squeak/Squeak-3.7-7.src.tar.gz) = c6b051b745080516c550cab0db1882fc
-SHA256 (squeak/Squeak-3.7-7.src.tar.gz) = 9a41e3245c092115690c055297a9cb94caf1cb79b7faeeff8b923e0822f45234
-SIZE (squeak/Squeak-3.7-7.src.tar.gz) = 2383081
-MD5 (squeak/Squeak3.7-5989-basic.zip) = cf2e63554772ca2f137bb793e8dfadfb
-SHA256 (squeak/Squeak3.7-5989-basic.zip) = 9f009a6d61b2562a6e0f46032fde5957e459197ad3571a4b08eec3fa51f6b1fe
-SIZE (squeak/Squeak3.7-5989-basic.zip) = 9235390
-MD5 (squeak/Squeak3.7-5989-full.zip) = a289c0ff94caf95f93eff7d0759ffc65
-SHA256 (squeak/Squeak3.7-5989-full.zip) = ed5c49cda9be1b70b1fdfa18bdac96b676b0e1337a153f72380bf825cf85ab8e
-SIZE (squeak/Squeak3.7-5989-full.zip) = 12993350
+MD5 (squeak/Squeak-3.9-7.src.tar.gz) = 89ca12f4134dbb26c5d383c566774010
+SHA256 (squeak/Squeak-3.9-7.src.tar.gz) = fbfa95093b32c53b302189f3b8ea08406dd9b133194e91810263d93f42344d0f
+SIZE (squeak/Squeak-3.9-7.src.tar.gz) = 3948315
+MD5 (squeak/Squeak3.9-final-7067.zip) = 30d991c418be1cd9c5d05fb87dea2f19
+SHA256 (squeak/Squeak3.9-final-7067.zip) = 4353a7bd05f2dba23ed735ac3171b32a0935a20ebfce9307cffc4eb9f254e872
+SIZE (squeak/Squeak3.9-final-7067.zip) = 11842207
 MD5 (squeak/SqueakPlugin.zip) = 8a14a482fc0e601fc9c1e702ac52b760
 SHA256 (squeak/SqueakPlugin.zip) = 9442d8f95166db4874800caa21b88551906d9ad66cb9391151d0d24e5022b488
 SIZE (squeak/SqueakPlugin.zip) = 5732659
 MD5 (squeak/SqueakV3.sources.gz) = 7dc6b3840e6bc1e5f81e3717fb46d2c3
 SHA256 (squeak/SqueakV3.sources.gz) = 6d8262b61d5608de36eff5cb930ea8aa588b7402c0a963680b07ff664ba74d02
 SIZE (squeak/SqueakV3.sources.gz) = 3476504
+MD5 (squeak/SqueakV39.sources.gz) = 4fe515af7428dbe69e90126c78255db9
+SHA256 (squeak/SqueakV39.sources.gz) = ac73d415398b0f79e64d01310e15e3af4203be3c97ea8c1154337d98949cf1a0
+SIZE (squeak/SqueakV39.sources.gz) = 4185101
 MD5 (squeak/SqueakImmX11Plugin3a.tar.gz) = 19f232d475bcce36a15be0f0fd726979
 SHA256 (squeak/SqueakImmX11Plugin3a.tar.gz) = 76858ebf5e45adc48cad2cee69312163ea0082b173325ef02e57dd826c6e3bdf
 SIZE (squeak/SqueakImmX11Plugin3a.tar.gz) = 11614
-MD5 (squeak/SqueakPlugin2005J.zip) = 47dafa5fa4c9c60982227a6bf97419f8
-SHA256 (squeak/SqueakPlugin2005J.zip) = a9b5bbc50742fea6172bb0ca99cef1244ce1f75ba46c20569316da3fbe909232
-SIZE (squeak/SqueakPlugin2005J.zip) = 7921994
+MD5 (squeak/SqueakPlugin2005J2.zip) = 057e3355d0d05e810d8629251cbb2838
+SHA256 (squeak/SqueakPlugin2005J2.zip) = 01a6df94213616e70b224710f7a572155a0e13259ffffcd702bd2e618b5ee584
+SIZE (squeak/SqueakPlugin2005J2.zip) = 7973501
diff --git a/lang/squeak/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h b/lang/squeak/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h
deleted file mode 100644
index ac04be2c3c10..000000000000
--- a/lang/squeak/files/patch-platforms::Cross::plugins::DropPlugin::DropPlugin.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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/squeak/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h b/lang/squeak/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h
deleted file mode 100644
index d1f69cfbbd48..000000000000
--- a/lang/squeak/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::JPEGReadWriter2Plugin.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/squeak/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c b/lang/squeak/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c
deleted file mode 100644
index a20e88f8d371..000000000000
--- a/lang/squeak/files/patch-platforms::Cross::plugins::JPEGReadWriter2Plugin::jmemdatasrc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/squeak/files/patch-platforms::unix::config::configure b/lang/squeak/files/patch-platforms__unix__config__configure
index 38f45aa494ec..38f45aa494ec 100644
--- a/lang/squeak/files/patch-platforms::unix::config::configure
+++ b/lang/squeak/files/patch-platforms__unix__config__configure
diff --git a/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile b/lang/squeak/files/patch-platforms__unix__npsqueak__Makefile
index d5def76a44c7..d5def76a44c7 100644
--- a/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile
+++ b/lang/squeak/files/patch-platforms__unix__npsqueak__Makefile
diff --git a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in b/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakregister.in
index a7bd917d2677..de93fdadec66 100644
--- a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in
+++ b/lang/squeak/files/patch-platforms__unix__npsqueak__npsqueakregister.in
@@ -7,7 +7,7 @@
 -BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib"
 -BROWSER_DIRS="/usr/local/lib /usr/lib /opt"
 +BROWSERS="netscape mozilla firefox opera seamonkey"
-+BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib"
++BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib"
  SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins"
  
  ACTION=register
diff --git a/lang/squeak/files/patch-platforms::unix::plugins::PseudoTTYPlugin::openpty.h b/lang/squeak/files/patch-platforms__unix__plugins__PseudoTTYPlugin__openpty.h
index 36dd49bcd97b..36dd49bcd97b 100644
--- a/lang/squeak/files/patch-platforms::unix::plugins::PseudoTTYPlugin::openpty.h
+++ b/lang/squeak/files/patch-platforms__unix__plugins__PseudoTTYPlugin__openpty.h
diff --git a/lang/squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::Makefile.in b/lang/squeak/files/patch-platforms__unix__plugins__SqueakFFIPrims__Makefile.in
index 3c0fd9e7894e..3c0fd9e7894e 100644
--- a/lang/squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::Makefile.in
+++ b/lang/squeak/files/patch-platforms__unix__plugins__SqueakFFIPrims__Makefile.in
diff --git a/lang/squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::ffi-config b/lang/squeak/files/patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config
index 80ded9fb17c9..80ded9fb17c9 100644
--- a/lang/squeak/files/patch-platforms::unix::plugins::SqueakFFIPrims::ffi-config
+++ b/lang/squeak/files/patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config
diff --git a/lang/squeak/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c b/lang/squeak/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c
new file mode 100644
index 000000000000..91518b93b728
--- /dev/null
+++ b/lang/squeak/files/patch-platforms__unix__src__plugins__UnixOSProcessPlugin__UnixOSProcessPlugin.c
@@ -0,0 +1,47 @@
+--- platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c.org	Sun Apr 23 16:18:27 2006
++++ platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c	Sun Apr 23 16:20:43 2006
+@@ -1818,7 +1818,7 @@
+ 		return interpreterProxy->primitiveFail();
+ 	}
+ 	sqFile = interpreterProxy->arrayValueOf(sqFileOop);
+-	if ((feof(sqFile->file)) == 0) {
++	if ((feof((FILE *)sqFile->file)) == 0) {
+ 		result = interpreterProxy->falseObject();
+ 	} else {
+ 		result = interpreterProxy->trueObject();
+@@ -1870,7 +1870,7 @@
+ 
+ 	/* 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 @@
+ 
+ 	/* 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 @@
+ 		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 @@
+ 
+ 	/* 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;
diff --git a/lang/squeak/files/patch-platforms::unix::vm-sound-OSS::acinclude.m4 b/lang/squeak/files/patch-platforms__unix__vm-sound-OSS__acinclude.m4
index 3fb9e7e023a1..3fb9e7e023a1 100644
--- a/lang/squeak/files/patch-platforms::unix::vm-sound-OSS::acinclude.m4
+++ b/lang/squeak/files/patch-platforms__unix__vm-sound-OSS__acinclude.m4
diff --git a/lang/squeak/pkg-descr b/lang/squeak/pkg-descr
index ed6e32cc57aa..c451fd6794a0 100644
--- a/lang/squeak/pkg-descr
+++ b/lang/squeak/pkg-descr
@@ -21,4 +21,4 @@ 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.squeakvm.org/unix/ (Unix Squeak)
+     http://www-sor.inria.fr/~piumarta/squeak/ (Unix Squeak)
diff --git a/lang/squeak/pkg-plist b/lang/squeak/pkg-plist
index 03866a82c0ac..c472231b2915 100644
--- a/lang/squeak/pkg-plist
+++ b/lang/squeak/pkg-plist
@@ -10,22 +10,23 @@ bin/squeak
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/Squeak3D
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/XDisplayControlPlugin
 %%PLIST_XIM%%%%DATADIR%%/%%VMVERSION%%/ImmX11Plugin
-%%PLIST_FFI%%%%DATADIR%%/%%VMVERSION%%/SqueakFFIPrims
 %%PLIST_NPSQUEAK%%%%DATADIR%%/%%VMVERSION%%/npsqueak.so
 %%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueakrun
 %%DATADIR%%/%%VMVERSION%%/squeak
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/vm-display-X11
+%%DATADIR%%/%%VMVERSION%%/AioPlugin
+%%DATADIR%%/%%VMVERSION%%/PseudoTTYPlugin
+%%DATADIR%%/%%VMVERSION%%/UnixOSProcessPlugin
 %%DATADIR%%/%%VMVERSION%%/vm-display-null
 %%DATADIR%%/%%VMVERSION%%/vm-sound-NAS
 %%DATADIR%%/%%VMVERSION%%/vm-sound-OSS
 %%DATADIR%%/%%VMVERSION%%/vm-sound-null
-%%DATADIR%%/ReadMe.txt
-%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-basic.changes.gz
-%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-basic.image.gz
-%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-full.changes.gz
-%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%-full.image.gz
-%%DATADIR%%/SqueakPlugin.image.gz
+%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%.changes.gz
+%%DATADIR%%/Squeak%%IMAGEVERSION%%-%%PATCHNUMBER%%.image.gz
+%%PLIST_NPSQUEAK%%%%DATADIR%%/SqueakPlugin.image.gz
 %%DATADIR%%/SqueakV3.sources
+%%DATADIR%%/SqueakV39.sources
+%%DATADIR%%/%%VMVERSION%%/SqueakV39.sources
 %%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueakregister
 @dirrm %%DATADIR%%/%%VMVERSION%%
 @dirrm %%DATADIR%%