Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Feb 1997 00:51:47 +0900 (JST)
From:      mita@jp.FreeBSD.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/2694: change request for vflib ports
Message-ID:  <199702081551.AAA09820@hanpen.fujita3.iis.u-tokyo.ac.jp>
Resent-Message-ID: <199702081550.HAA17549@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         2694
>Category:       ports
>Synopsis:       VFlib ports is updated.
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb  8 07:50:01 PST 1997
>Last-Modified:
>Originator:     MITA Yoshio
>Organization:
IIS, the University of Tokyo
>Release:        FreeBSD 2.2-ALPHA i386
>Environment:

current ports collection for vflib

>Description:

VFlib ports have been updated.  Support for FontWave is added.

>How-To-Repeat:

>Fix:
	
Apply this patch to current vflib ports, SVP.


diff -rcN vflib.orig/Makefile vflib/Makefile
*** vflib.orig/Makefile	Thu Dec  5 19:03:02 1996
--- vflib/Makefile	Sat Feb  8 00:11:32 1997
***************
*** 11,23 ****
  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
  
  MAINTAINER=	mita@jp.FreeBSD.org
  
  EXTRACT_ONLY=	VFlib-2.22.tar.gz
  
! post-patch:
  	@(cd ${WRKSRC}; \
  	 uudecode ${DISTDIR}/VFlib-2.22-PATCH-1 ; \
  	 cd tools ; \
--- 11,25 ----
  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
  
  MAINTAINER=	mita@jp.FreeBSD.org
  
  EXTRACT_ONLY=	VFlib-2.22.tar.gz
+ PATCH_DEBUG=yes
  
! pre-patch:
  	@(cd ${WRKSRC}; \
  	 uudecode ${DISTDIR}/VFlib-2.22-PATCH-1 ; \
  	 cd tools ; \
***************
*** 25,31 ****
  	 ${PATCH} -s < Imakefile.diff ; \
  	 ${PATCH} -s < ktest.diff ; \
  	 cd ../src ; \
! 	 ${PATCH} -s < ${DISTDIR}/VFlib-2.22-PATCH-2 )
  
  do-build:
  	@(cd ${WRKSRC}/src; make)
--- 27,38 ----
  	 ${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 ; \
! 	 gzcat VF_FNTWV.patch.gz | ${PATCH} -s -p1  \
! 	)
  
  do-build:
  	@(cd ${WRKSRC}/src; make)
diff -rcN vflib.orig/files/md5 vflib/files/md5
*** vflib.orig/files/md5	Fri Nov  8 20:54:33 1996
--- vflib/files/md5	Fri Feb  7 23:13:48 1997
***************
*** 2,4 ****
--- 2,6 ----
  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) = 80da308f5bb488c1402e8e9243cddde9
diff -rcN vflib.orig/patches/patch-aa vflib/patches/patch-aa
*** vflib.orig/patches/patch-aa	Thu Dec  5 19:03:10 1996
--- vflib/patches/patch-aa	Sat Feb  8 00:26:38 1997
***************
*** 1,5 ****
! *** src/Makefile.orig	Mon Apr  8 17:29:08 1996
! --- src/Makefile	Tue Nov 26 11:41:31 1996
  ***************
  *** 32,38 ****
    #   SONY_FSLIB = -L/usr/sony/lib -lFSlib
--- 1,5 ----
! *** 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,64 ****
    
    
  ***************
! *** 82,102 ****
    #endif
    
    default:
! ! 	make libVFlib.a ttindex bdfindex
    all:
! ! 	make libVFlib.a ttindex bdfindex
    
    install:
    	-$(RM) -f $(INSTALL_LIBDIR)/VFlib.a $(INSTALL_LIBDIR)/libVFlib.a
--- 52,64 ----
    
    
  ***************
! *** 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
***************
*** 73,108 ****
  ! 	-$(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 ----
    #endif
    
    default:
! ! 	make libVFlib.a libVFlib.so.2.22 ttindex bdfindex
    all:
! ! 	make libVFlib.a libVFlib.so.2.22 ttindex bdfindex
    
    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
    	$(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 \
  ! 		*.so libVFlib.so.2.22
    veryclean:
    	-$(RM) -rf VFlib.a libVFlib.a ttindex bdfindex bdfjpindex\
!   	           *.o core *~ \#tz* 
! ***************
! *** 106,111 ****
! --- 108,121 ----
    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
    
  + 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
--- 73,119 ----
  ! 	-$(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
***************
*** 117,123 ****
    libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
  ***************
  *** 168,173 ****
! --- 178,253 ----
    # Null font driver
    VF_Null.o:  	VF_Null.c
    	$(CC) $(CFLAGS)  -c VF_Null.c
--- 128,134 ----
    libVFlib.a:	VFlib.o VFenc.o VFEtable.o VFcap.o fn2ent.o fman.o $(DRV_OBJ)
  ***************
  *** 168,173 ****
! --- 180,255 ----
    # Null font driver
    VF_Null.o:  	VF_Null.c
    	$(CC) $(CFLAGS)  -c VF_Null.c
diff -rcN vflib.orig/pkg/PLIST vflib/pkg/PLIST
*** vflib.orig/pkg/PLIST	Fri Dec 13 19:02:40 1996
--- vflib/pkg/PLIST	Sat Feb  8 00:27:45 1997
***************
*** 7,12 ****
--- 7,15 ----
  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

----
MITA Yoshio
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199702081551.AAA09820>