4 files changed, 36 insertions, 11 deletions

diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index e3f4e4e8ee42..84a8e1090253 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	skkinput3
-PORTVERSION=	${SRCVERSION}.${PATCHLEVEL}
+PORTVERSION=	3.0.6
 CATEGORIES=	japanese x11
-MASTER_SITES=	http://downloads.sourceforge.jp/skkinput3/1504/
-DISTNAME=	skkinput-${SRCVERSION}_${PATCHLEVEL}
+MASTER_SITES=	http://downloads.sourceforge.jp/skkinput3/2222/
+DISTNAME=	skkinput-${PORTVERSION}
 
 MAINTAINER=	koma2@jiro.c.u-tokyo.ac.jp
 COMMENT=	An SKK-like Japanese input method for X11
@@ -18,6 +18,13 @@ USE_IMAKE=		yes
 
 NO_INSTALL_MANPAGES=	yes
 
+.if defined(USE_SKK10)
+USE_REINPLACE=		yes
+PLIST_SUB=		SKK8="@comment " SKK10=""
+.else
+PLIST_SUB=		SKK8="" SKK10="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
 # sanity check
@@ -33,10 +40,14 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv
 RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv
 .endif
 
-SRCVERSION=	3.0
-PATCHLEVEL=	3.1
+DOCS=		*.jis dot.skkinput ChangeLog
 
-DOCS=		*.jis dot.skkinput
+.if defined(USE_SKK10)
+post-patch:
+	${REINPLACE_CMD} -e '/\(#define.*UseSkk8\)/ s/^/XCOMM /' \
+	                 -e '/XCOMM.*#define.*UseSkk10/ s/XCOMM[[:space:]]*//' \
+			 ${WRKSRC}/Skkinput.conf
+.endif
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/japanese/skkinput3/distinfo b/japanese/skkinput3/distinfo
index 547f64cbf18c..9993bad4ca80 100644
--- a/japanese/skkinput3/distinfo
+++ b/japanese/skkinput3/distinfo
@@ -1 +1 @@
-MD5 (skkinput-3.0_3.1.tar.gz) = 7bdf1f8beaba5ffa6eb2ea5dc31f7c5b
+MD5 (skkinput-3.0.6.tar.gz) = 96b4a37e71bb415b6fced59bbc02372e
diff --git a/japanese/skkinput3/files/patch-Skkinput.conf b/japanese/skkinput3/files/patch-Skkinput.conf
index b5fef4246754..92dfc41f3f06 100644
--- a/japanese/skkinput3/files/patch-Skkinput.conf
+++ b/japanese/skkinput3/files/patch-Skkinput.conf
@@ -1,11 +1,15 @@
---- Skkinput.conf.orig	Sat Aug 10 00:47:48 2002
-+++ Skkinput.conf	Wed Aug 14 15:54:45 2002
-@@ -1,10 +1,10 @@
+--- Skkinput.conf.orig	Fri Jan 10 23:57:00 2003
++++ Skkinput.conf	Tue Jan 21 21:06:51 2003
+@@ -1,6 +1,6 @@
  /*	skk.el, init.el install directory
   */
 -ELISP_DIR = $(LIBDIR)/skkinput
 +ELISP_DIR = $(LIBDIR)/skkinput3
  
+ /*	If you want skk10.62a compatible mode, 
+  *	uncomment UseSkk10 and comment UseSkk8.
+@@ -10,7 +10,7 @@
+ 
  /*	 Skkinput3 Window uses these fonts. 
   */
 -#define Default_FontSet -*-fixed-medium-r-normal--16-*-*-*-*-*-iso8859-1,-misc-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0,-misc-fixed-medium-r-normal--16-*-*-*-*-*-jisc6226.1978-0,-misc-fixed-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0,-misc-fixed-medium-r-normal--16-*-*-*-*-*-jisx0212.1990-0
diff --git a/japanese/skkinput3/pkg-plist b/japanese/skkinput3/pkg-plist
index 78d0f71c838e..94b296899bc6 100644
--- a/japanese/skkinput3/pkg-plist
+++ b/japanese/skkinput3/pkg-plist
@@ -2,8 +2,18 @@ bin/skkinput3
 lib/X11/skkinput3/init.el
 lib/X11/skkinput3/skk.el
 lib/X11/skkinput3/skk-startup.el
-lib/X11/skkinput3/skk-trial.el
+%%SKK8%%lib/X11/skkinput3/skk-trial.el
+%%SKK10%%lib/X11/skkinput3/advice.el
+%%SKK10%%lib/X11/skkinput3/custom.el
+%%SKK10%%lib/X11/skkinput3/skk-comp.el
+%%SKK10%%lib/X11/skkinput3/skk-foreword.el
+%%SKK10%%lib/X11/skkinput3/skk-kcode.el
+%%SKK10%%lib/X11/skkinput3/skk-look.el
+%%SKK10%%lib/X11/skkinput3/skk-num.el
+%%SKK10%%lib/X11/skkinput3/skk-server.el
+%%SKK10%%lib/X11/skkinput3/skk-vars.el
 @dirrm lib/X11/skkinput3
+%%PORTDOCS%%share/doc/skkinput3/ChangeLog
 %%PORTDOCS%%share/doc/skkinput3/README-lisp.jis
 %%PORTDOCS%%share/doc/skkinput3/README.jis
 %%PORTDOCS%%share/doc/skkinput3/dot.skkinput