- Stage support

- Cleanup

PR:		190776

3 files changed, 32 insertions, 34 deletions

diff --git a/textproc/kmfl-sil-panafrican-latin/Makefile b/textproc/kmfl-sil-panafrican-latin/Makefile
index b1a9f79b27bf..a88fdd3c9001 100644
--- a/textproc/kmfl-sil-panafrican-latin/Makefile
+++ b/textproc/kmfl-sil-panafrican-latin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kmfl-sil-panafrican-latin
 PORTVERSION=	20090831
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=AfricaKeyboardDead2009\&filename=/:1 \
 		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=AfricaKeyboardUS2009\&filename=/:2 \
@@ -22,52 +22,33 @@ DOS2UNIX_FILES=	PanAfricaMnemonic/AfricaDeadKey.kmn \
 		PanAfricaUSlayout/AfricaUS.kmn
 NO_BUILD=	yes
 
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
+OPTIONS_DEFINE=	DOCS
+DOCSDIR=	share/doc/kmfl/${PORTNAME}
+DOCSLIST=	PanAfricaMnemonic/SIL\ Unicode\ Keyboard\ Chart\ for\ Africa\ using\ deadkeys.pdf \
+		PanAfricaUSlayout/SIL\ Unicode\ Keyboard\ Chart\ for\ Africa\ using\ shiftkeys.pdf
+
 KMFL_DIR=	share/kmfl
 KMFL_ICONS_DIR=	share/kmfl/icons
 
-NO_STAGE=	yes
+SUB_FILES=	pkg-message
+
 post-patch:
 		@${REINPLACE_CMD} -e 's|^BITMAP AFR|BITMAP AFR.bmp|' \
 			${WRKSRC}/PanAfricaMnemonic/AfricaDeadKey.kmn \
 			${WRKSRC}/PanAfricaUSlayout/AfricaUS.kmn
 
-PORTDOCS=	*
-DOCSLIST=	PanAfricaMnemonic/SIL\ Unicode\ Keyboard\ Chart\ for\ Africa\ using\ deadkeys.pdf \
-		PanAfricaUSlayout/SIL\ Unicode\ Keyboard\ Chart\ for\ Africa\ using\ shiftkeys.pdf
-
-PLIST_FILES=	${KMFL_DIR}/AfricaDeadKey.kmn \
-		${KMFL_DIR}/AfricaUS.kmn \
-		${KMFL_ICONS_DIR}/AFR.bmp
-PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
-		${KMFL_DIR}
-
 do-install:
-	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${KMFL_DIR} ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
 	${INSTALL_DATA} ${WRKSRC}/PanAfricaMnemonic/*.kmn \
-		${LOCALBASE}/${KMFL_DIR}
+		${STAGEDIR}${PREFIX}/${KMFL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/PanAfricaUSlayout/*.kmn \
-		${LOCALBASE}/${KMFL_DIR}
+		${STAGEDIR}${PREFIX}/${KMFL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/PanAfricaMnemonic/*.bmp \
-		${LOCALBASE}/${KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+		${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${DOCSDIR:S,/${PORTNAME},,} \
+		${STAGEDIR}${PREFIX}/${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} "${WRKSRC}/$$doc" ${DOCSDIR} ; \
+		${INSTALL_DATA} "${WRKSRC}/$$doc" ${STAGEDIR}${PREFIX}/${DOCSDIR} ; \
 	done
-.endif
-
-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."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  The documentation is installed into:"
-	@${ECHO_MSG} "    ${DOCSDIR}"
-.endif
-	@${ECHO_MSG} "--------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/textproc/kmfl-sil-panafrican-latin/files/pkg-message.in b/textproc/kmfl-sil-panafrican-latin/files/pkg-message.in
new file mode 100644
index 000000000000..a6d28997190f
--- /dev/null
+++ b/textproc/kmfl-sil-panafrican-latin/files/pkg-message.in
@@ -0,0 +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.
+
+  The documentation is installed into:
+  %%LOCALBASE%%/%%DOCSDIR%%
+---------------------------------------------------------
diff --git a/textproc/kmfl-sil-panafrican-latin/pkg-plist b/textproc/kmfl-sil-panafrican-latin/pkg-plist
new file mode 100644
index 000000000000..65597e44653b
--- /dev/null
+++ b/textproc/kmfl-sil-panafrican-latin/pkg-plist
@@ -0,0 +1,9 @@
+%%PORTDOCS%%%%DOCSDIR%%/SIL Unicode Keyboard Chart for Africa using deadkeys.pdf
+%%PORTDOCS%%%%DOCSDIR%%/SIL Unicode Keyboard Chart for Africa using shiftkeys.pdf
+share/kmfl/AfricaDeadKey.kmn
+share/kmfl/AfricaUS.kmn
+share/kmfl/icons/AFR.bmp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry share/doc/kmfl
+@dirrmtry share/kmfl/icons
+@dirrmtry share/kmfl