Update to 22.40.w.1.17.

PR:		ports-jp/13672
Submitted by:	ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>
Approved by:	maintainer timeout (3 months)

6 files changed, 60 insertions, 82 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index ad639673b229..2b04ad663967 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -6,46 +6,36 @@
 #
 
 PORTNAME=	xdvik-vflib
-PORTVERSION=	22.15
-PORTREVISION=	1
+PORTVERSION=	22.40.w.1.17
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
-		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
-		ftp://komadori.planet.sci.kobe-u.ac.jp/pub/xdvi/ \
-		ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/xdvi/ \
-		ftp://ftp.iij.ad.jp/pub/TeX/CTAN/dviware/xdvik/ \
-		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
-		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
-		ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS
-DISTNAME=	xdvik-${PORTVERSION}
-
-PATCH_SITES=	ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
-		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
-		ftp://komadori.planet.sci.kobe-u.ac.jp/pub/xdvi/ \
-		ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/xdvi/ \
-		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	asami/LOCAL_PORTS
-PATCHFILES=	${DISTNAME}-j1.04.patch.gz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,xdvi,}
+DISTNAME=	xdvik-22.40w
+
+PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/tex/
+PATCHFILES=	xdvik-22.40w-j1.17.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
 COMMENT=	DVI Previewer(kpathsearch) for X. + jp-patch
 
-LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib
-RUN_DEPENDS+=	makejvf:${PORTSDIR}/japanese/makejvf
-
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib \
+		wwwcore.1:${PORTSDIR}/www/libwww \
+		t1.5:${PORTSDIR}/devel/t1lib
+#RUN_DEPENDS+=	makejvf:${PORTSDIR}/japanese/makejvf
 
 DIST_SUBDIR=	xdvik
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
+CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-a4 --enable-bdpi=${BDPI} --enable-shrink=${SHRINK} \
 		--with-dvifilter=${DVIPS} \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
 		--enable-smallpanel --enable-zoombutton \
-		--enable-vikey
+		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
+		--with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \
+		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
+		--with-t1lib-include=${LIBT1_PREFIX}/include \
+		--enable-vikey --disable-multiplatform
 CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -54,8 +44,10 @@ CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
 #MAKE_ENV=	'XDEFS=${XDEFS}'
 PATCH_STRIP=	-p1
-MAN1=		xdvi.1
+MAN1=		xdvi.1 xdvizilla.1 t1mapper.1
 
+LIBWWW_PREFIX?=	${LOCALBASE}
+LIBT1_PREFIX?=	${LOCALBASE}
 TEXMF=		${PREFIX}/share/texmf
 #VARTEXFONTS=	/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
@@ -68,7 +60,10 @@ XDVIDIR=	${TEXMF}/xdvi
 #XDEFS+=		-DDEFAULT_PKFONTS=\"\\\"${PKFONTS}\\\"\"
 
 DOCS=		FAQ xdvi.icon CHANGES.xdvik-jp \
-		README README.xdvik-jp \
+		README.xdvik-jp \
+		README.src-specials \
+		README.t1fonts \
+		README.t1mapper \
 		READMEs/ChangeLog.xdvik20a-j1.1 \
 		READMEs/ChangeLog.xdvik20c-j1.0 \
 		READMEs/HEADERS.DOC \
@@ -84,7 +79,9 @@ DOCS=		FAQ xdvi.icon CHANGES.xdvik-jp \
 		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
+		READMEs/README.xdvik20c-j1.0p1.patch \
+		READMEs/README.vf2ft \
+		READMEs/README.xdvik-22.15-j1.04.patch
 
 # ******************
 # USEPK_MODE:
diff --git a/japanese/xdvik/distinfo b/japanese/xdvik/distinfo
index 8287b0e9b38b..d5b2b883d58f 100644
--- a/japanese/xdvik/distinfo
+++ b/japanese/xdvik/distinfo
@@ -1,2 +1,2 @@
-MD5 (xdvik/xdvik-22.15.tar.gz) = 2052b671e87c9d41ea8ef5fb7aafeb5e
-MD5 (xdvik/xdvik-22.15-j1.04.patch.gz) = 0d38b63b06779c66ebbe638457ccc1ba
+MD5 (xdvik/xdvik-22.40w.tar.gz) = e484c7b21a6221c9b9f5015dfa2a6225
+MD5 (xdvik/xdvik-22.40w-j1.17.patch.gz) = dba1978dc924653cd75ee4a54109b3c2
diff --git a/japanese/xdvik/files/patch-HTReader.c b/japanese/xdvik/files/patch-HTReader.c
deleted file mode 100644
index 96c16d20e6aa..000000000000
--- a/japanese/xdvik/files/patch-HTReader.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- xdvik-22.15/libs/libwww/HTReader.c.orig	Tue Jan 19 17:56:33 1999
-+++ xdvik-22.15/libs/libwww/HTReader.c	Wed Jan 16 06:36:58 2002
-@@ -60,6 +60,7 @@
-     return HT_ERROR;
- }
- 
-+#ifdef FIND_SIGNATURE
- /*	Push data from a socket down a stream
- **	-------------------------------------
- **
-@@ -76,7 +77,7 @@
- **     		HT_WOULD_BLOCK	if read or write would block
- **		HT_PAUSE	if stream is paused
- */
--char * strnstr(char * haystack, int *pLen, char * needle)
-+PRIVATE char * strnstr(char * haystack, int *pLen, char * needle)
- {
-     int found = 0;
-     int need = strlen(needle);
-@@ -94,6 +95,7 @@
-     *pLen = 0;
-     return NULL;
- }
-+#endif
- 
- /* int DebugBufferSize = INPUT_BUFFER_SIZE; */
- 
diff --git a/japanese/xdvik/files/patch-ab b/japanese/xdvik/files/patch-ab
index 298dca8a7e64..56383278c625 100644
--- a/japanese/xdvik/files/patch-ab
+++ b/japanese/xdvik/files/patch-ab
@@ -1,27 +1,28 @@
---- xdvik-22.02.orig/texk/xdvik/Makefile.in.orig	Thu Apr  8 21:47:48 1999
-+++ xdvik-22.02/texk/xdvik/Makefile.in	Thu Apr  8 21:48:39 1999
-@@ -65,7 +65,7 @@
-   paper.o tategaki.o vfontmap.o \
-   $(ALLOCA)
+--- xdvik-22.40w/texk/xdvik/Makefile.in.orig	Wed Apr 16 23:26:11 2003
++++ xdvik-22.40w/texk/xdvik/Makefile.in	Wed Apr 16 23:29:12 2003
+@@ -80,7 +80,7 @@
+   paper.o tategaki.o vfontmap.o vf2ft.o \
+   $(ALLOCA) dvips.o tfmload.o
  
 -program = xdvi.bin
 +program = xdvi
