- Fix runtime behaviour: fonts.alias was not updated properly

- Add pkg-message.in; fontpath setting instructions
- Bump PORTREVISION
- New maintainer: WATANABE Kazuhiro (CQG00620@nifty.ne.jp)

PR:		199537
Submitted by:	CQG00620@nifty.ne.jp (maintainer)
MFH:		2015Q2

5 files changed, 20 insertions, 75 deletions

diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 67f883d7700a..eda3b2101cf2 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	naga10
 PORTVERSION=	1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA013391/fonts/
 DISTNAME=	knj10-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	X11 10-dot Kanji font 'naga10 font'
 
 BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
@@ -17,6 +17,7 @@ BUILD_DEPENDS=	mkbold:${PORTSDIR}/x11-fonts/mkbold-mkitalic \
 USES=		fonts
 
 MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,}
+SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
@@ -26,5 +27,6 @@ post-extract:
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/k10/pkg-install b/japanese/k10/files/fonts.alias
index f83ed947612b..e78f21383251 100644
--- a/japanese/k10/pkg-install
+++ b/japanese/k10/files/fonts.alias
@@ -1,18 +1,3 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-FONTDIR=${PKG_PREFIX}/share/fonts/kanji
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
 k10  -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
 k10i -misc-fixed-medium-i-normal--10-90-75-75-c-100-jisx0208.1983-0
 k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0
@@ -25,18 +10,3 @@ r10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
 r10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-jisx0201.1976-0
 r10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-jisx0201.1976-0
 r10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-jisx0201.1976-0
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias
-rm -f fonts.alias.orig ${TMPFILE}
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0
diff --git a/japanese/k10/files/pkg-message.in b/japanese/k10/files/pkg-message.in
new file mode 100644
index 000000000000..c5acde405124
--- /dev/null
+++ b/japanese/k10/files/pkg-message.in
@@ -0,0 +1,15 @@
+*******************************************************************
+You can start using the font(s) by following these instructions:
+
+Eiter type the following in an X terminal:
+
+        xset fp+ %%FONTSDIR%%
+        xset fp rehash
+
+Or, more permanently, add the following line to the "Files" section
+of your X.Org configuration file (typically /etc/X11/xorg.conf):
+
+        FontPath "%%FONTSDIR%%/"
+
+then restart X.
+*******************************************************************
diff --git a/japanese/k10/pkg-deinstall b/japanese/k10/pkg-deinstall
deleted file mode 100644
index e6f3a362f8a8..000000000000
--- a/japanese/k10/pkg-deinstall
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "DEINSTALL" ]; then
-	exit 0
-fi
-
-FONTDIR=${PKG_PREFIX}/share/fonts/kanji
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
-k10  -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
-k10i -misc-fixed-medium-i-normal--10-90-75-75-c-100-jisx0208.1983-0
-k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0
-k10bi -misc-fixed-bold-i-normal--10-90-75-75-c-100-jisx0208.1983-0
-a10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1
-a10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-iso8859-1
-a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1
-a10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-iso8859-1
-r10  -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
-r10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-jisx0201.1976-0
-r10i -misc-fixed-medium-i-normal--10-90-75-75-c-50-jisx0201.1976-0
-r10bi -misc-fixed-bold-i-normal--10-90-75-75-c-50-jisx0201.1976-0
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-grepv ${TMPFILE} fonts.alias.orig > fonts.alias
-if [ ! -s fonts.alias ]; then rm -f fonts.alias; fi
-rm -f fonts.alias.orig ${TMPFILE}
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0
diff --git a/japanese/k10/pkg-plist b/japanese/k10/pkg-plist
index e89b63e1e9aa..190de399aa5c 100644
--- a/japanese/k10/pkg-plist
+++ b/japanese/k10/pkg-plist
@@ -1,3 +1,4 @@
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/5x10B.pcf.gz
 %%FONTSDIR%%/5x10a.pcf.gz
 %%FONTSDIR%%/5x10rk.pcf.gz