From owner-ports-jp@jp.FreeBSD.org Mon Jun  2 13:04:20 2003
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id h5244Ks43925;
	Mon, 2 Jun 2003 13:04:20 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from takehiko.zive.net (p293ad4.tokynt01.ap.so-net.ne.jp [218.41.58.212])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id h5244KY43920
	for <ports-jp@jp.FreeBSD.org>; Mon, 2 Jun 2003 13:04:20 +0900 (JST)
	(envelope-from st@be.to)
Received: by takehiko.zive.net (Postfix, from userid 1001)
	id 9568B295BA4; Mon,  2 Jun 2003 13:04:19 +0900 (JST)
From: SHIOZAKI Takehiko <st@be.to>
To: ports-jp@jp.FreeBSD.org
Cc: inagaki@tg.rim.or.jp
Message-ID: <20030602040418.GA23174%st@be.to>
References: <20030417.160539.39185915.tsuyoshi@is.s.u-tokyo.ac.jp> <20030418083859.GA89842%st@be.to>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: inline
In-Reply-To: <20030418083859.GA89842%st@be.to>
User-Agent: Mutt/1.5.4i-ja.1
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Mon, 2 Jun 2003 13:04:19 +0900
X-Sequence: ports-jp 13781
Subject: [ports-jp 13781] Re: Update of japanese/xdvik-vflib port to 22.40w-j1.17
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: st@be.to
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+030602

