5 files changed, 78 insertions, 31 deletions

diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index 91dc6ef92cc7..d703bcc95d43 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -3,11 +3,11 @@
 # Date created:		24 June 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1998/08/05 09:31:18 asami Exp $
+# $Id: Makefile,v 1.6 1998/08/07 22:43:07 asami Exp $
 #
 
 DISTNAME=	kaname_k12_bdf
-PKGNAME=	ja-k12font-1.0
+PKGNAME=	ja-kaname12-1.0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/FreeBSD/etc/
 
@@ -16,7 +16,20 @@ MAINTAINER=	mita@jp.FreeBSD.org
 USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
+FONTSDIR=	lib/X11/fonts/local
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
+PLIST_SUB=	FONTSDIR=${FONTSDIR}
+
+pre-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+
 post-install:
-	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/k12
+	@${CP} ${WRKSRC}/readme.kaname_bdf ${PREFIX}/share/doc/k12
+	@${CP} ${WRKSRC}/doc.orig/*        ${PREFIX}/share/doc/k12
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/k12/files/patch-aa b/japanese/k12/files/patch-aa
index 2774dd9ee3cd..4bad7d503322 100644
--- a/japanese/k12/files/patch-aa
+++ b/japanese/k12/files/patch-aa
@@ -2,16 +2,12 @@
 --- Makefile	Sat Jul  6 12:25:35 1996
 ***************
 *** 0 ****
---- 1,12 ----
+--- 1,8 ----
 + all:
 + 	bdftopcf knmhn12x.bdf > knmhn12x.pcf
 + 	bdftopcf knmzn12x.bdf > knmzn12x.pcf
-+ 	compress *.pcf
++ 	gzip *.pcf
 + install:
-+ 	if [ ! -d /usr/X11R6/lib/X11/k12 ] ; then \
-+ 	mkdir -p /usr/X11R6/lib/X11/k12 ; fi
-+ 	if [ ! -d /usr/X11R6/lib/X11/fonts/misc ] ; then \
-+ 	mkdir -p /usr/X11R6/lib/X11/fonts/misc ; fi
-+ 	cp knmhn12x.pcf.Z knmzn12x.pcf.Z /usr/X11R6/lib/X11/fonts/misc/
-+ 	cp readme.kaname_bdf doc.orig/* /usr/X11R6/lib/X11/k12 
-+ 	cd /usr/X11R6/lib/X11/fonts/misc ; mkfontdir
++ 	if [ ! -d ${PREFIX}/${FONTSDIR} ] ; then \
++ 	mkdir -p ${PREFIX}/X11R6/${FONTSDIR} ; fi
++ 	cp knmhn12x.pcf.gz knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR}
diff --git a/japanese/k12/pkg-descr b/japanese/k12/pkg-descr
index b19be8760d9d..97b07d24b206 100644
--- a/japanese/k12/pkg-descr
+++ b/japanese/k12/pkg-descr
@@ -1,8 +1,11 @@
 Japanese 12 dot font named `kanamecho'.
-knmhn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-60-JISX0201.1976-0
-knmzn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-120-JISX0208.1983-0
+knmhn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-60-\
+JISX0201.1976-0
+knmzn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-120-\
+JISX0208.1983-0
 
-You can also use 'k12' as an alias for knmzn12x.pcf, and 'r12' for knmhn12x.pcf.
+You can also use 'k12' as an alias for knmzn12x.pcf,
+and 'r12' for knmhn12x.pcf.
 
 Simple usage:
 	% kterm -fn r12 -fk k12 -fl r12
diff --git a/japanese/k12/pkg-plist b/japanese/k12/pkg-plist
index c152a895a44e..020b873808ad 100644
--- a/japanese/k12/pkg-plist
+++ b/japanese/k12/pkg-plist
@@ -1,10 +1,9 @@
-lib/X11/fonts/misc/knmhn12x.pcf.Z
-lib/X11/fonts/misc/knmzn12x.pcf.Z
-lib/X11/k12/gijutsu-siryou.doc
-lib/X11/k12/kaname.doc
-lib/X11/k12/readme.kaname_bdf
-lib/X11/k12/readme.knm
-@exec cd %D/lib/X11/fonts/misc ; mkfontdir
-@unexec cd %D/lib/X11/fonts/misc ; mkfontdir
-@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc; cp fonts.alias fonts.alias.orig; grep -v '\-mnkaname\-fixed\-medium\-r\-normal' fonts.alias.orig > fonts.alias; rm fonts.alias.orig
-@dirrm lib/X11/k12
+%%FONTSDIR%%/knmhn12x.pcf.gz
+%%FONTSDIR%%/knmzn12x.pcf.gz
+share/doc/k12/gijutsu-siryou.doc
+share/doc/k12/kaname.doc
+share/doc/k12/readme.kaname_bdf
+share/doc/k12/readme.knm
+@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@dirrm share/doc/k12
diff --git a/japanese/k12/pkg-req b/japanese/k12/pkg-req
index 382e9dffeef0..00cfab56d1b9 100644
--- a/japanese/k12/pkg-req
+++ b/japanese/k12/pkg-req
@@ -1,10 +1,46 @@
 #!/bin/sh
-if [ "$2" != "INSTALL" ] ; then
-	exit 0
+
+if [ "x$1" = "x" ]; then
+	exit 1;
 fi
-echo "Updating misc/fonts.alias"
-cd /usr/X11R6/lib/X11/fonts/misc
+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
+
+# 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
+r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
+EOF
+
+echo "Updating ${FONTDIR}/fonts.alias"
+cd ${FONTDIR}
 touch fonts.alias
 cp fonts.alias fonts.alias.orig
-(cat fonts.alias.orig ; echo "k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0" ; echo "r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0") > fonts.alias
-rm fonts.alias.orig
+if [ "$2" = "INSTALL" ] ; then
+	(grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \
+	 cat ${TMPFILE}) > fonts.alias
+elif [ "$2" = "DEINSTALL" ] ; then
+	grep -v -e "`cat ${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;