Index: head/japanese/vflib/files/patch-aa
===================================================================
--- head/japanese/vflib/files/patch-aa	(revision 5838)
+++ head/japanese/vflib/files/patch-aa	(revision 5839)
@@ -1,207 +1,211 @@
-*** src/Makefile.orig	Sat Feb  8 00:23:02 1997
---- src/Makefile	Sat Feb  8 00:26:20 1997
+*** src/Makefile.orig	Tue Mar  4 14:50:27 1997
+--- src/Makefile	Tue Mar  4 14:59:59 1997
 ***************
 *** 32,38 ****
   #   SONY_FSLIB = -L/usr/sony/lib -lFSlib
   
   # VFontcap file
 !         VFCAP = -DDEFAULT_VFCAP=\"/usr/local/TeX/lib/vfontcap\"
   
   # OS and Machine dependent compiling options
   #  Define __MSDOS__ (e.g., CCOPT=-D__MSDOS__) if you compile VFlib on MS-DOS
 --- 32,38 ----
   #   SONY_FSLIB = -L/usr/sony/lib -lFSlib
   
   # VFontcap file
 !         VFCAP = -DDEFAULT_VFCAP=\"/usr/local/lib/VFlib/vfontcap\"
   
   # OS and Machine dependent compiling options
   #  Define __MSDOS__ (e.g., CCOPT=-D__MSDOS__) if you compile VFlib on MS-DOS
 ***************
 *** 45,51 ****
   # Compilers, compiling options, etc.
   #-------------------------
           CC = cc
 !     CFLAGS = $(CCOPT) $(DEBUGOPT) -O
   
      LDFLAGS = $(LDOPT)
     SYS_LIBS = -lm
 --- 45,51 ----
   # Compilers, compiling options, etc.
   #-------------------------
           CC = cc
 !     CFLAGS = $(CCOPT) $(DEBUGOPT) -O -m486
   
      LDFLAGS = $(LDOPT)
     SYS_LIBS = -lm
 ***************
 *** 62,68 ****
   #-------------------------
   INSTALL_LIBDIR=/usr/local/lib
   INSTALL_INCDIR=/usr/local/include
 ! INSTALL_BINDIR=/usr/local/etc
   
   
   
 --- 62,68 ----
   #-------------------------
   INSTALL_LIBDIR=/usr/local/lib
   INSTALL_INCDIR=/usr/local/include
 ! INSTALL_BINDIR=/usr/local/lib/VFlib
   
   
   
 ***************
 *** 82,111 ****
   #endif
   
   default:
 ! 	make libVFlib.a ttindex bdfindex fwindex
   all:
 ! 	make libVFlib.a 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
   	$(LN) $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
   	$(CP) VF.h $(INSTALL_INCDIR)/VF.h
   	$(CP) ttindex $(INSTALL_BINDIR)/ttindex
   	$(CP) bdfindex $(INSTALL_BINDIR)/bdfindex
   
   clean:
 ! 	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex *.o core
   veryclean:
   	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex 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
   
   
   # 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 fwindex
   all:
 ! 	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
   	$(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*  \
 ! 		*.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
   
 + 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
++ 	   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
   libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
 ***************
 *** 168,173 ****
---- 180,255 ----
+--- 180,259 ----
   # Null font driver
   VF_Null.o:  	VF_Null.c
   	$(CC) $(CFLAGS)  -c VF_Null.c
 + 
 + # VFlib
 + VFlib.so:  	VFlib.c
 + 	$(CC) -fpic -DPIC $(CFLAGS) $(USEFSLIB)  -c VFlib.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + 
 + # font capability database 
 + VFcap.so:	VFcap.c
 + 	$(CC) -fpic -DPIC $(CFLAGS) $(VFCAP) -c VFcap.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + 
 + # handling of font encodings
 + VFenc.so:	VFenc.c
 + 	$(CC) -fpic -DPIC $(CFLAGS) -c VFenc.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + 
 + # font encoding and character set tables
 + VFEtable.so:	VFEtable.c
 + 	$(CC) -fpic -DPIC $(CFLAGS) -c VFEtable.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + 
 + # conv font name to font entry name
 + fn2ent.so:	fn2ent.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c fn2ent.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + 
 + # dynamic file stream manager
 + fman.so:		fman.c
 + 	$(CC) -fpic -DPIC $(CFLAGS) $(OPENFILES) -c fman.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + 
 + # Sony Font driver
 + VF_Sony.so:  	VF_Sony.c
 + 	$(CC) -fpic -DPIC $(CFLAGS) $(USEFSLIB) -c VF_Sony.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + # Zeit Syotai-Club Font driver
 + VF_Zeit.so:  	VF_Zeit.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Zeit.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + # Zeit JG Font driver
 + VF_Jg.so:  	VF_Jg.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Jg.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + # TrueType Driver
 + VF_TT.so:  	VF_TT.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_TT.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + # BDF Driver
 + VF_Bdf.so:  	VF_Bdf.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Bdf.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + # HBF Driver
 + VF_Hbf.so:	VF_Hbf.c
 + 	$(CC) -fpic -DPIC $(CFLAGS) -D$(FS) -c VF_Hbf.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + hbf.so:	hbf.c
 + 	$(CC) -fpic -DPIC $(CFLAGS) -D$(FS) -DNO_STRDUP -c hbf.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + # Composite font driver
 + VF_Comp.so:  	VF_Comp.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Comp.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)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
 + # Null font driver
 + VF_Null.so:  	VF_Null.c
 + 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_Null.c -o $(.TARGET)
++ 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
++ # FontWave font driver
++ VF_FNTWV.so:  	VF_FNTWV.c
++ 	$(CC) -fpic -DPIC $(CFLAGS)  -c VF_FNTWV.c -o $(.TARGET)
 + 	$(LD) -O $(.TARGET) -x -r $(.TARGET)
   
   # Index generator for TrueType font
   ttindex:	ttindex.c 

Property changes on: head/japanese/vflib/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property