6 files changed, 54 insertions, 97 deletions

diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index 4e9d100d1de8..e30d317bb4bb 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -3,46 +3,41 @@
 
 PORTNAME=	kaname12
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
-		http://www.din.or.jp/~storm/fonts/
+MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 DISTNAME=	kaname_k12_bdf
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		knm_new_linux.tar.gz
 EXTRACT_ONLY=	knm_new_linux.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	X11 12-dot Kanji font
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 WRKSRC=		${WRKDIR}/fonts
 
-FONTSDIR=	lib/X11/fonts/local
-MAKE_ENV=	FONTSDIR=${FONTSDIR}
+FONTSDIR=	lib/X11/fonts/${PORTNAME}
+MAKE_ENV=	FONTSDIR=${FONTSDIR} MKDIR="${MKDIR}"
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 DOCSDIR=	${PREFIX}/share/doc/k12
 
+SUB_FILES=	pkg-message
+SUB_LIST=	FONTSDIR=${FONTSDIR}
+
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
 post-install:
-	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/readme            ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc.orig/*        ${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias \
+		${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme            ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc.orig/*        ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/japanese/k12/files/fonts.alias b/japanese/k12/files/fonts.alias
new file mode 100644
index 000000000000..3c007c4e977c
--- /dev/null
+++ b/japanese/k12/files/fonts.alias
@@ -0,0 +1,4 @@
+k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
+k12b -mnkaname-fixed-bold-r-normal--12-110-75-75-c-120-jisx0208.1983-0
+r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
+a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
diff --git a/japanese/k12/files/patch-aa b/japanese/k12/files/patch-aa
index 588588c22861..ee69ae48a026 100644
--- a/japanese/k12/files/patch-aa
+++ b/japanese/k12/files/patch-aa
@@ -1,17 +1,15 @@
-*** /dev/null	Wed Oct 13 00:00:00 1999
---- Makefile	Wed Oct 13 00:00:00 1999
-***************
-*** 0 ****
---- 1,12 ----
-+ all:
-+ 	bdftopcf knmhn12x.bdf > knmhn12x.pcf
-+ 	gzip -9 -nf knmhn12x.pcf
-+ install:
-+ 	if [ ! -d ${PREFIX}/${FONTSDIR} ] ; then \
-+ 	${MKDIR} ${PREFIX}/${FONTSDIR} ; fi
-+ 	${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${PREFIX}/${FONTSDIR}
-+ 	${BSD_INSTALL_DATA} knm12p.pcf.gz ${PREFIX}/${FONTSDIR}
-+ 	${BSD_INSTALL_DATA} knm12pb.pcf.gz ${PREFIX}/${FONTSDIR}
-+ 	${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${PREFIX}/${FONTSDIR}
-+ 	${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR}
-+ 	${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${PREFIX}/${FONTSDIR}
+--- Makefile.orig	2014-05-08 22:08:32.000000000 +0900
++++ Makefile	2014-05-08 22:10:13.000000000 +0900
+@@ -0,0 +1,12 @@
++all:
++	bdftopcf knmhn12x.bdf > knmhn12x.pcf
++	gzip -9 -nf knmhn12x.pcf
++install:
++	if [ ! -d ${DESTDIR}${PREFIX}/${FONTSDIR} ] ; then \
++	${MKDIR} ${DESTDIR}${PREFIX}/${FONTSDIR} ; fi
++	${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
++	${BSD_INSTALL_DATA} knm12p.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
++	${BSD_INSTALL_DATA} knm12pb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
++	${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
++	${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
++	${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR}
diff --git a/japanese/k12/files/pkg-message.in b/japanese/k12/files/pkg-message.in
new file mode 100644
index 000000000000..235c49536344
--- /dev/null
+++ b/japanese/k12/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+ %%PREFIX%%/%%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 "%%PREFIX%%/%%FONTSDIR%%/"
+
+then restart X.
+*******************************************************************
diff --git a/japanese/k12/pkg-plist b/japanese/k12/pkg-plist
index 29d644d6a7c7..1e95d610c095 100644
--- a/japanese/k12/pkg-plist
+++ b/japanese/k12/pkg-plist
@@ -5,13 +5,10 @@
 %%FONTSDIR%%/knmhn12x.pcf.gz
 %%FONTSDIR%%/knmzn12x.pcf.gz
 %%FONTSDIR%%/knmzn12xb.pcf.gz
+@fontsdir %%FONTSDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/gijutsu-siryou.doc
 %%PORTDOCS%%%%DOCSDIR%%/kaname.doc
 %%PORTDOCS%%%%DOCSDIR%%/readme
 %%PORTDOCS%%%%DOCSDIR%%/readme.kaname_bdf
 %%PORTDOCS%%%%DOCSDIR%%/readme.knm
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/k12/pkg-req b/japanese/k12/pkg-req
deleted file mode 100644
index 737c7117a15b..000000000000
--- a/japanese/k12/pkg-req
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-	exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
-	exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
-	echo '**********************************************************************'
-	echo "****** ${FONTDIR}/ doesn't exist."
-	echo "****** Creating ${FONTDIR}/"
-	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
-	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
-	echo '**********************************************************************'
-	mkdir ${FONTDIR}
-fi
-
-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}
-k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
-k12b -mnkaname-fixed-bold-r-normal--12-110-75-75-c-120-jisx0208.1983-0
-r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
-a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias
-cp fonts.alias fonts.alias.orig
-if [ "$2" = "INSTALL" ] ; then
-	(grepv ${TMPFILE} fonts.alias.orig ; \
-	 cat ${TMPFILE}) > fonts.alias
-elif [ "$2" = "DEINSTALL" ] ; then
-	grepv ${TMPFILE} fonts.alias.orig > 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;