- do not install ${PREFIX}/bin/t1mapper nor ${PREFIX}/man/man1/t1mapper.1.

  teTeX2-bin package installs them as well.

- fix build problem.  tested only on NetBSD-current.

bump PKGREVISION.

5 files changed, 37 insertions, 23 deletions

diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index 8aa9d35c98c..26c54cd4a83 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:16:25 martti Exp $
+# $NetBSD: Makefile,v 1.6 2003/10/05 02:00:43 kei Exp $
 
 DISTNAME=	xdvik-${XDVIK_ORIGINAL_VERS}
 PKGNAME=	ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xdvi/} # not xdvik
 
diff --git a/print/ja-vfxdvik/PLIST b/print/ja-vfxdvik/PLIST
index 98501d8ba87..3252acd4eda 100644
--- a/print/ja-vfxdvik/PLIST
+++ b/print/ja-vfxdvik/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/15 19:57:00 kei Exp $
-bin/t1mapper
+@comment $NetBSD: PLIST,v 1.3 2003/10/05 02:00:43 kei Exp $
 bin/vfxdvi
 bin/vfxdvi.bin
 bin/vfxdviprint
 bin/vfxdvizilla
-man/man1/t1mapper.1
 man/man1/vfxdvi.1
 man/man1/vfxdvizilla.1
 share/texmf.local/vfxdvi/vfontmap
diff --git a/print/ja-vfxdvik/distinfo b/print/ja-vfxdvik/distinfo
index 9ce201e2ce7..add2c6bab2c 100644
--- a/print/ja-vfxdvik/distinfo
+++ b/print/ja-vfxdvik/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2003/03/15 19:57:00 kei Exp $
+$NetBSD: distinfo,v 1.3 2003/10/05 02:00:43 kei Exp $
 
 SHA1 (xdvik-22.40v.tar.gz) = 2022029ae6efd458685ca29c427f47b792d9584c
 Size (xdvik-22.40v.tar.gz) = 2254426 bytes
 SHA1 (xdvik-22.40v-j1.14.patch.gz) = 61519d8c06f09821588cec8425aa3f9c5a1cdb22
 Size (xdvik-22.40v-j1.14.patch.gz) = 157221 bytes
-SHA1 (patch-ac) = 3ba2de8b0a4646dddbbe86d25e2ddca5e5d8f5de
+SHA1 (patch-aa) = 6acf03d0cf4c36a3c940af81049f314590d9b13a
+SHA1 (patch-ac) = 491facd23630101f1ec5b2ad0926387470dfb92c
 SHA1 (patch-ad) = 0931e15d67bd0ab3a24e3c436ce41cbd4ad2fcd5
 SHA1 (patch-ae) = ab7c26a017341467341d447753522cb66e0d0e52
 SHA1 (patch-af) = 5503ee4e90318e2c28fa9e5195ffc525dc52bc10
diff --git a/print/ja-vfxdvik/patches/patch-aa b/print/ja-vfxdvik/patches/patch-aa
new file mode 100644
index 00000000000..f2087cb5c17
--- /dev/null
+++ b/print/ja-vfxdvik/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/10/05 02:00:43 kei Exp $
+
+--- texk/make/programs.mk.orig	2003-10-05 10:45:02.000000000 +0900
++++ texk/make/programs.mk	2003-10-05 10:45:39.000000000 +0900
+@@ -6,7 +6,7 @@
+ 
+ # proglib is for web2c; 
+ # XLOADLIBES is for the installer.
+-LIBS = @LIBS@
++LIBS = 
+ LOADLIBES = $(proglib) $(kpathsea) $(LIBS) $(XLOADLIBES)
+ 
+ # May as well separate linking from compiling, just in case.
diff --git a/print/ja-vfxdvik/patches/patch-ac b/print/ja-vfxdvik/patches/patch-ac
index 3bcad4b026e..a6fdbbcf2b5 100644
--- a/print/ja-vfxdvik/patches/patch-ac
+++ b/print/ja-vfxdvik/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2003/03/15 19:57:01 kei Exp $
+$NetBSD: patch-ac,v 1.3 2003/10/05 02:00:43 kei Exp $
 
---- texk/xdvik/Makefile.in.orig	Sun Mar 16 02:51:01 2003
-+++ texk/xdvik/Makefile.in	Sun Mar 16 03:01:09 2003
+--- texk/xdvik/Makefile.in.orig	Fri Jul 11 22:28:01 2003
++++ texk/xdvik/Makefile.in	Fri Jul 11 22:30:59 2003
 @@ -44,8 +44,8 @@
  #   -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
  x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs)
@@ -18,11 +18,12 @@ $NetBSD: patch-ac,v 1.2 2003/03/15 19:57:01 kei Exp $
    $(ALLOCA) dvips.o tfmload.o
  
 -program = xdvi.bin
+-perlprog = t1mapper
 +program = vfxdvi.bin
