Changed the location of several files from /usr/local/lib/tex ->

/usr/local/share/tex.

Submitted by:	mita@jp.freebsd.org

2 files changed, 92 insertions, 75 deletions

diff --git a/japanese/vfxdvi300/files/patch-aa b/japanese/vfxdvi300/files/patch-aa
index 94d2282e0c50..982d94761a93 100644
--- a/japanese/vfxdvi300/files/patch-aa
+++ b/japanese/vfxdvi300/files/patch-aa
@@ -108,78 +108,6 @@
   	fontp->glyph = (struct glyph *)
   		xmalloc(256 * sizeof(struct glyph), "glyph array");
   	bzero((char *) fontp->glyph, 256 * sizeof(struct glyph));
-*** Imakefile.orig	Sat Nov  9 10:43:30 1996
---- Imakefile	Sat Nov  9 10:42:48 1996
-***************
-*** 22,28 ****
-  TEXFONTS=$(TEXLIB)/fonts
-  
-  #ifdef	Use_ZEIT
-! DEFAULT_FONT_PATH=.:$(TEXFONTS)/pk:$(TEXFONTS)/jfms
-  #else
-  DEFAULT_FONT_PATH=.:$(TEXFONTS)/pk
-  #endif	/* Use_ZEIT */
---- 22,28 ----
-  TEXFONTS=$(TEXLIB)/fonts
-  
-  #ifdef	Use_ZEIT
-! DEFAULT_FONT_PATH=CHANGE
-  #else
-  DEFAULT_FONT_PATH=.:$(TEXFONTS)/pk
-  #endif	/* Use_ZEIT */
-***************
-*** 72,79 ****
-  #endif
-  
-  #ifdef	Use_ZEIT
-! DEFAULT_FONTCONFDIR=$(TEXFONTS)/zeit
-! DEFAULT_FONTCONF=$(DEFAULT_FONTCONFDIR)/FontConf
-  #ifdef	Use_NTTZEIT
-  ZEIT_DEFS=-DUSE_ZEIT -DNTTZEIT -DDEFAULT_FONTCONF=\"$(DEFAULT_FONTCONF)\"
-  #else
---- 72,79 ----
-  #endif
-  
-  #ifdef	Use_ZEIT
-! DEFAULT_FONTCONFDIR=/usr/local/lib/VFlib
-! DEFAULT_FONTCONF=$(DEFAULT_FONTCONFDIR)/vfontcap
-  #ifdef	Use_NTTZEIT
-  ZEIT_DEFS=-DUSE_ZEIT -DNTTZEIT -DDEFAULT_FONTCONF=\"$(DEFAULT_FONTCONF)\"
-  #else
-***************
-*** 175,181 ****
-  
-  CDEBUGFLAGS=-g
-  
-! VFLIB=VFlib-1.32/VFlib.a
-  #ifdef	Use_ZEIT
-  DEPLIBS=$(VFLIB) XawClientDepLibs
-  LOCAL_LIBRARIES=$(VFLIB) XawClientLibs
---- 175,181 ----
-  
-  CDEBUGFLAGS=-g
-  
-! VFLIB=/usr/local/lib/VFlib.a
-  #ifdef	Use_ZEIT
-  DEPLIBS=$(VFLIB) XawClientDepLibs
-  LOCAL_LIBRARIES=$(VFLIB) XawClientLibs
-***************
-*** 267,273 ****
-  #endif	/* Use_MAKEPK */
-  
-  #ifdef	Use_ZEIT
-! InstallNonExecFile(VFlib-1.32/FontConf, $(DEFAULT_FONTCONFDIR))
-  #endif	/* Use_ZEIT */
-  
-  #ifdef	Use_PRINTDVI
---- 267,273 ----
-  #endif	/* Use_MAKEPK */
-  
-  #ifdef	Use_ZEIT
-! 
-  #endif	/* Use_ZEIT */
-  
-  #ifdef	Use_PRINTDVI
 *** dvi_draw.c.orig	Sat Nov  9 10:43:58 1996
 --- dvi_draw.c	Sat Nov  9 10:42:43 1996
 ***************
@@ -435,3 +363,92 @@
   	fontp->kglyph = (struct glyph **)
   	    xmalloc(sizeof(struct glyph *) * KTABLESIZE, "read_ZEIT_index");
   	dimconv = fontp->dimconv;
