Update to new version xdvik-20c.

PR:		7096
Submitted by:	maintainer

5 files changed, 138 insertions, 52 deletions

diff --git a/japanese/xdvik-vflib/Makefile b/japanese/xdvik-vflib/Makefile
index d40d701a55ef..515b2943fe2e 100644
--- a/japanese/xdvik-vflib/Makefile
+++ b/japanese/xdvik-vflib/Makefile
@@ -1,46 +1,75 @@
-# New ports collection makefile for:   xdvik+jp-patch(use VFlib)
-# Version required:    20
-# Date created:        26 Feb 1998
-# Whom:                Kentaro Inagaki <JBD01226@niftyserve.or.jp>
+# New ports collection makefile for:   xdvik + jp-patch
+# Version required:    20c
+# Date created:        15 Jun 1998
+# Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/14 07:58:50 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/07/11 14:06:58 kuriyama Exp $
 #
 
-DISTNAME=	xdvik-20a
-PKGNAME=	ja-vfxdvik-20a
+DISTNAME=	xdvik-20c
+PKGNAME=	ja-vfxdvik-20c
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-20/ \
+MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-20c/ \
 		${MASTER_SITE_LOCAL}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xdvik20a-j1.1p15.patch.gz
 
-MAINTAINER=	JBD01226@niftyserve.or.jp
+PATCH_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-20c/ \
+		${MASTER_SITE_LOCAL}
+PATCHFILES=	xdvik20c-j1.0p0d.patch.gz
+PATCH_DIST_STRIP=	-p1
+
+MAINTAINER=	inagaki@tg.rim.or.jp
 
-RUN_DEPENDS=    mf:${PORTSDIR}/japanese/ptex-common
-LIB_DEPENDS=    VFlib\\.2\\.:${PORTSDIR}/japanese/vflib
+RUN_DEPENDS=	mf:${PORTSDIR}/japanese/ptex-common
+LIB_DEPENDS=	VFlib2\\.23\\.:${PORTSDIR}/japanese/vflib
 
-EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+USE_GMAKE=YES
 GNU_CONFIGURE=YES
-CONFIGURE_ARGS=--with-dvifilter=dvi2ps
+CONFIGURE_ARGS=--enable-shared=yes --with-dvifilter=dvips
 #CONFIGURE_ARGS=--enable-shared=yes --with-dvifilter=dvi2ps
-USE_GMAKE=YES
+CONFIGURE_ENV=ac_cv_path_install="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}"
+MAKE_FLAGS=VFLIB='-L$(LOCALBASE)/lib -lVFlib2 -lttf'
+STRIP=
+MAN1=xdvi.1
 
-MAN1=xdvi.1 gsftopk.1
+TEXMF=		${PREFIX}/share/texmf
+XDVIDIR=	${TEXMF}/xdvi
+BINARIES=	xdvi
 
-pre-patch:
-	(cd ${WRKSRC}/xdvik ; \
-	${GZCAT} ${DISTDIR}/xdvik20a-j1.1p15.patch.gz | ${PATCH} -s )
+DOCS=		xdvi.FAQ \
+		xdvi.icon \
+		README \
+		README.xdvik20a-j1.1.patch \
+		README.xdvik20c-j1.0p0.patch \
+		ChangeLog \
+		ChangeLog.xdvik20a-j1.1 \
+		ChangeLog.xdvik20c-j1.0 \
+		READMEs/HEADERS.DOC \
+		READMEs/InternalVars \
+		READMEs/README.jp-patch \
+		READMEs/README.tasai-ussy \
+		READMEs/README.markpage+toc+printdvi \
+		READMEs/README.markpage+toc+printdvi+paper \
+		READMEs/README.xdvik18f-j1.0.patch \
+		READMEs/README.xdvik18f-j1.1p5.patch
 
 pre-build:
