From owner-ports-jp@jp.FreeBSD.org Thu Feb 26 09:42:31 2004
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id i1Q0gVJ78365;
	Thu, 26 Feb 2004 09:42:31 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from takehiko.zive.net (p2936ce.tokynt01.ap.so-net.ne.jp [218.41.54.206])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id i1Q0gUO78360
	for <ports-jp@jp.FreeBSD.org>; Thu, 26 Feb 2004 09:42:30 +0900 (JST)
	(envelope-from st@be.to)
Received: by takehiko.zive.net (Postfix, from userid 1001)
	id B0FA11B5048; Thu, 26 Feb 2004 09:42:28 +0900 (JST)
From: SHIOZAKI Takehiko <st@be.to>
To: ports-jp@jp.FreeBSD.org
Message-ID: <20040226004227.GA79489%st@be.to>
References: <20030715103051.9E7FC2843B@taro.c.u-tokyo.ac.jp> <030716135907.M0102597@pelsia.ensure-tech.co.jp> <20030818094739.GA10546%st@be.to> <20031022053335.GA66734%st@be.to> <20031110081155.GA60098%st@be.to> <20040225071736.GA52794%st@be.to>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: inline
In-Reply-To: <20040225071736.GA52794%st@be.to>
User-Agent: Mutt/1.5.6i
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Thu, 26 Feb 2004 09:42:28 +0900
X-Sequence: ports-jp 14600
Subject: [ports-jp 14600] 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+040130

[On Feb 25, SHIOZAKI Takehiko <st@be.to> wrote:]

>>$B$3$l$bF|K\8l2=%Q%C%A$N%P!<%8%g%s%"%C%W$K9g$o$;$F99?7$7$^$7$?!#(B
>
>$B$3$A$i$b$5$i$K99?7$7$^$7$?!#(B

$B%?%$%_%s%0$h$/(B(?)$B!"$5$i$K?7$7$$$N$,=P$?$N$G!"99?7$7$^$7$?!#(B
$B$?$@$7!"(Bomega$BMQ$N(Boxdvi$B$O:n$k$h$&$K$O$J$C$F$$$^$;$s!#(B
http://www.nn.iij4u.or.jp/~tutimura/tex/xdvi.html#xdvik-22.40y1

diff -urN xdvik-vflib/Makefile xdvik/Makefile
--- xdvik-vflib/Makefile	Wed Feb 25 11:14:51 2004
+++ xdvik/Makefile	Thu Feb 26 09:19:11 2004
@@ -2,34 +2,48 @@
 # Date created:        15 Jun 1998
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
-# $FreeBSD: ports/japanese/xdvik-vflib/Makefile,v 1.28 2004/02/18 03:58:57 kris Exp $
+# $FreeBSD: ports/japanese/xdvik-vflib/Makefile,v 1.24 2003/07/29 01:22:26 nork Exp $
 #
 
-PORTNAME=	xdvik-vflib
-PORTVERSION=	22.40w.1.17
-PORTREVISION=	1
+PORTNAME=	xdvik
+PORTVERSION=	${VERSION}.${JP_VERSION}
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
-DISTNAME=	xdvik-22.40w
+.if defined(WITH_FREETYPE2)
+PKGNAMESUFFIX=	-freetype
+.else
+PKGNAMESUFFIX=	-vflib
+.endif
+DISTNAME=	xdvik-${VERSION}
 
 PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/tex/
-PATCHFILES=	xdvik-22.40w-j1.17.patch.gz
+PATCHFILES=	xdvik-${VERSION}-j${JP_VERSION}.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 \
-		wwwcore.1:${PORTSDIR}/www/libwww \
+LIB_DEPENDS=	wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
+.if defined(WITH_FREETYPE2)
+BUILD_DEPENDS+=	freetype-config:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+.else
+LIB_DEPENDS+=	VFlib2.24:${PORTSDIR}/japanese/vflib
+.endif
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
+VERSION=	22.40y1
+JP_VERSION=	1.21
+
+CONFLICTS=	ja-vfxdvi* ja-xdvik-vflib-* xdvi-* xdvik-*
 DIST_SUBDIR=	xdvik
 USE_XLIB=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--enable-a4 --enable-shrink=${SHRINK} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--enable-a4 --enable-shrink=${SHRINK} \
 		--with-dvifilter=${DVIPS} \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
 		--enable-smallpanel --enable-zoombutton \
@@ -38,33 +52,20 @@
 		--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}" \
-		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" \
-		XDEFS='-DMFMODE=\"${MF_MODE}\"'
-SCRIPTS_ENV=	MV=${MV} SED=${SED}
-#MAKE_ENV=	'XDEFS=${XDEFS}'
-PATCH_STRIP=	-p1
+.if defined(WITH_FREETYPE2)
+CONFIGURE_ARGS+=	--with-vflib=vf2ft
+.endif
 MAN1=		xdvi.1 xdvizilla.1 t1mapper.1
 
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 TEXMF=		${PREFIX}/share/texmf
-#VARTEXFONTS=	/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
 APPDEFAULTSDIR?=	lib/X11/app-defaults
 
 PLIST_SUB+=	APPDEFAULTSDIR=${APPDEFAULTSDIR}
 
