Update skk to 14.0.91.

Based on PR#43649 by Ryo ONODERA.

Back from snapshot release, so version scheme also back from timestamp.
This release is still alpha release, but, yes, better than snapshot,
and need to support of emacs23.

While here,
* set LICENSE=gnu-gpl-v2
* simplify PLIST.
* fixes paths for tutorial file in setup file
* change to use MAKE_FLAGS instead of MAKEFLAGS, it affect subsequent
  make, e.g. failed to build of emacs for resolving dependency.

3 files changed, 25 insertions, 50 deletions

diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index 2829039f623..e784326e498 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2009/08/06 01:44:52 minskim Exp $
+# $NetBSD: Makefile,v 1.21 2010/07/31 08:45:09 obache Exp $
 #
 
-DISTNAME=	ddskk-20080309
+DISTNAME=	ddskk-14.0.91
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/^ddskk/skk/}
-PKGREVISION=	1
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
-		http://openlab.ring.gr.jp/skk/maintrunk/old-snapshots/
+		http://openlab.ring.gr.jp/skk/maintrunk/old-releases/
 
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/skk/index.html
 COMMENT=	Japanese input methods for Emacs
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -19,7 +19,7 @@ CONFLICTS=	ddskk-[0-9]*
 EMACS_MODULES+=	base leim
 EMACS_BUILDLINK=# defined
 
-MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
+MAKE_FLAGS+=	EMACS=${EMACS_BIN:Q}
 MAKE_ENV=	prefix=${DESTDIR:Q}${PREFIX:Q} \
 		EMACS_INFOPREFIX=${DESTDIR:Q}${EMACS_INFOPREFIX:Q} \
 		EMACS_LISPPREFIX=${DESTDIR:Q}${EMACS_LISPPREFIX:Q}
@@ -27,6 +27,12 @@ BUILD_TARGET=	elc
 
 INFO_FILES=	# PLIST
 
+SUBST_CLASSES+=			fix-paths
+SUBST_STAGE.fix-paths=		pre-configure
+SUBST_MESSAGE.fix-paths=	Fix user-destdir pathes.
+SUBST_FILES.fix-paths=		skk-setup.el.in
+SUBST_SED.fix-paths=		-e 's,@TUT@,${PREFIX}/share/skk/SKK.tut,g'
+
 # Substitute directory definitions during do-configure.
 post-extract:
 	@${MV} ${WRKSRC}/SKK-CFG ${WRKSRC}/SKK-CFG.orig
diff --git a/inputmethod/skk/PLIST b/inputmethod/skk/PLIST
index 217ad4f9ba8..24a6655168a 100644
--- a/inputmethod/skk/PLIST
+++ b/inputmethod/skk/PLIST
@@ -1,25 +1,10 @@
-@comment $NetBSD: PLIST,v 1.13 2009/08/05 07:16:18 minskim Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/07/31 08:45:09 obache Exp $
 ${EMACS_INFOPREFIX}/skk.info
