- Stage support

- Cleanup

PR:		190775

3 files changed, 28 insertions, 31 deletions

diff --git a/textproc/kmfl-sil-ipa-unicode/Makefile b/textproc/kmfl-sil-ipa-unicode/Makefile
index 612e162ebe54..8cbf280128cc 100644
--- a/textproc/kmfl-sil-ipa-unicode/Makefile
+++ b/textproc/kmfl-sil-ipa-unicode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kmfl-sil-ipa-unicode
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_12_Src\&filename=/:1 \
 		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=IPAUni_12.pdf\&filename=/:2
@@ -22,34 +22,24 @@ WRKSRC=		${WRKDIR}/IPA12
 DOS2UNIX_FILES=	IPAUni12.kmn
 NO_BUILD=	yes
 
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
+OPTIONS_DEFINE=	DOCS
+DOCSDIR=	share/doc/kmfl/${PORTNAME}
+DOCSLIST=	${WRKSRC}/welcome.htm \
+		${DISTDIR}/${DIST_SUBDIR}/IPA+Unicode+5.1_ver+1.2_KMN.pdf
+
 KMFL_DIR=	share/kmfl
 KMFL_ICONS_DIR=	share/kmfl/icons
 
 SUB_FILES=	pkg-message
-PORTDOCS=	*
-DOCSLIST=	${WRKSRC}/welcome.htm \
-		${DISTDIR}/${DIST_SUBDIR}/IPA+Unicode+5.1_ver+1.2_KMN.pdf
-PLIST_FILES=	${KMFL_DIR}/IPAUni12.kmn \
-		${KMFL_ICONS_DIR}/ipa.bmp \
-		${KMFL_ICONS_DIR}/sil.bmp
-PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
-		${KMFL_DIR}
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${KMFL_DIR} ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.kmn ${STAGEDIR}${PREFIX}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.bmp ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${DOCSDIR:S,/${PORTNAME},,} \
+		${STAGEDIR}${PREFIX}/${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} $$doc ${DOCSDIR} ; \
+		${INSTALL_DATA} $$doc ${STAGEDIR}${PREFIX}/${DOCSDIR} ; \
 	done
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in b/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
index a2544bd6871e..a6d28997190f 100644
--- a/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
+++ b/textproc/kmfl-sil-ipa-unicode/files/pkg-message.in
@@ -1,10 +1,8 @@
+---------------------------------------------------------
+  You should now have the new keyboard in the section
+  "Others" in your SCIM/IBus menu. If you don't see it,
+  restart X.
 
-------------------------------------------------------------------------
-  You should now have the new keyboard in section "Others" of your
-  SCIM/IBus menu. If you don't see it, restart X.
-
-  The PDF documentation for use of SIL IPA Unicode5 keyboard can be
-  found in 
-
-    %%PREFIX%%/share/doc/kmfl/scim-kmfl-sil-ipa-unicode5/
-------------------------------------------------------------------------
+  The documentation is installed into:
+  %%LOCALBASE%%/%%DOCSDIR%%
+---------------------------------------------------------
diff --git a/textproc/kmfl-sil-ipa-unicode/pkg-plist b/textproc/kmfl-sil-ipa-unicode/pkg-plist
new file mode 100644
index 000000000000..5a4cf98118f5
--- /dev/null
+++ b/textproc/kmfl-sil-ipa-unicode/pkg-plist
@@ -0,0 +1,9 @@
+%%PORTDOCS%%%%DOCSDIR%%/IPA+Unicode+5.1_ver+1.2_KMN.pdf
+%%PORTDOCS%%%%DOCSDIR%%/welcome.htm
+share/kmfl/IPAUni12.kmn
+share/kmfl/icons/ipa.bmp
+share/kmfl/icons/sil.bmp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry share/doc/kmfl
+@dirrmtry share/kmfl/icons
+@dirrmtry share/kmfl