From owner-freebsd-ports Sat Jan 8 8: 0:29 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 6CC4B15A56 for ; Sat, 8 Jan 2000 08:00:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA50149; Sat, 8 Jan 2000 08:00:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from serio.al.rim.or.jp (serio.al.rim.or.jp [202.247.191.123]) by hub.freebsd.org (Postfix) with ESMTP id CC36B15AD1 for ; Sat, 8 Jan 2000 07:58:29 -0800 (PST) (envelope-from inagaki@tg.rim.or.jp) Received: from mail1.rim.or.jp by serio.al.rim.or.jp (8.8.8/3.7W/HMX-12) with ESMTP id AAA08086 for ; Sun, 9 Jan 2000 00:58:17 +0900 (JST) Received: from lunatic.kareidoscope.ne.jp (skai0532.ppp.infoweb.ne.jp [210.131.78.144]) by mail1.rim.or.jp (3.7W/) id AAA04803 for ; Sun, 9 Jan 2000 00:58:17 +0900 (JST) Received: from localhost (localhost [127.0.0.1]) by lunatic.kareidoscope.ne.jp (8.9.3/3.7W) with ESMTP id AAA64409 for ; Sun, 9 Jan 2000 00:56:26 +0900 (JST) Message-Id: <20000109005625G.inagaki@tg.rim.or.jp> Date: Sun, 09 Jan 2000 00:56:25 +0900 From: Kentaro Inagaki / =?iso-2022-jp?B?GyRCMHAzQBsoQiAbJEI3ckJATzobKEI=?= To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/15989: fix and update: xdvik-vflib Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 15989 >Category: ports >Synopsis: update: xdvik-vflib >Confidential: no >Severity: critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jan 8 08:00:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Inagaki Kentaro & >Release: FreeBSD 4.0-CURRENT i386 >Organization: >Environment: >Description: japanese/xdvik-vflib in CURRENT is broken. This PR is fix and update. In this update this port is changed to master/slave ports of the following. Master port is ports/japanese/xdvik-vflib. Slave port is ports/japanese/xdvik-vflib-pkall, ports/japanese/xdvik-vflib-pk118, ports/japanese/xdvik-vflib-pk240, ports/japanese/xdvik-vflib-pk300, ports/japanese/xdvik-vflib-pk360, ports/japanese/xdvik-vflib-pk400, ports/japanese/xdvik-vflib-pk600. and japanese/xdvik-vflib-pkall. This update is diff and shar. For example. % cd /usr/ports/japanese/xdvik-vflib % patch -p1 < ja-xdvik-vflib.patch % rm pkg/MESSAGE % cd /usr/ports/japanese % sh ja-xdvik-vflib-pk.shar >How-To-Repeat: Please make new directory for slave port: japanese/xdvik-vflib-pk118, japanese/xdvik-vflib-pk240, japanese/xdvik-vflib-pk300, japanese/xdvik-vflib-pk360, japanese/xdvik-vflib-pk400, japanese/xdvik-vflib-pk600, and japanese/xdvik-vflib-pkall. And delete xdvik-vflib/pkg/MESSAGE >Fix: ---- cut here (ja-xdvik-vflib.patch) ---- diff -ruNx CVS /usr/ports/japanese/xdvik-vflib/Makefile xdvik-vflib/Makefile --- /usr/ports/japanese/xdvik-vflib/Makefile Thu Nov 18 08:50:33 1999 +++ xdvik-vflib/Makefile Sun Jan 9 00:21:52 2000 @@ -3,11 +3,11 @@ # Date created: 15 Jun 1998 # Whom: Kentaro Inagaki # -# $FreeBSD: /a/ncvs/FreeBSD/ports/japanese/xdvik-vflib/Makefile,v 1.11 1999/11/17 23:50:33 sumikawa Exp $ +# $FreeBSD: /a/ncvs/FreeBSD/ports/japanese/vfxdvik/Makefile,v 1.11 1999/11/17 23:50:33 sumikawa Exp $ # DISTNAME= xdvik-22.15 -PKGNAME= ja-vfxdvik-22.15 +PKGNAME?= ja-xdvik-vflib-22.15 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/ \ @@ -18,7 +18,7 @@ ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \ ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \ ${MASTER_SITE_LOCAL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +#DISTFILES= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \ ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \ @@ -38,33 +38,32 @@ DIST_SUBDIR= xdvik USE_GMAKE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= \ - --enable-a4 --enable-bdpi=300 --enable-shrink=8 \ +CONFIGURE_ARGS= --enable-a4 --enable-bdpi=${BDPI} --enable-shrink=${SHRINK} \ + --with-dvifilter=${DVIPS} \ --enable-xdviprint=${PREFIX}/libexec/xdviprint -CONFIGURE_ENV= INSTALL="${INSTALL}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ +CONFIGURE_ENV= INSTALL="${INSTALL}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" SCRIPTS_ENV= MV=${MV} SED=${SED} -VFFONTS= .:${PREFIX}/share/fonts/makejvf/vf// -TFMFONTS= .:${PREFIX}/share/fonts/makejvf/tfm/ptex// -PKFONTS= .:${PREFIX}/lib/fonts/pk{118:240:300:360:400:600}// -MAKE_ENV= XDEFS="-DDEFAULT_VFFONTS='"\"\\\"${VFFONTS}\\\""\"' -DDEFAULT_TFMFONTS='"\"\\\"${TFMFONTS}\\\""\"' -DDEFAULT_PKFONTS='"\"\\\"${PKFONTS}\\\""\"'" +MAKE_ENV= 'XDEFS=${XDEFS}' PATCH_STRIP= -p1 MAN1= xdvi.1 TEXMF= ${PREFIX}/share/texmf -VARTEXFONTS= /var/tmp/texfonts +#VARTEXFONTS= /var/tmp/texfonts XDVIDIR= ${TEXMF}/xdvi -MAKEJVFDIR= ${PREFIX}/share/fonts/makejvf -MAKETEX_MODE?= ljfour -DVIPS?= dvipsk +XDEFS= -DMAKETEX_MODE=${MF_MODE} + +#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}\\\"\" -PTEXTFM= standard nmin-ngoth jis morisawa -DOCS= FAQ \ - xdvi.icon \ - CHANGES.xdvik-jp \ - README \ - README.xdvik-jp \ +DOCS= FAQ xdvi.icon CHANGES.xdvik-jp \ + README README.xdvik-jp \ READMEs/ChangeLog.xdvik20a-j1.1 \ READMEs/ChangeLog.xdvik20c-j1.0 \ READMEs/HEADERS.DOC \ @@ -83,37 +82,64 @@ READMEs/README.xdvik20c-j1.0p1.patch # ****************** -# DVIPS: -# Please set up [dvipsk｜dvipsk-vflib｜dvi2ps] to DVIPS when I want to -# change it. -# Also, please change script $ PREFIX/libexec/xdviprint after installation -# when the choice other than this wants. +# 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: -# When MetaFont is used the kind of the printer that I use is set up. -# The default is ljfour. -# It does not need to change it particularly because it is able to set up it -# with the option of xdvi. +# 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?= preview +MAKETEX_MODE?= ljfour +SHRINK?= 6 +BDPI?= 300 +DVIPS?= dvipsk -.if ${DVIPS} == dvi2ps -CONFIGURE_ARGS+= --with-dvifilter=dvi2ps -.elif ${DVIPS} == dvipsk-vflib -CONFIGURE_ARGS+= --with-dvifilter=dvips -.elif ${DVIPS} == dvipsk -CONFIGURE_ARGS+= --with-dvifilter=dvips +.if ${FONTTYPE} == metafont +RUN_DEPENDS= ptex-common:${PORTSDIR}/japanese/ptex-common +MF_MODE= ${MAKETEX_MODE} .else -DVIPS=dvipsk -CONFIGURE_ARGS+= --with-dvifilter=dvips +MF_MODE= ${USEPK_MODE} +.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} != dvipsk + @${ECHO} "Error: invalid value for DVIPS: \"${DVIPS}\"" + @${ECHO} "Possible values are: dvi2ps and dvipsk." + @${FALSE} .endif -#.include +.include pre-fetch: @( \ - ${ECHO} "************************************************************"; \ - ${ECHO} "* japanese/dvipsk is used in default. *"; \ - ${ECHO} "* Please refer to Makefile about a change. *"; \ - ${ECHO} "************************************************************") + ${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} "**************************************************************") pre-build: @(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;) @@ -127,9 +153,9 @@ .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/xdvi @for i in ${DOCS} ; do \ - ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i ${PREFIX}/share/doc/xdvi ; \ + ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i \ + ${PREFIX}/share/doc/xdvi ; \ done .endif - @${CAT} ${PKGDIR}/MESSAGE .include diff -ruNx CVS /usr/ports/japanese/xdvik-vflib/pkg/DESCR xdvik-vflib/pkg/DESCR --- /usr/ports/japanese/xdvik-vflib/pkg/DESCR Thu Nov 18 08:50:39 1999 +++ xdvik-vflib/pkg/DESCR Fri Oct 15 10:22:47 1999 @@ -8,6 +8,6 @@ 5. built-in EPS preview (need to any ghostscript) 6. print out from this program (use lpr). 7. convert dvi -> ps (default use japanese/dvipsk). - 8. support wheel mouse. + 8. wheel mouse supports. - Kentaro Inagaki ---- cut here ---- ---- cut here (ja-xdvik-vflib-pk.shar) ---- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # xdvik-vflib-pk118 # xdvik-vflib-pk118/Makefile # xdvik-vflib-pk240 # xdvik-vflib-pk240/Makefile # xdvik-vflib-pk300 # xdvik-vflib-pk300/Makefile # xdvik-vflib-pk360 # xdvik-vflib-pk360/Makefile # xdvik-vflib-pk400 # xdvik-vflib-pk400/Makefile # xdvik-vflib-pk600 # xdvik-vflib-pk600/Makefile # xdvik-vflib-pkall # xdvik-vflib-pkall/Makefile # echo c - xdvik-vflib-pk118 mkdir -p xdvik-vflib-pk118 > /dev/null 2>&1 echo x - xdvik-vflib-pk118/Makefile sed 's/^X//' >xdvik-vflib-pk118/Makefile << 'END-of-xdvik-vflib-pk118/Makefile' X# New ports collection makefile for: xdvik + jp-patch X# Version required: 22.15 X# Date created: 15 Jun 1998 X# Whom: Kentaro Inagaki X# X# $FreeBSD$ X# X XPKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15 X XRUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI} X XFONTTYPE= pkfont XBDPI= 118 XSHRINK= 4 XMASTERDIR= ${.CURDIR}/../xdvik-vflib X X.include "${MASTERDIR}/Makefile" END-of-xdvik-vflib-pk118/Makefile echo c - xdvik-vflib-pk240 mkdir -p xdvik-vflib-pk240 > /dev/null 2>&1 echo x - xdvik-vflib-pk240/Makefile sed 's/^X//' >xdvik-vflib-pk240/Makefile << 'END-of-xdvik-vflib-pk240/Makefile' X# New ports collection makefile for: xdvik + jp-patch X# Version required: 22.15 X# Date created: 15 Jun 1998 X# Whom: Kentaro Inagaki X# X# $FreeBSD$ X# X XPKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15 X XRUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI} X XFONTTYPE= pkfont XBDPI= 240 XSHRINK= 6 XMASTERDIR= ${.CURDIR}/../xdvik-vflib X X.include "${MASTERDIR}/Makefile" END-of-xdvik-vflib-pk240/Makefile echo c - xdvik-vflib-pk300 mkdir -p xdvik-vflib-pk300 > /dev/null 2>&1 echo x - xdvik-vflib-pk300/Makefile sed 's/^X//' >xdvik-vflib-pk300/Makefile << 'END-of-xdvik-vflib-pk300/Makefile' X# New ports collection makefile for: xdvik + jp-patch X# Version required: 22.15 X# Date created: 15 Jun 1998 X# Whom: Kentaro Inagaki X# X# $FreeBSD$ X# X XPKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15 X XRUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI} X XFONTTYPE= pkfont XBDPI= 300 XSHRINK= 6 XMASTERDIR= ${.CURDIR}/../xdvik-vflib X X.include "${MASTERDIR}/Makefile" END-of-xdvik-vflib-pk300/Makefile echo c - xdvik-vflib-pk360 mkdir -p xdvik-vflib-pk360 > /dev/null 2>&1 echo x - xdvik-vflib-pk360/Makefile sed 's/^X//' >xdvik-vflib-pk360/Makefile << 'END-of-xdvik-vflib-pk360/Makefile' X# New ports collection makefile for: xdvik + jp-patch X# Version required: 22.15 X# Date created: 15 Jun 1998 X# Whom: Kentaro Inagaki X# X# $FreeBSD$ X# X XPKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15 X XRUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI} X XFONTTYPE= pkfont XBDPI= 360 XSHRINK= 6 XMASTERDIR= ${.CURDIR}/../xdvik-vflib X X.include "${MASTERDIR}/Makefile" END-of-xdvik-vflib-pk360/Makefile echo c - xdvik-vflib-pk400 mkdir -p xdvik-vflib-pk400 > /dev/null 2>&1 echo x - xdvik-vflib-pk400/Makefile sed 's/^X//' >xdvik-vflib-pk400/Makefile << 'END-of-xdvik-vflib-pk400/Makefile' X# New ports collection makefile for: xdvik + jp-patch X# Version required: 22.15 X# Date created: 15 Jun 1998 X# Whom: Kentaro Inagaki X# X# $FreeBSD$ X# X XPKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15 X XRUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI} X XFONTTYPE= pkfont XBDPI= 400 XSHRINK= 7 XMASTERDIR= ${.CURDIR}/../xdvik-vflib X X.include "${MASTERDIR}/Makefile" END-of-xdvik-vflib-pk400/Makefile echo c - xdvik-vflib-pk600 mkdir -p xdvik-vflib-pk600 > /dev/null 2>&1 echo x - xdvik-vflib-pk600/Makefile sed 's/^X//' >xdvik-vflib-pk600/Makefile << 'END-of-xdvik-vflib-pk600/Makefile' X# New ports collection makefile for: xdvik + jp-patch X# Version required: 22.15 X# Date created: 15 Jun 1998 X# Whom: Kentaro Inagaki X# X# $FreeBSD$ X# X XPKGNAME= ja-xdvik-vflib-pk${BDPI}-22.15 X XRUN_DEPENDS= ${LOCALBASE}/share/texmf/fonts/pk/${MF_MODE}/pk${BDPI}:${PORTSDIR}/japanese/ptex-pkfonts${BDPI} X XFONTTYPE= pkfont XBDPI= 600 XSHRINK= 8 XMASTERDIR= ${.CURDIR}/../xdvik-vflib X X.include "${MASTERDIR}/Makefile" END-of-xdvik-vflib-pk600/Makefile echo c - xdvik-vflib-pkall mkdir -p xdvik-vflib-pkall > /dev/null 2>&1 echo x - xdvik-vflib-pkall/Makefile sed 's/^X//' >xdvik-vflib-pkall/Makefile << 'END-of-xdvik-vflib-pkall/Makefile' X# New ports collection makefile for: xdvik + jp-patch X# Version required: 22.15 X# Date created: 15 Jun 1998 X# Whom: Kentaro Inagaki X# X# $FreeBSD$ X# X XPKGNAME= ja-xdvik-vflib-${FONTTYPE}-22.15 X XFONTTYPE= pkall XBDPI= 300 XSHRINK= 6 XMASTERDIR= ${.CURDIR}/../xdvik-vflib X X.include "${MASTERDIR}/Makefile" END-of-xdvik-vflib-pkall/Makefile exit ---- cut here ---- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message