ports/103474: Add XIM support for lang/squeak
Takeshi MUTOH
mutoh at openedu.org
Fri Sep 22 05:10:20 UTC 2006
>Number: 103474
>Category: ports
>Synopsis: Add XIM support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 22 05:10:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Takeshi MUTOH <mutoh at openedu.org>
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
610t
>Environment:
FreeBSD sacraya.610t.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #4: Wed Sep 20 10:57:37 JST 2006 root at sacraya.610t.org:/usr/obj/usr/src/sys/SMP i386
>Description:
For CJK people, they must input their character using some input
method(IM).
There is additional XIM support patches for Squeak.
So I try to merge it to lang/squeak.
>How-To-Repeat:
None.
>Fix:
Please apply patch below.
diff -ruN /usr/ports/lang/squeak/Makefile squeak/Makefile
--- /usr/ports/lang/squeak/Makefile Sun Jul 30 07:26:02 2006
+++ squeak/Makefile Fri Sep 22 13:11:55 2006
@@ -15,12 +15,16 @@
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
##################################################
@@ -41,10 +45,16 @@
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 @@
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 @@
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 @@
-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 @@
(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 -ruN /usr/ports/lang/squeak/distinfo squeak/distinfo
--- /usr/ports/lang/squeak/distinfo Fri Jun 9 07:24:36 2006
+++ squeak/distinfo Wed Sep 20 09:38:45 2006
@@ -13,3 +13,9 @@
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 -ruN /usr/ports/lang/squeak/pkg-message squeak/pkg-message
--- /usr/ports/lang/squeak/pkg-message Sun Jul 30 05:48:49 2006
+++ squeak/pkg-message Fri Sep 22 13:32:27 2006
@@ -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 -ruN /usr/ports/lang/squeak/pkg-plist squeak/pkg-plist
--- /usr/ports/lang/squeak/pkg-plist Wed Jun 14 07:01:23 2006
+++ squeak/pkg-plist Fri Sep 22 13:44:32 2006
@@ -9,6 +9,7 @@
%%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
--
Takeshi MUTOH <mutoh at openedu.org>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list