-#VFFONTS=	.:${MAKEJVFDIR}/vf//
-#XDEFS+=		-DDEFAULT_VFFONTS=\"\\\"${VFFONTS}\\\"\"
-#TFMFONTS=	.:${MAKEJVFDIR}/tfm/ptex//
-#XDEFS+=		-DDEFAULT_TFMFONTS=\"\\\"${TFMFONTS}\\\"\"
-#PKFONTS=	.:${PREFIX}/lib/fonts/pk{118:240:300:360:400:600}//
-#XDEFS+=		-DDEFAULT_PKFONTS=\"\\\"${PKFONTS}\\\"\"
-
-DOCS=		FAQ xdvi.icon CHANGES.xdvik-jp \
+DOCS=		FAQ xdvi.icon CHANGES.xdvik-jp.html \
 		README.xdvik-jp \
 		README.src-specials \
 		README.t1fonts \
@@ -89,54 +90,15 @@
 		READMEs/README.xdvik-22.15-j1.04.patch
 
 # ******************
-# USEPK_MODE:
-#  Mode name of Metafont to give to print/pkfonts* is set.
-#  It is care-and-attention to the other program how MetaFont wants to
-#  be executed that do not use modeless. Kpathsea always searches
-#  modeless because even if you specify any kind of mode.
-# MAKETEX_MODE:
-#  It is mode name of default at executing MetaFont. The default is ljfour.
-#  This needs not to be changed. It can be changed with an option or resource.
 # DVIPS:
 #  Specification of `dvi -> ps' conversion program to use.
 #  You can set following one: dvips, dvipsk-vflib, dvi2ps.
 #  Other way... After installation if you change script
 #  ${PREFIX}/libexec/xdviprint, any kind of program can be used.
 # ******************
-FONTTYPE?=	metafont
-USEPK_MODE?=	cx
-MAKETEX_MODE?=	cx
 SHRINK?=	6
-BDPI?=		300
 DVIPS?=		dvips
 