-${FOR_emacs20}${EMACS_LISPPREFIX}/skk/ccc.el
-${FOR_emacs21}${EMACS_LISPPREFIX}/skk/ccc.el
-${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/ccc.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/skk/ccc.el
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/ccc.el
-${FOR_emacs23}${EMACS_LISPPREFIX}/skk/ccc.el
-${FOR_emacs20}${EMACS_LISPPREFIX}/skk/ccc.elc
-${FOR_emacs21}${EMACS_LISPPREFIX}/skk/ccc.elc
-${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/ccc.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/skk/ccc.elc
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/ccc.elc
-${FOR_emacs23}${EMACS_LISPPREFIX}/skk/ccc.elc
+${FOR_emacs}${EMACS_LISPPREFIX}/skk/ccc.el
+${FOR_emacs}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${EMACS_LISPPREFIX}/skk/context-skk.el
 ${EMACS_LISPPREFIX}/skk/context-skk.elc
-${FOR_emacs20}${EMACS_LISPPREFIX}/skk/leim-list.el
-${FOR_emacs21}${EMACS_LISPPREFIX}/skk/leim-list.el
-${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/leim-list.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/skk/leim-list.el
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/leim-list.el
-${FOR_emacs23}${EMACS_LISPPREFIX}/skk/leim-list.el
+${FOR_emacs}${EMACS_LISPPREFIX}/skk/leim-list.el
 ${EMACS_LISPPREFIX}/skk/queue-m.el
 ${EMACS_LISPPREFIX}/skk/queue-m.elc
 ${EMACS_LISPPREFIX}/skk/skk-abbrev.el
@@ -46,16 +31,8 @@ ${EMACS_LISPPREFIX}/skk/skk-develop.el
 ${EMACS_LISPPREFIX}/skk/skk-develop.elc
 ${EMACS_LISPPREFIX}/skk/skk-dic.el
 ${EMACS_LISPPREFIX}/skk/skk-dic.elc
-${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-e21.el
-${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-e21.el
-${FOR_emacs22}${EMACS_LISPPREFIX}/skk/skk-e21.el
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/skk-e21.el
-${FOR_emacs23}${EMACS_LISPPREFIX}/skk/skk-e21.el
-${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-e21.elc
-${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-e21.elc
-${FOR_emacs22}${EMACS_LISPPREFIX}/skk/skk-e21.elc
-${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/skk-e21.elc
-${FOR_emacs23}${EMACS_LISPPREFIX}/skk/skk-e21.elc
+${NOTFOR_emacs20}${EMACS_LISPPREFIX}/skk/skk-e21.el
+${NOTFOR_emacs20}${EMACS_LISPPREFIX}/skk/skk-e21.elc
 ${EMACS_LISPPREFIX}/skk/skk-gadget.el
 ${EMACS_LISPPREFIX}/skk/skk-gadget.elc
 ${EMACS_LISPPREFIX}/skk/skk-hint.el
@@ -64,14 +41,8 @@ ${EMACS_LISPPREFIX}/skk/skk-isearch.el
 ${EMACS_LISPPREFIX}/skk/skk-isearch.elc
 ${EMACS_LISPPREFIX}/skk/skk-jisx0201.el
 ${EMACS_LISPPREFIX}/skk/skk-jisx0201.elc
-${FOR_emacs20}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
-${FOR_emacs20}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
-${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
-${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
-${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
-${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
-${FOR_emacs23}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
-${FOR_emacs23}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
+${FOR_emacs}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
+${FOR_emacs}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
 ${EMACS_LISPPREFIX}/skk/skk-jisyo-edit-mode.el
 ${EMACS_LISPPREFIX}/skk/skk-jisyo-edit-mode.elc
 ${EMACS_LISPPREFIX}/skk/skk-kakasi.el
@@ -109,10 +80,8 @@ ${EMACS_LISPPREFIX}/skk/skk-version.el
 ${EMACS_LISPPREFIX}/skk/skk-version.elc
 ${EMACS_LISPPREFIX}/skk/skk-viper.el
 ${EMACS_LISPPREFIX}/skk/skk-viper.elc
-${FOR_xemacs214}${EMACS_LISPPREFIX}/skk/skk-xemacs.el
-${FOR_xemacs214}${EMACS_LISPPREFIX}/skk/skk-xemacs.elc
-${FOR_xemacs215}${EMACS_LISPPREFIX}/skk/skk-xemacs.el
-${FOR_xemacs215}${EMACS_LISPPREFIX}/skk/skk-xemacs.elc
+${FOR_xemacs}${EMACS_LISPPREFIX}/skk/skk-xemacs.el
+${FOR_xemacs}${EMACS_LISPPREFIX}/skk/skk-xemacs.elc
 ${EMACS_LISPPREFIX}/skk/skk.el
 ${EMACS_LISPPREFIX}/skk/skk.elc
 share/skk/NICOLA-SKK.tut
diff --git a/inputmethod/skk/distinfo b/inputmethod/skk/distinfo
index 56c843a14f7..805958ecd2e 100644
--- a/inputmethod/skk/distinfo
+++ b/inputmethod/skk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/03/11 01:26:08 uebayasi Exp $
+$NetBSD: distinfo,v 1.5 2010/07/31 08:45:09 obache Exp $
 
-SHA1 (ddskk-20080309.tar.gz) = 80aa2d69349a5deeca127c16b335993760ddae85
-RMD160 (ddskk-20080309.tar.gz) = 1c93b592937f2f33d94f1aa13fabd4605b3f3d68
-Size (ddskk-20080309.tar.gz) = 744963 bytes
+SHA1 (ddskk-14.0.91.tar.gz) = 4181ea6474a7040c05e590d7df36ff8e0c845df6
+RMD160 (ddskk-14.0.91.tar.gz) = 864f59642ed8bb79d94c9fd1616ea9f7b20d0eaa
+Size (ddskk-14.0.91.tar.gz) = 752470 bytes