Update to version 22.02.

7 files changed, 137 insertions, 111 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index a69344718eb3..97c4fd86a14e 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -1,74 +1,121 @@
 # New ports collection makefile for:   xdvik + jp-patch
-# Version required:    20c
+# Version required:    22.02
 # Date created:        15 Jun 1998
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
-# $Id: Makefile,v 1.4 1998/10/07 06:11:42 asami Exp $
+# $Id: Makefile,v 1.5 1999/01/18 03:07:17 steve Exp $
 #
 
-DISTNAME=	xdvik-20c
-PKGNAME=	ja-vfxdvik-20c
+DISTNAME=	xdvik-22.02
+PKGNAME=	ja-vfxdvik-22.02
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-20c/ \
+MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
 		${MASTER_SITE_LOCAL}
 
-PATCH_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-20c/ \
+PATCH_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
 		${MASTER_SITE_LOCAL}
-PATCHFILES=	xdvik20c-j1.0p0d.patch.gz
+PATCHFILES=	xdvik-22.02-j1.02.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
 
-RUN_DEPENDS=	mf:${PORTSDIR}/japanese/ptex-common
-LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
+#RUN_DEPENDS=	mf:${PORTSDIR}/japanese/ptex-common
+#LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_GMAKE=YES
 GNU_CONFIGURE=YES
-CONFIGURE_ARGS=--enable-shared=yes --with-dvifilter=dvips
-#CONFIGURE_ARGS=--enable-shared=yes --with-dvifilter=dvi2ps
-CONFIGURE_ENV=ac_cv_path_install="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}"
-MAKE_FLAGS=VFLIB='-L$(LOCALBASE)/lib -lVFlib2 -lttf'
-STRIP=
+#CONFIGURE_ARGS= --enable-shared=yes \
+CONFIGURE_ARGS= \
+		--enable-bdpi=300 --enable-shrink=8 \
+		--enable-xdviprint=${PREFIX}/libexec/xdviprint
+CONFIGURE_ENV= INSTALL="${INSTALL}" \
+	INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+	INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
+SCRIPTS_ENV=	MV=${MV} SED=${SED}
+VFFONTS=	.:${PREFIX}/share/fonts/makejvf//
+TFMFONTS=	.:${PREFIX}/share/fonts/makejvf//
+PKFONTS=	.:${PREFIX}/lib/fonts/pk300//
+MAKE_ENV=	XDEFS="-DDEFAULT_VFFONTS='"\"\\\"${VFFONTS}\\\""\"' -DDEFAULT_TFMFONTS='"\"\\\"${TFMFONTS}\\\""\"' -DDEFAULT_PKFONTS='"\"\\\"${PKFONTS}\\\""\"'"
 MAN1=xdvi.1
 
 TEXMF=		${PREFIX}/share/texmf
+VARTEXFONTS=/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
-BINARIES=	xdvi
+MAKETEX_MODE?=ljfour
+DVIPS?=	dvipsk
 
-DOCS=		xdvi.FAQ \
+DOCS=		FAQ \
 		xdvi.icon \
 		README \
-		README.xdvik20a-j1.1.patch \
-		README.xdvik20c-j1.0p0.patch \
-		ChangeLog \
-		ChangeLog.xdvik20a-j1.1 \
-		ChangeLog.xdvik20c-j1.0 \
+		README.xdvik-22.x-jp \
+		READMEs/ChangeLog.xdvik20a-j1.1 \
+		READMEs/ChangeLog.xdvik20c-j1.0 \
 		READMEs/HEADERS.DOC \
 		READMEs/InternalVars \
+		READMEs/README.jp+toc+hal2 \
 		READMEs/README.jp-patch \
-		READMEs/README.tasai-ussy \
 		READMEs/README.markpage+toc+printdvi \
 		READMEs/README.markpage+toc+printdvi+paper \
+		READMEs/README.miyu-beta6 \
+		READMEs/README.ptex \
+		READMEs/README.tasai-ussy \
 		READMEs/README.xdvik18f-j1.0.patch \