-.if ${FONTTYPE} == metafont
-RUN_DEPENDS+=	mktexpk:${PORTSDIR}/japanese/ptex-base
-MF_MODE=	${MAKETEX_MODE}
-.else
-MF_MODE=	${USEPK_MODE}
-CONFIGURE_ARGS+=--without-mktexpk-default
-.if ${FONTTYPE} == pkall
-PKGNAMESUFFIX=	-${FONTTYPE}
-.else
-PKGNAMESUFFIX=	-pk${BDPI}
-.endif
-.endif
-
-.BEGIN:
-.if ${FONTTYPE} != metafont && \
-	${FONTTYPE} != pkfont && ${FONTTYPE} != pkall
-	@${ECHO} "Error: invalid value for FONTTYPE: \"${FONTTYPE}\""
-	@${ECHO} "Possible values are: metafont, pkall and pkfont."
-	@${FALSE}
-.endif
-.if ${BDPI} != 118 && ${BDPI} != 240 && \
-	${BDPI} != 300 && ${BDPI} != 360 && \
-	${BDPI} != 400  && ${BDPI} != 600
-	@${ECHO} "Error: invalid value for BDPI: \"${BDPI}\""
-	@${ECHO} "Possible values are: all, 118, 240, 300, 360, 400 and 600."
-	@${FALSE}
-.endif
 .if ${DVIPS} != dvi2ps && ${DVIPS} != dvips
 	@${ECHO} "Error: invalid value for DVIPS: \"${DVIPS}\""
 	@${ECHO} "Possible values are: dvi2ps and dvips."
@@ -145,13 +107,13 @@
 
 .include <bsd.port.pre.mk>
 
-pre-fetch:
+pre-everything::
 	@( \
 	${ECHO} "**************************************************************"; \
 	${ECHO} "*            japanese/dvipsk is used in default.             *"; \
 	${ECHO} "*          Please refer to Makefile about a change.          *"; \
 	${ECHO} "*           or, after installation, please change            *"; \
-	${ECHO} "*                ${PREFIX}/libexec/xdviprint.                *"; \
+	${ECHO} "*                ${PREFIX}/libexec/xdviprint.               *"; \
 	${ECHO} "**************************************************************")
 
 pre-build:
@@ -162,8 +124,8 @@
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	@${INSTALL_DATA} ${FILESDIR}/vfontmap ${XDVIDIR}
-	@${INSTALL_DATA} ${WRKSRC}/texk/xdvik/texmf/XDvi ${X11BASE}/${APPDEFAULTSDIR}
+	#${INSTALL_DATA} ${VFONTMAP} ${XDVIDIR}/vfontmap
+	${INSTALL_DATA} ${WRKSRC}/texk/xdvik/texmf/XDvi ${X11BASE}/${APPDEFAULTSDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@for i in ${DOCS} ; do \
diff -urN xdvik-vflib/distinfo xdvik/distinfo
--- xdvik-vflib/distinfo	Mon Jul 14 16:27:38 2003
+++ xdvik/distinfo	Thu Feb 26 09:19:28 2004
@@ -1,2 +1,4 @@
-MD5 (xdvik/xdvik-22.40w.tar.gz) = e484c7b21a6221c9b9f5015dfa2a6225
-MD5 (xdvik/xdvik-22.40w-j1.17.patch.gz) = dba1978dc924653cd75ee4a54109b3c2
+MD5 (xdvik/xdvik-22.40y1.tar.gz) = ab9083c9580e215715dc0369db3c028b
+SIZE (xdvik/xdvik-22.40y1.tar.gz) = 2256174
+MD5 (xdvik/xdvik-22.40y1-j1.21.patch.gz) = 9ce0615764079502f3b76692127a068a
+SIZE (xdvik/xdvik-22.40y1-j1.21.patch.gz) = 166908
diff -urN xdvik-vflib/files/patch-ab xdvik/files/patch-ab
--- xdvik-vflib/files/patch-ab	Mon Jul 14 16:27:38 2003
+++ xdvik/files/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,28 +0,0 @@
---- 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
- perlprog = t1mapper
- 
- default all: $(program) $(perlprog) xdvi.1 t1mapper.1 xdviprint
-@@ -148,7 +148,6 @@
- 	$(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)/xdvi-sh $(scriptdir)/xdvi
- ### 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 $(program) $(perlprog) xdvi; do rm -f $(bindir)/$$p; done
-+	for p in $(program) $(perlprog); 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
diff -urN xdvik-vflib/files/patch-texk:xdvik:vfontmap.freetype xdvik/files/patch-texk:xdvik:vfontmap.freetype
--- xdvik-vflib/files/patch-texk:xdvik:vfontmap.freetype	Thu Jan  1 09:00:00 1970
+++ xdvik/files/patch-texk:xdvik:vfontmap.freetype	Thu Feb 26 09:21:59 2004
@@ -0,0 +1,23 @@
+--- texk/xdvik/vfontmap.freetype.orig	Wed Feb 25 11:46:38 2004
++++ texk/xdvik/vfontmap.freetype	Wed Feb 25 15:35:06 2004
+@@ -6,16 +6,16 @@
+ %    "tfm name1" "{,unicode,adobejapan,cidv}"
+ %    "tfm name2" "{,unicode,adobejapan,cidv}"
+ 
+-/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
+-%/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
++%/usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
++/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf
+ %/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho.ttf
+ 	min
+ 	tmin
+ 	nmin
+ 	jis
+ 	jis-v
+-/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
+-%/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
++%/usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
++/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf
+ %/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic.ttf
+ 	goth
+ 	tgoth
diff -urN xdvik-vflib/files/vfontmap xdvik/files/vfontmap
--- xdvik-vflib/files/vfontmap	Thu Nov 18 08:50:34 1999
+++ xdvik/files/vfontmap	Thu Jan  1 09:00:00 1970
@@ -1,50 +0,0 @@
-## ---- start of defaults ----
-
-## ---- NTT jTeX fontset ----
-#dg	goth
-#dm	min
-
-## ---- pTeX fontset ----
-#goth	goth
-#min	min
-#ngoth	goth
-#nmin	min
-#tgoth	goth
-#tmin	min
-## ---- end of defaults ----
-
-## ---- jis fontset ----
-#jis	min
-#jisg	goth
-
-## ---- morisawa 5 fontset ----
-#Ryumin-Light-H		min
-#Ryumin-Light-J		min
-#Ryumin-Light-V		min
-#GothicBBB-Medium-H	goth
-#GothicBBB-Medium-J	goth
-#GothicBBB-Medium-V	goth
-#FutoMinA101-Bold-H	min
-#FutoMinA101-Bold-J	min
-#FutoMinA101-Bold-V	min
-#FutoGoB101-Bold-H	goth
-#FutoGoB101-Bold-J	goth
-#FutoGoB101-Bold-V	goth
-#Jun101-Light-H		min
-#Jun101-Light-J		min
-#Jun101-Light-V		min
-
-## ---- other ----
-#mgoth	maru
-#fmin	fmin
-#fgoth	goth
-
-## ---- pTeX tate fonts ----
-#tmin    tmin
-#tgoth   tgoth
-
-## ---- not use pTeX TFM (VF) ----
-#rml     min
-#gbm     goth
-#rmlv    tmin
-#gbmv    tgoth
diff -urN xdvik-vflib/pkg-plist xdvik/pkg-plist
--- xdvik-vflib/pkg-plist	Wed Jul 30 09:50:44 2003
+++ xdvik/pkg-plist	Wed Feb 25 11:43:03 2004
@@ -1,13 +1,16 @@
 bin/t1mapper
 bin/xdvi
+bin/xdvi.bin
 bin/xdvizilla
 libexec/xdviprint
 share/texmf/xdvi/vfontmap
+share/texmf/xdvi/vfontmap.freetype
+share/texmf/xdvi/vfontmap.vflib     
 share/texmf/xdvi/xdvi.cfg
 share/texmf/xdvi/xdvipaper.dvi2ps-j
 share/texmf/xdvi/xdvipaper.dvips
 share/texmf/xdvi/xdvipaper.jdvi2kps
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp.html
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20a-j1.1
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20c-j1.0
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
diff -urN xdvik-vflib/scripts/post-configure xdvik/scripts/post-configure
--- xdvik-vflib/scripts/post-configure	Sat Jun 12 04:03:45 1999
+++ xdvik/scripts/post-configure	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
-#!/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

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