3 files changed, 35 insertions, 35 deletions

diff --git a/textproc/kmfl-sil-ezra/Makefile b/textproc/kmfl-sil-ezra/Makefile
index 70f3d96e0edc..ee292cc43b1b 100644
--- a/textproc/kmfl-sil-ezra/Makefile
+++ b/textproc/kmfl-sil-ezra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kmfl-sil-ezra
 PORTVERSION=	2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=EzraSIL251_Src.zip\&filename=/:1 \
 		http://scripts.sil.org/cms/scripts/render_download.php\?site_id=nrsi\&format=file\&media_id=EzraSIL2.5Keying\&filename=/:2 \
@@ -23,49 +23,26 @@ USES=		dos2unix zip
 DOS2UNIX_FILES=	Keyman/EZRAUNI24.KMN
 NO_BUILD=	yes
 
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-KMFL_DIR=	share/kmfl
-KMFL_ICONS_DIR=	share/kmfl/icons
-
-PORTDOCS=	*
+OPTIONS_DEFINE=	DOCS
+DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 DOCSLIST=	${WRKSRC}/Licenses.txt ${WRKSRC}/README.txt \
 		${WRKSRC}/WordDocs/Ezra\ SIL\ Keyboard\ Chart.doc \
 		${DISTDIR}/${DIST_SUBDIR}/Keying+in+Hebrew.pdf \
 		${WRKSRC}/WordDocs/Simplified\ keyboard\ chart.doc
 
-PLIST_FILES=	${KMFL_DIR}/EZRAUNI24.kmn \
-		${KMFL_ICONS_DIR}/HEBDISPY.bmp \
-		${KMFL_ICONS_DIR}/alef.bmp
-PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
-		${KMFL_DIR}
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
+
+SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${KMFL_DIR} ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
 	${CP} -f ${WRKSRC}/Keyman/EZRAUNI24.KMN ${WRKSRC}/Keyman/EZRAUNI24.kmn
-	${INSTALL_DATA} ${WRKSRC}/Keyman/*.kmn ${LOCALBASE}/${KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/Keyman/*.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Keyman/*.kmn ${STAGEDIR}${PREFIX}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/Keyman/*.bmp ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} "$$doc" ${DOCSDIR} ; \
+		${INSTALL_DATA} "$$doc" ${STAGEDIR}${DOCSDIR} ; \
 	done
-.endif
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Hebrew\" 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}"
-	@${ECHO_MSG} "  Please note that some documentation files are"
-	@${ECHO_MSG} "  officially released in proprietary formats only and"
-	@${ECHO_MSG} "  that they are installed as such."
-.endif
-	@${ECHO_MSG} "--------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/textproc/kmfl-sil-ezra/files/pkg-message.in b/textproc/kmfl-sil-ezra/files/pkg-message.in
new file mode 100644
index 000000000000..2a0d872b6197
--- /dev/null
+++ b/textproc/kmfl-sil-ezra/files/pkg-message.in
@@ -0,0 +1,11 @@
+---------------------------------------------------------
+  You should now have the new keyboard in the section
+  "Hebrew" in your SCIM/IBus menu. If you don't see it,
+  restart X.
+
+  The documentation is installed into:
+  %%DOCSDIR%%
+  Please note that some documentation files are
+  officially released in proprietary formats only and
+  that they are installed as such.
+---------------------------------------------------------
diff --git a/textproc/kmfl-sil-ezra/pkg-plist b/textproc/kmfl-sil-ezra/pkg-plist
new file mode 100644
index 000000000000..f115ada79c6d
--- /dev/null
+++ b/textproc/kmfl-sil-ezra/pkg-plist
@@ -0,0 +1,12 @@
+%%PORTDOCS%%%%DOCSDIR%%/Ezra SIL Keyboard Chart.doc
+%%PORTDOCS%%%%DOCSDIR%%/Keying+in+Hebrew.pdf
+%%PORTDOCS%%%%DOCSDIR%%/Licenses.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/Simplified keyboard chart.doc
+share/kmfl/EZRAUNI24.kmn
+share/kmfl/icons/HEBDISPY.bmp
+share/kmfl/icons/alef.bmp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry share/doc/kmfl
+@dirrmtry share/kmfl/icons
+@dirrmtry share/kmfl