-		READMEs/README.xdvik18f-j1.1p5.patch
+		READMEs/README.xdvik18f-j1.1p5.patch \
+		READMEs/README.xdvik20a-j1.1.patch \
+		READMEs/README.xdvik20c-j1.0+hal2+dvisel \
+		READMEs/README.xdvik20c-j1.0p1.patch
+
+# ******************
+# DVIPS:
+#  Please set up [dvipskˇĂdvipsk-vflibˇĂdvi2ps] to DVIPS when I want to
+#  change it.
+#  Also, please change script $ PREFIX/libexec/xdviprint after installation
+#  when the choice other than this wants.
+# MAKETEX_MODE:
+#  When MetaFont is used the kind of the printer that I use is set up.
+#  The default is ljfour.
+#  It does not need to change it particularly because it is able to set up it
+#  with the option of xdvi.
+# ******************
+
+.if ${DVIPS} == dvi2ps
+RUN_DEPENDS+=	dvi2ps:${PORTSDIR}/japanese/dvi2ps
+CONFIGURE_ARGS+= --with-dvifilter=dvi2ps
+.elif ${DVIPS} == dvipsk-vflib
+RUN_DEPENDS+=	dvips:${PORTSDIR}/japanese/dvipsk-vflib
+CONFIGURE_ARGS+= --with-dvifilter=dvips
+.elif ${DVIPS} == dvipsk
+RUN_DEPENDS+=	dvips:${PORTSDIR}/japanese/dvipsk
+CONFIGURE_ARGS+= --with-dvifilter=dvips
+.else
+DVIPS=dvipsk
+RUN_DEPENDS+=	dvips:${PORTSDIR}/japanese/dvipsk
+CONFIGURE_ARGS+= --with-dvifilter=dvips
+.endif
+
+#.include <bsd.port.pre.mk>
+
+pre-fetch:
+	@( \
+	${ECHO} "************************************************************"; \
+	${ECHO} "*           japanese/dvipsk is used in default.            *"; \
+	${ECHO} "*          Please refer to Makefile about a change.        *"; \
+	${ECHO} "************************************************************")
 
 pre-build:
 	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
 
 do-install:
