Stage japanese/ddskk

PR:		192800
Submitted by:	Ports Fury

2 files changed, 37 insertions, 26 deletions

diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 3b6ca9467a9e..c28ca43cb5d7 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -13,40 +13,49 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+LICENSE=	GPLv2
+
+NO_ARCH=	yes
 
 USE_EMACS=	yes
+MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}" \
+		SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \
+		SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}"
+ALL_TARGET=	elc info
+
 INFO=		skk
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
-PORTDOCS=	AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
-PORTEXAMPLES=	Emacs.ad dot.emacs dot.skk
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-ALL_TARGET=	elc info
-MAKE_ARGS+=	SKK_LISPDIR=${PREFIX}/${SKK_LISPDIR} SKK_INFODIR=${PREFIX}/${INFO_PATH}
+SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
 
-NO_STAGE=	yes
-pre-install:
-	# required for non-standard PREFIX
-	${MKDIR} ${PREFIX}/${SKK_LISPDIR}
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/skk-tut-file/s|@TUT@|${PREFIX}/share/skk/SKK.tut|' \
+		${WRKSRC}/skk-setup.el.in
 
-.include <bsd.port.options.mk>
+pre-build:
+.for i in skk-lookup.el skk-jisx0213.el
+	@${MV} ${WRKSRC}/${i} ${WRKDIR}
+.endfor
 
 post-install:
-.for i in skk-jisx0213 skk-lookup
-	${INSTALL_DATA} ${WRKSRC}/${i}.el ${PREFIX}/${SKK_LISPDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
+.for i in skk-lookup.el skk-jisx0213.el
+	(cd ${WRKDIR} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${PREFIX}/${SKK_LISPDIR})
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
+	(cd ${WRKSRC}/READMEs && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-.for i in ${PORTEXAMPLES}
-	${INSTALL_DATA}	${WRKSRC}/etc/${i} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for i in Emacs.ad dot.emacs dot.skk
+	(cd ${WRKSRC}/etc && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${EXAMPLESDIR})
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index eb3899d45b92..74682ee5ac9e 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -44,7 +44,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
+@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.elc
 %%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
@@ -56,7 +56,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
+@rmtry %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
@@ -84,9 +84,11 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.elc
-@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk
 share/skk/NICOLA-SKK.tut
 share/skk/SKK.tut
 share/skk/SKK.tut.E
 share/skk/skk.xpm
 @dirrmtry share/skk
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk
+@dirrmtry %%EMACS_VERSION_SITE_LISPDIR%%
+@dirrmtry %%EMACS_LIBDIR_WITH_VER%%