Use shared VFlib lib.

5 files changed, 29 insertions, 15 deletions

diff --git a/japanese/dvi2ps/Makefile b/japanese/dvi2ps/Makefile
index 0c0a789e408f..745236033948 100644
--- a/japanese/dvi2ps/Makefile
+++ b/japanese/dvi2ps/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 Sep 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/09 12:55:09 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/11 10:11:47 max Exp $
 #
 
 DISTNAME=	dvi2ps-2.0j-beta4
@@ -14,7 +14,7 @@ DISTFILES=	dvi2ps-2.0j-beta4.tar.gz
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/VFlib.a:${PORTSDIR}/japanese/vflib
+LIB_DEPENDS=	VFlib\\.2\\.:${PORTSDIR}/japanese/vflib
 
 post-patch:
 	@(cd ${WRKSRC}; make newlib)
diff --git a/japanese/dvi2ps/files/patch-aa b/japanese/dvi2ps/files/patch-aa
index 749ad01803b8..7dd01030abe7 100644
--- a/japanese/dvi2ps/files/patch-aa
+++ b/japanese/dvi2ps/files/patch-aa
@@ -47,7 +47,7 @@
   # optional font formats
   FONTF = -DVFLIB
   # VFlib library (comment out next line if -DFVLIB is not included)
-! VFLIB = ${PREFIX}/lib/VFlib.a
+! VFLIB = -L${PREFIX}/lib -lVFlib
   
   #
   CC=cc
diff --git a/japanese/vfghostscript/Makefile b/japanese/vfghostscript/Makefile
index 1b73e0c7735f..7967fdb4a87d 100644
--- a/japanese/vfghostscript/Makefile
+++ b/japanese/vfghostscript/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 May 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1996/11/13 12:41:13 asami Exp $
+# $Id: Makefile,v 1.6 1996/11/18 10:24:17 asami Exp $
 #
 
 DISTNAME=	ghostscript2.6.2
@@ -22,8 +22,7 @@ DISTFILES=	ghostscript-2.6.2.tar.gz ghostscript-fonts-2.6.2.tar.gz \
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libVFlib.a:${PORTSDIR}/japanese/vflib
-RUN_DEPENDS=	${PREFIX}/lib/libVFlib.a:${PORTSDIR}/japanese/vflib
+LIB_DEPENDS=	VFlib\\.2\\.:${PORTSDIR}/japanese/vflib
 
 WRKSRC=		${WRKDIR}/gs262
 EXTRACT_ONLY=	ghostscript-2.6.2.tar.gz
diff --git a/japanese/vfxdvi300/Makefile b/japanese/vfxdvi300/Makefile
index 2bffbd72a63a..c18cbd49c0ab 100644
--- a/japanese/vfxdvi300/Makefile
+++ b/japanese/vfxdvi300/Makefile
@@ -3,7 +3,7 @@
 # Date created:		8 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1996/12/03 04:07:10 asami Exp $
+# $Id: Makefile,v 1.4 1996/12/03 13:08:20 obrien Exp $
 #
 
 DISTNAME=	xdvi-17
@@ -20,8 +20,7 @@ DISTFILES=	xdvi-17.tar.gz xdvi-17miyu.patch-beta6.gz \
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/VFlib.a:${PORTSDIR}/japanese/vflib
-RUN_DEPENDS= 	${LOCALBASE}/lib/VFlib/vfontcap:${PORTSDIR}/japanese/vflib
+LIB_DEPENDS=	VFlib\\.2\\.:${PORTSDIR}/japanese/vflib
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	xdvi
diff --git a/japanese/vfxdvi300/files/patch-aa b/japanese/vfxdvi300/files/patch-aa
index 982d94761a93..a13f0d61b5da 100644
--- a/japanese/vfxdvi300/files/patch-aa
+++ b/japanese/vfxdvi300/files/patch-aa
@@ -419,22 +419,38 @@
   /* FILTOPTTBLDIR=/usr/local/lib/tex */
   /* FILTOPTTBLFILE=$(FILTOPTBLDIR)/xdvipaper.jdvi2kps */
 ***************
-*** 175,181 ****
+*** 175,183 ****
   
   CDEBUGFLAGS=-g
   
 ! VFLIB=VFlib-1.32/VFlib.a
   #ifdef	Use_ZEIT
-  DEPLIBS=$(VFLIB) XawClientDepLibs
+! DEPLIBS=$(VFLIB) XawClientDepLibs
   LOCAL_LIBRARIES=$(VFLIB) XawClientLibs
---- 175,181 ----
+  #else
+  DEPLIBS=XawClientDepLibs
+--- 175,183 ----
   
   CDEBUGFLAGS=-g
   
-! VFLIB=/usr/local/lib/VFlib.a
+! VFLIB=-L/usr/local/lib -lVFlib
   #ifdef	Use_ZEIT
-  DEPLIBS=$(VFLIB) XawClientDepLibs
+! DEPLIBS=XawClientDepLibs
   LOCAL_LIBRARIES=$(VFLIB) XawClientLibs
+  #else
+  DEPLIBS=XawClientDepLibs
+***************
+*** 244,252 ****
+  
+  ComplexProgramTarget(xdvi)
+  
+- $(VFLIB):
+- 	cd VFlib-1.32; make
+- 
+  xdvi.man: xdvi_man.sed mksedscript
+  	chmod u+x mksedscript
+  	./mksedscript $(DEFAULT_FONT_PATH) $(DEFAULT_FONT_SIZES) \
+--- 244,249 ----
 ***************
 *** 267,273 ****
   #endif	/* Use_MAKEPK */
@@ -444,7 +460,7 @@
   #endif	/* Use_ZEIT */
   
   #ifdef	Use_PRINTDVI
---- 267,273 ----
+--- 264,270 ----
   #endif	/* Use_MAKEPK */
   
   #ifdef	Use_ZEIT