From afa2185baf4742042ec0fe25db991e44fe977738 Mon Sep 17 00:00:00 2001
From: Masafumi Max NAKANE <max@FreeBSD.org>
Date: Thu, 2 Oct 1997 03:10:07 +0000
Subject: Upgrade, 2.22 pl9 -> pl10. Submitted by:	maintainer PR:	
 4674

---
 japanese/vflib/Makefile       | 14 ++++++++------
 japanese/vflib/distinfo       |  1 +
 japanese/vflib/files/patch-aa | 18 ++++++++----------
 3 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'japanese/vflib')

diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 24130b6d9d81..a0d4895cf487 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	vflib
-# Version required:	2.22 Patchlevel 9
+# Version required:	2.22 Patchlevel 10
 # Date created:		10 May 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.8 1997/07/24 20:52:43 max Exp $
+# $Id: Makefile,v 1.9 1997/09/14 21:36:16 max Exp $
 #
 
 DISTNAME=	VFlib-2.22-PL8
-PKGNAME=	ja-vflib-2.22.9
+PKGNAME=	ja-vflib-2.22.10
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://gull.se.hiroshima-u.ac.jp/pub/VFlib/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} VFlib-2.22-Patch9 watanabe-vf.tar.Z
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} VFlib-2.22-Patch9 VFlib-2.22-Patch10\
+		watanabe-vf.tar.Z
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
@@ -19,8 +20,9 @@ WRKSRC=		${WRKDIR}/VFlib-2.22pl8
 
 pre-patch:
 	@(cd ${WRKSRC}/src; \
-	  ${PATCH} --forward --quiet -p0 -E < ${DISTDIR}/VFlib-2.22-Patch9 )
-
+	  ${PATCH} --forward --quiet -p0 -E < ${DISTDIR}/VFlib-2.22-Patch9 ;\
+	  ${PATCH} --forward --quiet -p0 -E < ${DISTDIR}/VFlib-2.22-Patch10 ;\
+	  )
 
 do-build:
 	@(cd ${WRKSRC}/src; make)
diff --git a/japanese/vflib/distinfo b/japanese/vflib/distinfo
index e1bacd317643..a681f615d91b 100644
--- a/japanese/vflib/distinfo
+++ b/japanese/vflib/distinfo
@@ -1,3 +1,4 @@
 MD5 (VFlib-2.22-PL8.tar.gz) = 432d19b2fd8ff0e33e8cf205fd891a6c
 MD5 (VFlib-2.22-Patch9) = b579993d11c15902f9eb873b9c657cd3
+MD5 (VFlib-2.22-Patch10) = 802dbace2abc7b6d37b32076a57b2e6f
 MD5 (watanabe-vf.tar.Z) = 17a6a1ef6bfedac3d0b48f0365741e13
diff --git a/japanese/vflib/files/patch-aa b/japanese/vflib/files/patch-aa
index 78797fa28ea0..f20a7e9609fa 100644
--- a/japanese/vflib/files/patch-aa
+++ b/japanese/vflib/files/patch-aa
@@ -1,5 +1,5 @@
 *** src/Makefile.orig	Fri Apr 25 13:14:25 1997
---- src/Makefile	Fri Jul 25 05:40:39 1997
+--- src/Makefile	Thu Oct  2 08:12:51 1997
 ***************
 *** 24,29 ****
 --- 24,32 ----
@@ -68,7 +68,7 @@
   
   
 ***************
-*** 82,112 ****
+*** 82,111 ****
   #endif
   
   default:
@@ -96,11 +96,10 @@
   # 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_Comp2.o VF_Null.o
-! 
+  
   
   # VFlib
-  libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
---- 85,119 ----
+--- 85,118 ----
   #endif
   
   default:
@@ -117,7 +116,6 @@
   	$(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 fwindex bdfjpindex \
@@ -130,12 +128,12 @@
   # 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_Comp2.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_FNTWV.so VF_Comp2.so VF_Null.so
++    
++ 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_FNTWV.so VF_Comp2.so VF_Null.so
+  
   
   # VFlib
-  libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
 ***************
 *** 116,121 ****
 --- 123,132 ----
-- 
cgit v1.2.3