From 1952e07d57381eeca13e92b236c4da774f2ad5c6 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 23 Jul 2014 12:13:02 +0000 Subject: [PATCH] Replace japaneses/xdvik with texlive version directly --- MOVED | 2 +- japanese/Makefile | 1 - japanese/xdvik/Makefile | 145 ------- japanese/xdvik/distinfo | 4 - .../xdvik/files/patch-texk-xdvik-dvi-draw.c | 11 - japanese/xdvik/files/patch-texk-xdvik-xdvi.h | 11 - .../files/patch-texk::kpathsea::Makefile.in | 11 - .../files/patch-texk::kpathsea::texmf.in | 360 ------------------ .../xdvik/files/patch-texk::make::paths.mk | 20 - .../files/patch-texk::xdvik::Makefile.in | 37 -- japanese/xdvik/files/patch-texk_xdvik_vf2ft.c | 10 - japanese/xdvik/files/vfontmap.freetype | 113 ------ japanese/xdvik/pkg-descr | 13 - japanese/xdvik/pkg-message | 8 - japanese/xdvik/pkg-plist | 14 - 15 files changed, 1 insertion(+), 759 deletions(-) delete mode 100644 japanese/xdvik/Makefile delete mode 100644 japanese/xdvik/distinfo delete mode 100644 japanese/xdvik/files/patch-texk-xdvik-dvi-draw.c delete mode 100644 japanese/xdvik/files/patch-texk-xdvik-xdvi.h delete mode 100644 japanese/xdvik/files/patch-texk::kpathsea::Makefile.in delete mode 100644 japanese/xdvik/files/patch-texk::kpathsea::texmf.in delete mode 100644 japanese/xdvik/files/patch-texk::make::paths.mk delete mode 100644 japanese/xdvik/files/patch-texk::xdvik::Makefile.in delete mode 100644 japanese/xdvik/files/patch-texk_xdvik_vf2ft.c delete mode 100644 japanese/xdvik/files/vfontmap.freetype delete mode 100644 japanese/xdvik/pkg-descr delete mode 100644 japanese/xdvik/pkg-message delete mode 100644 japanese/xdvik/pkg-plist diff --git a/MOVED b/MOVED index e140554fa420..67d453f48f8d 100644 --- a/MOVED +++ b/MOVED @@ -6300,4 +6300,4 @@ print/latex-tipa|print/texlive-texmf|2014-07-23|Has been incorporated in TeXLive print/latex-ucs|print/texlive-texmf|2014-07-23|Has been incorporated in TeXLive print/teTeX-base|print/texlive-base|2014-07-23|Has been incorporated in TeXLive print/teTeX-texmf|print/texlive-texmf|2014-07-23|Has been incorporated in TeXLive - +japanese/xdvik|print/tex-xdvik|2014-07-23|Use TeXLive version diff --git a/japanese/Makefile b/japanese/Makefile index d66bab67a1ef..689a9105f196 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -315,7 +315,6 @@ SUBDIR += wordpress SUBDIR += wwasw-fpw SUBDIR += xdtp - SUBDIR += xdvik SUBDIR += xgate SUBDIR += xjtext SUBDIR += xlockmore diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile deleted file mode 100644 index 677a94e61ce0..000000000000 --- a/japanese/xdvik/Makefile +++ /dev/null @@ -1,145 +0,0 @@ -# Created by: Kentaro Inagaki -# $FreeBSD$ - -PORTNAME= xdvik -PORTVERSION= ${VERSION_XDVIK}.${VERSION_JPATCH} -PORTREVISION= 16 -CATEGORIES= japanese print -MASTER_SITES= SF/xdvi/OldFiles -PKGNAMESUFFIX= -tetex -DISTNAME= xdvik-${VERSION_XDVIK} - -PATCH_SITES= http://www.nn.iij4u.or.jp/~tutimura/tex/ -PATCHFILES= ${PORTNAME}-${VERSION_XDVIK}-j${VERSION_JPATCH}.patch.gz -PATCH_DIST_STRIP= -p1 - -MAINTAINER= hrs@FreeBSD.org -COMMENT= DVI Previewer(kpathsearch) for X. + freetype support - -RUN_DEPENDS= ${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex \ - ${LOCALBASE}/${MINCHO}:${PORTSDIR}/japanese/font-std \ - ${LOCALBASE}/${GOTHIC}:${PORTSDIR}/japanese/font-std -LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libwwwcore.so:${PORTSDIR}/www/libwww \ - libt1.so:${PORTSDIR}/devel/t1lib - -DIST_SUBDIR= xdvik -USE_TEX= tetex base texmf -USES= gmake -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --datadir=${PREFIX}/${TEXMFDIR:S,texmf$,,} \ - --enable-a4 --enable-shrink=${SHRINK} \ - --with-dvifilter=${DVIPS} \ - --enable-xdviprint=${PREFIX}/libexec/xdviprint \ - --enable-xdvietcdir=${PREFIX}/${XDVIETCDIR} \ - --enable-smallpanel --enable-zoombutton \ - --enable-gf \ - --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 \ - --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}\"' -CFLAGS+= -I${LOCALBASE}/include -SCRIPTS_ENV= MV=${MV} SED=${SED} -PATCH_STRIP= -p1 - -MAN1= xdvi.1 xdvizilla.1 t1mapper.1 - -INSTALL_WRKSRC= ${WRKSRC}/texk/xdvik -PLIST_SUB= TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} \ - XDVIETCDIR=${XDVIETCDIR} -CONFLICTS= texlive-[0-9]* tex-web2c-[0-9]* \ - tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \ - tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]* \ - xdvi-[0-9]* xdvi-*-[0-9]* xdvik-[0-9]* - -VERSION_XDVIK= 22.40y1 -VERSION_JPATCH= 1.21 -LIBWWW_PREFIX?= ${LOCALBASE} -LIBT1_PREFIX?= ${LOCALBASE} - -TEXMFDIR= share/texmf -TEXMFDISTDIR= share/texmf-dist -TEXMFLOCALDIR= share/texmf-local -TEXMFLOCAL_LSR= ${LOCALBASE}/${TEXMFLOCALDIR}/ls-R -XDVIETCDIR= ${TEXMFDIR}/xdvi/ptex -MKTEXLSR?= ${LOCALBASE}/bin/mktexlsr - -CIDFONTDIR= ${TEXMFDIR}/dvipdfm/CIDFont -MINCHO= share/fonts/std.ja_JP/Ryumin-Light -GOTHIC= share/fonts/std.ja_JP/GothicBBB-Medium -VFONTCAPFT_SRC= ${WRKSRC}/vfontmap.freetype -VFONTCAPFT_SUB= CIDFONTDIR=${LOCALBASE}/${CIDFONTDIR} \ - MINCHO=${LOCALBASE}/${MINCHO} \ - GOTHIC=${LOCALBASE}/${GOTHIC} - -NO_STAGE= yes -.include - -BDPI?= 600 -SHRINK?= 6 -DVIPS?= dvips -MF_MODES= 118:bitgraph \ - 240:canonlbp \ - 300:cx \ - 360:canonbjc \ - 400:nexthi \ - 600:ljfour -.for B in ${BDPI} -MF_MODE?= ${MF_MODES:M${B}*:C/.*://} -.endfor -.if !defined(MF_MODE) || empty(MF_MODE) -MF_MODE= cx -.endif - -DOCS= FAQ xdvi.icon CHANGES.xdvik-jp.html \ - README.xdvik-jp README.src-specials \ - README.t1fonts README.t1mapper \ - READMEs/ChangeLog.xdvik20a-j1.1 READMEs/ChangeLog.xdvik20c-j1.0 \ - READMEs/HEADERS.DOC READMEs/InternalVars \ - READMEs/README.jp+toc+hal2 READMEs/README.jp-patch \ - READMEs/README.markpage+toc+printdvi \ - READMEs/README.markpage+toc+printdvi+paper \ - READMEs/README.miyu-beta6 READMEs/README.ptex \ - READMEs/README.tasai-ussy READMEs/README.xdvik18f-j1.0.patch \ - 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.vf2ft \ - READMEs/README.xdvik-22.15-j1.04.patch - -PORTDOCS= ${DOCS:S,READMEs/,,} - -pre-build: - @(cd ${WRKSRC} && ${FIND} . -name '*.orig' -exec ${RM} -f {} \;) - ${SED} ${VFONTCAPFT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - < ${FILESDIR}/vfontmap.freetype \ - > ${VFONTCAPFT_SRC} - -post-install: - ${RM} -f ${PREFIX}/${XDVIETCDIR}/vfontmap.freetype - ${RM} -f ${PREFIX}/${XDVIETCDIR}/vfontmap.vflib - ${INSTALL_DATA} \ - ${VFONTCAPFT_SRC} \ - ${PREFIX}/${XDVIETCDIR}/vfontmap.dist - ${INSTALL_DATA} \ - ${VFONTCAPFT_SRC} \ - ${PREFIX}/${XDVIETCDIR}/vfontmap - ${INSTALL_DATA} \ - ${WRKSRC}/texk/xdvik/texmf/XDvi \ - ${PREFIX}/${XDVIETCDIR}/XDvi -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/texk/xdvik && \ - ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif - ${MKTEXLSR} - -.include diff --git a/japanese/xdvik/distinfo b/japanese/xdvik/distinfo deleted file mode 100644 index 1eb126e34258..000000000000 --- a/japanese/xdvik/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (xdvik/xdvik-22.40y1.tar.gz) = 47afcb4f45a30a6db1c03b89b0bf118a5af1c124f9f380b4312d7ccf4da95701 -SIZE (xdvik/xdvik-22.40y1.tar.gz) = 2256174 -SHA256 (xdvik/xdvik-22.40y1-j1.21.patch.gz) = d7cd93e1b32e82dab39fbabdc0a67d0a06f291a854e82a29a1ee97f9f61bcf8f -SIZE (xdvik/xdvik-22.40y1-j1.21.patch.gz) = 166908 diff --git a/japanese/xdvik/files/patch-texk-xdvik-dvi-draw.c b/japanese/xdvik/files/patch-texk-xdvik-dvi-draw.c deleted file mode 100644 index 9b880bc16e43..000000000000 --- a/japanese/xdvik/files/patch-texk-xdvik-dvi-draw.c +++ /dev/null @@ -1,11 +0,0 @@ ---- xdvik-22.40w/texk/xdvik/dvi-draw.c.orig Sat May 12 15:00:41 2007 -+++ xdvik-22.40w/texk/xdvik/dvi-draw.c Sat May 12 15:01:18 2007 -@@ -522,7 +522,7 @@ - - #endif /* T1LIB */ - --extern void home(); /* from events.c */ -+extern void home ARGS((wide_bool go_home)); /* from events.c */ - extern int fallbacktfm; /* from tfmload.c */ - - static struct frame frame0; /* dummy head of list */ diff --git a/japanese/xdvik/files/patch-texk-xdvik-xdvi.h b/japanese/xdvik/files/patch-texk-xdvik-xdvi.h deleted file mode 100644 index 692861168563..000000000000 --- a/japanese/xdvik/files/patch-texk-xdvik-xdvi.h +++ /dev/null @@ -1,11 +0,0 @@ ---- xdvik-22.40y1/texk/xdvik/xdvi.h.orig Sat Jun 2 13:34:09 2007 -+++ xdvik-22.40y1/texk/xdvik/xdvi.h Sat Jun 2 13:34:42 2007 -@@ -349,7 +349,7 @@ - - typedef unsigned char ubyte; - --#if NeedWidePrototypes -+#if 1 - typedef unsigned int wide_ubyte; - typedef int wide_bool; - #define WIDENINT (int) diff --git a/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in b/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in deleted file mode 100644 index 396813cc44c5..000000000000 --- a/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- xdvik-22.40w/texk/kpathsea/Makefile.in.orig Sun Feb 16 02:21:42 2003 -+++ xdvik-22.40w/texk/kpathsea/Makefile.in Fri Jun 11 20:45:58 2004 -@@ -126,7 +126,7 @@ - | sed 's/^\([^ =]*\)[ ]*=*[ ]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \ - | tr '%' '\012' \ - | sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \ -- -e 's%\$$TEXMF%$(texmf)%g' \ -+ -e 's%\$$TEXMF\([,}/]\)%$(texmf)\1%g' \ - -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \ - -e 's%\$$web2cdir%$(web2cdir)%g' \ - -e 's%\$$prefix%$(prefix)%g' \ diff --git a/japanese/xdvik/files/patch-texk::kpathsea::texmf.in b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in deleted file mode 100644 index 23eaf5e9470d..000000000000 --- a/japanese/xdvik/files/patch-texk::kpathsea::texmf.in +++ /dev/null @@ -1,360 +0,0 @@ ---- xdvik-22.40y1/texk/kpathsea/texmf.in.orig Fri Jan 17 10:31:58 2003 -+++ xdvik-22.40y1/texk/kpathsea/texmf.in Sun Feb 6 06:49:44 2005 -@@ -54,30 +54,57 @@ - % find where to look dynamically. See the manual and the definition - % below of TEXMFCNF. - --% The main tree, which must be mentioned in $TEXMF, below: -+% The tree containing the runtime files closely related to the specific -+% program version used: - TEXMFMAIN = @texmf@ - --% A place for local additions to a "standard" texmf tree. For example: -+% The main distribution tree: -+TEXMFDIST = @texmf@-dist -+ -+% A place for local additions to a "standard" texmf tree. -+% This tree is not used for local configuration maintained by -+% texconfig, it uses TEXMFCONFIG below. - TEXMFLOCAL = @texmf@-local - --% If defined, teTeX's texconfig stores modifications here (instead of the --% TEXMFMAIN tree). --% VARTEXMF = @texmf@-var -+% TEXMFSYSVAR, where texconfig-sys stores variable runtime data. -+% With teTeX-3.0 or later, this must be set. -+% For sharing this tree with $TEXMFMAIN: -+% TEXMFSYSVAR = $TEXMFMAIN -+% For using a separate tree: -+TEXMFSYSVAR = @texmf@-var -+ -+% TEXMFSYSCONFIG, where texconfig-sys stores configuration data. -+% With teTeX-3.0 or later, this must be set. -+% For sharing this tree with $TEXMFMAIN: -+% TEXMFSYSCONFIG = $TEXMFMAIN -+% For using a separate tree: -+TEXMFSYSCONFIG = @texmf@-config - - % User texmf trees can be catered for like this... --HOMETEXMF = $HOME/texmf -+% This used to be HOMETEXMF. -+TEXMFHOME = $HOME/texmf - --% Now, list all the texmf trees. If you have multiple trees you can --% use shell brace notation, like this: --% TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN} --% The braces are necessary. If you set VARTEXMF, you also have to --% - list $VARTEXMF in the TEXMF definition; --% - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition. --% TEXMF = $TEXMFMAIN --TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN} -+% TEXMFVAR, where texconfig stores variable runtime data. -+% With teTeX-3.0 or later, this must be set. -+% For sharing this tree with $TEXMFMAIN: -+% TEXMFVAR = $TEXMFMAIN -+% For using a separate tree: -+TEXMFVAR = $HOME/.texmf-var -+ -+% TEXMFCONFIG, where texconfig stores configuration data. -+% With teTeX-3.0 or later, this must be set. -+% For sharing this tree with $TEXMFMAIN: -+% TEXMFCONFIG = $TEXMFMAIN -+% For using a separate tree: -+TEXMFCONFIG = $HOME/.texmf-config -+ -+% Now, list all the texmf trees. -+% The braces are necessary. For texconfig to work properly, TEXMFCONFIG -+% and TEXMFVAR should be named explicitly and before all other trees. -+TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} - - % The system trees. These are the trees that are shared by all the users. --SYSTEXMF = $TEXMF -+SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST - - % Where generated fonts may be written. This tree is used when the sources - % were found in a system tree and either that tree wasn't writable, or the -@@ -92,23 +119,23 @@ - TEXMFDBS = $TEXMF;$VARTEXFONTS - - % It may be convenient to define TEXMF like this: --% TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME} -+% TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME} - % which allows users to set up entire texmf trees, and tells TeX to - % look in places like ~/tex and ~/bibtex. If you do this, define TEXMFDBS - % like this: --% TEXMFDBS = $HOMETEXMF;$TEXMFLOCAL;$TEXMFMAIN;$VARTEXFONTS -+% TEXMFDBS = $TEXMFHOME;$TEXMFLOCAL;$TEXMFMAIN;$VARTEXFONTS - % or mktexlsr will generate an ls-R file for $HOME when called, which is - % rarely desirable. If you do this you'll want to define SYSTEXMF like - % this: --% SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN -+% SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST - % so that fonts from a user's tree won't escape into the global trees. - % - % On some systems, there will be a system tree which contains all the font - % files that may be created as well as the formats. For example --% VARTEXMF = /var/lib/texmf -+% TEXMFVAR = /var/lib/texmf - % is used on many Linux systems. In this case, set VARTEXFONTS like this --% VARTEXFONTS = $VARTEXMF/fonts --% and do not mention it in TEXMFDBS (but _do_ mention VARTEXMF). -+% VARTEXFONTS = $TEXMFVAR/fonts -+% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR). - - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -140,58 +167,69 @@ - % latex209, useful for macros that were written for 2.09 and do not - % mention 2e at all, but can be used with 2e. - TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// --TEXINPUTS.platex = .;$TEXMF/tex/{platex,latex,generic,}// -+%TEXINPUTS.platex = .;$TEXMF/tex/{platex,latex,generic,}// - TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}// -+TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}// - TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}// - -+% TeXfamily -+TEXINPUTS.jtex = .:$TEXMF/{jtex,tex}/{plain,generic,}// -+TEXINPUTS.jlatex = .:$TEXMF/{jtex,tex}/{latex,generic,}// -+TEXINPUTS.jlatex209 = .:$TEXMF/{jtex,tex}/{latex209,generic,latex,}// -+TEXINPUTS.multex = .:$TEXMF/{multex,jtex,tex}/{plain,generic,}// -+TEXINPUTS.mullatex = .:$TEXMF/{multex,jtex,tex}/{latex,generic,}// -+ - % Fontinst needs to read afm files. --TEXINPUTS.fontinst = .;$TEXMF/tex//;$TEXMF/fonts/afm// -+TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}// - - % MLTeX. --TEXINPUTS.frlatex = .;$TEXMF/{mltex,tex}/{french,latex,generic,}// --TEXINPUTS.frtex = .;$TEXMF/{mltex,tex}/{french,plain,generic,}// --TEXINPUTS.mllatex = .;$TEXMF/{mltex,tex}/{latex,generic,}// --TEXINPUTS.mltex = .;$TEXMF/{mltex,tex}/{plain,generic,}// -+TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}// -+TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}// -+TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}// -+TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}// - - % e-TeX. This form of the input paths is borrowed from teTeX. A certain - % variant of TDS is assumed here, unaffected by the build variables. --TEXINPUTS.elatex = .;$TEXMF/{etex,tex}/{latex,generic,}// --TEXINPUTS.etex = .;$TEXMF/{etex,tex}/{plain,generic,}// -+TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}// -+TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// - - % pdfTeX. This form of the input paths is borrowed from teTeX. A certain - % variant of TDS is assumed here, unaffected by the build variables. --TEXINPUTS.pdfcslatex = .;$TEXMF/{pdftex,tex}/{cslatex,csplain,latex,generic,}// --TEXINPUTS.pdfcsplain = .;$TEXMF/{pdftex,tex}/{csplain,plain,generic,}// --TEXINPUTS.pdfjadetex = .;$TEXMF/{pdftex,tex}/{jadetex,plain,generic,}// --TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}// --TEXINPUTS.pdfmex = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}// --TEXINPUTS.pdftex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// --TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,plain,generic,}// --TEXINPUTS.pdfamstex = .;$TEXMF/{pdftex,tex}/{amstex,plain,generic,}// -+TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// -+TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}// -+TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,plain,generic,}// -+TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}// -+TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}// -+TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}// -+TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}// -+TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// -+TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// - - % pdfeTeX. --TEXINPUTS.pdfelatex = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{latex,generic,}// --TEXINPUTS.pdfetex = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{plain,generic,}// -+TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// -+TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// - --% Omega. --TEXINPUTS.lambda = .;$TEXMF/{omega,tex}/{lambda,latex,generic,}// --TEXINPUTS.omega = .;$TEXMF/{omega,tex}/{plain,generic,}// -+% Omega / Aleph -+TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// -+TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// -+TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// -+TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// - - % Context macros by Hans Hagen: --TEXINPUTS.context = .;$TEXMF/{pdftex,etex,tex}/{context,plain,generic,}// -+TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// - - % odd formats needing their own paths - TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// - TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// --TEXINPUTS.mex-pl = .;$TEXMF/tex/{mex,plain,generic,}// - TEXINPUTS.platex-pl = .;$TEXMF/tex/{platex,latex,generic,}// --TEXINPUTS.pdfplatex = .;$TEXMF/{pdftex,tex}/{platex,latex,generic,}// --TEXINPUTS.pdfmex-pl = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}// --TEXINPUTS.pdfemex = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{mex,plain,generic,}// --TEXINPUTS.pdfemex-pl = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{mex,plain,generic,}// -+TEXINPUTS.pdfplatex = .;$TEXMF/tex/{platex,latex,generic,}// -+ -+% XeTeX -+TEXINPUTS.xelatex = .;$TEXMF/tex/{latex,generic,}// -+TEXINPUTS.xetex = .;$TEXMF/tex/{plain,generic,}// - - % Earlier entries override later ones, so put this last. --TEXINPUTS = .;$TEXMF/tex/{generic,}// -+TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// - - % Metafont, MetaPost inputs. - MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// -@@ -201,12 +239,12 @@ - % and string pools (.pool) for ini{tex,mf,mp}. It is silly that we have six - % paths and directories here (they all resolve to a single place by default), - % but historically ... --TEXFORMATS = .;$TEXMF/web2c --MFBASES = .;$TEXMF/web2c --MPMEMS = .;$TEXMF/web2c --TEXPOOL = .;$TEXMF/web2c --MFPOOL = .;$TEXMF/web2c --MPPOOL = .;$TEXMF/web2c -+TEXFORMATS = .;$TEXMF/web2c{/ptex,} -+MFBASES = .;$TEXMF/web2c{/ptex,} -+MPMEMS = .;$TEXMF/web2c{/ptex,} -+TEXPOOL = .;$TEXMF/web2c{/ptex,} -+MFPOOL = .;$TEXMF/web2c{/ptex,} -+MPPOOL = .;$TEXMF/web2c{/ptex,} - - % Device-independent font metric files. - VFFONTS = .;$TEXMF/fonts/vf// -@@ -228,20 +266,26 @@ - % A place to puth everything that doesn't fit the other font categories. - MISCFONTS = .;$TEXMF/fonts/misc// - --% For texfonts.map and included map files used by mktexpk. --% See ftp://ftp.tug.org/tex/fontname.tar.gz. --TEXFONTMAPS = .;$TEXMF/fontname -+% font name map files. -+TEXFONTMAPS = .;$TEXMF/fonts/map// -+ -+% support non"k"-xdvi: -+PKFONTS.XDvi = .:$TEXMF/%s:$VARTEXFONTS/pk/{%m,modeless}// -+VFFONTS.XDvi = .:$TEXMF/%s -+PSHEADERS.XDvi = .:$TEXMF/%q{dvips,fonts/type1}// -+TEXPICTS.XDvi = .:$TEXMF/%q{dvips,tex}// - - % BibTeX bibliographies and style files. --BIBINPUTS = .;$TEXMF/bibtex/{bib,}// --BSTINPUTS = .;$TEXMF/bibtex/{bst,}// -+BIBINPUTS = .;$TEXMF/bibtex/bib// -+BSTINPUTS = .;$TEXMF/bibtex/bst// - - % MFT style files. - MFTINPUTS = .;$TEXMF/mft// - --% PostScript headers, prologues (.pro), encodings (.enc) and fonts. --TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}// --TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,pdftex,tex,fonts/{type1,truetype}}// -+% PostScript headers and prologues (.pro); unfortunately, some programs -+% also use this for acessing font files (enc, type1, truetype) -+TEXPSHEADERS = .;$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3}}// -+TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3,truetype}}// - - % PostScript Type 1 outline fonts. - T1FONTS = .;$TEXMF/fonts/type1// -@@ -255,14 +299,34 @@ - % Type 42 outline fonts. - T42FONTS = .;$TEXMF/fonts/type42// - -+% Ligature definition files. -+LIGFONTS = .;$TEXMF/fonts/lig// -+ - % Dvips' config.* files (this name should not start with `TEX'!). --TEXCONFIG = .;$TEXMF/dvips// -+TEXCONFIG = $TEXMF/dvips{/ptex,}// - - % Makeindex style (.ist) files. --INDEXSTYLE = .;$TEXMF/makeindex// -+INDEXSTYLE = .;$TEXMF/makeindex{/ptex,}// -+ -+% Font encoding files (.enc). -+ENCFONTS = .;$TEXMF/fonts/enc// -+ -+% CMap files. -+CMAPFONTS = .;$TEXMF/fonts/cmap// -+ -+% Subfont definition files. -+SFDFONTS = .;$TEXMF/fonts/sfd// -+ -+% Opentype outline fonts. -+OPENTYPEFONTS = .;$TEXMF/fonts/opentype// -+ -+% pdftex config files: -+PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// - - % Used by DMP (ditroff-to-mpx), called by makempx -troff. --TRFONTS = /usr/lib/font/devpost -+% The path given is correct for GROFF on Linux installed under /usr. -+% Originally: TRFONTS = /usr/lib/font/devpost -+TRFONTS = /usr/share/groff/current/font/devps - MPSUPPORT = .;$TEXMF/metapost/support - - % For xdvi to find mime.types and .mailcap, if they do not exist in -@@ -295,9 +359,12 @@ - % search formats, you'll want to add their variables here as well. - T4HTINPUTS = .;$TEXMF/tex4ht// - --% xdvik and dvipdfm can share some files with dvips --XDVIINPUTS = .;$TEXMF/{xdvi,dvips}// --DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}// -+% xdvik and dvipdfm can share some files with dvips (for old ones) -+XDVIINPUTS = .;$TEXMF/{xdvi,dvips}{/ptex,}// -+DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}{/ptex,}// -+ -+% Architecture independent executables -+TEXMFSCRIPTS = $TEXMF/scripts// - - %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment. - % KPSE_DOT = . -@@ -312,12 +379,18 @@ - % - % For security reasons, it is better not to have . part of the path. - % --TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@ -+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,,-dist}/web2c{/ptex,}};$TETEXDIR;$TEXMF/web2c;@web2c@ - -+# $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To -+# avoid empty expansions from binaries linked against an earlier -+# version of the library, we set $progname and $engine to something -+# non-empty: -+progname = unset -+engine = unset - - - % Part 2: Non-path options. -- -+ - % Write .log/.dvi/etc. files here, if the current directory is unwritable. - % TEXMFOUTPUT = /tmp - -@@ -348,6 +421,9 @@ - % the %&format construct. - parse_first_line = f - -+% Enable file:line:error style messages. -+file_line_error_style = f -+ - % Enable the mktex... scripts by default? These must be set to 0 or 1. - % Particular programs can and do override these settings, for example - % dvips's -M option. Your first chance to specify whether the scripts -@@ -406,7 +482,7 @@ - font_mem_size = 500000 - - % Total number of fonts. Must be >= 50 and <= 2000 (without tex.ch changes). --font_max = 1000 -+font_max = 2000 - - % Extra space for the hash table of control sequences (which allows 10K - % names as distributed). -@@ -477,3 +553,8 @@ - error_line = 79 - half_error_line = 50 - max_print_line = 79 -+ -+% default file code of JTeX and MuLTeX -+% These override the code specified by TeX command in dumping (making format). -+jtex_filetype = euc -+%ml_input_code = junet diff --git a/japanese/xdvik/files/patch-texk::make::paths.mk b/japanese/xdvik/files/patch-texk::make::paths.mk deleted file mode 100644 index e15a1de2fc3d..000000000000 --- a/japanese/xdvik/files/patch-texk::make::paths.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- xdvik-22.40w/texk/make/paths.mk.orig Sat Jun 12 12:13:14 2004 -+++ xdvik-22.40w/texk/make/paths.mk Sat Jun 12 12:13:04 2004 -@@ -61,7 +61,7 @@ - dvilj_latex2e_macrodir = $(texinputdir)/latex/dvilj - - # mktex.cnf, texmf.cnf, etc. --web2cdir = $(texmf)/web2c -+web2cdir = $(texmf)/web2c/ptex - - # The top-level font directory. - fontdir = $(texmf)/fonts -@@ -80,7 +80,7 @@ - fontnamedir = $(texmf)/fontname - - # For dvips configuration files, psfonts.map, etc. --dvipsdir = $(texmf)/dvips -+dvipsdir = $(texmf)/dvips/ptex - - # For dvips .pro files, gsftopk's render.ps, etc. - psheaderdir = $(dvipsdir) diff --git a/japanese/xdvik/files/patch-texk::xdvik::Makefile.in b/japanese/xdvik/files/patch-texk::xdvik::Makefile.in deleted file mode 100644 index b354cc9b67a5..000000000000 --- a/japanese/xdvik/files/patch-texk::xdvik::Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ ---- xdvik-22.40y1/texk/xdvik/Makefile.in.orig Mon Sep 20 04:09:40 2004 -+++ xdvik-22.40y1/texk/xdvik/Makefile.in Mon Sep 20 04:10:30 2004 -@@ -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.vflib vfontmap.freetype -@@ -167,7 +166,7 @@ - $(INSTALL_DATA) xdvi.1 $(man1dir)/xdvi.$(manext) - $(INSTALL_DATA) $(srcdir)/t1mapper.1 $(man1dir)/t1mapper.$(manext) - $(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext) -- $(INSTALL_DATA) $(srcdir)/texmf/xdvi-teTeX.cfg $(texmf)/xdvi/xdvi.cfg -+ $(INSTALL_DATA) $(srcdir)/texmf/xdvi-teTeX.cfg $(XDVIETCDIR)/xdvi.cfg - if test ! -f $(XDVIETCDIR)/vfontmap; then \ - case "$(vflib_def)" in \ - *-DVF2FT) $(INSTALL_DATA) vfontmap.freetype $(XDVIETCDIR)/vfontmap;; \ diff --git a/japanese/xdvik/files/patch-texk_xdvik_vf2ft.c b/japanese/xdvik/files/patch-texk_xdvik_vf2ft.c deleted file mode 100644 index b06b806673eb..000000000000 --- a/japanese/xdvik/files/patch-texk_xdvik_vf2ft.c +++ /dev/null @@ -1,10 +0,0 @@ ---- xdvik-22.40w/texk/xdvik/vf2ft.c.orig 2013-12-16 09:29:17.000000000 +0100 -+++ xdvik-22.40w/texk/xdvik/vf2ft.c 2013-12-16 09:29:47.000000000 +0100 -@@ -1278,7 +1278,6 @@ - - static int fontsmax=0; - --#include - #include "vf2ft.h" - - int VF_Init(char *vfcap) diff --git a/japanese/xdvik/files/vfontmap.freetype b/japanese/xdvik/files/vfontmap.freetype deleted file mode 100644 index c2538ce57458..000000000000 --- a/japanese/xdvik/files/vfontmap.freetype +++ /dev/null @@ -1,113 +0,0 @@ -% $FreeBSD$ -% -% Sample "vfontmap" (--with-vflib=vf2ft) -% - -% "/font/file/name" -% "tfm name1" "{,unicode,adobejapan,cidv}" -% "tfm name2" "{,unicode,adobejapan,cidv}" - -%%%CIDFONTDIR%%/HiraMinPro-W3.otf -%%MINCHO%% - min - tmin - nmin - jis - jis-v - dm -%%%CIDFONTDIR%%/HiraKakuPro-W6.otf -%%GOTHIC%% - goth - tgoth - ngoth - jisg - jisg-v - dg -%%CIDFONTDIR%%/HiraMinPro-W6.otf - fmin -%%CIDFONTDIR%%/HiraKakuPro-W8.otf - fgoth -%%CIDFONTDIR%%/HiraMaruPro-W4.otf - maru - -% UTF package -%%CIDFONTDIR%%/HiraMinPro-W3.otf - unijmin-h unicode % \UTF font - unijmin-v unicode % \UTF font - cidmin-h adobejapan % \CID font - cidmin-v adobejapan % \CID font - hmr % \CID font - hmrv cidv % \CID font - -%%CIDFONTDIR%%/HiraKakuPro-W6.otf - unijgoth-h unicode % \UTF font - unijgoth-v unicode % \UTF font - cidgoth-h adobejapan % \CID font - cidgoth-v adobejapan % \CID font - hkb % \CID font - hkbv cidv % \CID font - -% OTF package -%%CIDFONTDIR%%/HiraMinPro-W3.otf - otf-ujmr-h unicode - otf-ujmr-v unicode - otf-cjmr-h adobejapan - otf-cjmr-v adobejapan - hminr-h - hminr-v cidv - -%%CIDFONTDIR%%/HiraKakuPro-W3.otf - otf-ujgr-h unicode - otf-ujgr-v unicode - otf-cjgr-h adobejapan - otf-cjgr-v adobejapan - hgothr-h - hgothr-v cidv - -%%CIDFONTDIR%%/HiraMinPro-W6.otf - otf-ujmb-h unicode - otf-ujmb-v unicode - otf-cjmb-h adobejapan - otf-cjmb-v adobejapan - hminb-h - hminb-v cidv - -%%CIDFONTDIR%%/HiraKakuPro-W6.otf - otf-ujgb-h unicode - otf-ujgb-v unicode - otf-cjgb-h adobejapan - otf-cjgb-v adobejapan - hgothb-h - hgothb-v cidv - -%%CIDFONTDIR%%/HiraMaruPro-W4.otf - otf-ujmgr-h unicode - otf-ujmgr-v unicode - otf-cjmgr-h adobejapan - otf-cjmgr-v adobejapan - hmgothr-h - hmgothr-v cidv - -%%CIDFONTDIR%%/MSungStd-Light-Acro.otf - otf-utmr-h unicode - otf-utmr-v unicode - -%%CIDFONTDIR%%/MHei-Medium.otf - otf-utgr-h unicode - otf-utgr-v unicode - -%%CIDFONTDIR%%/STSongStd-Light-Acro.otf - otf-ucmr-h unicode - otf-ucmr-v unicode - -%%CIDFONTDIR%%/STHeiti-Regular.otf - otf-ucgr-h unicode - otf-ucgr-v unicode - -%%CIDFONTDIR%%/HYSMyeongJoStd-Medium-Acro.otf - otf-ukmr-h unicode - otf-ukmr-v unicode - -%%CIDFONTDIR%%/HYGoThic-Medium-UniKS.otf - otf-ukgr-h unicode - otf-ukgr-v unicode diff --git a/japanese/xdvik/pkg-descr b/japanese/xdvik/pkg-descr deleted file mode 100644 index 54155c7c0e3c..000000000000 --- a/japanese/xdvik/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -This is a Japanese dvi file previewer for X which supports: - - 1. dvi file of ASCII Japanese TeX(and pTeX) and NTT jTeX. - 2. Color dvi file.(support color anti-aliasing.) - 3. built-in EPS preview (using ghostscript) - 4. printing (using lpr). - 5. convert dvi -> ps (using japanese/dvipsk by default). - 6. wheel mouse. - -And this requires METAFONT, FreeType2 (vector font library), -and kpathsearch libraries version 3.2 (search library). - -WWW: http://www.nn.iij4u.or.jp/~tutimura/tex/xdvi.html diff --git a/japanese/xdvik/pkg-message b/japanese/xdvik/pkg-message deleted file mode 100644 index 5fe19b42a37e..000000000000 --- a/japanese/xdvik/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -=== IMPORTANT NOTICE === - -- xdvi(1) searches the necessary files from the share/texmf/xdvi/ptex - directory first, and then the share/texmf/xdvi directory. - -- The files in share/texmf/xdvi/ptex should not be edited - directly. Instead, copy them to share/texmf-config/xdvi/ptex and - edit them. xdvi(1) will find the latter files first. diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist deleted file mode 100644 index bcc2e748ab19..000000000000 --- a/japanese/xdvik/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -bin/t1mapper -bin/xdvi -bin/xdvizilla -libexec/xdviprint -%%XDVIETCDIR%%/vfontmap -%%XDVIETCDIR%%/vfontmap.dist -%%XDVIETCDIR%%/xdvi.cfg -%%XDVIETCDIR%%/xdvipaper.dvi2ps-j -%%XDVIETCDIR%%/xdvipaper.dvips -%%XDVIETCDIR%%/xdvipaper.jdvi2kps -%%XDVIETCDIR%%/XDvi -@dirrm %%XDVIETCDIR%% -@exec %%MKTEXLSR%% -@unexec %%MKTEXLSR%%