From owner-ports-jp@jp.FreeBSD.org Mon Aug 18 18:47:50 2003
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id h7I9loO87876;
	Mon, 18 Aug 2003 18:47:50 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from takehiko.zive.net (p293aea.tokynt01.ap.so-net.ne.jp [218.41.58.234])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id h7I9ln087869
	for <ports-jp@jp.FreeBSD.org>; Mon, 18 Aug 2003 18:47:49 +0900 (JST)
	(envelope-from st@be.to)
Received: by takehiko.zive.net (Postfix, from userid 1001)
	id 749A71B5004; Mon, 18 Aug 2003 18:47:40 +0900 (JST)
From: SHIOZAKI Takehiko <st@be.to>
To: ports-jp@jp.FreeBSD.org
Message-ID: <20030818094739.GA10546%st@be.to>
References: <20030715103051.9E7FC2843B@taro.c.u-tokyo.ac.jp> <030716135907.M0102597@pelsia.ensure-tech.co.jp>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: inline
In-Reply-To: <030716135907.M0102597@pelsia.ensure-tech.co.jp>
User-Agent: Mutt/1.5.4i-ja.1
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Mon, 18 Aug 2003 18:47:39 +0900
X-Sequence: ports-jp 14051
Subject: [ports-jp 14051] 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+030814

xdvik$B$,(BVFlib$B$r;H$o$:$KD>@\(BFreeType2$B$r;H$&$h$&$K$G$-$k$3$H$,J,$+$C(B
$B$?$N$G!"$=$lMQ$N(Bport$B$r:n$C$F$_$^$7$?!#D4;R$K>h$C$F(BCONFLICTS$B;XDj(B
$B$bB-$7$F$_$^$7$?!#(B
$B$^$?!"(BMFMODE$B$N;XDj$J$I$O$b$&MW$i$J$$5$$b$9$k$N$G$9$,!"$h$/J,$+$i(B
$B$J$$$N$G;D$7$F$"$j$^$9!#(B
$B$3$l$r;H$($P!"(BVFlib($B$d$=$l$,0MB8$9$k(BFreeType1$B7ONs(B)$B$rF~$l$J$/$F$9(B
$B$`$h$&$K$J$j$^$9!#(BZeit$B$J$I$N%U%)%s%H$r;H$C$F$J$1$l$P$G$9$,!#(B
$B$H$3$m$G!"$^$?8+MM8+$^$M$G!V(Bpre-fetch:$B!W$NItJ,$r!V(Bpre-everything::$B!W(B
$B$K$7$F$_$?$N$G$9$,!"$d$O$jFsEY<B9T(B($BI=<((B)$B$5$l$F$7$^$$$^$9!#$I$&$9(B
$B$l$P$h$m$7$$$N$G$7$g$&$+!#(B

diff -urN xdvik-vflib/Makefile xdvik-ft2/Makefile
--- xdvik-vflib/Makefile	Wed Jul 30 09:50:44 2003
+++ xdvik-ft2/Makefile	Mon Aug 18 18:33:27 2003
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/japanese/xdvik-vflib/Makefile,v 1.24 2003/07/29 01:22:26 nork Exp $
 #
 
-PORTNAME=	xdvik-vflib
+PORTNAME=	xdvik-ft2
 PORTVERSION=	22.40w.1.17
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,15 +19,18 @@
 MAINTAINER=	inagaki@tg.rim.or.jp
 COMMENT=	DVI Previewer(kpathsearch) for X. + jp-patch
 
-LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib \
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
+CONFLICTS=	ja-vfxdvi* ja-xdvik-vflib-* xdvi-* xdvik-*
 DIST_SUBDIR=	xdvik
 USE_XLIB=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include/freetype2
 CONFIGURE_ARGS=	--enable-a4 --enable-shrink=${SHRINK} \
 		--with-dvifilter=${DVIPS} \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
@@ -36,12 +39,14 @@
 		--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
+		--enable-vikey --disable-multiplatform \
+		--with-vflib=vf2ft
 CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" \
-		XDEFS='-DMFMODE=\"${MF_MODE}\"'
+		XDEFS='-DMFMODE=\"${MF_MODE}\"' \
+		LDFLAGS=-L${LOCALBASE}/lib
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
 #MAKE_ENV=	'XDEFS=${XDEFS}'
 PATCH_STRIP=	-p1
@@ -64,6 +69,7 @@
 #XDEFS+=		-DDEFAULT_PKFONTS=\"\\\"${PKFONTS}\\\"\"
 
 DOCS=		FAQ xdvi.icon CHANGES.xdvik-jp \
+		vfontmap.sample \
 		README.xdvik-jp \
 		README.src-specials \
 		README.t1fonts \
@@ -144,13 +150,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:
diff -urN xdvik-vflib/files/vfontmap xdvik-ft2/files/vfontmap
--- xdvik-vflib/files/vfontmap	Thu Nov 18 08:50:34 1999
+++ xdvik-ft2/files/vfontmap	Mon Aug 18 17:08:05 2003
@@ -1,50 +1,11 @@
-## ---- 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
+#  --with-vflib=vf2ft
+min     /usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf
+nmin    /usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf
+goth    /usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf
+tmin    /usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf
+tgoth   /usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf
+ngoth   /usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf
+jis     /usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf
+jisg    /usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf
+dm      /usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf  # not checked
+dg      /usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic-subst.ttf # not checked
diff -urN xdvik-vflib/pkg-plist xdvik-ft2/pkg-plist
--- xdvik-vflib/pkg-plist	Wed Jul 30 09:50:44 2003
+++ xdvik-ft2/pkg-plist	Mon Aug 18 18:14:33 2003
@@ -32,6 +32,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0p1.patch 
 %%PORTDOCS%%%%DOCSDIR%%/README.xdvik-22.15-j1.04.patch  
 %%PORTDOCS%%%%DOCSDIR%%/xdvi.icon
+%%PORTDOCS%%%%DOCSDIR%%/vfontmap.sample 
 @dirrm share/texmf/xdvi
 @dirrm %%DOCSDIR%%
 @exec [ -x %D/bin/mktexlsr ] && %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)
