--- admin/PlamoBuild-template-20180815	2018-08-15 16:18:50.000000000 +0900
+++ plamo/03_xclassics/fep.txz/kinput2/PlamoBuild.kinput2-v3.1	2019-10-13 15:36:26.000000000 +0900
@@ -1,19 +1,27 @@
 #!/bin/sh
 
 ######################################################################
-url=""
+url="ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v3.1.tar.gz
+    ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/03_xclassics/fep.txz/kinput2/kinput2-v3.1-canna-keybind.patch.gz
+    ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/03_xclassics/fep.txz/kinput2/kinput2-v3.1-canna-keybind2.patch.gz
+    ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/03_xclassics/fep.txz/kinput2/kinput2-v3.1-canna-keybind3.patch.gz
+    ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/03_xclassics/fep.txz/kinput2/kinput2-v3.1-sj3-numlock.patch.gz"
 verify=
 digest=
 branch=
 commitid=
-pkgbase=
-vers=
+pkgbase=kinput2
+vers=v3.1
 arch=`uname -m`
-build=P1
+build=P6
 src=$pkgbase-$vers
-patchfiles=""
+patchfiles="kinput2-v3.1-canna-keybind.patch.gz
+    kinput2-v3.1-canna-keybind2.patch.gz
+    kinput2-v3.1-canna-keybind3.patch.gz
+    kinput2-v3.1-sj3-numlock.patch.gz"
 OPT_CONFIG=""
-DOCS="README"
+DOCS="README NEWS `echo doc/{protocol,sj3{def,guide.{ps,tex}}}`
+    `echo doc/{defaultkeys,resources,problems,classes,ccdef,defkeys.wnn}`"
 template=20180815
 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin
 ######################################################################
@@ -37,6 +45,34 @@
     if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]}
   done
   apply_patches
+  cd $B
+  cp -p lib/cconv.c{,.orig}
+  sed -i 's@getline@ki2_&@g' lib/cconv.c
+  cp -p lib/wnnlib.c{,.orig}
+  cat <<- "EOF" | patch lib/wnnlib.c
+	1370c1370
+	< 	len = jl_kanji_len(buf->wnn, cl);
+	---
+	> 	len = jl_kanji_len(buf->wnn, cl, 0);
+	EOF
+  cp -p Kinput2.conf{,.orig}
+  uudecode <<- "EOF" | gunzip | patch Kinput2.conf
+	begin-base64 644 /dev/stdout
+	H4sIAAAAAAAAA51UXW+bMBR9Lr/CUvOQVGSOw1cqdUgp2SS2lEhJpuZtog7N3FGoIGTqv9/FGDAf
+	zaI9YIw599xzz7VNZpTMlDuEb9D1PnhmUYB+pMFjFKEbfAWLYo09o/c4Q34SoEPMogM6xihLA5QD
+	hyddRScTxQk6WSOIU8bjsWK3+K7+m02zqGY1JQJwyZ4WLEE4jV8D/BbQLGR+gvcsCegxTt7xH15C
+	S4oUl6UJDtlTjlN0neo6ZHCcxZevPxfuGn1Gg+HSvYfpCFMK0YJIRlQUO0IEyDCoYQDRzlk9PKBH
+	z3M9RwIDcG1iFtEw2wc8c8HaAcoQw6KGJXOCLsCNw0a8vGhqqmlQPkIc/NysHV6Rs/K2a/cePkf4
+	LYkPif+a4l3KMPhSICsZg2ERNyq1FP+LNPXPl7x+eCDtJ1+oqYRelNbuMaub3G6X/5GEGVFnGuVj
+	5Zkz97y56222ct9i6oeY+lHkN3GVaClINkGClp5zFmKWW6SbrVw9z233s95O1FtC+Zhv0QZPn7FO
+	HqdNS6ygW4qsHJs7Jug78vusOJfG7nHkgmRkolF4QOXmm9Z36tIXrT52DQzvX/oLbo8cpBCiqYTo
+	VLyrFkFMUYDU73YbAVPaDVSgtM4nxdYN6uLJdKKSKaHiXdRz1rhc813NNBgWAbxisZWLWetAXcJr
+	t+s6y07gZiX8ap1vV9/Lwvxj/JtMo2qWHVnYEPJP8F8a9B13VAYAAA==
+	====
+	EOF
+  if [ $arch == x86_64 ] ; then
+    sed -i '/\(WnnLibDir\|CCDEF_DIR\)/s@lib@lib64@' Kinput2.conf
+  fi
   for i in `seq 0 $((${#B[@]} - 1))` ; do
     cd ${B[$i]}
     if [ -x configure ] ; then
@@ -45,6 +81,9 @@
           --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]}
     fi
   done
+  xmkmf -a
+  find . -name "Makefile" -exec sed -i -e '/MANPATH =/s@man$@share/man@g' \
+      -e '/CONFDIR =/s@ETCX11@LIB@g' {} \;
 fi
 if [ $opt_build -eq 1 ] ; then
   for i in `seq 0 $((${#B[@]} - 1))` ; do
