Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Nov 1999 14:19:30 -0800 (PST)
From:      watanabe@zlab.phys.nagoya-u.ac.jp
To:        freebsd-gnats-submit@freebsd.org
Subject:   ports/15171: Updated port: ja-dvi2dvi (japanese/dvi2dvi)
Message-ID:  <19991129221930.5CDD91548A@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         15171
>Category:       ports
>Synopsis:       Updated port: ja-dvi2dvi (japanese/dvi2dvi)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 29 14:20:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Makoto WATANABE
>Release:        FreeBSD 3.2-RELEASE i386
>Organization:
Z lab. Division of Particle and Astrophysical Science, Nagoya University, JAPAN
>Environment:
>Description:
I have updated the 'ja-dvi2dvi' ports. (1.0 -> 1.1)
I put the patch below "Fix:"

Changed files are

  dvi2dvi/Makefile
  dvi2dvi/files/md5
  dvi2dvi/files/fontdesc
  dvi2dvi/patches/patch-aa
  dvi2dvi/patches/patch-ab
  dvi2dvi/patches/patch-ac
  dvi2dvi/patches/patch-ad
  dvi2dvi/patches/patch-ae
  dvi2dvi/patches/patch-af
  dvi2dvi/pkg/PLIST

- Makoto WATANABE
watanabe@zlab.phys.nagoya-u.ac.jp

>How-To-Repeat:

>Fix:
diff -ruN dvi2dvi.orig/Makefile dvi2dvi/Makefile
--- dvi2dvi.orig/Makefile	Wed Aug 25 21:17:26 1999
+++ dvi2dvi/Makefile	Tue Nov 30 04:46:49 1999
@@ -1,33 +1,48 @@
 # New ports collection makefile for:    dvi2dvi
-# Version required:     1.0
+# Version required:     1.1
 # Date created:         25 Dec 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD: ports/japanese/dvi2dvi/Makefile,v 1.2 1999/08/25 05:23:43 obrien Exp $
 #
 
-DISTNAME=	dvi2dvi-1.0
-PKGNAME=	ja-dvi2dvi-1.0
+DISTNAME=	dvi2dvi-1.1
+PKGNAME=	ja-dvi2dvi-1.1
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/
+MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/ \
+		ftp://ftp.math.s.chiba-u.ac.jp/tex/tex/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} web2c-7.2a${EXTRACT_SUFX}
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
 RUN_DEPENDS=	${PREFIX}/share/fonts/vf-n2a:${PORTSDIR}/japanese/vftool
 
+USE_GMAKE=	yes
+MAKE_ENV+=	kpathsea_parent=../${KPATHSEA_PARENT}
+
+KPATHSEA_PARENT=	web2c-7.2
+
 post-extract:
 	@( cd ${WRKSRC} ; ${MAKE} newlib )
 	@${CP} ${FILESDIR}/fontdesc ${WRKSRC}/lib
 
-post-patch:
-.for i in config p2n
+pre-configure:
+	@( cd ${WRKDIR}/${KPATHSEA_PARENT}/kpathsea ; \
+	    ./configure --prefix=${PREFIX} )
+
+pre-build:
+	@( cd ${WRKDIR}/${KPATHSEA_PARENT}/kpathsea ; ${GMAKE} )
+
+pre-install:
+.for i in config configk fonts/p2n fontsk/p2n
 	@${CP} ${WRKSRC}/lib/$i ${WRKSRC}/lib/$i.orig
 	@${SED} -e 's,@PREFIX@,${PREFIX},g' \
 	  ${WRKSRC}/lib/$i.orig > ${WRKSRC}/lib/$i
 .endfor
 
 post-install:
