- Update to 14.2

- Make PREFIX-safe
- Unbreak
- Pass maintainership to submitter

PR:		ports/157419
Submitted by:	Hiroto Kagotani <hiroto.kagotani@gmail.com>

4 files changed, 40 insertions, 39 deletions

diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 67b685930d6f..c06673923977 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -6,38 +6,20 @@
 #
 
 PORTNAME=	ddskk
-PORTVERSION=	13.1
-PORTREVISION=	5
+PORTVERSION=	14.2
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
 		ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
 		http://www.ring.gr.jp/archives/elisp/skk/maintrunk/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 
-BROKEN=	Does not fetch
-
 USE_EMACS=      yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(EMACS_PORT_NAME)
-.if (${EMACS_PORT_NAME} == "emacs23")
-DEPPORT_SUFFIX=
-.else
-DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
-.endif
-BUILD_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
-RUN_DEPENDS=	${BUILD_DEPENDS}
-.else
-.BEGIN:
-	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_PORT_NAME."
-	@${FALSE}
-.endif
-
 INFO=		skk
 
 SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
@@ -47,6 +29,10 @@ SKK_EXAMPLES=	etc/Emacs.ad etc/dot.emacs etc/dot.skk
 ALL_TARGET=	elc info
 MAKE_ARGS+=	SKK_LISPDIR=${PREFIX}/${SKK_LISPDIR}
 
+pre-install:
+	# required for non-standard PREFIX
+	${MKDIR} ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+
 post-install:
 .for i in skk-jisx0213 skk-lookup
 	${INSTALL_DATA} ${WRKSRC}/${i}.el ${PREFIX}/${SKK_LISPDIR}
diff --git a/japanese/ddskk/distinfo b/japanese/ddskk/distinfo
index cc7a6e9e496a..de1281684ed7 100644
--- a/japanese/ddskk/distinfo
+++ b/japanese/ddskk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ddskk-13.1.tar.gz) = d2b1bcf7f4e6b41afb126bbde4e119a16cd4f5507ae984154250dd8a19801582
-SIZE (ddskk-13.1.tar.gz) = 720490
+SHA256 (ddskk-14.2.tar.gz) = ddf1f892b0b41e163b29cbbc00eae1ca3eef512dc3b5217ede329d414252fdf1
+SIZE (ddskk-14.2.tar.gz) = 794060
diff --git a/japanese/ddskk/files/patch-Makefile b/japanese/ddskk/files/patch-Makefile
new file mode 100644
index 000000000000..9555fcb4dbd9
--- /dev/null
+++ b/japanese/ddskk/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2011-06-01 09:07:20.000000000 +0800
++++ Makefile	2011-06-01 09:07:54.000000000 +0800
+@@ -11,7 +11,7 @@
+ DATE	  = date
+ EMACS	  = emacs
+ ETAGS	  = etags
+-FLAGS     = -batch -q -no-site-file -l SKK-MK
++FLAGS     = -batch -q -no-site-file --eval '(setq PREFIX "${PREFIX}")' -l SKK-MK
+ GZIP      = gzip -9
+ MD5	  = md5
+ RM	  = /bin/rm -f
diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index b93fc12e4190..030a4dae3f06 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -1,5 +1,7 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/cdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/cdb.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/context-skk.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/context-skk.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.el
@@ -17,6 +19,8 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-azik.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-azik.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cdb.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.el
@@ -27,14 +31,14 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.el
-%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-e21.el
-%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-e21.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-emacs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-emacs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-hint.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-hint.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-inline.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-inline.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
@@ -57,13 +61,13 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.el
-%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server-completion.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server-completion.elc
 %%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-sticky.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-sticky.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-study.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tankan.el
@@ -84,14 +88,14 @@ share/skk/SKK.tut
 share/skk/SKK.tut.E
 share/skk/skk.xpm
 @dirrmtry 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.ja
-%%PORTDOCS%%share/doc/ddskk/CODENAME.ja
-%%PORTDOCS%%share/doc/ddskk/Contributors
-%%PORTDOCS%%share/doc/ddskk/FAQ.ja
-%%PORTDOCS%%share/doc/ddskk/NEWS.ja
-%%PORTDOCS%%share/doc/ddskk/README
-%%PORTDOCS%%@dirrm share/doc/ddskk
+%%EXAMPLESDIR%%/Emacs.ad
+%%EXAMPLESDIR%%/dot.emacs
+%%EXAMPLESDIR%%/dot.skk
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.ja
+%%PORTDOCS%%%%DOCSDIR%%/CODENAME.ja
+%%PORTDOCS%%%%DOCSDIR%%/Contributors
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.ja
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.ja
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%