- Stage support

- Cleanup

PR:		190777

2 files changed, 16 insertions, 17 deletions

diff --git a/textproc/kmfl-sil-yi/Makefile b/textproc/kmfl-sil-yi/Makefile
index bc5dff56d7fe..5b1366829005 100644
--- a/textproc/kmfl-sil-yi/Makefile
+++ b/textproc/kmfl-sil-yi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kmfl-sil-yi
 PORTVERSION=	20020903
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=SILYi12OFL_Src&filename=/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
@@ -23,27 +23,16 @@ NO_BUILD=	yes
 KMFL_DIR=	share/kmfl
 KMFL_ICONS_DIR=	share/kmfl/icons
 
+SUB_FILES=	pkg-message
+
 PLIST_FILES=	${KMFL_DIR}/Yi7.kmn \
 		${KMFL_ICONS_DIR}/YiPinYin.bmp
 PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
 		${KMFL_DIR}
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.kmn ${LOCALBASE}/${KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Others\" in your SCIM/IBus menu. If you don't see it,"
-	@${ECHO_MSG} "  restart X."
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  At the moment, this keyboard has no documentation."
-	@${ECHO_MSG} "  As a general rule, type the Pinyin romanization for"
-	@${ECHO_MSG} "  that syllable, followed by a space. For punctuation,"
-	@${ECHO_MSG} "  try usual punctuation keystrokes."
-	@${ECHO_MSG} "--------------------------------------------------------"
+	${MKDIR} ${STAGEDIR}${PREFIX}/${KMFL_DIR} ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.kmn ${STAGEDIR}${PREFIX}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/SourceFiles/*.bmp ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/kmfl-sil-yi/files/pkg-message.in b/textproc/kmfl-sil-yi/files/pkg-message.in
new file mode 100644
index 000000000000..b15ad97ea22d
--- /dev/null
+++ b/textproc/kmfl-sil-yi/files/pkg-message.in
@@ -0,0 +1,10 @@
+---------------------------------------------------------
+  You should now have the new keyboard in the section
+  "Others" in your SCIM/IBus menu. If you don't see it,
+  restart X.
+
+  At the moment, this keyboard has no documentation.
+  As a general rule, type the Pinyin romanization for
+  that syllable, followed by a space. For punctuation,
+  try usual punctuation keystrokes.
+---------------------------------------------------------