$B$($i$/;~4V$,7P$C$F$7$^$$$^$7$?$,!"<jD>$7$7$^$7$?!#(B
$B0J2<$N%Q%C%A$r;n$7$F$$$?$@$1$k$H9,$$$G$9!#(B

[On Apr 18, SHIOZAKI Takehiko <st@be.to> wrote:]

>$B$^$?!"(Bmakejvf$B$O0MB8$7$J$/$F$b$h$$$N$G$O$J$$$+!"$H;W$$$^$9$,!"$3(B
>$B$l$O@N$+$i$h$/J,$+$C$F$J$$$N$G!"I,MW$J>lLL$,$"$k$N$+$b$7$l$^$;$s!#(B

$B$3$l$OMW$i$J$5$=$&$J$N$G30$7$^$7$?!#(B

>$B%$%s%9%H!<%k8e$K(Bmktexlsr$B$r$7$J$$$H(Bxdvi.cfg$B$r8+$D$1$F$b$i$($J$$$N(B
>$B$G$9$,!"$3$l$OBP=h$7$F$$$^$;$s!#C1$K(Bpost-install$B$K=q$1$P$h$$$N$G(B
>$B$7$g$&$+!#(B

$B$3$l$O(BMakefile$B$b(Bpkg-plist$B$b8+MM8+$^$M$GBP=h$7$^$7$?!#(B

>$B0lIt=$@5$7$^$7$?$,!"$^$@LdBj$,$"$C$F!"(B
>	work/xdvik-22.40w/texk/xdvik/texmf/XDvi
>$B$O(B
>	/usr/X11R6/lib/X11/app-defaults
>$B$K%$%s%9%H!<%k$5$l$k$Y$-$H;W$&$s$G$9$h$M!#(B
>$B$3$3$b@5$7$$=q$-J}$,J,$+$C$F$$$J$$$N$G!"<B:]$K(B($B%"%s(B)$B%$%s%9%H!<%k(B
>$B$9$kItJ,$b(Bpkg-plist$B$bD>$;$F$^$;$s!#;29M$K$9$Y$-(Bport$B$,$"$l$P$I$J(B
>$B$?$+65$($F$/$@$5$$!#(B
>$B$=$b$=$b!"(Bxdvi$B<+BN$O(B/usr/{local,X11R6}/bin$B$N$I$A$i$KF~$l$k$Y$-$J(B
>$B$N$+!"$H$$$&5?Ld$bM/$$$F$-$^$7$?$,!#(B

$B$3$l$O(BteTeX$B<+BN$G$b(B/usr/local/share/texmf/xdvi/XDvi$B$KF~$l$F$$$k(B
$B$h$&$J$N$G!"(Bpost-install$B$GBP=h$7$^$7$?!#(B
$B$?$@!"$3$l$O(Bxdvik-22.40w/texk/xdvik/Makefile.in$B$X$N%Q%C%A$H$7$F!"(B
files/patch-ab$B$GBP=h$9$Y$-$J$N$+$J$H$b;W$C$F$*$j$^$9!#(B

$B$^$?!":#2s$N:GBg$NJQ99E@$O(Bconfigure$B$N%*%W%7%g%s$+$i(B
	--enable-bdpi=300
$B$r30$7$?$3$H$G$9!#$3$l$,$"$k$H2$J8$,JQ$KI=<($5$l$F$7$^$&$N$G!#(B

$B:G8e$K!"(Bfiles/patch-HTReader.c$B$O$b$&>C$7$F$7$^$C$F$h$$$h$&$G$9!#(B
diff$B$G%Q%C%A$r:n$k$H6u$N%U%!%$%k$,$G$-$k$h$&$K$J$C$F$7$^$$$^$9$,!#(B

diff -urN xdvik-vflib.orig/Makefile xdvik-vflib/Makefile
--- xdvik-vflib.orig/Makefile	Sat Feb 22 18:35:36 2003
+++ xdvik-vflib/Makefile	Mon Jun  2 12:31:18 2003
@@ -6,46 +6,35 @@
 #
 
 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
 
 DIST_SUBDIR=	xdvik
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--enable-a4 --enable-bdpi=${BDPI} --enable-shrink=${SHRINK} \
+CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--enable-a4 --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 +43,10 @@
 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 +59,10 @@
 #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 +78,9 @@
 		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:
@@ -109,7 +105,7 @@
 DVIPS?=		dvips
 
 .if ${FONTTYPE} == metafont
-RUN_DEPENDS+=	mktexpk:${PORTSDIR}/japanese/ptex-common
+RUN_DEPENDS+=	mktexpk:${PORTSDIR}/japanese/ptex-base
 MF_MODE=	${MAKETEX_MODE}
 .else
 MF_MODE=	${USEPK_MODE}
@@ -166,7 +162,8 @@
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	@$(INSTALL_DATA) $(FILESDIR)/vfontmap $(XDVIDIR)
+	@${INSTALL_DATA} ${FILESDIR}/vfontmap ${XDVIDIR}
+	@${INSTALL_DATA} ${WRKSRC}/texk/xdvik/texmf/XDvi ${XDVIDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/xdvi
 	@for i in ${DOCS} ; do \
@@ -174,5 +171,6 @@
 		${PREFIX}/share/doc/xdvi ; \
 	done
 .endif
+	@${PREFIX}/bin/mktexlsr ${PREFIX}/share/texmf
 
 .include <bsd.port.post.mk>
diff -urN xdvik-vflib.orig/distinfo xdvik-vflib/distinfo
--- xdvik-vflib.orig/distinfo	Mon Jan 21 18:02:46 2002
+++ xdvik-vflib/distinfo	Mon Jun  2 12:10:33 2003
@@ -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 -urN xdvik-vflib.orig/files/patch-HTReader.c xdvik-vflib/files/patch-HTReader.c
--- xdvik-vflib.orig/files/patch-HTReader.c	Sun Jan 20 21:00:33 2002
+++ xdvik-vflib/files/patch-HTReader.c	Thu Jan  1 09:00:00 1970
@@ -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 -urN xdvik-vflib.orig/files/patch-ab xdvik-vflib/files/patch-ab
--- xdvik-vflib.orig/files/patch-ab	Thu Jun 17 11:05:16 1999
+++ xdvik-vflib/files/patch-ab	Mon Jun  2 12:10:33 2003
@@ -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 -urN xdvik-vflib.orig/pkg-descr xdvik-vflib/pkg-descr
--- xdvik-vflib.orig/pkg-descr	Tue Jan 25 23:22:52 2000
+++ xdvik-vflib/pkg-descr	Mon Jun  2 12:10:33 2003
@@ -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 @@
 
 - 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 -urN xdvik-vflib.orig/pkg-plist xdvik-vflib/pkg-plist
--- xdvik-vflib.orig/pkg-plist	Thu Nov 18 17:50:39 1999
+++ xdvik-vflib/pkg-plist	Mon Jun  2 12:13:21 2003
@@ -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,20 @@
 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
+@exec %D/bin/mktexlsr %D/share/texmf
+@unexec %D/bin/mktexlsr %D/share/texmf

-- 
$B$?$@$7!";d$O<*I!0v9"$,<e$$$N$G!"2q5D$O6X1l$K$7$F$/$@$5$$!#(B
--
$B1v:j(B $B5#I'(B(SHIOZAKI Takehiko)