-	@(cd ${WRKSRC}/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	@for i in ${BINARIES} ; do \
-	    strip ${PREFIX}/bin/$$i ; \
-	done
 	@$(INSTALL_DATA) $(FILESDIR)/vfontmap $(XDVIDIR)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/xdvi
 	@for i in ${DOCS} ; do \
-	    ${INSTALL_DATA} ${WRKSRC}/xdvik/$$i ${PREFIX}/share/doc/xdvi ; \
+	    ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i ${PREFIX}/share/doc/xdvi ; \
 	done
 .endif
 
diff --git a/japanese/xdvik/distinfo b/japanese/xdvik/distinfo
index d0a9588a7ff3..ebb54da0dd62 100644
--- a/japanese/xdvik/distinfo
+++ b/japanese/xdvik/distinfo
@@ -1,2 +1,2 @@
-MD5 (xdvik-20c.tar.gz) = 4cc8a621d7c00d8f7ef9462552993f42
-MD5 (xdvik20c-j1.0p0d.patch.gz) = 63ede5e4c6a01f882ca1eeacc7aafc61
+MD5 (xdvik-22.02.tar.gz) = 1a331c609753e9eb6a099fef2eda595e
+MD5 (xdvik-22.02-j1.02.patch.gz) = fbb1a3a85dae5fd7710332435298e148
diff --git a/japanese/xdvik/files/patch-ab b/japanese/xdvik/files/patch-ab
index 56d68a7284bf..c3bc292f890b 100644
--- a/japanese/xdvik/files/patch-ab
+++ b/japanese/xdvik/files/patch-ab
@@ -1,64 +1,27 @@
-*** xdvik/Makefile.in.orig	Sun Jun 28 12:02:02 1998
---- xdvik/Makefile.in	Sun Jun 28 12:02:25 1998
-***************
-*** 16,22 ****
-  # define NOVFONTMAP when you don't use "vfontmap"
-  # define VI_KEY when you use VI_KEY
-  # define SMALL_PANEL when you use SMALL_PANEL
-! XDEFS= -DA4 -DNOTEXXET -DVI_KEY -DPTEX -DCOLOR
-  
-  FILTOPTTBLDIR = $(texmf)/xdvi
-  
---- 16,22 ----
-  # define NOVFONTMAP when you don't use "vfontmap"
-  # define VI_KEY when you use VI_KEY
-  # define SMALL_PANEL when you use SMALL_PANEL
-! XDEFS= -DA4 -DNOTEXXET -DVI_KEY -DPTEX -DCOLOR -DSHRINK=\"7\" -DBDPI=300 -DSMALL_PANEL
-  
-  FILTOPTTBLDIR = $(texmf)/xdvi
-  
-***************
-*** 55,61 ****
-    paper.o tategaki.o vfontmap.o \
-    $(ALLOCA)
-  
-! program = xdvi.bin
-  programs = $(program)
-  
-  default all: $(programs) xdvi.1 
---- 55,61 ----
-    paper.o tategaki.o vfontmap.o \
-    $(ALLOCA)
-  
-! program = xdvi
-  programs = $(program)
-  
-  default all: $(programs) xdvi.1 
-***************
-*** 87,99 ****
-  install-exec: $(programs)
-  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-  	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
-- 	$(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi
-  uninstall-exec:
-! 	for p in $(programs) xdvi; do rm -f $(bindir)/$$p; done
-  
-  install-data: xdvi.1 
-  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) 
-! 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(psheaderdir) $(FILTOPTBLDIR)
-  	$(INSTALL_DATA) xdvi.1 $(mandir)/xdvi.$(manext)
-  	$(INSTALL_DATA) xdvipaper.dvi2ps-j $(FILTOPTTBLDIR)/xdvipaper.dvi2ps-j
-  	$(INSTALL_DATA) xdvipaper.dvips $(FILTOPTTBLDIR)/xdvipaper.dvips
---- 87,98 ----
-  install-exec: $(programs)
-  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-  	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
-  uninstall-exec:
-! 	for p in $(programs) ; do rm -f $(bindir)/$$p; done
-  
-  install-data: xdvi.1 
-  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) 
-! 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(psheaderdir) $(FILTOPTTBLDIR)
-  	$(INSTALL_DATA) xdvi.1 $(mandir)/xdvi.$(manext)
-  	$(INSTALL_DATA) xdvipaper.dvi2ps-j $(FILTOPTTBLDIR)/xdvipaper.dvi2ps-j
-  	$(INSTALL_DATA) xdvipaper.dvips $(FILTOPTTBLDIR)/xdvipaper.dvips
+--- texk/xdvik/Makefile.in.orig	Thu Apr  8 21:47:48 1999
++++ texk/xdvik/Makefile.in	Thu Apr  8 21:48:39 1999
+@@ -65,7 +65,7 @@
+   paper.o tategaki.o vfontmap.o \
+   $(ALLOCA)
+ 
+-program = xdvi.bin
++program = xdvi
+ programs = $(program)
+ 
+ default all: $(programs) xdvi.1 xdviprint
+@@ -109,14 +109,13 @@
+ install-exec: $(programs) xdviprint
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+ 	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
+-	$(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi
+ 	if test "@XDVIPRINTCMD@" != no; then \
+ 	  if test ! -x @XDVIPRINTCMD@; then \
+ 	    $(INSTALL_SCRIPT) $(srcdir)/xdviprint @XDVIPRINTCMD@; \
+ 	  fi; \
+ 	fi
+ uninstall-exec:
+-	for p in $(programs) xdvi; do rm -f $(bindir)/$$p; done
++	for p in $(programs) ; do rm -f $(bindir)/$$p; done
+ 
+ install-data: xdvi.1 vfontmap.sample
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(psheaderdir) $(XDVIETCDIR)
diff --git a/japanese/xdvik/pkg-comment b/japanese/xdvik/pkg-comment
index 650692eba9be..47218c5decdc 100644
--- a/japanese/xdvik/pkg-comment
+++ b/japanese/xdvik/pkg-comment
@@ -1 +1 @@
-DVI Previewer(kpathsearch) for X. + jp-patch
+DVI Previewer(kpathsearch) for X + jp-patch
diff --git a/japanese/xdvik/pkg-descr b/japanese/xdvik/pkg-descr
index 75acfc795f21..85831e455a73 100644
--- a/japanese/xdvik/pkg-descr
+++ b/japanese/xdvik/pkg-descr
@@ -1,12 +1,10 @@
-
 Japanese dvi file previewer for X.
-(xdvik-20c + xdvik20c-j1.0p0d)
+(xdvik-22.02 + xdvik-22.02-j1.02)
 
     1. support dvi file of ASCII Japanese TeX(and pTeX) and NTT jTeX.
     2. require METAFONT and VFlib (vector font library).
     3. require kpathsearch libraries version 3.2 (search library)
-    4. support Color dvi file.
-       (but not support color anti-aliasing. so this mode is ugly preview!)
+    4. support Color dvi file.(support color anti-aliasing.)
     5. built-in EPS preview (need to any ghostscript)
     6. print out from this program (use lpr).
     7. convert dvi -> ps (default use japanese/dvipsk).
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index 36f4f4241388..10e194973b62 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -1,23 +1,28 @@
 bin/xdvi
-share/texmf/xdvi/vfontmap
-share/texmf/xdvi/xdvipaper.dvi2ps-j
-share/texmf/xdvi/xdvipaper.dvips
-share/texmf/xdvi/xdvipaper.jdvi2kps
-share/doc/xdvi/xdvi.FAQ
-share/doc/xdvi/xdvi.icon
-share/doc/xdvi/README
-share/doc/xdvi/README.xdvik20c-j1.0p0.patch
-share/doc/xdvi/README.xdvik20a-j1.1.patch
-share/doc/xdvi/ChangeLog
+libexec/xdviprint
 share/doc/xdvi/ChangeLog.xdvik20a-j1.1
 share/doc/xdvi/ChangeLog.xdvik20c-j1.0
+share/doc/xdvi/FAQ
 share/doc/xdvi/HEADERS.DOC
 share/doc/xdvi/InternalVars
+share/doc/xdvi/README
+share/doc/xdvi/README.jp+toc+hal2
 share/doc/xdvi/README.jp-patch
-share/doc/xdvi/README.tasai-ussy
 share/doc/xdvi/README.markpage+toc+printdvi
 share/doc/xdvi/README.markpage+toc+printdvi+paper
+share/doc/xdvi/README.miyu-beta6
+share/doc/xdvi/README.ptex
+share/doc/xdvi/README.tasai-ussy
+share/doc/xdvi/README.xdvik-22.x-jp
 share/doc/xdvi/README.xdvik18f-j1.0.patch
 share/doc/xdvi/README.xdvik18f-j1.1p5.patch
-@dirrm share/texmf/xdvi
+share/doc/xdvi/README.xdvik20a-j1.1.patch
+share/doc/xdvi/README.xdvik20c-j1.0+hal2+dvisel
+share/doc/xdvi/README.xdvik20c-j1.0p1.patch 
+share/doc/xdvi/xdvi.icon
+share/texmf/xdvi/vfontmap
+share/texmf/xdvi/xdvipaper.dvi2ps-j
+share/texmf/xdvi/xdvipaper.dvips
+share/texmf/xdvi/xdvipaper.jdvi2kps
 @dirrm share/doc/xdvi
+@dirrm share/texmf/xdvi
diff --git a/japanese/xdvik/scripts/post-configure b/japanese/xdvik/scripts/post-configure
new file mode 100644
index 000000000000..1a01eae6fec5
--- /dev/null
+++ b/japanese/xdvik/scripts/post-configure
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+chgdirs=". texk texk/kpathsea texk/xdvik"
+
+cd ${WRKSRC}
+
+for dir in ${chgdirs}; do
+    ${MV} -f ${dir}/Makefile ${dir}/Makefile.bak
+    ${SED} \
+	-e 's@^prefix[ 	]*=.*$@prefix=${PREFIX}@' \
+	-e 's@^texmf[ 	]*=.*$@texmf=${PREFIX}/share/texmf@' \
+	< ${dir}/Makefile.bak > ${dir}/Makefile
+done