3 files changed, 31 insertions, 32 deletions

diff --git a/textproc/kmfl-european-latin/Makefile b/textproc/kmfl-european-latin/Makefile
index 8cec92e19491..928386bb7557 100644
--- a/textproc/kmfl-european-latin/Makefile
+++ b/textproc/kmfl-european-latin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kmfl-european-latin
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.tavultesoft.com/eurolatin/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
@@ -19,46 +20,27 @@ WRKSRC=		${WRKDIR}/EuroLatin\ Source\ Files
 USES=		dos2unix zip
 DOS2UNIX_FILES=	european.kmn
 
-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=	EuroLatin\ Keyman\ Desktop\ Keyboard\ Files/eurolatin1.6.pdf \
 		EuroLatin\ KeymanWeb\ Keyboard\ Files/european.html \
 		licence.txt
-PLIST_FILES=	${KMFL_DIR}/european.kmn \
-		${KMFL_ICONS_DIR}/latin.png
-PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
-		${KMFL_DIR}
 
-NO_STAGE=	yes
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
+
+SUB_FILES=	pkg-message
+
 do-build:
-	base64 -d ${FILESDIR}/latin.png.base64.txt > ${WRKSRC}/latin.png
+	${LOCALBASE}/bin/base64 -d ${FILESDIR}/latin.png.base64.txt > ${WRKSRC}/latin.png
 
 do-install:
-	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/*.kmn ${LOCALBASE}/${KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/latin.png ${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}/latin.png ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} ${WRKSRC}/"$$doc" ${DOCSDIR} ; \
+		${INSTALL_DATA} ${WRKSRC}/"$$doc" ${STAGEDIR}${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 PDF documentation for use of the European Latin"
-	@${ECHO_MSG} "  Keyboard can be found in:"
-	@${ECHO_MSG} "  ${PREFIX}/share/doc/kmfl/${PORTNAME}/"
-.endif
-	@${ECHO_MSG} "--------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/textproc/kmfl-european-latin/files/pkg-message.in b/textproc/kmfl-european-latin/files/pkg-message.in
new file mode 100644
index 000000000000..3f3df9cf6359
--- /dev/null
+++ b/textproc/kmfl-european-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:
+  %%DOCSDIR%%
+---------------------------------------------------------
diff --git a/textproc/kmfl-european-latin/pkg-plist b/textproc/kmfl-european-latin/pkg-plist
new file mode 100644
index 000000000000..28456cc92879
--- /dev/null
+++ b/textproc/kmfl-european-latin/pkg-plist
@@ -0,0 +1,9 @@
+%%PORTDOCS%%%%DOCSDIR%%/eurolatin1.6.pdf
+%%PORTDOCS%%%%DOCSDIR%%/european.html
+%%PORTDOCS%%%%DOCSDIR%%/licence.txt
+share/kmfl/european.kmn
+share/kmfl/icons/latin.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry share/doc/kmfl
+@dirrmtry share/kmfl/icons
+@dirrmtry share/kmfl