@@ -62,7 +101,7 @@
   for i in `seq 0 $((${#B[@]} - 1))` ; do
     cd ${B[$i]}
     if [ -f Makefile ] ; then
-      make install DESTDIR=$P
+      make install install.man DESTDIR=$P
     fi
   done
   touch $W/i.et
@@ -70,9 +109,40 @@
   TZ=UTC find $P ! -type l -newer i.st ! -newer i.et \
       -exec touch -t `date -u '+%m%d0000'` {} \;
   compress
+  install -d $P/usr/libexec
+  cp -p $P/usr/bin/kinput2 $P/usr/libexec
+  uudecode <<- "EOF" | gunzip > $P/usr/bin/kinput2
+	begin-base64 644 /dev/stdout
+	H4sIAAAAAAAAA51WbW/bNhD+HP2Km2NkzQZHbVf0Q/yCBZmHeW3joi62AUGAUhRlMZZIgaTdJPX2
+	23ekKEV2LGWYP0gy7+65e+6F5PF3YcRFqNPgGNaaLNk5rLgo1uY1XGsji61i2hBlbmAkFV9yQbJa
+	gailngTB+/nlu3H/t/mHaXjmRWcfZ78El/OrP6afFrP51eX72fTq89gLA3ZXSGVgXx4EPIFrGCSw
+	C6Yo3MAQTMpEAF7B+sTVkxNAT+MvlJhy7QtqUKIZ9F8Bt+qWwym+naGAXh/1e6VlocH+g5MJhDHb
+	hGKdZXZ9xfHtJENQufc1BHbHDbyE4RDRfFJK4P5L5wVVdMoT41QZtcu9/s+90oBpQvF19oRaHe9i
+	+gmzUQZNiRBk+1WIrb79qXRSpqZBoE6Ilx5ks6OEUdBUQq8qH9eg1kJwsQQpoMT1NF95E5ZpVltX
+	ufALCQ8aLwfd78OkkS9MQrjWKsx4ZP+EleNBRbY///h54bLkMFymfjh9xOtxsSEZj+GfRsb2gnxM
+	rw/2GHPIDUe7B4YtzdT3yJMmPGPwoolj/ZReqGLE2DTsuHF1MDAaDaA3nf/aA8ttv3pHx1ByOS+L
+	BiFg2fCJhQuOStHYSYIjq2wJn4MsDJdCQyJVNUxWCDCIKHT9IkJXX4mKgcq8wJgjJJXLmHnrRAoM
+	2D4nh6wvFpezGTglIyFy2Ym96YqIW95u/+7i6vcOU9LhGU0vWizDH0v2LWwJNXxDDMN+rj59uqBQ
+	0kgqM0hIzrP7Gu+O50Vr9g7h/WUNKrQmTHsRDsLAzMX1gZlUxvuAJkoZX6aYIbHOI6b2cqQLRnly
+	D4UsBusCdxGWZdi0hpuMRURBaVx1CLbAUsm1iGGEHuQeWEPspHVnKNZh1RA3rdSmPQtgd8ENU7h3
+	bXjMZLMPY66LjNzDyH+08PVSb2SxcCranBWKYwtVSlxgyDmxYwQEo7YbgsUZ2ZFy8zbxsOVYtv6w
+	G+HSqbyYKZmSUyDabpqYB1E5YwLPPc/tWwmI2wpKtwOq/4ZRKrURJGeT63NxU7Nr6IHVaMbjdqNR
+	/dnIz4410DWeLLndyKxaTRC3mIqe3W06fpben6jSTWpw6+N8pHKwYLcH6NCYJUjFvvao7NBJicJh
+	QdtGCGhyVhMruTCxse5xUJ4EUWNZPqjHlRQ5w56wqjsIir6BUfXZDKoNwZXDJhYFb/ag3v5/qLd7
+	UIeROqHqkuN5UpUcP58r+QJVnik5othqPlfyhCttoFJuFN4vvW4BqOw1wwDiFgB7OsPIPp+eVxWA
+	03E9gUCCUXeMeLhqJMuEbhFSUZzHlpHCS5tcK8ps37krAqbksfu+DXRUoeioHUXf5xGeO4bYs7dp
+	rlZ1EKuOIGRO3ImJdBpzcCietAZMOwBTriyg+Q+AD2kF+JC2Az4wEaZEdMHZW8y419wJIZOUZLa6
+	veAIb0v2blVeggO8IP4LDlvP8mUMAAA=
+	====
+	EOF
+  TZ=UTC touch -t `date -u '+%m%d0000'` $P/usr/bin/kinput2
   setup_docdir
   convert_links
   tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2`
+  tar rvpf $pkg.tar -C $P `cd $P ; find usr/libexec | tail -n+2`
+  tar rvpf $pkg.tar -C $P `cd $P ; find usr/$libdir/X11/app-defaults | tail -n+2`
+  tar rvpf $pkg.tar -C $P usr/$libdir/X11/ccdef
+  tar rvpf $pkg.tar -C $P usr/share/sj3
   tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2`
   tar rvpf $pkg.tar -C $P usr/share/doc/$src
   TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar