Update to 2.22pl9.

PR:		4143
Submitted by:	mita@jp.freebsd.org

While at it, also changed this port to correctly respect the value of
${PREFIX} if set.

4 files changed, 114 insertions, 94 deletions

diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index e13f3e7b2157..6f15d5f58bf6 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -1,37 +1,26 @@
 # New ports collection makefile for:	jp-vflib
-# Version required:	2.22
+# Version required:	2.22 Patchlevel 9
 # Date created:		10 May 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1997/03/03 09:00:04 asami Exp $
+# $Id: Makefile,v 1.7 1997/07/17 15:12:47 max Exp $
 #
 
-DISTNAME=	VFlib-2.22
-PKGNAME=	jp-vflib-2.22
+DISTNAME=	VFlib-2.22-PL8
+PKGNAME=	jp-vflib-2.22.9
 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-3 VFlib-2.22-PATCH-4.updated
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} VFlib-2.22-Patch9 watanabe-vf.tar.Z
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-EXTRACT_ONLY=	VFlib-2.22.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+WRKSRC=		${WRKDIR}/VFlib-2.22pl8
 
 pre-patch:
-	@(cd ${WRKSRC}; \
-	 uudecode ${DISTDIR}/VFlib-2.22-PATCH-1 ; \
-	 cd tools ; \
-	 tar xzf ../ktestdiff.tar.gz ; \
-	 ${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-3 )
-	(cd ${WRKSRC}; \
-	 uudecode ${DISTDIR}/VFlib-2.22-PATCH-4.updated ; \
-	 gzcat VF_FNTWV.patch.gz | ${PATCH} -s -p1  \
-	)
+	@(cd ${WRKSRC}/src; \
+	  ${PATCH} --forward --quiet -p0 -E < ${DISTDIR}/VFlib-2.22-Patch9 )
+
 
 do-build:
 	@(cd ${WRKSRC}/src; make)
@@ -45,7 +34,7 @@ do-install:
 	    ${PREFIX}/lib/VFlib)
 	@(cd ${WRKSRC}; \
 	  ${CP} -R doc jTeX COPYING README.txt.JP_EUC vfontcap \
-	    ${PREFIX}/lib/VFlib)
+	    vfontcap.bdf vfontcap.comp2 ${PREFIX}/lib/VFlib)
 	${MKDIR} ${PREFIX}/share/fonts/watanabe_font
 	tar -C ${PREFIX}/share/fonts/watanabe_font \
 	  -xzf ${DISTDIR}/watanabe-vf.tar.Z
diff --git a/japanese/vflib/distinfo b/japanese/vflib/distinfo
index e3bd8823795a..e1bacd317643 100644
--- a/japanese/vflib/distinfo
+++ b/japanese/vflib/distinfo
@@ -1,6 +1,3 @@
-MD5 (VFlib-2.22.tar.gz) = 700f966d2f5b72a3e067a6ff57219496
+MD5 (VFlib-2.22-PL8.tar.gz) = 432d19b2fd8ff0e33e8cf205fd891a6c
+MD5 (VFlib-2.22-Patch9) = b579993d11c15902f9eb873b9c657cd3
 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 bd4512697abb..78797fa28ea0 100644
--- a/japanese/vflib/files/patch-aa
+++ b/japanese/vflib/files/patch-aa
@@ -1,5 +1,17 @@
-*** src/Makefile.orig	Tue Mar  4 14:50:27 1997
---- src/Makefile	Tue Mar  4 14:59:59 1997
+*** src/Makefile.orig	Fri Apr 25 13:14:25 1997
+--- src/Makefile	Fri Jul 25 05:40:39 1997
+***************
+*** 24,29 ****
+--- 24,32 ----
+  ### VFlib configurations
+  #-------------------------
+  
++ # Installation prefix.
++ PREFIX?= /usr/local
++ 
+  # Maximum of open files
+      OPENFILES = -DMAX_OPEN_FONT_FILES=6
+  
 ***************
 *** 32,38 ****
   #   SONY_FSLIB = -L/usr/sony/lib -lFSlib
@@ -9,11 +21,11 @@
   
   # OS and Machine dependent compiling options
   #  Define __MSDOS__ (e.g., CCOPT=-D__MSDOS__) if you compile VFlib on MS-DOS
---- 32,38 ----
+--- 35,41 ----
   #   SONY_FSLIB = -L/usr/sony/lib -lFSlib
   
   # VFontcap file
-!         VFCAP = -DDEFAULT_VFCAP=\"/usr/local/lib/VFlib/vfontcap\"
+!         VFCAP = -DDEFAULT_VFCAP=\"${PREFIX}/lib/VFlib/vfontcap\"
   
   # OS and Machine dependent compiling options
   #  Define __MSDOS__ (e.g., CCOPT=-D__MSDOS__) if you compile VFlib on MS-DOS
@@ -26,7 +38,7 @@
   
      LDFLAGS = $(LDOPT)
     SYS_LIBS = -lm
---- 45,51 ----
+--- 48,54 ----
   # Compilers, compiling options, etc.
   #-------------------------
           CC = cc
@@ -35,24 +47,28 @@
      LDFLAGS = $(LDOPT)
     SYS_LIBS = -lm
 ***************
-*** 62,68 ****
+*** 60,68 ****
   #-------------------------
-  INSTALL_LIBDIR=/usr/local/lib
-  INSTALL_INCDIR=/usr/local/include
+  # Installation Directories
+  #-------------------------
+! INSTALL_LIBDIR=/usr/local/lib
+! INSTALL_INCDIR=/usr/local/include
 ! INSTALL_BINDIR=/usr/local/etc
   
   
   
---- 62,68 ----
+--- 63,71 ----
+  #-------------------------
+  # Installation Directories
   #-------------------------
-  INSTALL_LIBDIR=/usr/local/lib
-  INSTALL_INCDIR=/usr/local/include
-! INSTALL_BINDIR=/usr/local/lib/VFlib
+! INSTALL_LIBDIR=${PREFIX}/lib
+! INSTALL_INCDIR=${PREFIX}/include
+! INSTALL_BINDIR=${PREFIX}/lib/VFlib
   
   
   
 ***************
-*** 82,111 ****
+*** 82,112 ****
   #endif
   
   default:
@@ -70,20 +86,21 @@
   	$(CP) bdfindex $(INSTALL_BINDIR)/bdfindex
   
   clean:
-! 	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex *.o core
+  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex fwindex bdfjpindex \
+! 		   *.o core
   veryclean:
-  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex\
+  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex fwindex bdfjpindex\
 ! 	           *.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
-  
+  	  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)
---- 82,123 ----
+--- 85,119 ----
   #endif
   
   default:
@@ -103,32 +120,38 @@
 + 	$(CP) fwindex $(INSTALL_BINDIR)/fwindex
   
   clean:
-! 	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex *.o core \
-! 		*.so libVFlib.so.2.22
+  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex fwindex bdfjpindex \
+! 		   *.o core *.so libVFlib.so.2.22
   veryclean:
-  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex\
-! 	           *.o core *~ \#tz*  \
-! 		*.so libVFlib.so.2.22
+  	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex fwindex bdfjpindex\
+! 	           *.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_FNTWV.o VF_Null.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
+  
+  # VFlib
+  libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
+***************
+*** 116,121 ****
+--- 123,132 ----
+  	$(CP) libVFlib.a VFlib.a
+  	-$(RANLIB) VFlib.a
   
-+ 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_Null.so
-+ 
-+ 
-+ # VFlib
 + libVFlib.so.2.22:	VFlib.so VFenc.so VFEtable.so VFcap.so fn2ent.so fman.so $(DRV_SOBJ)
 + 	$(LD) -x -Bshareable -o libVFlib.so.2.22 \
-+ 		VFlib.so VFenc.so VFEtable.so VFcap.so fn2ent.so fman.so $(DRV_SOBJ)
-  
++ 	VFlib.so VFenc.so VFEtable.so VFcap.so fn2ent.so fman.so $(DRV_SOBJ)
++ 
   # VFlib
-  libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
+  VFlib.o:  	VFlib.c
+  	$(CC) $(CFLAGS) $(USEFSLIB)  -c VFlib.c
 ***************
-*** 168,173 ****
---- 180,259 ----
+*** 169,174 ****
+--- 180,263 ----
   # Null font driver
   VF_Null.o:  	VF_Null.c
   	$(CC) $(CFLAGS)  -c VF_Null.c
@@ -194,6 +217,10 @@
 + VF_Comp.so:  	VF_Comp.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Comp.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
++ # Composite font driver
++ VF_Comp2.so:  	VF_Comp2.c
++ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Comp2.c -o $(.TARGET)
++ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + # Bit-Operated font driver
 + VF_BitOp.so:  	VF_BitOp.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_BitOp.c -o $(.TARGET)
diff --git a/japanese/vflib/pkg-plist b/japanese/vflib/pkg-plist
index f0e716f7bcf5..5d29a894628b 100644
--- a/japanese/vflib/pkg-plist
+++ b/japanese/vflib/pkg-plist
@@ -1,33 +1,16 @@
 include/VF.h
-lib/VFlib.a
-lib/libVFlib.a
-lib/libVFlib.so.2.22
-lib/VFlib/COPYING
-lib/VFlib/README.txt.JP_EUC
-lib/VFlib/bdfindex
-lib/VFlib/disol
-lib/VFlib/fmtest
+lib/VFlib/ttindex
 lib/VFlib/bdfindex
 lib/VFlib/fwindex
+lib/VFlib/fmtest
 lib/VFlib/disol
 lib/VFlib/kban
 lib/VFlib/ktest
-lib/VFlib/ttindex
-lib/VFlib/vfontcap
 lib/VFlib/vfperf
 lib/VFlib/vftest
-lib/VFlib/doc/Makefile
-lib/VFlib/doc/QA.txt
-lib/VFlib/doc/README.euc
-lib/VFlib/doc/man.aux
-lib/VFlib/doc/man.dvi
-lib/VFlib/doc/man.log
-lib/VFlib/doc/man.ps
-lib/VFlib/doc/man.tex
-lib/VFlib/doc/manfig1.latex
-lib/VFlib/doc/manfig2.latex
-lib/VFlib/jTeX/README.euc
-lib/VFlib/jTeX/jfmsrc/MakeSlantTFM
+lib/VFlib/jTeX/jfonts/Gen
+lib/VFlib/jTeX/jfonts/Makefile
+lib/VFlib/jTeX/jfmsrc/minslg9.tfm
 lib/VFlib/jTeX/jfmsrc/Makefile
 lib/VFlib/jTeX/jfmsrc/goth10.nwfadj
 lib/VFlib/jTeX/jfmsrc/goth10.pl
@@ -48,6 +31,7 @@ lib/VFlib/jTeX/jfmsrc/goth7.nwfadj
 lib/VFlib/jTeX/jfmsrc/goth7.pl
 lib/VFlib/jTeX/jfmsrc/goth7.tfm
 lib/VFlib/jTeX/jfmsrc/goth8.nwfadj
+lib/VFlib/jTeX/jfmsrc/min5.pl
 lib/VFlib/jTeX/jfmsrc/goth8.pl
 lib/VFlib/jTeX/jfmsrc/goth8.tfm
 lib/VFlib/jTeX/jfmsrc/goth9.nwfadj
@@ -70,9 +54,9 @@ lib/VFlib/jTeX/jfmsrc/gothsla6.pl
 lib/VFlib/jTeX/jfmsrc/gothsla6.tfm
 lib/VFlib/jTeX/jfmsrc/gothsla7.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothsla7.pl
+lib/VFlib/jTeX/jfmsrc/gothsla8.pl
 lib/VFlib/jTeX/jfmsrc/gothsla7.tfm
 lib/VFlib/jTeX/jfmsrc/gothsla8.nwfadj
-lib/VFlib/jTeX/jfmsrc/gothsla8.pl
 lib/VFlib/jTeX/jfmsrc/gothsla8.tfm
 lib/VFlib/jTeX/jfmsrc/gothsla9.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothsla9.pl
@@ -129,13 +113,14 @@ lib/VFlib/jTeX/jfmsrc/gothsld10.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothsld10.pl
 lib/VFlib/jTeX/jfmsrc/gothsld10.tfm
 lib/VFlib/jTeX/jfmsrc/gothsld12.nwfadj
+lib/VFlib/jTeX/jfmsrc/gothsld5.pl
 lib/VFlib/jTeX/jfmsrc/gothsld12.pl
 lib/VFlib/jTeX/jfmsrc/gothsld12.tfm
 lib/VFlib/jTeX/jfmsrc/gothsld17.nwfadj
+lib/VFlib/jTeX/jfmsrc/min6.pl
 lib/VFlib/jTeX/jfmsrc/gothsld17.pl
 lib/VFlib/jTeX/jfmsrc/gothsld17.tfm
 lib/VFlib/jTeX/jfmsrc/gothsld5.nwfadj
-lib/VFlib/jTeX/jfmsrc/gothsld5.pl
 lib/VFlib/jTeX/jfmsrc/gothsld5.tfm
 lib/VFlib/jTeX/jfmsrc/gothsld6.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothsld6.pl
@@ -154,6 +139,7 @@ lib/VFlib/jTeX/jfmsrc/gothsle10.pl
 lib/VFlib/jTeX/jfmsrc/gothsle10.tfm
 lib/VFlib/jTeX/jfmsrc/gothsle12.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothsle12.pl
+lib/VFlib/jTeX/jfmsrc/min7.pl
 lib/VFlib/jTeX/jfmsrc/gothsle12.tfm
 lib/VFlib/jTeX/jfmsrc/gothsle17.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothsle17.pl
@@ -172,6 +158,7 @@ lib/VFlib/jTeX/jfmsrc/gothsle8.pl
 lib/VFlib/jTeX/jfmsrc/gothsle8.tfm
 lib/VFlib/jTeX/jfmsrc/gothsle9.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothsle9.pl
+lib/VFlib/jTeX/jfmsrc/gothslf5.pl
 lib/VFlib/jTeX/jfmsrc/gothsle9.tfm
 lib/VFlib/jTeX/jfmsrc/gothslf10.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothslf10.pl
@@ -183,7 +170,6 @@ lib/VFlib/jTeX/jfmsrc/gothslf17.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothslf17.pl
 lib/VFlib/jTeX/jfmsrc/gothslf17.tfm
 lib/VFlib/jTeX/jfmsrc/gothslf5.nwfadj
-lib/VFlib/jTeX/jfmsrc/gothslf5.pl
 lib/VFlib/jTeX/jfmsrc/gothslf5.tfm
 lib/VFlib/jTeX/jfmsrc/gothslf6.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothslf6.pl
@@ -197,8 +183,9 @@ lib/VFlib/jTeX/jfmsrc/gothslf8.tfm
 lib/VFlib/jTeX/jfmsrc/gothslf9.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothslf9.pl
 lib/VFlib/jTeX/jfmsrc/gothslf9.tfm
-lib/VFlib/jTeX/jfmsrc/gothslg10.nwfadj
+lib/VFlib/jTeX/jfmsrc/min8.pl
 lib/VFlib/jTeX/jfmsrc/gothslg10.pl
+lib/VFlib/jTeX/jfmsrc/gothslg10.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothslg10.tfm
 lib/VFlib/jTeX/jfmsrc/gothslg12.nwfadj
 lib/VFlib/jTeX/jfmsrc/gothslg12.pl
@@ -231,16 +218,12 @@ lib/VFlib/jTeX/jfmsrc/min17.nwfadj
 lib/VFlib/jTeX/jfmsrc/min17.pl
 lib/VFlib/jTeX/jfmsrc/min17.tfm
 lib/VFlib/jTeX/jfmsrc/min5.nwfadj
-lib/VFlib/jTeX/jfmsrc/min5.pl
 lib/VFlib/jTeX/jfmsrc/min5.tfm
 lib/VFlib/jTeX/jfmsrc/min6.nwfadj
-lib/VFlib/jTeX/jfmsrc/min6.pl
 lib/VFlib/jTeX/jfmsrc/min6.tfm
 lib/VFlib/jTeX/jfmsrc/min7.nwfadj
-lib/VFlib/jTeX/jfmsrc/min7.pl
 lib/VFlib/jTeX/jfmsrc/min7.tfm
 lib/VFlib/jTeX/jfmsrc/min8.nwfadj
-lib/VFlib/jTeX/jfmsrc/min8.pl
 lib/VFlib/jTeX/jfmsrc/min8.tfm
 lib/VFlib/jTeX/jfmsrc/min9.nwfadj
 lib/VFlib/jTeX/jfmsrc/min9.pl
@@ -412,13 +395,37 @@ lib/VFlib/jTeX/jfmsrc/minslg8.pl
 lib/VFlib/jTeX/jfmsrc/minslg8.tfm
 lib/VFlib/jTeX/jfmsrc/minslg9.nwfadj
 lib/VFlib/jTeX/jfmsrc/minslg9.pl
-lib/VFlib/jTeX/jfmsrc/minslg9.tfm
-lib/VFlib/jTeX/jfonts/Gen
-lib/VFlib/jTeX/jfonts/Makefile
+lib/VFlib/jTeX/jfmsrc/MakeSlantTFM
 lib/VFlib/jTeX/macros/Gen
 lib/VFlib/jTeX/macros/STYLE-SRC
+lib/VFlib/jTeX/README.euc
+lib/VFlib/doc/README.euc
+lib/VFlib/doc/Makefile
+lib/VFlib/doc/man.tex
+lib/VFlib/doc/QA.txt
+lib/VFlib/doc/manfig1.latex
+lib/VFlib/doc/manfig2.latex
+lib/VFlib/doc/man.aux
+lib/VFlib/doc/man.dvi
+lib/VFlib/doc/man.ps
+lib/VFlib/doc/man.log
+lib/VFlib/vfontcap
+lib/VFlib/vfontcap.bdf
+lib/VFlib/vfontcap.comp2
+lib/VFlib/README.txt.JP_EUC
+lib/VFlib/COPYING
+lib/VFlib.a
+lib/libVFlib.a
+lib/libVFlib.so.2.22
 share/fonts/watanabe_font/README
 share/fonts/watanabe_font/dviprt.vfn
 share/fonts/watanabe_font/mincho.vf1
 share/fonts/watanabe_font/mincho.vf2
+@dirrm lib/VFlib/jTeX/jfonts
+@dirrm lib/VFlib/jTeX/jfmsrc
+@dirrm lib/VFlib/jTeX/macros
+@dirrm lib/VFlib/jTeX
+@dirrm lib/VFlib/doc
+@dirrm lib/VFlib
+@dirrm share/fonts/watanabe_font
 @exec /sbin/ldconfig -m %D/lib