-	(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
+	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
 
 do-install:
-	(cd ${WRKSRC}/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+	@(cd ${WRKSRC}/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	$(INSTALL_DATA) $(FILESDIR)/vfontmap $(PREFIX)/share/texmf/xdvi
-	${MKDIR} ${PREFIX}/share/doc/xdvi
-	$(INSTALL_DATA) ${WRKSRC}/xdvik/README* ${PREFIX}/share/doc/xdvi
-	$(INSTALL_DATA) ${WRKSRC}/xdvik/ChangeLog* ${PREFIX}/share/doc/xdvi
+	@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 ; \
+	done
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/xdvik-vflib/distinfo b/japanese/xdvik-vflib/distinfo
index c7bc83229af4..d0a9588a7ff3 100644
--- a/japanese/xdvik-vflib/distinfo
+++ b/japanese/xdvik-vflib/distinfo
@@ -1,2 +1,2 @@
-MD5 (xdvik-20a.tar.gz) = 58090c0a4e8f4cc5a406f47a95b81b67
-MD5 (xdvik20a-j1.1p15.patch.gz) = e260055ad86755b933326d30bc887a92
+MD5 (xdvik-20c.tar.gz) = 4cc8a621d7c00d8f7ef9462552993f42
+MD5 (xdvik20c-j1.0p0d.patch.gz) = 63ede5e4c6a01f882ca1eeacc7aafc61
diff --git a/japanese/xdvik-vflib/files/patch-ab b/japanese/xdvik-vflib/files/patch-ab
index e02709054cd7..56d68a7284bf 100644
--- a/japanese/xdvik-vflib/files/patch-ab
+++ b/japanese/xdvik-vflib/files/patch-ab
@@ -1,11 +1,64 @@
---- xdvik/Makefile.in.orig	Fri Jan 30 00:37:19 1998
-+++ xdvik/Makefile.in	Fri Jan 30 00:45:39 1998
-@@ -16,7 +16,7 @@
- # 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
-+XDEFS= -DA4 -DNOTEXXET -DVI_KEY -DPTEX -DCOLOR -DSMALL_PANEL -DSHRINK=\"7\" -DBDPI=300
- 
- FILTOPTTBLDIR = $(texmf)/xdvi
- 
+*** 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
diff --git a/japanese/xdvik-vflib/pkg-descr b/japanese/xdvik-vflib/pkg-descr
index e4addccc9485..75acfc795f21 100644
--- a/japanese/xdvik-vflib/pkg-descr
+++ b/japanese/xdvik-vflib/pkg-descr
@@ -1,14 +1,15 @@
 
 Japanese dvi file previewer for X.
-(xdvik-20a + xdvik20a-j1.1p15)
+(xdvik-20c + xdvik20c-j1.0p0d)
 
     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.0 (search library)
+    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!)
-    5. built-in EPS preview(need to any ghostscript)
-    6. print out from this program(use lpr).
+       (but not support color anti-aliasing. so this mode is ugly preview!)
+    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).
 
 - Kentarou Inagaki
-JBD01226@niftyserve.ne.jp
+inagaki@tg.rim.or.jp
diff --git a/japanese/xdvik-vflib/pkg-plist b/japanese/xdvik-vflib/pkg-plist
index 63fa6a1efe1a..d3bf30486043 100644
--- a/japanese/xdvik-vflib/pkg-plist
+++ b/japanese/xdvik-vflib/pkg-plist
@@ -1,21 +1,24 @@
 bin/xdvi
-bin/gsftopk
-man/man1/gsftopk.1.gz
 man/man1/xdvi.1.gz
-share/texmf/dvips/render.ps
 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
+share/doc/xdvi/ChangeLog.xdvik20a-j1.1
+share/doc/xdvi/ChangeLog.xdvik20c-j1.0
+share/doc/xdvi/HEADERS.DOC
+share/doc/xdvi/InternalVars
 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.tasai-ussy
 share/doc/xdvi/README.xdvik18f-j1.0.patch
 share/doc/xdvi/README.xdvik18f-j1.1p5.patch
-share/doc/xdvi/README.xdvik20a-j1.1.patch
-share/doc/xdvi/ChangeLog
-share/doc/xdvi/ChangeLog.xdvik20a-j1.1
 @dirrm share/texmf/xdvi
 @dirrm share/doc/xdvi