Update to 12.2.0

Add missing dependency

4 files changed, 24 insertions, 17 deletions

diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 8d92f32b5fb1..dced7c35e463 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	ddskk
-PORTVERSION=	11.6.0
+PORTVERSION=	12.2.0
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	yoichi@FreeBSD.org
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 
 BUILD_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 EMACS_PORT_NAME?=	emacs21
 .if (${EMACS_PORT_NAME} == emacs21)
@@ -24,19 +24,18 @@ DEPPORT_SUFFIX=
 DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
 PLIST=	${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
-AMBIGUOUS_ELCS=	skk-jisx0213 skk-lookup
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-ALL_TARGET=	elc info
 
 SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
-SKK_DOCS=	AUTHORS Codename Contributors FAQ.txt NEWS README
+SKK_DOCS=	AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
 SKK_EXAMPLES=	etc/Emacs.ad etc/dot.emacs etc/dot.skk
 
+ALL_TARGET=	elc info
+MAKE_ARGS+=	SKK_LISPDIR=${PREFIX}/${SKK_LISPDIR}
+
 post-install:
-.for i in ${AMBIGUOUS_ELCS}
-	${RM} -f ${PREFIX}/${SKK_LISPDIR}/${i}.elc
+.for i in skk-jisx0213 skk-lookup
 	${INSTALL_DATA} ${WRKSRC}/${i}.el ${PREFIX}/${SKK_LISPDIR}
 .endfor
 	${MKDIR} ${EXAMPLESDIR}
diff --git a/japanese/ddskk/distinfo b/japanese/ddskk/distinfo
index c690a4f6f8ce..1200222aa984 100644
--- a/japanese/ddskk/distinfo
+++ b/japanese/ddskk/distinfo
@@ -1 +1 @@
-MD5 (ddskk11.6.0.tar.bz2) = 4b1c53becfc42a74ade43657a1f4f5fc
+MD5 (ddskk-12.2.0.tar.bz2) = 3b0f2a2ff13508d6dbb2a3b09369c444
diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index df7299b74fc7..2331ad8af8f5 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -32,6 +32,7 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc || true
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.el
@@ -43,6 +44,7 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc || true
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
@@ -52,6 +54,8 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.el
@@ -73,15 +77,16 @@ info/skk.info-4
 share/skk/NICOLA-SKK.tut
 share/skk/SKK.tut
 share/skk/SKK.tut.E
+share/skk/skk.xpm
 @dirrm share/skk
 share/examples/ddskk/Emacs.ad
 share/examples/ddskk/dot.emacs
 share/examples/ddskk/dot.skk
 @dirrm share/examples/ddskk
-%%PORTDOCS%%share/doc/ddskk/AUTHORS
-%%PORTDOCS%%share/doc/ddskk/Codename
+%%PORTDOCS%%share/doc/ddskk/AUTHORS.ja
+%%PORTDOCS%%share/doc/ddskk/CODENAME.ja
 %%PORTDOCS%%share/doc/ddskk/Contributors
-%%PORTDOCS%%share/doc/ddskk/FAQ.txt
-%%PORTDOCS%%share/doc/ddskk/NEWS
+%%PORTDOCS%%share/doc/ddskk/FAQ.ja
+%%PORTDOCS%%share/doc/ddskk/NEWS.ja
 %%PORTDOCS%%share/doc/ddskk/README
 %%PORTDOCS%%@dirrm share/doc/ddskk
diff --git a/japanese/ddskk/pkg-plist.emacs20 b/japanese/ddskk/pkg-plist.emacs20
index 8fae5872bd2e..b838d1c974e2 100644
--- a/japanese/ddskk/pkg-plist.emacs20
+++ b/japanese/ddskk/pkg-plist.emacs20
@@ -30,6 +30,7 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc || true
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.el
@@ -41,6 +42,7 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el
+@unexec rm -f %D/%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc || true
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
@@ -71,15 +73,16 @@ info/skk.info-4
 share/skk/NICOLA-SKK.tut
 share/skk/SKK.tut
 share/skk/SKK.tut.E
+share/skk/skk.xpm
 @dirrm share/skk
 share/examples/ddskk/Emacs.ad
 share/examples/ddskk/dot.emacs
 share/examples/ddskk/dot.skk
 @dirrm share/examples/ddskk
-%%PORTDOCS%%share/doc/ddskk/AUTHORS
-%%PORTDOCS%%share/doc/ddskk/Codename
+%%PORTDOCS%%share/doc/ddskk/AUTHORS.ja
+%%PORTDOCS%%share/doc/ddskk/CODENAME.ja
 %%PORTDOCS%%share/doc/ddskk/Contributors
-%%PORTDOCS%%share/doc/ddskk/FAQ.txt
-%%PORTDOCS%%share/doc/ddskk/NEWS
+%%PORTDOCS%%share/doc/ddskk/FAQ.ja
+%%PORTDOCS%%share/doc/ddskk/NEWS.ja
 %%PORTDOCS%%share/doc/ddskk/README
 %%PORTDOCS%%@dirrm share/doc/ddskk