- programs = $(program)
+ perlprog = t1mapper
  
- default all: $(programs) xdvi.1 xdviprint
-@@ -109,14 +109,13 @@
- install-exec: $(programs) xdviprint
+ default all: $(program) $(perlprog) xdvi.1 t1mapper.1 xdviprint
+@@ -148,7 +148,6 @@
  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- 	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
+ 	for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
+ 	$(INSTALL_SCRIPT) $(srcdir)/$(perlprog) $(scriptdir)/$(perlprog)
 -	$(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi
- 	if test "@XDVIPRINTCMD@" != no; then \
- 	  if test ! -x @XDVIPRINTCMD@; then \
- 	    $(INSTALL_SCRIPT) $(srcdir)/xdviprint @XDVIPRINTCMD@; \
- 	  fi; \
+ ### fix wrong CVS permissions for shell script
+ 	chmod +x $(srcdir)/xdvizilla
+ 	$(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
+@@ -159,7 +158,7 @@
  	fi
+ 
  uninstall-exec:
--	for p in $(programs) xdvi; do rm -f $(bindir)/$$p; done
-+	for p in $(programs) ; do rm -f $(bindir)/$$p; done
+-	for p in $(program) $(perlprog) xdvi; do rm -f $(bindir)/$$p; done
++	for p in $(program) $(perlprog); do rm -f $(bindir)/$$p; done
  
- install-data: xdvi.1 vfontmap.sample
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(psheaderdir) $(XDVIETCDIR)
+ ### //FIXME: add installation for encoding.map here!! (same place where psfonts.map is?)
+ install-data: xdvi.1 t1mapper.1 vfontmap.sample
diff --git a/japanese/xdvik/pkg-descr b/japanese/xdvik/pkg-descr
index 66f4e247536b..4d4526906c33 100644
--- a/japanese/xdvik/pkg-descr
+++ b/japanese/xdvik/pkg-descr
@@ -1,5 +1,4 @@
 Japanese dvi file previewer for X.
-(xdvik-22.15 + xdvik-22.15-j1.03)
 
     1. support dvi file of ASCII Japanese TeX(and pTeX) and NTT jTeX.
     2. require METAFONT and VFlib (vector font library).
@@ -12,4 +11,4 @@ Japanese dvi file previewer for X.
 
 - Kentaro Inagaki <inagaki@tg.rim.or.jp>
 
-WWW: http://www.ipc.chiba-u.ac.jp/~yamaga/index-j.html
+WWW: http://www.nn.iij4u.or.jp/~tutimura/tex/xdvi.html
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index c280cfffcb51..76fed98449f9 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -1,16 +1,17 @@
+bin/t1mapper
 bin/xdvi
+bin/xdvizilla
 libexec/xdviprint
+share/texmf/xdvi/XDvi
 share/texmf/xdvi/vfontmap
+share/texmf/xdvi/xdvi.cfg
 share/texmf/xdvi/xdvipaper.dvi2ps-j
 share/texmf/xdvi/xdvipaper.dvips
 share/texmf/xdvi/xdvipaper.jdvi2kps
-share/doc/xdvi/FAQ
-share/doc/xdvi/xdvi.icon
 share/doc/xdvi/CHANGES.xdvik-jp
-share/doc/xdvi/README
-share/doc/xdvi/README.xdvik-jp
 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.jp+toc+hal2
@@ -19,11 +20,18 @@ 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.src-specials
+share/doc/xdvi/README.t1fonts
+share/doc/xdvi/README.t1mapper
 share/doc/xdvi/README.tasai-ussy
+share/doc/xdvi/README.vf2ft
+share/doc/xdvi/README.xdvik-jp
 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/README.xdvik20c-j1.0+hal2+dvisel
 share/doc/xdvi/README.xdvik20c-j1.0p1.patch 
+share/doc/xdvi/README.xdvik-22.15-j1.04.patch  
+share/doc/xdvi/xdvi.icon
 @dirrm share/texmf/xdvi
 @dirrm share/doc/xdvi