6 files changed, 39 insertions, 16 deletions

diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index bcb24af892e1..278dbc8271df 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -10,14 +10,14 @@ PORTVERSION=	${VFLIB_VERSION}
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
 DISTNAME=	VFlib2-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		watanabe-vf.tar.Z
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mita@FreeBSD.org
 
 BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
-VFLIB_VERSION=	2.25.2
+VFLIB_VERSION=	2.25.6
 PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
 
 USE_FREETYPE=	yes
@@ -36,9 +36,6 @@ pre-install:
 	  ${CP} COPYING COPYING.LIB README.txt.JP_EUC \
 		${PREFIX}/share/VFlib/${VFLIB_VERSION} ;\
 	  ${CP} -R jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION})
-	${MKDIR} ${PREFIX}/share/fonts/watanabe_font
-	tar -C ${PREFIX}/share/fonts/watanabe_font \
-	  -xzf ${DISTDIR}/watanabe-vf.tar.Z
 
 post-install:
 	${MV} ${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${PREFIX}/include
diff --git a/japanese/vflib/distinfo b/japanese/vflib/distinfo
index 4c6ba26cb12e..d3adb34de726 100644
--- a/japanese/vflib/distinfo
+++ b/japanese/vflib/distinfo
@@ -1,2 +1,2 @@
-MD5 (VFlib2-2.25.2.tar.gz) = f0e211d05bdeb5ce59f7a8d70f9082d3
+MD5 (VFlib2-2.25.6.tar.gz) = 64899702c94ce059069a5532098d5937
 MD5 (watanabe-vf.tar.Z) = 17a6a1ef6bfedac3d0b48f0365741e13
diff --git a/japanese/vflib/files/patch-ab b/japanese/vflib/files/patch-ab
new file mode 100644
index 000000000000..a098b00407c6
--- /dev/null
+++ b/japanese/vflib/files/patch-ab
@@ -0,0 +1,32 @@
+--- vfontcap.orig	Mon Jan 14 06:14:01 2002
++++ vfontcap	Mon Jan 14 06:16:41 2002
+@@ -33,9 +33,9 @@
+ ####
+ 
+ min:\
+-	:fc=watanabe-mincho:
++	:fc=kochi-mincho:
+ goth:\
+-	:fc=watanabe-mincho:
++	:fc=kochi-gothic:
+ #min:\
+ #	:ft=freetype:\
+ #	:ff=/usr/local/share/fonts/DynaFont-Premium30/win95/futt/dfhsmw3.ttc:
+@@ -46,6 +46,17 @@
+ ###--------------------------
+ #### PRIMITIVE  FONTS
+ ####
++### Kochi fonts
++kochi-mincho:\
++	:fc=r-kochi-mincho:
++kochi-gothic:\
++	:fc=r-kochi-gothic:
++r-kochi-mincho|Kochi Mincho:\
++	:ft=freetype:\
++	:ff=/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho.ttf:
++r-kochi-gothic|Kochi Gothic:\
++	:ft=freetype:\
++	:ff=/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic.ttf:
+ 
+ ### SONY VECTOR FONTS
+ r-sony-mincho|Sony Vector Font (Mincho):\
diff --git a/japanese/vflib/pkg-comment b/japanese/vflib/pkg-comment
index a0aa6df609f9..9c8690d9c7fa 100644
--- a/japanese/vflib/pkg-comment
+++ b/japanese/vflib/pkg-comment
@@ -1 +1 @@
-Japanese Vector font library with free vector font
+Japanese Vector font library
diff --git a/japanese/vflib/pkg-plist b/japanese/vflib/pkg-plist
index 4491f652aa40..20a19eb4b25f 100644
--- a/japanese/vflib/pkg-plist
+++ b/japanese/vflib/pkg-plist
@@ -407,24 +407,18 @@ share/VFlib/%%VFLIB_VERSION%%/jTeX/jfmsrc/minslg9.tfm
 share/VFlib/%%VFLIB_VERSION%%/jTeX/macros/Gen
 share/VFlib/%%VFLIB_VERSION%%/jTeX/macros/STYLE-SRC
 share/VFlib/%%VFLIB_VERSION%%/jTeX/README.euc
+share/VFlib/%%VFLIB_VERSION%%/vfontcap.orig
 share/VFlib/%%VFLIB_VERSION%%/vfontcap.mgp
 share/VFlib/%%VFLIB_VERSION%%/vfontcap.comp2
 share/VFlib/%%VFLIB_VERSION%%/vfontcap.bdf
-share/VFlib/%%VFLIB_VERSION%%/vfontcap.ORG
 share/VFlib/%%VFLIB_VERSION%%/vfontcap
 share/VFlib/%%VFLIB_VERSION%%/QA.txt
 share/VFlib/%%VFLIB_VERSION%%/QA-english.tex
 share/VFlib/%%VFLIB_VERSION%%/man.ps
 share/VFlib/%%VFLIB_VERSION%%/man.dvi
-share/fonts/watanabe_font/README
-share/fonts/watanabe_font/dviprt.vfn
-share/fonts/watanabe_font/mincho.vf1
-share/fonts/watanabe_font/mincho.vf2
 @dirrm share/VFlib/%%VFLIB_VERSION%%/jTeX/macros
 @dirrm share/VFlib/%%VFLIB_VERSION%%/jTeX/jfonts
 @dirrm share/VFlib/%%VFLIB_VERSION%%/jTeX/jfmsrc
 @dirrm share/VFlib/%%VFLIB_VERSION%%/jTeX
 @dirrm share/VFlib/%%VFLIB_VERSION%%
 @dirrm share/VFlib
-@dirrm share/fonts/watanabe_font
-@unexec rmdir %D/share/fonts 2>/dev/null || true
diff --git a/japanese/vfxdvi300/files/patch-aa b/japanese/vfxdvi300/files/patch-aa
index 295b953cd3bc..f42eb82c0795 100644
--- a/japanese/vfxdvi300/files/patch-aa
+++ b/japanese/vfxdvi300/files/patch-aa
@@ -396,7 +396,7 @@
   #endif
   
   #ifdef	Use_ZEIT
-! DEFAULT_FONTCONFDIR=/usr/local/share/VFlib/2.25.2
+! DEFAULT_FONTCONFDIR=/usr/local/share/VFlib/2.25.6
 ! DEFAULT_FONTCONF=$(DEFAULT_FONTCONFDIR)/vfontcap
   #ifdef	Use_NTTZEIT
   ZEIT_DEFS=-DUSE_ZEIT -DNTTZEIT -DDEFAULT_FONTCONF=\"$(DEFAULT_FONTCONF)\"