- Fix LICENSE

- Add LICENSE_FILE
- Simplify installation
- Switch to options helpers

1 files changed, 12 insertions, 11 deletions

diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 28d71d76ed3a..4758e97c73d7 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -13,24 +13,24 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Kana to Kanji conversion program on Emacsen
 
-LICENSE=	GPLv2
-
-NO_ARCH=	yes
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/READMEs/COPYING
 
 USE_EMACS=	yes
 MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}" \
 		SKK_LISPDIR="${STAGEDIR}${PREFIX}/${SKK_LISPDIR}" \
 		SKK_INFODIR="${STAGEDIR}${PREFIX}/${INFO_PATH}"
 ALL_TARGET=	elc info
+NO_ARCH=	yes
 
 INFO=		skk
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
 SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/skk-tut-file/s|@TUT@|${PREFIX}/share/skk/SKK.tut|' \
@@ -44,18 +44,19 @@ pre-build:
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
 .for i in skk-lookup.el skk-jisx0213.el
-	(cd ${WRKDIR} && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${PREFIX}/${SKK_LISPDIR})
+	${INSTALL_DATA} ${WRKDIR}/${i} ${STAGEDIR}${PREFIX}/${SKK_LISPDIR}
 .endfor
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
-	(cd ${WRKSRC}/READMEs && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in Emacs.ad dot.emacs dot.skk
-	(cd ${WRKSRC}/etc && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${EXAMPLESDIR})
+	${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>