- perlprog = t1mapper
++perlprog = 
  
 -default all: $(program) $(perlprog) xdvi.1 t1mapper.1 xdviprint
-+default all: $(program) $(perlprog) vfxdvi.1 t1mapper.1 vfxdviprint
++default all: $(program) $(perlprog) vfxdvi.1 vfxdviprint
  
  $(program): $(kpathsea) $(objects) $(LIBWWWDEP) $(LIBT1DEP)
  	$(kpathsea_link) $(objects) $(x_link) $(VFLIB) $(LOADLIBES)
@@ -39,7 +40,7 @@ $NetBSD: patch-ac,v 1.2 2003/03/15 19:57:01 kei Exp $
  	if test -x /usr/bin/nawk; then \
  	  sed -e '/^## for @DVIFILTER@/,/^##/s/^# //' -e 's/awk/nawk/' \
  	      -e "s,/usr/local/share/texmf/xdvi,$(XDVIETCDIR)," \
-@@ -142,15 +142,15 @@
+@@ -142,28 +142,25 @@
  install: install-exec install-data
  uninstall: uninstall-exec uninstall-data
  
@@ -47,7 +48,7 @@ $NetBSD: patch-ac,v 1.2 2003/03/15 19:57:01 kei Exp $
 +install-exec: $(program) vfxdviprint
  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
  	for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
- 	$(INSTALL_SCRIPT) $(srcdir)/$(perlprog) $(scriptdir)/$(perlprog)
+-	$(INSTALL_SCRIPT) $(srcdir)/$(perlprog) $(scriptdir)/$(perlprog)
 -	$(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi
 -	$(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
 +	$(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/vfxdvi
@@ -59,36 +60,37 @@ $NetBSD: patch-ac,v 1.2 2003/03/15 19:57:01 kei Exp $
  	  fi; \
  	fi
  
-@@ -158,12 +158,11 @@
- 	for p in $(program) $(perlprog) xdvi; do rm -f $(bindir)/$$p; done
+ uninstall-exec:
+-	for p in $(program) $(perlprog) xdvi; do rm -f $(bindir)/$$p; done
++	for p in $(program) $(perlprog) vfxdvi; do rm -f $(bindir)/$$p; done
  
  ### //FIXME: add installation for encoding.map here!! (same place where psfonts.map is?)
 -install-data: xdvi.1 t1mapper.1 vfontmap.sample
-+install-data: vfxdvi.1 t1mapper.1 vfontmap.sample
++install-data: vfxdvi.1 vfontmap.sample
  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(XDVIETCDIR)
 -	$(INSTALL_DATA) xdvi.1 $(man1dir)/xdvi.$(manext)
-+	$(INSTALL_DATA) vfxdvi.1 $(man1dir)/vfxdvi.$(manext)
- 	$(INSTALL_DATA) $(srcdir)/t1mapper.1 $(man1dir)/t1mapper.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/t1mapper.1 $(man1dir)/t1mapper.$(manext)
 -	$(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext)
 -	$(INSTALL_DATA) $(srcdir)/texmf/xdvi-teTeX.cfg $(texmf)/xdvi/xdvi.cfg
++	$(INSTALL_DATA) vfxdvi.1 $(man1dir)/vfxdvi.$(manext)
 +	$(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/vfxdvizilla.$(manext)
  	if test ! -f $(XDVIETCDIR)/vfontmap; then \
  	  $(INSTALL_DATA) vfontmap.sample $(XDVIETCDIR)/vfontmap; \
  	fi
-@@ -172,10 +171,9 @@
+@@ -172,10 +169,8 @@
  	$(INSTALL_DATA) xdvipaper.jdvi2kps $(XDVIETCDIR)/xdvipaper.jdvi2kps
  
  uninstall-data:
 -	rm -f $(man1dir)/xdvi.$(manext) 
-+	rm -f $(man1dir)/vfxdvi.$(manext) 
- 	rm -f $(man1dir)/t1mapper.$(manext)
+-	rm -f $(man1dir)/t1mapper.$(manext)
 -	rm -f $(texmf)/xdvi/xdvi.cfg $(texmf)/xdvi/XDvi
 -	rm -f $(man1dir)/xdvizilla.$(manext) $(scriptdir)/xdvizilla
++	rm -f $(man1dir)/vfxdvi.$(manext) 
 +	rm -f $(man1dir)/vfxdvizilla.$(manext) $(scriptdir)/vfxdvizilla
  	rm -f $(FILTOPTTBLDIR)/xdvipaper.*
  
  distname = xdvik
-@@ -207,9 +205,6 @@
+@@ -207,9 +202,6 @@
  	test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) distclean; } || true
  	test -f $(LIBTYPE1DIR)/Makefile && { cd $(LIBTYPE1DIR); $(MAKE) distclean; } || true
  	test -f $(LIBT1DIR)/Makefile && { cd $(LIBT1DIR); $(MAKE) distclean; } || true