4 files changed, 42 insertions, 20 deletions

diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 916e15496022..7d3430e4777c 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 May 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.4 1996/11/11 10:13:04 max Exp $
+# $Id: Makefile,v 1.5 1996/12/05 12:04:39 asami Exp $
 #
 
 DISTNAME=	VFlib-2.22
@@ -11,13 +11,14 @@ PKGNAME=	jp-vflib-2.22
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://gull.se.hiroshima-u.ac.jp/pub/VFlib/
 DISTFILES=	VFlib-2.22.tar.gz watanabe-vf.tar.Z \
-		VFlib-2.22-PATCH-1 VFlib-2.22-PATCH-2
+		VFlib-2.22-PATCH-1 VFlib-2.22-PATCH-2 \
+		VFlib-2.22-PATCH-3 VFlib-2.22-PATCH-4.updated
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
 EXTRACT_ONLY=	VFlib-2.22.tar.gz
 
-post-patch:
+pre-patch:
 	@(cd ${WRKSRC}; \
 	 uudecode ${DISTDIR}/VFlib-2.22-PATCH-1 ; \
 	 cd tools ; \
@@ -25,7 +26,12 @@ post-patch:
 	 ${PATCH} -s < Imakefile.diff ; \
 	 ${PATCH} -s < ktest.diff ; \
 	 cd ../src ; \
-	 ${PATCH} -s < ${DISTDIR}/VFlib-2.22-PATCH-2 )
+	 ${PATCH} -s < ${DISTDIR}/VFlib-2.22-PATCH-2 ; \
+	 ${PATCH} -s < ${DISTDIR}/VFlib-2.22-PATCH-3 )
+	(cd ${WRKSRC}; \
+	 uudecode ${DISTDIR}/VFlib-2.22-PATCH-4.updated ; \
+	 gzcat VF_FNTWV.patch.gz | ${PATCH} -s -p1  \
+	)
 
 do-build:
 	@(cd ${WRKSRC}/src; make)
diff --git a/japanese/vflib/distinfo b/japanese/vflib/distinfo
index 94e78cad9bce..e3bd8823795a 100644
--- a/japanese/vflib/distinfo
+++ b/japanese/vflib/distinfo
@@ -2,3 +2,5 @@ MD5 (VFlib-2.22.tar.gz) = 700f966d2f5b72a3e067a6ff57219496
 MD5 (watanabe-vf.tar.Z) = 17a6a1ef6bfedac3d0b48f0365741e13
 MD5 (VFlib-2.22-PATCH-1) = efde929386c932130aea43fc2e6ae082
 MD5 (VFlib-2.22-PATCH-2) = f022f72a17704f7381b3a2f756818c67
+MD5 (VFlib-2.22-PATCH-3) = 863cee3e950ec1a79101102f36174d37
+MD5 (VFlib-2.22-PATCH-4.updated) = 0feddfc38efdff698707f22d984a07c0
diff --git a/japanese/vflib/files/patch-aa b/japanese/vflib/files/patch-aa
index 3b023885a2bb..bdd6b59190e7 100644
--- a/japanese/vflib/files/patch-aa
+++ b/japanese/vflib/files/patch-aa
@@ -1,5 +1,5 @@
-*** src/Makefile.orig	Mon Apr  8 17:29:08 1996
---- src/Makefile	Tue Nov 26 11:41:31 1996
+*** src/Makefile.orig	Sat Feb  8 00:23:02 1997
+--- src/Makefile	Sat Feb  8 00:26:20 1997
 ***************
 *** 32,38 ****
   #   SONY_FSLIB = -L/usr/sony/lib -lFSlib
@@ -52,13 +52,13 @@
   
   
 ***************
-*** 82,102 ****
+*** 82,111 ****
   #endif
   
   default:
-! 	make libVFlib.a ttindex bdfindex
+! 	make libVFlib.a ttindex bdfindex fwindex
   all:
-! 	make libVFlib.a ttindex bdfindex
+! 	make libVFlib.a ttindex bdfindex fwindex
   
   install:
   	-$(RM) -f $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
@@ -73,36 +73,47 @@
 ! 	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex *.o core
   veryclean:
   	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex\
-  	           *.o core *~ \#tz* 
---- 82,104 ----
+! 	           *.o core *~ \#tz* 
+  
+  
+  # Font drivers
+  DRV_OBJ=  VF_Sony.o VF_Zeit.o VF_Jg.o VF_TT.o VF_Bdf.o VF_Hbf.o hbf.o \
+  	  VF_Comp.o VF_BitOp.o VF_FNTWV.o VF_Null.o
+  
+  
+  # VFlib
+  libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
+--- 82,123 ----
   #endif
   
   default:
-! 	make libVFlib.a libVFlib.so.2.22 ttindex bdfindex
+! 	make libVFlib.a libVFlib.so.2.22 ttindex bdfindex fwindex
   all:
-! 	make libVFlib.a libVFlib.so.2.22 ttindex bdfindex
+! 	make libVFlib.a libVFlib.so.2.22 ttindex bdfindex fwindex
   
   install:
   	-$(RM) -f $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
   	$(CP) VFlib.a $(INSTALL_LIBDIR)/VFlib.a
   	-$(RANLIB) $(INSTALL_LIBDIR)/VFlib.a
-+ 	$(INSTALL) -c -m 644 libVFlib.so.2.22 $(INSTALL_LIBDIR)/libVFlib.so.2.22
   	$(LN) $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
++ 	$(INSTALL) -c -m 644 libVFlib.so.2.22 $(INSTALL_LIBDIR)/libVFlib.so.2.22
   	$(CP) VF.h $(INSTALL_INCDIR)/VF.h
   	$(CP) ttindex $(INSTALL_BINDIR)/ttindex
   	$(CP) bdfindex $(INSTALL_BINDIR)/bdfindex
++ 	$(CP) fwindex $(INSTALL_BINDIR)/fwindex
   
   clean:
 ! 	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex *.o core \
 ! 		*.so libVFlib.so.2.22
   veryclean:
   	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex\
-  	           *.o core *~ \#tz* 
-***************
-*** 106,111 ****
---- 108,121 ----
+! 	           *.o core *~ \#tz*  \
+! 		*.so libVFlib.so.2.22
+  
+  
+  # Font drivers
   DRV_OBJ=  VF_Sony.o VF_Zeit.o VF_Jg.o VF_TT.o VF_Bdf.o VF_Hbf.o hbf.o \
-  	  VF_Comp.o VF_BitOp.o VF_Null.o
+  	  VF_Comp.o VF_BitOp.o VF_FNTWV.o VF_Null.o
   
 + DRV_SOBJ=  VF_Sony.so VF_Zeit.so VF_Jg.so VF_TT.so VF_Bdf.so VF_Hbf.so hbf.so \
 + 	   VF_Comp.so VF_BitOp.so VF_Null.so
@@ -117,7 +128,7 @@
   libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
 ***************
 *** 168,173 ****
---- 178,253 ----
+--- 180,255 ----
   # Null font driver
   VF_Null.o:  	VF_Null.c
   	$(CC) $(CFLAGS)  -c VF_Null.c
diff --git a/japanese/vflib/pkg-plist b/japanese/vflib/pkg-plist
index d38407739b58..f0e716f7bcf5 100644
--- a/japanese/vflib/pkg-plist
+++ b/japanese/vflib/pkg-plist
@@ -7,6 +7,9 @@ lib/VFlib/README.txt.JP_EUC
 lib/VFlib/bdfindex
 lib/VFlib/disol
 lib/VFlib/fmtest
+lib/VFlib/bdfindex
+lib/VFlib/fwindex
+lib/VFlib/disol
 lib/VFlib/kban
 lib/VFlib/ktest
 lib/VFlib/ttindex