-	@${RM} ${WRKSRC}/lib/*.orig
+	@${RM} ${WRKSRC}/lib/*.orig \
+	  ${WRKSRC}/lib/fonts/*.orig ${WRKSRC}/lib/fontsk/*.orig
 	@( cd ${WRKSRC} ; ${MAKE} PREFIX=${PREFIX} install-lib )
 	@${MKDIR} -m 777 ${PREFIX}/share/fonts/vf-rot
 .if !defined(NOPORTDOCS)
diff -ruN dvi2dvi.orig/files/fontdesc dvi2dvi/files/fontdesc
--- dvi2dvi.orig/files/fontdesc	Tue Dec 22 00:59:00 1998
+++ dvi2dvi/files/fontdesc	Tue Nov 30 04:46:49 1999
@@ -2,13 +2,12 @@
 # dvi2dvi fontdesc file for FreeBSD jTeX and pTeX ports collection.
 #
 # configuration
-fontdesc	config
+fontdesc	config$kpse
 #
 # NTT dvi (subfont) -> ASCII dvi
-#
-# virtual font
-font	vf	* 0	$vf/vf-n2a/%f.vf
-#
-# tfm used in the above vf (ASCII jfm, i.e. min10.tfm ...)
-font	jfm	* 0	$af/tfm/ptex/%f.tfm
-font	jfm	* 0	$nsf/jfms/%f.tfm
+fontdesc	fonts$kpse/n2a
+# ASCII dvi -> NTT dvi (subfont)
+#fontdesc	fonts$kpse/a2n
+# pTeX dvi -> NTT dvi (subfont)
+#fontdesc	fonts$kpse/p2n
+#fontdesc	fonts$kpse/p2pn
diff -ruN dvi2dvi.orig/files/md5 dvi2dvi/files/md5
--- dvi2dvi.orig/files/md5	Tue Dec 22 00:59:00 1998
+++ dvi2dvi/files/md5	Tue Nov 30 04:46:49 1999
@@ -1 +1,2 @@
-MD5 (dvi2dvi-1.0.tar.gz) = 9018a59f80b622ec83731d5d31c58157
+MD5 (dvi2dvi-1.1.tar.gz) = 00d3c6b793e3a466301a223cc77fc1e4
+MD5 (web2c-7.2a.tar.gz) = 012c33d3862472012fb02ef1773e0627
diff -ruN dvi2dvi.orig/patches/patch-aa dvi2dvi/patches/patch-aa
--- dvi2dvi.orig/patches/patch-aa	Thu Feb 11 21:10:23 1999
+++ dvi2dvi/patches/patch-aa	Tue Nov 30 04:46:49 1999
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon May 20 05:32:43 1996
-+++ Makefile	Mon Dec 21 19:31:32 1998
+--- Makefile.orig	Fri Sep  3 22:01:59 1999
++++ Makefile	Tue Nov 30 04:16:41 1999
 @@ -2,10 +2,10 @@
  # your site:
  #
@@ -13,16 +13,24 @@
  #
  # name of default fontdesc file in your site
  FONTDESC=fontdesc
-@@ -15,10 +15,10 @@
+@@ -13,16 +13,16 @@
+ DVI2PATH=.:${DVI2LIB}
+ 
+ # kpathsea
+-KPSEINCLUDE = -I/usr/local/include -DKPATHSEA
+-KPSELIB = -L/usr/local/lib -lkpathsea
++KPSEINCLUDE = -I${kpathsea_parent} -DKPATHSEA
++KPSELIB = -L${kpathsea_parent}/kpathsea/STATIC -lkpathsea
+ 
  #
- CC=cc
+ CC=gcc
  #
--CFLAGS = -g
-+#CFLAGS = -g
- #CFLAGS = -O		# SUN etc ...
- #CFLAGS = -O -traditional -DPOSIX	# 386bsd (gcc 1.X)
--#CFLAGS = -O -DPOSIX	# Netbsd (gcc 2.X), Linux
-+CFLAGS += -DPOSIX	# Netbsd (gcc 2.X), Linux
- #CFLAGS = -O -bsd	# NeXT
- #CFLAGS = -O -DMSDOS -DPOSIX	# DJGCC (gcc 2.X)
- #CFLAGS = -O -DSYSV	# SysV
+-CCFLAGS = -g
++#CCFLAGS = -g
+ #CCFLAGS = -O		# SUN etc ...
+ #CCFLAGS = -O -traditional -DPOSIX	# 386bsd (gcc 1.X)
+-#CCFLAGS = -O -DPOSIX	# Netbsd (gcc 2.X), Linux
++CCFLAGS += -O -DPOSIX	# Netbsd (gcc 2.X), Linux
+ #CCFLAGS = -O -bsd	# NeXT
+ #CCFLAGS = -O -DMSDOS -DPOSIX	# DJGCC (gcc 2.X)
+ #CCFLAGS = -O -DSYSV	# SysV
diff -ruN dvi2dvi.orig/patches/patch-ab dvi2dvi/patches/patch-ab
--- dvi2dvi.orig/patches/patch-ab	Tue Dec 22 00:59:00 1998
+++ dvi2dvi/patches/patch-ab	Tue Nov 30 04:46:49 1999
@@ -1,13 +1,17 @@
---- lib/a2n.orig	Sun Apr 30 14:54:32 1995
-+++ lib/a2n	Mon Dec 21 19:31:33 1998
-@@ -3,7 +3,8 @@
- # configuration
- fontdesc	config
+--- lib/fonts/a2n.orig	Sat Jun 13 02:53:19 1998
++++ lib/fonts/a2n	Tue Nov 30 04:19:25 1999
+@@ -1,4 +1,4 @@
  # min,goth -> dm,dg
 -font	jvf	* 0	$af/vf-a2n/%f.vf
 +font	jvf	* 0	$vf/vf-a2n/%f.vf
- #
- # tfm used in the above vf (NTT subfont tfm, i.e. dmjsys10.tfm ...)
--font	tfm	* 0	$nsf/tfm/%f.tfm
-+font	tfm	* 0	$nsf/mincho/%f.tfm
-+font	tfm	* 0	$nsf/gothic/%f.tfm
+ font	decomp	* 0	dm,ntt
+ font	decomp	* 0	dg,ntt
+--- lib/fontsk/a2n.orig	Sat Jun 13 02:53:09 1998
++++ lib/fontsk/a2n	Tue Nov 30 04:21:27 1999
+@@ -1,5 +1,5 @@
+ # min,goth -> dm,dg
+-font	jvf	* 0	$tmf/vf//a2n/
++font	jvf	* 0	$vf/vf-a2n/
+ font	decomp	* 0	dm,ntt
+ font	decomp	* 0	dg,ntt
+ 
diff -ruN dvi2dvi.orig/patches/patch-ac dvi2dvi/patches/patch-ac
--- dvi2dvi.orig/patches/patch-ac	Tue Dec 22 00:59:00 1998
+++ dvi2dvi/patches/patch-ac	Tue Nov 30 04:46:49 1999
@@ -1,5 +1,5 @@
---- lib/config.orig	Sun Apr 30 14:50:47 1995
-+++ lib/config	Mon Dec 21 19:31:33 1998
+--- lib/config.orig	Mon May  1 03:50:47 1995
++++ lib/config	Tue Nov 30 04:17:43 1999
 @@ -1,3 +1,4 @@
 -define	f	/usr/local/lib/tex/fonts
 -define	nsf	/usr/local/lib/tex/jfonts
@@ -7,4 +7,11 @@
 +define	f	@PREFIX@/share/tex/fonts
 +define	nsf	@PREFIX@/share/tex/jfonts
 +define	af	@PREFIX@/share/texmf/fonts
++define	vf	@PREFIX@/share/fonts
+--- lib/configk.orig	Mon Jun  8 01:24:46 1998
++++ lib/configk	Tue Nov 30 04:17:44 1999
+@@ -1 +1,3 @@
+-define	tmf	/usr/local/share/texmf/fonts
++define	tmf	@PREFIX@/share/texmf/fonts
++define	nsf	@PREFIX@/share/tex/jfonts
 +define	vf	@PREFIX@/share/fonts
diff -ruN dvi2dvi.orig/patches/patch-ad dvi2dvi/patches/patch-ad
--- dvi2dvi.orig/patches/patch-ad	Tue Dec 22 00:59:00 1998
+++ dvi2dvi/patches/patch-ad	Tue Nov 30 04:46:49 1999
@@ -1,13 +1,17 @@
---- lib/n2a.orig	Sun Apr 30 14:53:22 1995
-+++ lib/n2a	Mon Dec 21 19:31:33 1998
-@@ -3,7 +3,8 @@
- # configuration
- fontdesc	config
+--- lib/fonts/n2a.orig	Mon Jun  8 01:15:57 1998
++++ lib/fonts/n2a	Tue Nov 30 04:19:28 1999
+@@ -1,4 +1,4 @@
  # virtual font
 -font	vf	* 0	$nsf/vf-n2a/%f.vf
 +font	vf	* 0	$vf/vf-n2a/%f.vf
- #
  # tfm used in the above vf (ASCII jfm, i.e. min10.tfm ...)
 -font	jfm	* 0	$af/jfm/%f.tfm
 +font	jfm	* 0	$af/tfm/ptex/%f.tfm
-+font	jfm	* 0	$nsf/jfms/%f.tfm
+--- lib/fontsk/n2a.orig	Mon Jun  8 01:31:48 1998
++++ lib/fontsk/n2a	Tue Nov 30 04:21:32 1999
+@@ -1,4 +1,4 @@
+ # virtual font
+-font	vf	* 0	$tmf/vf//n2a/
++font	vf	* 0	$vf/vf-n2a/
+ # tfm used in the above vf (ASCII jfm, i.e. min10.tfm ...)
+ font	jfm	* 0	$tmf/tfm//ptex/
diff -ruN dvi2dvi.orig/patches/patch-ae dvi2dvi/patches/patch-ae
--- dvi2dvi.orig/patches/patch-ae	Tue Dec 22 00:59:00 1998
+++ dvi2dvi/patches/patch-ae	Tue Nov 30 04:46:49 1999
@@ -1,16 +1,16 @@
---- lib/p2n.orig	Mon Jun 26 10:02:01 1995
-+++ lib/p2n	Mon Dec 21 19:31:33 1998
-@@ -3,20 +3,21 @@
- # configuration
- fontdesc	config
+--- lib/fonts/p2n.orig	Sat Jun 20 05:16:50 1998
++++ lib/fonts/p2n	Tue Nov 30 04:19:33 1999
+@@ -1,20 +1,21 @@
  # min,goth -> dm,dg
 -font	jvf	* 0	$af/vf-a2n/%f.vf
 +font	jvf	* 0	$vf/vf-a2n/%f.vf
  # tmin,tgoth -> dm,dg + d?jsy in vertical mode
 -font	jvf	* 0	$af/vf-p2pn/%f.vf
 +font	jvf	* 0	$vf/vf-p2pn/%f.vf
+ font	decomp	* 0	dm,ntt
+ font	decomp	* 0	dg,ntt
  #
- # tfm used in the above vf (NTT subfont tfm, i.e. dmjsy10.tfm ...)
+ # tfm of NTT subfont (dmjsy10.tfm ...)
 -font	tfm	* 0	$nsf/tfm/%f.tfm
 +font	tfm	* 0	$nsf/mincho/%f.tfm
 +font	tfm	* 0	$nsf/gothic/%f.tfm
@@ -20,12 +20,43 @@
 -vfont	vf	* 0	$af/vf-tjsy/%f.vf
 +vfont	vf	* 0	$vf/vf-tjsy/%f.vf
  # cmr.. -> rcmr..
--define	gen	$f/vf-rot
-+define	gen	$vf/vf-rot
- vfont	vf	* 0	$gen/%f.vf
+-define	rotdir	$f/vf-rot
++define	rotdir	$vf/vf-rot
+ vfont	vf	* 0	$rotdir/%f.vf
  vfont	func	* 0	\
 -	exist($f/tfm/%f.tfm),\
--	exec(/usr/local/lib/mkrotvf %f r%f $f/tfm/%f.tfm $gen/),\
+-	exec(/usr/local/lib/mkrotvf %f r%f $f/tfm/%f.tfm $rotdir/),\
 +	exist($f/%f.tfm),\
-+	exec(@PREFIX@/bin/mkrotvf %f r%f $f/%f.tfm $gen/),\
- 	vf($gen/%f.vf)
++	exec(@PREFIX@/bin/mkrotvf %f r%f $f/%f.tfm $rotdir/),\
+ 	vf($rotdir/%f.vf)
+--- lib/fontsk/p2n.orig	Sat Jun 20 05:18:04 1998
++++ lib/fontsk/p2n	Tue Nov 30 04:21:38 1999
+@@ -1,21 +1,22 @@
+ # min,goth -> dm,dg
+-font	jvf	* 0	$tmf/vf//a2n/
++font	jvf	* 0	$vf/vf-a2n/
+ # tmin,tgoth -> dm,dg + d?jsy in vertical mode
+-font	jvf	* 0	$tmf/vf//p2pn/
++font	jvf	* 0	$vf/vf-p2pn/
+ font	decomp	* 0	dm,ntt
+ font	decomp	* 0	dg,ntt
+ #
+ # tfm of NTT subfont (dmjsy10.tfm ...)
+-font	tfm	* 0	$tmf/tfm//nttsub/
++font	tfm	* 0	$nsf/mincho/
++font	tfm	* 0	$nsf/gothic/
+ #
+ # convert fonts in vertical mode to fonts with rotated bitmap
+ # dmjsy.. -> tdmjsy..
+-vfont	vf	* 0	$tmf/vf//tjsy/
++vfont	vf	* 0	$vf/vf-tjsy/
+ # cmr.. -> rcmr..
+-define	rotdir	$tfm/vf/ptex/rot/
++define	rotdir	$vf/vf-rot/
+ vfont	vf	* 0	$rotdir
+ vfont	func	* 0	\
+ 	exist($tmf/tfm//%f.tfm),\
+-	exec(/usr/local/lib/mkrotvf %f r%f `kpsewhich -path=$tmf/tfm// %f.tfm`\
++	exec(@PREFIX@/bin/mkrotvf %f r%f `kpsewhich -path=$tmf/tfm// %f.tfm`\
+ 	     $rotdir),\
+ 	vf($rotdir)
diff -ruN dvi2dvi.orig/patches/patch-af dvi2dvi/patches/patch-af
--- dvi2dvi.orig/patches/patch-af	Tue Dec 22 00:59:00 1998
+++ dvi2dvi/patches/patch-af	Tue Nov 30 04:46:49 1999
@@ -1,23 +1,40 @@
---- lib/p2pn.orig	Fri May  5 14:14:20 1995
-+++ lib/p2pn	Mon Dec 21 19:31:33 1998
-@@ -3,15 +3,16 @@
- # configuration
- fontdesc	config
+--- lib/fonts/p2pn.orig	Sat Jun 13 03:03:38 1998
++++ lib/fonts/p2pn	Tue Nov 30 04:19:35 1999
+@@ -1,14 +1,15 @@
  # min,goth -> dm,dg
 -font	jvf	* 0	$af/vf-a2n/%f.vf
 +font	jvf	* 0	$vf/vf-a2n/%f.vf
  # tmin,tgoth -> dm,dg + d?jsy in vertical mode
 -font	jvf	* 0	$af/vf-p2pn/%f.vf
 +font	jvf	* 0	$vf/vf-p2pn/%f.vf
+ font	decomp	* 0	dm,ntt
+ font	decomp	* 0	dg,ntt
  #
- # tfm used in the above vf (NTT subfont tfm, i.e. dmjsy10.tfm ...)
+ # tfm of NTT subfont (dmjsy10.tfm ...)
 -font	tfm	* 0	$nsf/tfm/%f.tfm
 +font	tfm	* 0	$nsf/mincho/%f.tfm
 +font	tfm	* 0	$nsf/gothic/%f.tfm
- #
  # tfm of ascii font
 -font	tfm	* 0	$f/tfm/%f.tfm
 +font	tfm	* 0	$f/%f.tfm
  #
  ptex	special	vert	"ps:gsave currentpoint currentpoint translate 90 rotate neg exch neg exch translate"
  ptex	special	end	"ps:currentpoint grestore moveto"
+--- lib/fontsk/p2pn.orig	Sat Jun 13 03:02:00 1998
++++ lib/fontsk/p2pn	Tue Nov 30 04:21:39 1999
+@@ -1,11 +1,13 @@
+ # min,goth -> dm,dg
+-font	jvf	* 0	$tmf/vf//a2n/
++font	jvf	* 0	$vf/vf-a2n/
+ # tmin,tgoth -> dm,dg + d?jsy in vertical mode
+-font	jvf	* 0	$tmf/vf//p2pn/
++font	jvf	* 0	$vf/vf-p2pn/
+ font	decomp	* 0	dm,ntt
+ font	decomp	* 0	dg,ntt
+ #
+ # tfm of all fonts
++font	tfm	* 0	$nsf/mincho/
++font	tfm	* 0	$nsf/gothic/
+ font	tfm	* 0	$tmf/tfm//
+ #
+ ptex	special	vert	"ps:gsave currentpoint currentpoint translate 90 rotate neg exch neg exch translate"
diff -ruN dvi2dvi.orig/pkg/PLIST dvi2dvi/pkg/PLIST
--- dvi2dvi.orig/pkg/PLIST	Tue Dec 22 00:59:00 1998
+++ dvi2dvi/pkg/PLIST	Tue Nov 30 04:46:49 1999
@@ -1,8 +1,17 @@
 bin/dvi2dvi
 lib/dvi2dvi/a2n
 lib/dvi2dvi/config
+lib/dvi2dvi/configk
 lib/dvi2dvi/fontdesc
-lib/dvi2dvi/mtex
+lib/dvi2dvi/fonts/a2n
+lib/dvi2dvi/fonts/n2a
+lib/dvi2dvi/fonts/p2n
+lib/dvi2dvi/fonts/p2pn
+lib/dvi2dvi/fontsk/a2n
+lib/dvi2dvi/fontsk/n2a
+lib/dvi2dvi/fontsk/p2n
+lib/dvi2dvi/fontsk/p2pn
+lib/dvi2dvi/multex
 lib/dvi2dvi/n2a
 lib/dvi2dvi/n2w
 lib/dvi2dvi/p2n
@@ -14,5 +23,7 @@
 share/doc/dvi2dvi/install.doc
 share/doc/dvi2dvi/lib.doc
 @exec mkdir -p -m 777 %D/share/fonts/vf-rot
+@dirrm lib/dvi2dvi/fonts
+@dirrm lib/dvi2dvi/fontsk
 @dirrm lib/dvi2dvi
 @dirrm share/doc/dvi2dvi


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991129221930.5CDD91548A>