+*** Imakefile.orig	Wed Nov 13 14:14:38 1996
+--- Imakefile	Wed Nov 13 14:25:27 1996
+***************
+*** 22,28 ****
+  TEXFONTS=$(TEXLIB)/fonts
+  
+  #ifdef	Use_ZEIT
+! DEFAULT_FONT_PATH=.:$(TEXFONTS)/pk:$(TEXFONTS)/jfms
+  #else
+  DEFAULT_FONT_PATH=.:$(TEXFONTS)/pk
+  #endif	/* Use_ZEIT */
+--- 22,28 ----
+  TEXFONTS=$(TEXLIB)/fonts
+  
+  #ifdef	Use_ZEIT
+! DEFAULT_FONT_PATH=CHANGE
+  #else
+  DEFAULT_FONT_PATH=.:$(TEXFONTS)/pk
+  #endif	/* Use_ZEIT */
+***************
+*** 72,79 ****
+  #endif
+  
+  #ifdef	Use_ZEIT
+! DEFAULT_FONTCONFDIR=$(TEXFONTS)/zeit
+! DEFAULT_FONTCONF=$(DEFAULT_FONTCONFDIR)/FontConf
+  #ifdef	Use_NTTZEIT
+  ZEIT_DEFS=-DUSE_ZEIT -DNTTZEIT -DDEFAULT_FONTCONF=\"$(DEFAULT_FONTCONF)\"
+  #else
+--- 72,79 ----
+  #endif
+  
+  #ifdef	Use_ZEIT
+! DEFAULT_FONTCONFDIR=/usr/local/lib/VFlib
+! DEFAULT_FONTCONF=$(DEFAULT_FONTCONFDIR)/vfontcap
+  #ifdef	Use_NTTZEIT
+  ZEIT_DEFS=-DUSE_ZEIT -DNTTZEIT -DDEFAULT_FONTCONF=\"$(DEFAULT_FONTCONF)\"
+  #else
+***************
+*** 128,134 ****
+  /* all marked pages */
+  DVIPRINTER="lp"
+  /* the default printer to print-out DVI file */
+! FILTOPTTBLDIR=/usr/local/lib/tex
+  FILTOPTTBLFILE=$(FILTOPTTBLDIR)/xdvipaper.dvi2ps-j
+  /* FILTOPTTBLDIR=/usr/local/lib/tex */
+  /* FILTOPTTBLFILE=$(FILTOPTBLDIR)/xdvipaper.jdvi2kps */
+--- 128,134 ----
+  /* all marked pages */
+  DVIPRINTER="lp"
+  /* the default printer to print-out DVI file */
+! FILTOPTTBLDIR=/usr/local/share/tex
+  FILTOPTTBLFILE=$(FILTOPTTBLDIR)/xdvipaper.dvi2ps-j
+  /* FILTOPTTBLDIR=/usr/local/lib/tex */
+  /* FILTOPTTBLFILE=$(FILTOPTBLDIR)/xdvipaper.jdvi2kps */
+***************
+*** 175,181 ****
+  
+  CDEBUGFLAGS=-g
+  
+! VFLIB=VFlib-1.32/VFlib.a
+  #ifdef	Use_ZEIT
+  DEPLIBS=$(VFLIB) XawClientDepLibs
+  LOCAL_LIBRARIES=$(VFLIB) XawClientLibs
+--- 175,181 ----
+  
+  CDEBUGFLAGS=-g
+  
+! VFLIB=/usr/local/lib/VFlib.a
+  #ifdef	Use_ZEIT
+  DEPLIBS=$(VFLIB) XawClientDepLibs
+  LOCAL_LIBRARIES=$(VFLIB) XawClientLibs
+***************
+*** 267,273 ****
+  #endif	/* Use_MAKEPK */
+  
+  #ifdef	Use_ZEIT
+! InstallNonExecFile(VFlib-1.32/FontConf, $(DEFAULT_FONTCONFDIR))
+  #endif	/* Use_ZEIT */
+  
+  #ifdef	Use_PRINTDVI
+--- 267,273 ----
+  #endif	/* Use_MAKEPK */
+  
+  #ifdef	Use_ZEIT
+! 
+  #endif	/* Use_ZEIT */
+  
+  #ifdef	Use_PRINTDVI
diff --git a/japanese/vfxdvi300/pkg-plist b/japanese/vfxdvi300/pkg-plist
index f42adebd2171..9e4bfa85a24d 100644
--- a/japanese/vfxdvi300/pkg-plist
+++ b/japanese/vfxdvi300/pkg-plist
@@ -2,6 +2,6 @@
 bin/xdvi
 man/man1/xdvi.1.gz
 @cwd /usr/local
-lib/tex/xdvipaper.dvi2ps-j
-lib/tex/xdvipaper.dvips
-lib/tex/xdvipaper.jdvi2kps
+share/tex/xdvipaper.dvi2ps-j
+share/tex/xdvipaper.dvips
+share/tex/xdvipaper.jdvi2kps