4 files changed, 45 insertions, 6 deletions

diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 7d6ec46525c0..972c2b9f5a9c 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		squeak
 PORTVERSION=		3.6
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		lang
 ##################################################
 MASTER_SITES=		ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/ \
@@ -15,16 +15,20 @@ MASTER_SITES=		ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/ \
 			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/ \
-			http://www.squeakland.org/installers/
+			http://www.squeakland.org/installers/ \
+			http://www.squeakland.jp/plugin/installers/ \
+			http://squeak.610t.org/patches/
 DISTFILES=		Squeak-${VMVERSION}.src.tar.gz \
 			Squeak${IMAGEVERSION}-${PATCHNUMBER}-basic.zip \
 			Squeak${IMAGEVERSION}-${PATCHNUMBER}-full.zip \
 			SqueakPlugin.zip \
-			SqueakV3.sources.gz
+			SqueakV3.sources.gz \
+			${XIM_PATCH} \
+			${JAPANESE_PLUGIN_IMAGE}
 EXTRACT_ONLY=		Squeak-${VMVERSION}.src.tar.gz
 
 ##################################################
-MAINTAINER=		chris@chrisburkert.de
+MAINTAINER=		mutoh@openedu.org
 COMMENT=		Full Smalltalk 80 with portability to UNIX, Mac, and Windows
 
 # Don't set USE_ZIP as this breaks EXTRACT_CMD.
@@ -41,10 +45,16 @@ 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
 
 .include <bsd.port.pre.mk>
 
 ##################################################
+XIM_PATCH=		SqueakImmX11Plugin2c.tar.gz
+PLUGIN_IMAGE=		SqueakPlugin.zip
+JAPANESE_PLUGIN_IMAGE=		SqueakPlugin2005J.zip
+
+##################################################
 DIST_SUBDIR=		squeak
 ONLY_FOR_ARCHS=		i386
 MAN1=			inisqueak.1 squeak.1
@@ -113,6 +123,16 @@ CONFIGURE_ARGS+=	--without-ffi
 PLIST_FFI=		"@comment feature not wanted - "
 .endif
 
+.if defined(WITH_XIM)
+PLIST_XIM=
+WITH_X=			yes
+USE_ICONV=		yes
+PLUGIN_IMAGE=		${JAPANESE_PLUGIN_IMAGE}
+EXT_PLUGINS+=		ImmX11Plugin
+.else
+PLIST_XIM=		"@comment feature not wanted - "
+.endif
+
 .ifdef (CC)
 MAKE_ARGS+=		CC="${CC}"
 .endif
@@ -130,7 +150,8 @@ PLIST_SUB=		IMAGEVERSION=${IMAGEVERSION}\
 			VMVERSION=${VMVERSION}\
 			PLIST_NPSQUEAK=${PLIST_NPSQUEAK}\
 			PLIST_X=${PLIST_X} \
-			PLIST_FFI=${PLIST_FFI}
+			PLIST_FFI=${PLIST_FFI} \
+			PLIST_XIM=${PLIST_XIM}
 
 ##################################################
 post-patch:
@@ -139,6 +160,12 @@ post-patch:
 		-e "s,%%X11BASE%%,${X11BASE},g" \
 		${WRKSRC}/platforms/unix/npsqueak/npsqueakregister.in \
 		${WRKSRC}/platforms/unix/npsqueak/Makefile
+.if defined(WITH_XIM)
+	@cd ${WRKSRC} && \
+		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${XIM_PATCH} ${EXTRACT_AFTER_ARGS}
+	@cd ${WRKSRC} && \
+		${PATCH} -p0 < ImmX11.patch
+.endif
 # Fix external plugins
 	@${ECHO_MSG} "EXTERNAL_PLUGINS = B3DAcceleratorPlugin UnixOSProcessPlugin XDisplayControlPlugin ${EXT_PLUGINS}" > ${WRKSRC}/src/plugins.ext
 
@@ -164,7 +191,7 @@ post-install:
 	(cd ${WRKDIR} && ${GZIP_CMD} ${file} && ${INSTALL_DATA} ${file}.gz ${PREFIX}/share/squeak/)
 .endfor
 .if defined(WITH_NPSQUEAK)
-	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u SqueakPlugin.zip -d ${WRKDIR})
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -u ${PLUGIN_IMAGE} -d ${WRKDIR})
 	(cd ${WRKDIR} && ${INSTALL_DATA} SqueakPlugin.image ${PREFIX}/share/squeak/npsqueak.image)
 .endif
 	${SED}	-e 's|VERSION=3.5-5180|VERSION=${IMAGEVERSION}-${PATCHNUMBER}|' \
diff --git a/lang/squeak/distinfo b/lang/squeak/distinfo
index 4945f081bdbb..c8b0fc7d5584 100644
--- a/lang/squeak/distinfo
+++ b/lang/squeak/distinfo
@@ -13,3 +13,9 @@ 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/SqueakImmX11Plugin2c.tar.gz) = 178af6041a3f745185140d1a9629976c
+SHA256 (squeak/SqueakImmX11Plugin2c.tar.gz) = 98446e852319bd28c565cb1695b4ab616620260495c50f9c715214630ecdd1b9
+SIZE (squeak/SqueakImmX11Plugin2c.tar.gz) = 11570
+MD5 (squeak/SqueakPlugin2005J.zip) = 47dafa5fa4c9c60982227a6bf97419f8
+SHA256 (squeak/SqueakPlugin2005J.zip) = a9b5bbc50742fea6172bb0ca99cef1244ce1f75ba46c20569316da3fbe909232
+SIZE (squeak/SqueakPlugin2005J.zip) = 7921994
diff --git a/lang/squeak/pkg-message b/lang/squeak/pkg-message
index 34ae9ff0fb29..b19bc6aa0dd2 100644
--- a/lang/squeak/pkg-message
+++ b/lang/squeak/pkg-message
@@ -13,5 +13,10 @@
 
  If you want to use web browser plugin,
     run %%PREFIX%%/share/squeak/npsqueakregister.
+
+ If you want to use (Japanese) XIM at full screen,
+    you get changeset at
+	http://squeak.610t.org/patches/CompositionFocus.1.cs
+     and file in it.
  ------------------ Thanks for your attention! ------------------
 
diff --git a/lang/squeak/pkg-plist b/lang/squeak/pkg-plist
index 59c2bd885b1b..4934bf409a5b 100644
--- a/lang/squeak/pkg-plist
+++ b/lang/squeak/pkg-plist
@@ -9,6 +9,7 @@ bin/squeak
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/B3DAcceleratorPlugin
 %%DATADIR%%/%%VMVERSION%%/UnixOSProcessPlugin
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/XDisplayControlPlugin
+%%PLIST_XIM%%share/squeak/%%VMVERSION%%/ImmX11Plugin
 %%PLIST_FFI%%%%DATADIR%%/%%VMVERSION%%/SqueakFFIPrims
 %%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueak.image
 %%PLIST_NPSQUEAK%%%%DATADIR%%/%%VMVERSION%%/npsqueak.so