- Update to 14.3 [1]

- Fix for port test [1]
- Set MAKE_JOBS_SAFE [1]
- Respect NOPORTEXAMPLES [2]
- Make use of PORTDOCS and PORTEXAMPLES [2]

PR:		ports/160020 [1]
Submitted by:	Hiroto Kagotani (maintainer) [1]
Approved by:	maintainer (via private e-mail) [2]

4 files changed, 17 insertions, 29 deletions

diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index b8897472af21..0c051facd812 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ddskk
-PORTVERSION=	14.2
-PORTREVISION=	2
+PORTVERSION=	14.3
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
 		ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
@@ -17,36 +16,36 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 
-USE_EMACS=      yes
-
-.include <bsd.port.pre.mk>
-
+MAKE_JOBS_SAFE=	yes
+USE_EMACS=	yes
 INFO=		skk
 
 SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
-SKK_DOCS=	AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
-SKK_EXAMPLES=	etc/Emacs.ad etc/dot.emacs etc/dot.skk
+PORTDOCS=	AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
+PORTEXAMPLES=	Emacs.ad dot.emacs 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}
+	${MKDIR} ${PREFIX}/${SKK_LISPDIR}
 
 post-install:
 .for i in skk-jisx0213 skk-lookup
 	${INSTALL_DATA} ${WRKSRC}/${i}.el ${PREFIX}/${SKK_LISPDIR}
 .endfor
-	${MKDIR} ${EXAMPLESDIR}
-.for i in ${SKK_EXAMPLES}
-	${INSTALL_DATA}	${WRKSRC}/${i} ${EXAMPLESDIR}
-.endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in ${SKK_DOCS}
+.for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${DOCSDIR}
 .endfor
 .endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+.for i in ${PORTEXAMPLES}
+	${INSTALL_DATA}	${WRKSRC}/etc/${i} ${EXAMPLESDIR}
+.endfor
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/ddskk/distinfo b/japanese/ddskk/distinfo
index de1281684ed7..017a6d6e79a5 100644
--- a/japanese/ddskk/distinfo
+++ b/japanese/ddskk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ddskk-14.2.tar.gz) = ddf1f892b0b41e163b29cbbc00eae1ca3eef512dc3b5217ede329d414252fdf1
-SIZE (ddskk-14.2.tar.gz) = 794060
+SHA256 (ddskk-14.3.tar.gz) = 478e2c824cfcd4e956a2e30e0f3967c3e385b3941f13fdd6c8c270d89367d0ef
+SIZE (ddskk-14.3.tar.gz) = 805289
diff --git a/japanese/ddskk/files/patch-Makefile b/japanese/ddskk/files/patch-Makefile
index 9555fcb4dbd9..386c4b81a3de 100644
--- a/japanese/ddskk/files/patch-Makefile
+++ b/japanese/ddskk/files/patch-Makefile
@@ -5,7 +5,7 @@
  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
++FLAGS     = -batch -q -no-site-file --eval '(setq PREFIX "${PREFIX}")' --eval '(setq SKK_LISPDIR "${SKK_LISPDIR}")' -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 030a4dae3f06..443050b7b592 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -88,14 +88,3 @@ share/skk/SKK.tut
 share/skk/SKK.tut.E
 share/skk/skk.xpm
 @dirrmtry share/skk
-%%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%%