update to texlive 2008

reorganize port structure

all from maintainer Edd Barrett
This commit is contained in:
steven 2008-10-21 20:57:57 +00:00
parent 45a5036ac6
commit cbd92ff8ac
90 changed files with 1619 additions and 52417 deletions

View File

@ -1,8 +1,6 @@
# $OpenBSD: Makefile,v 1.2 2007/09/07 08:25:18 steven Exp $
# $OpenBSD: Makefile,v 1.3 2008/10/21 20:57:57 steven Exp $
SUBDIR += base
SUBDIR += texmf-docs
SUBDIR += texmf-full
SUBDIR += texmf-minimal
SUBDIR += texmf
.include <bsd.port.subdir.mk>

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2007/09/07 15:26:18 steven Exp $
# $OpenBSD: Makefile.inc,v 1.2 2008/10/21 20:57:57 steven Exp $
CATEGORIES?= print
HOMEPAGE?= http://tug.org/texlive/
@ -10,4 +10,6 @@ PERMIT_PACKAGE_FTP?= Yes
PERMIT_DISTFILES_CDROM?=Yes
PERMIT_DISTFILES_FTP?= Yes
MASTER_SITES= http://students.dec.bournemouth.ac.uk/ebarrett/texlive/distfiles/
V = 2008
MASTER_SITES = http://students.dec.bmth.ac.uk/ebarrett/texlive/distfiles/
MASTER_SITES += ftp://ftp.tug.org/texlive/historic/${V}/

View File

@ -1,41 +1,44 @@
# $OpenBSD: Makefile,v 1.10 2008/06/30 21:38:28 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.11 2008/10/21 20:57:57 steven Exp $
COMMENT= base TeXLive LaTeX distribution
COMMENT = base binaries for TeXLive typesetting distribution
V= 2007
DISTNAME= texlive_base-${V}-src
PKGNAME= texlive_base-${V}p6
SHARED_LIBS= kpathsea 0.0
DIST_V = 20080816
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}
SHARED_LIBS = kpathsea 1.0
WANTLIB= m X11 ICE freetype Xt pthread c Xext fontconfig \
WANTLIB = m X11 ICE freetype Xt pthread c Xext fontconfig \
Xp Xpm SM Xmu z ncurses Xaw Xau Xdmcp stdc++ expat
EXTRACT_SUFX= .tar.bz2
EXTRACT_SUFX = .tar.lzma
BUILD_DEPENDS= :texlive_texmf-minimal-${V}*:print/texlive/texmf-minimal
RUN_DEPENDS= :texlive_texmf-minimal-${V}*:print/texlive/texmf-minimal \
:ruby-*:lang/ruby \
:ghostscript-*:print/ghostscript/gnu \
BUILD_DEPENDS = :lzma-*:archivers/lzma
RUN_DEPENDS = :ghostscript-*:print/ghostscript/gnu \
:detex-*:print/detex \
:dvi2tty-*:print/dvi2tty \
:ps2eps-*:print/ps2eps \
:psutils-*:print/psutils \
:t1utils-*:print/t1utils
LIB_DEPENDS= t1.>=4::devel/t1lib \
:t1utils-*:print/t1utils \
:texlive_texmf-minimal-*:print/texlive/texmf,-main
LIB_DEPENDS = t1.>=4::devel/t1lib \
png.>=3::graphics/png
WRKDIST= ${WRKDIR}/texlive_base-${V}
# Never set SEPARATE_BUILD
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = GNUMAKE=${GMAKE}
WRKBUILD = ${WRKSRC}/work # Can't build in same dir
CONFIGURE_SCRIPT = ../configure
MAKE_ENV = ${CONFIGURE_ENV}
NO_REGRESS = Yes # does not listen to DESTDIR, not worth the effort.
SEPARATE_BUILD= simple
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
NO_REGRESS= Yes # Regress does not listen to DESTDIR, not worth the effort.
CONFIGURE_STYLE= gnu
USE_X11 = Yes
USE_GMAKE = Yes
USE_LIBTOOL = Yes
# Do not link with system icu. TeXLive ICU is not vanilla (Yet)!
CONFIGURE_ARGS+= --with-fontconfig=${X11BASE} \
# Xindy not ready yet
CONFIGURE_ARGS += --with-fontconfig=${X11BASE} \
--with-system-freetype2 \
--with-freetype2-libdir=${X11BASE}/lib \
--with-freetype2-include=${X11BASE}/include \
@ -55,11 +58,30 @@ CONFIGURE_ARGS+= --with-fontconfig=${X11BASE} \
--without-dvi2tty \
--without-ps2eps \
--without-psutils \
--without-t1utils
--without-t1utils \
--disable-threads \
--with-old-mac-fonts \
--without-xindy \
--without-luatex
post-build:
@# Fix for broken metapost
mv ${WRKBUILD}/texk/web2c/mpware/.libs/makempx \
${WRKBUILD}/texk/web2c/mpware/makempx
# Could do with bsd.port.mk understanding lzma
# Also annoyingly loads of .orig files confuse update-patches
do-extract:
cd ${WRKDIR} && \
lzma -dc ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xf -
find ${WRKDIST} -name '*.orig' | xargs rm
post-install:
#mv ${PREFIX}/share/texmf/web2c/fmtutil.cnf \
# ${PREFIX}/share/texmf/web2c/fmtutil.cnf-full
${INSTALL_DATA} ${FILESDIR}/fmtutil.cnf-minimal \
${PREFIX}/share/texmf/web2c
${INSTALL_DATA} ${FILESDIR}/fmtutil.cnf-tetex \
${PREFIX}/share/texmf/web2c
${INSTALL_DATA} ${FILESDIR}/fmtutil.cnf-full \
${PREFIX}/share/texmf/web2c
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/texlive
${INSTALL_DATA} ${FILESDIR}/README.OpenBSD \
${PREFIX}/share/doc/texlive
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (texlive_base-2007-src.tar.bz2) = 2wBunw9j6b5yvVxF0HkF9g==
RMD160 (texlive_base-2007-src.tar.bz2) = 7cfqdAWIhK1toSBG6eLjUMM6nHU=
SHA1 (texlive_base-2007-src.tar.bz2) = 9vAZLCAEc8Nhrt+o00aRqZ5PcGU=
SHA256 (texlive_base-2007-src.tar.bz2) = gTwWjOmVk7vsK8cOkxFi3Ku1aUvIXM4ZxrHB0HxcibM=
SIZE (texlive_base-2007-src.tar.bz2) = 31107749
MD5 (texlive-20080816-source.tar.lzma) = VUKHw+RY2ndu3WhFBgSNRQ==
RMD160 (texlive-20080816-source.tar.lzma) = YpeEsRHA1LyfrJ+RMfYyA9bh3Tg=
SHA1 (texlive-20080816-source.tar.lzma) = cwmGxii9ZYtQYvrOnkAPYSA9a40=
SHA256 (texlive-20080816-source.tar.lzma) = YM8nemAxF1bqUe1+bFC1DUBp9LTAB7EcEUylxkDlo8I=
SIZE (texlive-20080816-source.tar.lzma) = 23175835

View File

@ -0,0 +1,40 @@
TeX Live for OpenBSD - Notes
$OpenBSD: README.OpenBSD,v 1.1 2008/10/21 20:57:57 steven Exp $
----------------------------
There are a number of texmf trees in the OpenBSD packages:
texmf-minimal:
A plain TeX only texmf. Very small, intended for people who do not require
laTeX macros or are only installing texlive to satisfy package dependencies
(approx 6MB).
texmf-tetex:
Add to texmf-minimal for a teTeX like tree, suitable for casual TeX usersi
who do not need many extra macros or ConTeXt (approx 212MB).
texmf-full:
Extra macros and ConTeXt support (approx 186MB).
texmf-doc:
Documentation for all of TeX Live (approx 504MB).
The texmf package contents to not overlap.
Please backup your TeX configuration files (texmf.cnf, fmtutil.cnf, etc.)
before adding/deleting texlive related packages. It is necessary for the
package tools to manipulate these files.
Some requirements of TeX Live were not included as dependancies to make the
package less bloated for people who don't need those features.
As far as I know:
* You should install ruby and ImageMagick if you wish to use ConTeXt.
* For texdoctk you will need p5-Tk
* lua for LuaTeX
If you know more, please mail me: <vext01@gmail.com>
Have fun TeXing.
Edd

View File

@ -0,0 +1,156 @@
# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun Jul 6 03:35:07 2008
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# Originally written by Thomas Esser, 1998. Public domain.
#
# As of TeX Live 2008, the final fmtutil.cnf is generated by
# tlmgr generate fmtutil. You can use
# tlmgr generate fmtutil -localcfg /some/file to make local additions.
# See tlmgr --help for more info.
#
# The format of the table is:
#
# format engine pattern-file arguments
#
# The last part of "arguments" must be the name of the file to run
# initex (or another ini-engine) on. For historical reasons, that
# filename may be preceded by a *, which is ignored.
#
# fmtutil always passes the -ini option to the engine.
#
# If no pattern-file is desired, use -.
#
# Either spaces or tabs can be used as separators.
#
# Other notes :
# 1) tex and amstex just load hyphen.tex. No customization.
# You can have your own customized (via babel's hyphen.cfg)
# formats on top of plain by using "bplain.tex" instead of
# plain.tex (see e.g. bplain.ini file for bplain format).
#
# 2) etex-based formats load language.def, not language.dat.
#
# 3) The symbolic link to the right engines (e.g. bplain -> tex)
# is generated by the "texlinks" script.
#
# 4) usual comments start with "# ", whereas disabled configurations
# start with "#! " in this file.
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
aleph aleph - *aleph.ini
lamed aleph language.dat *lambda.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "amstex.ini" to "bamstex.ini" and "-" to "language.dat"
# if you want babel support in amstex:
amstex pdftex - -translate-file=cp227.tcx *amstex.ini
# Change "pdfamstex.ini" to "pdfbamstex.ini" and "-" "language.dat"
# if you want babel support in pdfamstex:
#! pdfamstex pdftex - -translate-file=cp227.tcx *pdfamstex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# As a special case, texlinks ignores these, but fmtutil still builds them.
# The context startup scripts do not dynamically build the formats.
#
# Unfortunately, dynamically building both the pdftex and xetex cont-en
# fails, due to engine confusion; but it works with fmtutil --all, etc.
#
#! cont-cz pdftex cont-usr.tex -8bit *cont-cz.ini
#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini
cont-en pdftex cont-usr.tex -8bit *cont-en.ini
cont-en xetex cont-usr.tex -8bit *cont-en.ini
#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
#! cont-uk pdftex cont-usr.tex -8bit *cont-uk.ini
#
# mptopdf needs metafun.
mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
metafun mpost - -translate-file=cp227.tcx metafun.mp
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
csplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "eplain.ini" to "ebplain.ini" and "-" to "language.dat"
# if you want babel support in eplain:
eplain pdftex - -translate-file=cp227.tcx *eplain.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
jadetex pdftex language.dat &latex jadetex.ini
pdfjadetex pdftex language.dat &pdflatex pdfjadetex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
# ----------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
#luatex luatex - luatex.ini
#pdfluatex luatex - pdfluatex.ini
#
#lualatex luatex language.dat lualatex.ini
#pdflualatex luatex language.dat pdflualatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
mf mf-nowin - -translate-file=cp227.tcx mf.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
mpost mpost - -translate-file=cp227.tcx mpost.mp
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
omega omega - omega.ini
lambda omega language.dat lambda.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# The pdftex engine always includes the e-TeX extensions.
etex pdftex language.def -translate-file=cp227.tcx *etex.ini
pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
pdftex pdftex - -translate-file=cp227.tcx *pdfetex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
physe pdftex - physe.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
phyzzx pdftex - physe.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "tex.ini -> bplain.ini" and "- -> language.dat"
# if you want babel support in tex. Add -translate-file=cp227.tcx before
# tex.ini if you want to make all characters directly "printable" for
# any \write (instead of ^^xy).
tex tex - tex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
texsis pdftex - -translate-file=cp227.tcx texsis.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
utf8mex pdftex mexconf.tex -enc *utf8mex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
# XeTeX-based formats.
xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-full,v 1.1 2008/10/21 20:57:57 steven Exp $
xmltex pdftex language.dat &latex xmltex.ini
pdfxmltex pdftex language.dat &pdflatex pdfxmltex.ini

View File

@ -0,0 +1,156 @@
# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun Jul 6 03:35:07 2008
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
# Originally written by Thomas Esser, 1998. Public domain.
#
# As of TeX Live 2008, the final fmtutil.cnf is generated by
# tlmgr generate fmtutil. You can use
# tlmgr generate fmtutil -localcfg /some/file to make local additions.
# See tlmgr --help for more info.
#
# The format of the table is:
#
# format engine pattern-file arguments
#
# The last part of "arguments" must be the name of the file to run
# initex (or another ini-engine) on. For historical reasons, that
# filename may be preceded by a *, which is ignored.
#
# fmtutil always passes the -ini option to the engine.
#
# If no pattern-file is desired, use -.
#
# Either spaces or tabs can be used as separators.
#
# Other notes :
# 1) tex and amstex just load hyphen.tex. No customization.
# You can have your own customized (via babel's hyphen.cfg)
# formats on top of plain by using "bplain.tex" instead of
# plain.tex (see e.g. bplain.ini file for bplain format).
#
# 2) etex-based formats load language.def, not language.dat.
#
# 3) The symbolic link to the right engines (e.g. bplain -> tex)
# is generated by the "texlinks" script.
#
# 4) usual comments start with "# ", whereas disabled configurations
# start with "#! " in this file.
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
aleph aleph - *aleph.ini
lamed aleph language.dat *lambda.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "amstex.ini" to "bamstex.ini" and "-" to "language.dat"
# if you want babel support in amstex:
amstex pdftex - -translate-file=cp227.tcx *amstex.ini
# Change "pdfamstex.ini" to "pdfbamstex.ini" and "-" "language.dat"
# if you want babel support in pdfamstex:
#! pdfamstex pdftex - -translate-file=cp227.tcx *pdfamstex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
# As a special case, texlinks ignores these, but fmtutil still builds them.
# The context startup scripts do not dynamically build the formats.
#
# Unfortunately, dynamically building both the pdftex and xetex cont-en
# fails, due to engine confusion; but it works with fmtutil --all, etc.
#
#! cont-cz pdftex cont-usr.tex -8bit *cont-cz.ini
#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini
cont-en pdftex cont-usr.tex -8bit *cont-en.ini
cont-en xetex cont-usr.tex -8bit *cont-en.ini
#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
#! cont-uk pdftex cont-usr.tex -8bit *cont-uk.ini
#
# mptopdf needs metafun.
mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
metafun mpost - -translate-file=cp227.tcx metafun.mp
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
csplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "eplain.ini" to "ebplain.ini" and "-" to "language.dat"
# if you want babel support in eplain:
eplain pdftex - -translate-file=cp227.tcx *eplain.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
jadetex pdftex language.dat &latex jadetex.ini
pdfjadetex pdftex language.dat &pdflatex pdfjadetex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
# ----------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
#luatex luatex - luatex.ini
#pdfluatex luatex - pdfluatex.ini
#
#lualatex luatex language.dat lualatex.ini
#pdflualatex luatex language.dat pdflualatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
mf mf-nowin - -translate-file=cp227.tcx mf.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
mpost mpost - -translate-file=cp227.tcx mpost.mp
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
omega omega - omega.ini
lambda omega language.dat lambda.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
# The pdftex engine always includes the e-TeX extensions.
#etex pdftex language.def -translate-file=cp227.tcx *etex.ini
#pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
#pdftex pdftex - -translate-file=cp227.tcx *pdfetex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
physe pdftex - physe.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
phyzzx pdftex - physe.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "tex.ini -> bplain.ini" and "- -> language.dat"
# if you want babel support in tex. Add -translate-file=cp227.tcx before
# tex.ini if you want to make all characters directly "printable" for
# any \write (instead of ^^xy).
tex tex - tex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
texsis pdftex - -translate-file=cp227.tcx texsis.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
utf8mex pdftex mexconf.tex -enc *utf8mex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
# XeTeX-based formats.
#xetex xetex language.def -etex xetex.ini
#xelatex xetex language.dat -etex xelatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-minimal,v 1.1 2008/10/21 20:57:57 steven Exp $
xmltex pdftex language.dat &latex xmltex.ini
pdfxmltex pdftex language.dat &pdflatex pdfxmltex.ini

View File

@ -0,0 +1,156 @@
# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sun Jul 6 03:35:07 2008
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
# Originally written by Thomas Esser, 1998. Public domain.
#
# As of TeX Live 2008, the final fmtutil.cnf is generated by
# tlmgr generate fmtutil. You can use
# tlmgr generate fmtutil -localcfg /some/file to make local additions.
# See tlmgr --help for more info.
#
# The format of the table is:
#
# format engine pattern-file arguments
#
# The last part of "arguments" must be the name of the file to run
# initex (or another ini-engine) on. For historical reasons, that
# filename may be preceded by a *, which is ignored.
#
# fmtutil always passes the -ini option to the engine.
#
# If no pattern-file is desired, use -.
#
# Either spaces or tabs can be used as separators.
#
# Other notes :
# 1) tex and amstex just load hyphen.tex. No customization.
# You can have your own customized (via babel's hyphen.cfg)
# formats on top of plain by using "bplain.tex" instead of
# plain.tex (see e.g. bplain.ini file for bplain format).
#
# 2) etex-based formats load language.def, not language.dat.
#
# 3) The symbolic link to the right engines (e.g. bplain -> tex)
# is generated by the "texlinks" script.
#
# 4) usual comments start with "# ", whereas disabled configurations
# start with "#! " in this file.
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
aleph aleph - *aleph.ini
lamed aleph language.dat *lambda.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "amstex.ini" to "bamstex.ini" and "-" to "language.dat"
# if you want babel support in amstex:
amstex pdftex - -translate-file=cp227.tcx *amstex.ini
# Change "pdfamstex.ini" to "pdfbamstex.ini" and "-" "language.dat"
# if you want babel support in pdfamstex:
#! pdfamstex pdftex - -translate-file=cp227.tcx *pdfamstex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
# As a special case, texlinks ignores these, but fmtutil still builds them.
# The context startup scripts do not dynamically build the formats.
#
# Unfortunately, dynamically building both the pdftex and xetex cont-en
# fails, due to engine confusion; but it works with fmtutil --all, etc.
#
#! cont-cz pdftex cont-usr.tex -8bit *cont-cz.ini
#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini
cont-en pdftex cont-usr.tex -8bit *cont-en.ini
cont-en xetex cont-usr.tex -8bit *cont-en.ini
#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
#! cont-uk pdftex cont-usr.tex -8bit *cont-uk.ini
#
# mptopdf needs metafun.
mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
metafun mpost - -translate-file=cp227.tcx metafun.mp
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
csplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
#! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "eplain.ini" to "ebplain.ini" and "-" to "language.dat"
# if you want babel support in eplain:
eplain pdftex - -translate-file=cp227.tcx *eplain.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
jadetex pdftex language.dat &latex jadetex.ini
pdfjadetex pdftex language.dat &pdflatex pdfjadetex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
# ----------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
#luatex luatex - luatex.ini
#pdfluatex luatex - pdfluatex.ini
#
#lualatex luatex language.dat lualatex.ini
#pdflualatex luatex language.dat pdflualatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
mf mf-nowin - -translate-file=cp227.tcx mf.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
mpost mpost - -translate-file=cp227.tcx mpost.mp
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
omega omega - omega.ini
lambda omega language.dat lambda.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
# The pdftex engine always includes the e-TeX extensions.
etex pdftex language.def -translate-file=cp227.tcx *etex.ini
pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
pdftex pdftex - -translate-file=cp227.tcx *pdfetex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
physe pdftex - physe.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
phyzzx pdftex - physe.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
# Change "tex.ini -> bplain.ini" and "- -> language.dat"
# if you want babel support in tex. Add -translate-file=cp227.tcx before
# tex.ini if you want to make all characters directly "printable" for
# any \write (instead of ^^xy).
tex tex - tex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
texsis pdftex - -translate-file=cp227.tcx texsis.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
utf8mex pdftex mexconf.tex -enc *utf8mex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
# XeTeX-based formats.
#xetex xetex language.def -etex xetex.ini
#xelatex xetex language.dat -etex xelatex.ini
# ------------------------------------------------------------------
# $Id: fmtutil.cnf-tetex,v 1.1 2008/10/21 20:57:57 steven Exp $
xmltex pdftex language.dat &latex xmltex.ini
pdfxmltex pdftex language.dat &pdflatex pdfxmltex.ini

View File

@ -1,103 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- Makefile.in.orig Tue Dec 26 23:37:34 2006
+++ Makefile.in Thu May 24 15:28:58 2007
@@ -52,6 +52,20 @@ LIBSDIRS = @LIBSDIRS@
# install kpathsea and friends by default.
INSTDIRS = @INSTDIRS@
+# OpenBSD fake env patch
+MK_TEXMFDIST= ${DESTDIR}$(texmf)-dist
+MK_TEXMFLOCAL= ${DESTDIR}$(texmf)-local
+MK_TEXMFSYSVAR= ${DESTDIR}/var
+MK_TEXMFSYSCONFIG= ${DESTDIR}${SYSCONFDIR}/texmf
+MK_TEXMFMAIN= ${DESTDIR}$(texmf)
+
+TETEXENV= TEXMFDIST=${MK_TEXMFDIST} \
+ TEXMFLOCAL=${MK_TEXMFLOCAL} \
+ TEXMFSYSVAR=${MK_TEXMFSYSVAR} \
+ TEXMFSYSCONFIG=${MK_TEXMFSYSCONFIG} \
+ TEXMFMAIN=${MK_TEXMFMAIN} \
+ PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH)
+
default: all
install: all
for dir in $(INSTDIRS); do \
@@ -64,35 +78,41 @@ install: all
fi
@FMU@
@FMU@install-extra:
+
+# MESS - Will be @exec anyway...
# temporary fix for missing links
- - if test -f texk/web2c/omegafonts/omfonts; then \
- cd texk/web2c/omegafonts && $(MAKE) install-links; \
- else :; fi
- $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
- - if test -f $(scriptdir)/mktexlsr; then \
- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/mktexlsr; \
- else :; fi
- - if test -f $(scriptdir)/fmtutil-sys; then \
- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/fmtutil-sys --all; \
- else :; fi
- - if test -f $(scriptdir)/texlinks; then \
- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/texlinks; \
- else :; fi
- - if test -f $(scriptdir)/updmap-sys \
- && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
- then \
- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/updmap-sys; \
- else :; fi
+# - if test -f texk/web2c/omegafonts/omfonts; then \
+# cd texk/web2c/omegafonts && $(MAKE) install-links; \
+# else :; fi
+# $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
+# - if test -f $(scriptdir)/mktexlsr; then \
+# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+# $(scriptdir)/mktexlsr; \
+# else :; fi
+# - if test -f $(scriptdir)/fmtutil-sys; then \
+# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+# $(scriptdir)/fmtutil-sys --all; \
+# else :; fi
+# - if test -f $(scriptdir)/texlinks; then \
+# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+# $(scriptdir)/texlinks; \
+# else :; fi
+# - if test -f $(scriptdir)/updmap-sys \
+# && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+# $(scriptdir)/kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
+# then \
+# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+# $(scriptdir)/updmap-sys; \
+# else :; fi
+ # OpenBSD (All non @exec stuff here, see PLIST for the rest)
+ cd texk/web2c/omegafonts && $(MAKE) install-links
+ ${TETEXENV} $(srcdir)/selfautofix "${DESTDIR}$(bindir)" "${DESTDIR}$(texmf)/web2c"
+
install-exec:
for dir in $(INSTDIRS); do \
echo making $@ in $$dir; \
- (cd $$dir && PATH=$(scriptdir):$(bindir):$(PATH) \
+ (cd $$dir && PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH) \
$(MAKE) $@) || exit 1; \
done
@FMU@
@@ -101,9 +121,9 @@ install-exec:
- if test -f texk/web2c/omegafonts/omfonts; then \
cd texk/web2c/omegafonts && $(MAKE) install-links; \
else :; fi
- - if test -f $(scriptdir)/texlinks; then \
- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/texlinks; \
+ - if test -f ${DESTDIR}$(scriptdir)/texlinks; then \
+ TEXMFMAIN=${DESTDIR}$(texmf) PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH) \
+ ${DESTDIR}$(scriptdir)/texlinks; \
else :; fi
strip: install

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2008/10/21 20:57:57 steven Exp $
--- configure.orig Sun Jul 6 02:06:43 2008
+++ configure Sun Aug 24 12:28:30 2008
@@ -8656,7 +8656,7 @@ else
if test "$with_system_freetype2" = yes; then
if test "x$with_freetype2_libdir" != x; then
- EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir"
+ EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir -lz" # hack just for the OpenBSD build
fi
if test "x$with_freetype2_include" != x; then
EXTRA_FREETYPE2_INCLUDE="-I$with_freetype2_include -I$with_freetype2_include/freetype2"

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libs_configure,v 1.1 2008/10/21 20:57:57 steven Exp $
--- libs/configure.orig Sun Jul 6 02:06:43 2008
+++ libs/configure Sun Aug 24 12:28:30 2008
@@ -6347,7 +6347,7 @@ else
if test "$with_system_freetype2" = yes; then
if test "x$with_freetype2_libdir" != x; then
- EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir"
+ EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir -lz" # hack just for the OpenBSD build
fi
if test "x$with_freetype2_include" != x; then
EXTRA_FREETYPE2_INCLUDE="-I$with_freetype2_include -I$with_freetype2_include/freetype2"

View File

@ -1,14 +1,13 @@
$OpenBSD: patch-libs_icu-xetex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
--- libs/icu-xetex/Makefile.in.orig Fri May 11 12:34:40 2007
+++ libs/icu-xetex/Makefile.in Fri May 11 12:35:58 2007
@@ -174,7 +174,9 @@ $(top_builddir)/config/Makefile.inc: $(srcdir)/config/
$OpenBSD: patch-libs_icu-xetex_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- libs/icu-xetex/Makefile.in.orig Wed Sep 24 15:14:04 2008
+++ libs/icu-xetex/Makefile.in Wed Sep 24 15:15:02 2008
@@ -179,7 +179,8 @@ $(top_builddir)/config/Makefile.inc: $(srcdir)/config/
$(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
-$(RMV) $@
- $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
+ # OpenBSD - Cant use /usr/bin/install at build stage if in sudo build
+ # $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
+ # OpenBSD - cant use install during the build, only fake
+ cp $(top_srcdir)/config/icu-config-top $@
chmod u+w $@
@echo "# Following from @platform_make_fragment@" >> $@
sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@

View File

@ -1,74 +0,0 @@
$OpenBSD: patch-libs_icu-xetex_layout_KernTable_cpp,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
--- libs/icu-xetex/layout/KernTable.cpp.orig Wed Jun 27 09:59:39 2007
+++ libs/icu-xetex/layout/KernTable.cpp Wed Jun 27 10:00:16 2007
@@ -16,8 +16,10 @@
U_NAMESPACE_BEGIN
struct PairInfo {
- le_uint32 key; // sigh, MSVC compiler gags on union here
+ le_uint16 left;
+ le_uint16 right;
le_int16 value; // fword, kern value in funits
+ le_uint32 key() const { return ((le_uint32)SWAPW(left) << 16) | SWAPW(right); }
};
#define KERN_PAIRINFO_SIZE 6
@@ -81,9 +83,24 @@ KernTable::KernTable(const LEFontInstance* font, const
if (coverage & COVERAGE_HORIZONTAL) { // only handle horizontal kerning
const Subtable_0* table = (const Subtable_0*)((char*)subhead + KERN_SUBTABLE_HEADER_SIZE);
nPairs = SWAPW(table->nPairs);
+#if 0 // don't trust these fields as some old TTF fonts have bad data here
searchRange = SWAPW(table->searchRange);
entrySelector = SWAPW(table->entrySelector);
rangeShift = SWAPW(table->rangeShift);
+#else // recompute the binary search header fields
+ if (nPairs == 0) { // this probably shouldn't happen
+ searchRange = entrySelector = 0;
+ } else {
+ searchRange = 1;
+ entrySelector = 0;
+ while (searchRange * 2 <= nPairs) {
+ searchRange *= 2;
+ entrySelector += 1;
+ }
+ }
+ rangeShift = (nPairs - searchRange) * KERN_PAIRINFO_SIZE;
+ searchRange *= KERN_PAIRINFO_SIZE;
+#endif
pairs = (const PairInfo*)((char*)table + KERN_SUBTABLE_0_HEADER_SIZE);
#if DEBUG
@@ -103,9 +120,8 @@ KernTable::KernTable(const LEFontInstance* font, const
const PairInfo* p = pairs;
for (i = 0; i < nPairs; ++i, p = (const PairInfo*)((char*)p+KERN_PAIRINFO_SIZE)) {
- le_uint32 k = SWAPL(p->key);
- le_uint16 left = (k >> 16) & 0xffff;
- le_uint16 right = k & 0xffff;
+ le_uint16 left = SWAPW(p->left);
+ le_uint16 right = SWAPW(p->right);
if (left < 256 && right < 256) {
char c = ids[left];
if (c > 0x20 && c < 0x7f) {
@@ -149,10 +165,11 @@ void KernTable::process(LEGlyphStorage& storage)
// but it is not in sorted order on win32 platforms because of the endianness difference
// so either I have to swap the element each time I examine it, or I have to swap
// all the elements ahead of time and store them in the font
+ // The key() accessor on PairInfo handles the swapping if needed
const PairInfo* p = pairs;
const PairInfo* tp = (const PairInfo*)((char*)p + rangeShift);
- if (key > SWAPL(tp->key)) {
+ if (key > tp->key()) {
p = tp;
}
@@ -165,7 +182,7 @@ void KernTable::process(LEGlyphStorage& storage)
while (probe > KERN_PAIRINFO_SIZE) {
probe >>= 1;
tp = (const PairInfo*)((char*)p + probe);
- le_uint32 tkey = SWAPL(tp->key);
+ le_uint32 tkey = tp->key();
#if DEBUG
fprintf(stdout, " %.3d (%0.8x)\n", ((char*)tp - (char*)pairs)/KERN_PAIRINFO_SIZE, tkey);
fflush(stdout);

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libs_lua51_Makefile,v 1.1 2008/10/21 20:57:57 steven Exp $
--- libs/lua51/Makefile.orig Mon Mar 24 15:47:15 2008
+++ libs/lua51/Makefile Sun Oct 12 12:27:43 2008
@@ -20,9 +20,9 @@ MYLIBS=
# ++ Coco =========
# Default: autodetect gccasm/setjmp/ucontext/fibers context switch method.
-COCOCFLAGS=
+#COCOCFLAGS=
# Force use of setjmp (instead of gccasm).
-#COCOCFLAGS= -DCOCO_USE_SETJMP
+COCOCFLAGS= -DCOCO_USE_SETJMP
# Force use of ucontext (instead of gccasm or setjmp).
#COCOCFLAGS= -DCOCO_USE_UCONTEXT
# Uncomment this if you want to disable support for Coco.

View File

@ -1,137 +0,0 @@
$OpenBSD: patch-libs_xpdf_xpdf_Object_h,v 1.1 2008/04/22 23:55:09 kili Exp $
* CVE-2008-1693: Arbitrary code execution vulnerability in handling of
PDF embedded fonts.
From Debian.
--- libs/xpdf/xpdf/Object.h.orig Mon Jan 16 01:09:26 2006
+++ libs/xpdf/xpdf/Object.h Sun Apr 20 23:27:33 2008
@@ -68,17 +68,18 @@ enum ObjType {
//------------------------------------------------------------------------
#ifdef DEBUG_MEM
-#define initObj(t) ++numAlloc[type = t]
+#define initObj(t) zeroUnion(); ++numAlloc[type = t]
#else
-#define initObj(t) type = t
+#define initObj(t) zeroUnion(); type = t
#endif
class Object {
public:
-
+ // attempt to clear the anonymous union
+ void zeroUnion() { this->name = NULL; }
// Default constructor.
Object():
- type(objNone) {}
+ type(objNone) { zeroUnion(); }
// Initialize an object.
Object *initBool(GBool boolnA)
@@ -220,16 +221,16 @@ class Object { (private)
#include "Array.h"
inline int Object::arrayGetLength()
- { return array->getLength(); }
+ { if (type != objArray) return 0; return array->getLength(); }
inline void Object::arrayAdd(Object *elem)
- { array->add(elem); }
+ { if (type == objArray) array->add(elem); }
inline Object *Object::arrayGet(int i, Object *obj)
- { return array->get(i, obj); }
+ { if (type != objArray) return obj->initNull(); return array->get(i, obj); }
inline Object *Object::arrayGetNF(int i, Object *obj)
- { return array->getNF(i, obj); }
+ { if (type != objArray) return obj->initNull(); return array->getNF(i, obj); }
//------------------------------------------------------------------------
// Dict accessors.
@@ -238,31 +239,31 @@ inline Object *Object::arrayGetNF(int i, Object *obj)
#include "Dict.h"
inline int Object::dictGetLength()
- { return dict->getLength(); }
+ { if (type != objDict) return 0; return dict->getLength(); }
inline void Object::dictAdd(char *key, Object *val)
- { dict->add(key, val); }
+ { if (type == objDict) dict->add(key, val); }
inline GBool Object::dictIs(char *dictType)
- { return dict->is(dictType); }
+ { return (type == objDict) && dict->is(dictType); }
inline GBool Object::isDict(char *dictType)
- { return type == objDict && dictIs(dictType); }
+ { return (type == objDict) && dictIs(dictType); }
inline Object *Object::dictLookup(char *key, Object *obj)
- { return dict->lookup(key, obj); }
+ { if (type != objDict) return obj->initNull(); return dict->lookup(key, obj); }
inline Object *Object::dictLookupNF(char *key, Object *obj)
- { return dict->lookupNF(key, obj); }
+ { if (type != objDict) return obj->initNull(); return dict->lookupNF(key, obj); }
inline char *Object::dictGetKey(int i)
- { return dict->getKey(i); }
+ { if (type != objDict) return NULL; return dict->getKey(i); }
inline Object *Object::dictGetVal(int i, Object *obj)
- { return dict->getVal(i, obj); }
+ { if (type != objDict) return obj->initNull(); return dict->getVal(i, obj); }
inline Object *Object::dictGetValNF(int i, Object *obj)
- { return dict->getValNF(i, obj); }
+ { if (type != objDict) return obj->initNull(); return dict->getValNF(i, obj); }
//------------------------------------------------------------------------
// Stream accessors.
@@ -271,33 +272,33 @@ inline Object *Object::dictGetValNF(int i, Object *obj
#include "Stream.h"
inline GBool Object::streamIs(char *dictType)
- { return stream->getDict()->is(dictType); }
+ { return (type == objStream) && stream->getDict()->is(dictType); }
inline GBool Object::isStream(char *dictType)
- { return type == objStream && streamIs(dictType); }
+ { return (type == objStream) && streamIs(dictType); }
inline void Object::streamReset()
- { stream->reset(); }
+ { if (type == objStream) stream->reset(); }
inline void Object::streamClose()
- { stream->close(); }
+ { if (type == objStream) stream->close(); }
inline int Object::streamGetChar()
- { return stream->getChar(); }
+ { if (type != objStream) return EOF; return stream->getChar(); }
inline int Object::streamLookChar()
- { return stream->lookChar(); }
+ { if (type != objStream) return EOF; return stream->lookChar(); }
inline char *Object::streamGetLine(char *buf, int size)
- { return stream->getLine(buf, size); }
+ { if (type != objStream) return NULL; return stream->getLine(buf, size); }
inline Guint Object::streamGetPos()
- { return stream->getPos(); }
+ { if (type != objStream) return 0; return stream->getPos(); }
inline void Object::streamSetPos(Guint pos, int dir)
- { stream->setPos(pos, dir); }
+ { if (type == objStream) stream->setPos(pos, dir); }
inline Dict *Object::streamGetDict()
- { return stream->getDict(); }
+ { if (type != objStream) return NULL; return stream->getDict(); }
#endif

View File

@ -1,26 +1,23 @@
$OpenBSD: patch-texk_afm2pl_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/afm2pl/Makefile.in.orig Wed Apr 18 13:54:33 2007
+++ texk/afm2pl/Makefile.in Wed Apr 18 13:55:25 2007
@@ -22,16 +22,16 @@ install: install-exec install-data
$OpenBSD: patch-texk_afm2pl_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/afm2pl/Makefile.in.orig Mon Aug 25 00:43:41 2008
+++ texk/afm2pl/Makefile.in Mon Aug 25 00:44:48 2008
@@ -23,14 +23,15 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: $(program)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) $(DESTDIR)/$(bindir)
uninstall-exec:
- rm -f $(bindir)/$(program)
+ rm -f ${DESTDIR}$(bindir)/$(program)
rm -f $(bindir)/$(program)
install-data: $(program).1
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/$(program).1 \
+ $(DESTDIR)/$(man1dir)/$(program).$(manext)
uninstall-data:
- rm -f $(man1dir)/$(program).$(manext)
+ rm -f ${DESTDIR}$(man1dir)/$(program).$(manext)
rm -f $(man1dir)/$(program).$(manext)
kpse_include ../make/clean.mk
kpse_include ../make/config.mk

View File

@ -1,27 +1,28 @@
$OpenBSD: patch-texk_bibtex8_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/bibtex8/Makefile.in.orig Wed Apr 18 14:04:09 2007
+++ texk/bibtex8/Makefile.in Wed Apr 18 14:05:17 2007
@@ -29,17 +29,17 @@ bibtex8: $(OBJS) $(kpathsea)
$OpenBSD: patch-texk_bibtex8_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/bibtex8/Makefile.in.orig Mon Aug 25 00:51:38 2008
+++ texk/bibtex8/Makefile.in Mon Aug 25 00:53:51 2008
@@ -30,17 +30,18 @@ bibtex8: $(OBJS) $(kpathsea)
$(kpathsea_link) $(OBJS) $(LOADLIBES)
install: all install-data install-doc
- -$(top_srcdir)/../mkinstalldirs $(bindir)
- -$(INSTALL_LIBTOOL_PROG) bibtex8 $(bindir)/bibtex8
+ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) bibtex8 ${DESTDIR}$(bindir)/bibtex8
+ -$(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ -$(INSTALL_LIBTOOL_PROG) bibtex8 $(DESTDIR)/$(bindir)/bibtex8
install-data:
- -$(top_srcdir)/../mkinstalldirs $(texmf)/bibtex/csf
- -$(INSTALL) -m 644 $(srcdir)/csf/*.csf $(texmf)/bibtex/csf
+ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/bibtex/csf
+ $(INSTALL) -m 644 $(srcdir)/csf/*.csf ${DESTDIR}$(texmf)/bibtex/csf
+ -$(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(texmf)/bibtex/csf
+ -$(INSTALL) -m 644 $(srcdir)/csf/*.csf $(DESTDIR)/$(texmf)/bibtex/csf
install-doc:
- -$(top_srcdir)/../mkinstalldirs $(texmf)/doc/bibtex8
+ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/doc/bibtex8
+ -$(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(texmf)/doc/bibtex8
for i in 00readme.txt HISTORY csfile.txt file_id.diz ; \
- do $(INSTALL) -m 644 $(srcdir)/$$i $(texmf)/doc/bibtex8; \
+ do $(INSTALL) -m 644 $(srcdir)/$$i ${DESTDIR}$(texmf)/doc/bibtex8; \
+ do $(INSTALL) -m 644 $(srcdir)/$$i \
+ $(DESTDIR)/$(texmf)/doc/bibtex8; \
done
kpse_include ../make/tkpathsea.mk

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-texk_cjkutils_conv_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/cjkutils/conv/Makefile.in.orig Wed Apr 18 18:58:48 2007
+++ texk/cjkutils/conv/Makefile.in Wed Apr 18 18:59:45 2007
@@ -23,10 +23,10 @@ sjisconv: sjisconv.o
install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_PROGRAM) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir); done
uninstall-exec:
- for p in $(programs); do $(RM) $(bindir)/$$p; done
+ for p in $(programs); do $(RM) ${DESTDIR}$(bindir)/$$p; done
install-data:
uninstall-data:

View File

@ -1,26 +1,24 @@
$OpenBSD: patch-texk_cjkutils_hbf2gf_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/cjkutils/hbf2gf/Makefile.in.orig Wed Apr 18 19:00:52 2007
+++ texk/cjkutils/hbf2gf/Makefile.in Wed Apr 18 19:01:31 2007
@@ -43,16 +43,16 @@ $(CWEAVE):
$OpenBSD: patch-texk_cjkutils_hbf2gf_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/cjkutils/hbf2gf/Makefile.in.orig Mon Aug 25 15:51:36 2008
+++ texk/cjkutils/hbf2gf/Makefile.in Mon Aug 25 15:52:40 2008
@@ -44,14 +44,16 @@ $(CWEAVE):
install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do $(RM) $(bindir)/$$p; done
+ for p in $(programs); do $(RM) ${DESTDIR}$(bindir)/$$p; done
for p in $(programs); do $(RM) $(bindir)/$$p; done
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/$(program).1 \
+ $(DESTDIR)/$(man1dir)/$(program).$(manext)
uninstall-data:
- $(RM) $(man1dir)/$(program).$(manext)
+ $(RM) ${DESTDIR}$(man1dir)/$(program).$(manext)
$(RM) $(man1dir)/$(program).$(manext)
kpse_include ../make/dist.mk
kpse_include ../make/clean.mk

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-texk_cjkutils_scripts_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/cjkutils/scripts/Makefile.in.orig Wed Apr 18 19:44:57 2007
+++ texk/cjkutils/scripts/Makefile.in Wed Apr 18 19:45:22 2007
@@ -14,12 +14,12 @@ default all:
install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
- ln -sf gbklatex $(scriptdir)/bg5+latex
- ln -sf gbkpdflatex $(scriptdir)/bg5+pdflatex
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(scriptdir); done
+ ln -sf gbklatex ${DESTDIR}$(scriptdir)/bg5+latex
+ ln -sf gbkpdflatex ${DESTDIR}$(scriptdir)/bg5+pdflatex
uninstall-exec:
- for p in $(scripts); do $(RM) $(scriptdir)/$$p; done
+ for p in $(scripts); do $(RM) ${DESTDIR}$(scriptdir)/$$p; done
install-data:
uninstall-data:

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-texk_detex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/detex/Makefile.in.orig Wed Apr 18 20:37:27 2007
+++ texk/detex/Makefile.in Wed Apr 18 20:37:56 2007
@@ -39,13 +39,13 @@ distclean::
install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: $(program)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
uninstall-exec:
- rm -f $(bindir)/$(program)
+ rm -f ${DESTDIR}$(bindir)/$(program)
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/detex.man $(man1dir)/detex.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/detex.man ${DESTDIR}$(man1dir)/detex.$(manext)
uninstall-data:
- rm -f $(man1dir)/detex.$(manext)
+ rm -f ${DESTDIR}$(man1dir)/detex.$(manext)
depend info dvi check:

View File

@ -1,31 +1,25 @@
$OpenBSD: patch-texk_dtl_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/dtl/Makefile.in.orig Sat Apr 21 17:33:16 2007
+++ texk/dtl/Makefile.in Sat Apr 21 17:38:50 2007
@@ -29,19 +29,19 @@ install: install-exec install-data
$OpenBSD: patch-texk_dtl_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/dtl/Makefile.in.orig Mon Aug 25 15:57:18 2008
+++ texk/dtl/Makefile.in Mon Aug 25 15:58:15 2008
@@ -30,15 +30,16 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
for p in $(programs); do rm -f $(bindir)/$$p; done
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/dv2dt.man $(man1dir)/dv2dt.1
- $(INSTALL_DATA) $(srcdir)/dt2dv.man $(man1dir)/dt2dv.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dv2dt.man ${DESTDIR}$(man1dir)/dv2dt.1
+ $(INSTALL_DATA) $(srcdir)/dt2dv.man ${DESTDIR}$(man1dir)/dt2dv.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dv2dt.man $(DESTDIR)/$(man1dir)/dv2dt.1
+ $(INSTALL_DATA) $(srcdir)/dt2dv.man $(DESTDIR)/$(man1dir)/dt2dv.1
uninstall-data:
- rm -f $(man1dir)/dv2dt.1
- rm -f $(man1dir)/dt2dv.1
+ rm -f ${DESTDIR}$(man1dir)/dv2dt.1
+ rm -f ${DESTDIR}$(man1dir)/dt2dv.1
kpse_include ../make/dist.mk
kpse_include ../make/config.mk
rm -f $(man1dir)/dv2dt.1

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-texk_dvi2tty_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/dvi2tty/Makefile.in.orig Sat Apr 21 17:35:32 2007
+++ texk/dvi2tty/Makefile.in Sat Apr 21 17:38:01 2007
@@ -20,17 +20,17 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: $(programs)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
install-data: dvi2tty.1
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/dvi2tty.1 $(man1dir)/dvi2tty.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dvi2tty.1 ${DESTDIR}$(man1dir)/dvi2tty.$(manext)
uninstall-data:
- rm -f $(man1dir)/dvi2tty.$(manext)
+ rm -f ${DESTDIR}$(man1dir)/dvi2tty.$(manext)
pre-dist-$(distname):
post-dist-$(distname):

View File

@ -1,27 +1,23 @@
$OpenBSD: patch-texk_dvidvi_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
--- texk/dvidvi/Makefile.in.orig Sat Apr 21 17:39:12 2007
+++ texk/dvidvi/Makefile.in Sat Apr 21 17:42:36 2007
@@ -25,17 +25,17 @@ install: install-exec install-data
$OpenBSD: patch-texk_dvidvi_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/dvidvi/Makefile.in.orig Mon Aug 25 16:00:56 2008
+++ texk/dvidvi/Makefile.in Mon Aug 25 16:01:53 2008
@@ -26,14 +26,15 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
for p in $(programs); do rm -f $(bindir)/$$p; done
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/dvidvi.1 $(man1dir)/dvidvi.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dvidvi.1 ${DESTDIR}$(man1dir)/dvidvi.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dvidvi.1 $(DESTDIR)/$(man1dir)/dvidvi.1
uninstall-data:
- rm -f $(man1dir)/dvidvi.1
+ rm -f ${DESTDIR}$(man1dir)/dvidvi.1
kpse_include ../make/dist.mk
kpse_include ../make/config.mk
rm -f $(man1dir)/dvidvi.1

View File

@ -1,54 +1,56 @@
$OpenBSD: patch-texk_dviljk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/dviljk/Makefile.in.orig Sat Apr 21 17:43:02 2007
+++ texk/dviljk/Makefile.in Sat Apr 21 17:44:56 2007
@@ -52,28 +52,28 @@ install: install-exec install-data
$OpenBSD: patch-texk_dviljk_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/dviljk/Makefile.in.orig Wed Aug 27 09:28:36 2008
+++ texk/dviljk/Makefile.in Wed Aug 27 09:32:24 2008
@@ -59,35 +59,39 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
test ! -f $(program) \
- || $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+ || $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ || $(INSTALL_LIBTOOL_PROG) $(program) $(DESTDIR)/$(bindir)
test ! -f $(program2p) \
- || $(INSTALL_LIBTOOL_PROG) $(program2p) $(bindir)
+ || $(INSTALL_LIBTOOL_PROG) $(program2p) ${DESTDIR}$(bindir)
+ || $(INSTALL_LIBTOOL_PROG) $(program2p) $(DESTDIR)/$(bindir)
test ! -f $(program4) \
- || $(INSTALL_LIBTOOL_PROG) $(program4) $(bindir)
+ || $(INSTALL_LIBTOOL_PROG) $(program4) ${DESTDIR}$(bindir)
+ || $(INSTALL_LIBTOOL_PROG) $(program4) $(DESTDIR)/$(bindir)
test ! -f $(program4l) \
- || $(INSTALL_LIBTOOL_PROG) $(program4l) $(bindir)
- $(INSTALL_SCRIPT) $(srcdir)/dvihp $(scriptdir)/dvihp
- cd $(bindir) && (rm -f $(program6); $(LN) $(program4) $(program6))
+ || $(INSTALL_LIBTOOL_PROG) $(program4l) ${DESTDIR}$(bindir)
+ $(INSTALL_SCRIPT) $(srcdir)/dvihp ${DESTDIR}$(scriptdir)/dvihp
+ cd ${DESTDIR}$(bindir) && (rm -f $(program6); $(LN) $(program4) $(program6))
+ || $(INSTALL_LIBTOOL_PROG) $(program4l) $(DESTDIR)/$(bindir)
+ $(INSTALL_SCRIPT) $(srcdir)/dvihp $(DESTDIR)/$(scriptdir)/dvihp
+ cd $(DESTDIR)/$(bindir) && (rm -f $(program6); \
+ $(LN) $(program4) $(program6))
uninstall-exec:
- cd $(bindir); rm -f $(programs)
+ cd ${DESTDIR}$(bindir); rm -f $(programs)
cd $(bindir); rm -f $(programs)
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/dvilj.man $(man1dir)/dvilj.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dvilj.man ${DESTDIR}$(man1dir)/dvilj.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dvilj.man \
+ $(DESTDIR)/$(man1dir)/dvilj.$(manext)
for p in dvilj2p dvilj4 dvilj4l dvilj6; do \
- rm -f $(man1dir)/$$p.$(manext); \
- ln -s dvilj.$(manext) $(man1dir)/$$p.$(manext); \
+ rm -f ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ ln -s dvilj.$(manext) ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ rm -f $(DESTDIR)/$(man1dir)/$$p.$(manext); \
+ ln -s dvilj.$(manext) $(DESTDIR)/$(man1dir)/$$p.$(manext); \
done
- $(INSTALL_DATA) $(srcdir)/dvihp.man $(man1dir)/dvihp.$(manext)
+ $(INSTALL_DATA) $(srcdir)/dvihp.man ${DESTDIR}$(man1dir)/dvihp.$(manext)
+ $(INSTALL_DATA) $(srcdir)/dvihp.man \
+ $(DESTDIR)/$(man1dir)/dvihp.$(manext)
# It seems simplest to keep this separate. Use find and cpio instead of
# just cp -r in case the source hierarchy is cvs- or rcs-ified.
@@ -83,7 +83,7 @@ install-fonts:
find fonts -name \( "*.tfm" -o -name "*.vf" \) -print | cpio -pld $(texmf)
# Use "" to quote wildcards because backslash is a directory separator
# on MS-DOS and MS-Windows.
install-fonts:
- find fonts -name \( "*.tfm" -o -name "*.vf" \) -print | cpio -pld $(texmf)
+ find fonts -name \( "*.tfm" -o -name "*.vf" \) -print | cpio \
+ -pld $(DESTDIR)/$(texmf)
uninstall-data:
- rm -f $(man1dir)/dvilj.$(manext)
+ rm -f ${DESTDIR}$(man1dir)/dvilj.$(manext)
distname = dviljk
rm -f $(man1dir)/dvilj.$(manext)

View File

@ -1,40 +1,35 @@
$OpenBSD: patch-texk_dvipdfm_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
--- texk/dvipdfm/Makefile.in.orig Sat Apr 21 17:45:31 2007
+++ texk/dvipdfm/Makefile.in Sat Apr 21 17:46:16 2007
@@ -49,24 +49,24 @@ distclean::
$OpenBSD: patch-texk_dvipdfm_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/dvipdfm/Makefile.in.orig Mon Aug 25 16:07:56 2008
+++ texk/dvipdfm/Makefile.in Mon Aug 25 16:09:41 2008
@@ -51,21 +51,24 @@ distclean::
$(RM) config.h
install-exec:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
- $(INSTALL_LIBTOOL_PROG) ebb $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) $(DESTDIR)/$(bindir)
# don't install ebb; we use the compatible version in dvipdfmx.
# but i guess we may as well keep building it for now. --karl, 23may08.
# $(INSTALL_LIBTOOL_PROG) ebb $(bindir)
- $(INSTALL_SCRIPT) $(srcdir)/dvipdft $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) ebb ${DESTDIR}$(bindir)
+ $(INSTALL_SCRIPT) $(srcdir)/dvipdft ${DESTDIR}$(bindir)
+ $(INSTALL_SCRIPT) $(srcdir)/dvipdft $(DESTDIR)/$(bindir)
uninstall-exec:
- cd $(bindir); rm -f $(programs)
+ cd ${DESTDIR}$(bindir); rm -f $(programs)
cd $(bindir); rm -f $(programs)
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
- $(INSTALL_DATA) $(srcdir)/dvipdft.1 $(man1dir)/dvipdft.$(manext)
- $(INSTALL_DATA) $(srcdir)/ebb.1 $(man1dir)/ebb.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
+ $(INSTALL_DATA) $(srcdir)/dvipdft.1 ${DESTDIR}$(man1dir)/dvipdft.$(manext)
+ $(INSTALL_DATA) $(srcdir)/ebb.1 ${DESTDIR}$(man1dir)/ebb.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/$(program).1 \
+ $(DESTDIR)/$(man1dir)/$(program).$(manext)
+ $(INSTALL_DATA) $(srcdir)/dvipdft.1 \
+ $(DESTDIR)/$(man1dir)/dvipdft.$(manext)
+ $(INSTALL_DATA) $(srcdir)/ebb.1 \
+ $(DESTDIR)/$(man1dir)/ebb.$(manext)
uninstall-data:
- rm -f $(man1dir)/dvilj.$(manext)
- rm -f $(man1dir)/dvipdft.$(manext)
- rm -f $(man1dir)/ebb.$(manext)
+ rm -f ${DESTDIR}$(man1dir)/dvilj.$(manext)
+ rm -f ${DESTDIR}$(man1dir)/dvipdft.$(manext)
+ rm -f ${DESTDIR}$(man1dir)/ebb.$(manext)
kpse_include ../make/config.mk
rm -f $(man1dir)/dvilj.$(manext)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-texk_dvipng_configure,v 1.1 2008/10/21 20:57:57 steven Exp $
--- texk/dvipng/configure.orig Sun Jul 6 14:13:15 2008
+++ texk/dvipng/configure Sun Aug 24 12:28:30 2008
@@ -6878,7 +6878,7 @@ else
if test "$with_system_freetype2" = yes; then
if test "x$with_freetype2_libdir" != x; then
- EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir"
+ EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir -lz" # hack just for the OpenBSD build
fi
if test "x$with_freetype2_include" != x; then
EXTRA_FREETYPE2_INCLUDE="-I$with_freetype2_include -I$with_freetype2_include/freetype2"

View File

@ -1,28 +1,24 @@
$OpenBSD: patch-texk_dvipos_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/dvipos/Makefile.in.orig Sat Apr 21 17:49:47 2007
+++ texk/dvipos/Makefile.in Sat Apr 21 17:50:20 2007
@@ -22,18 +22,18 @@ install: install-exec install-data
$OpenBSD: patch-texk_dvipos_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/dvipos/Makefile.in.orig Wed Aug 27 09:36:31 2008
+++ texk/dvipos/Makefile.in Wed Aug 27 09:37:08 2008
@@ -23,15 +23,16 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
for p in $(programs); do rm -f $(bindir)/$$p; done
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/dvipos.1 $(man1dir)/dvipos.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dvipos.1 ${DESTDIR}$(man1dir)/dvipos.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dvipos.1 $(DESTDIR)/$(man1dir)/dvipos.1
uninstall-data:
- rm -f $(man1dir)/dvipos.1
+ rm -f ${DESTDIR}$(man1dir)/dvipos.1
kpse_include ../make/dist.mk
kpse_include ../make/config.mk
rm -f $(man1dir)/dvipos.1

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-texk_dvipsk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/dvipsk/Makefile.in.orig Sat Apr 21 17:50:40 2007
+++ texk/dvipsk/Makefile.in Sat Apr 21 17:53:12 2007
@@ -85,18 +85,18 @@ install: install-exec install-data
$OpenBSD: patch-texk_dvipsk_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/dvipsk/Makefile.in.orig Wed Aug 27 09:38:10 2008
+++ texk/dvipsk/Makefile.in Wed Aug 27 09:40:14 2008
@@ -89,10 +89,11 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
@ -9,58 +9,46 @@ $OpenBSD: patch-texk_dvipsk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
- rm -f $(bindir)/o$(program)
- ln -s $(program) $(bindir)/o$(program)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ rm -f ${DESTDIR}$(bindir)/o$(program)
+ ln -s $(program) ${DESTDIR}$(bindir)/o$(program)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
+ rm -f $(DESTDIR)/$(bindir)/o$(program)
+ ln -s $(program) $(DESTDIR)/$(bindir)/o$(program)
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
- rm -f $(bindir)/o$(program)
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+ rm -f ${DESTDIR}$(bindir)/o$(program)
for p in $(programs); do rm -f $(bindir)/$$p; done
rm -f $(bindir)/o$(program)
@@ -100,20 +101,26 @@ uninstall-exec:
# config.ps, encoding files, etc., are not installed here, since they
# need to go through the usual package mechanism.
install-data: $(program).info
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(infodir) $(psheaderdir)/base
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(infodir) ${DESTDIR}$(psheaderdir)/base
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir) \
+ $(DESTDIR)/$(infodir) $(DESTDIR)/$(psheaderdir)/base
# PostScript prologues and encodings.
- for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
+ for h in $(prologues); do $(INSTALL_DATA) $$h ${DESTDIR}$(psheaderdir)/base/$$h; done
# cd $(srcdir)/reencode && \
# for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
# config.ps. Any one config.ps will be wrong for most people, so don't
@@ -114,27 +114,27 @@ install-data: $(program).info
# else true; fi
+ for h in $(prologues); do $(INSTALL_DATA) $$h \
+ $(DESTDIR)/$(psheaderdir)/base/$$h; done
# Info files.
cd $(srcdir) && for i in $(program).i*; do \
- $(INSTALL_DATA) $$i $(infodir)/$$i; done
+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
- $(INSTALL_DATA) $(srcdir)/$(program).i* $(infodir)/
+ $(INSTALL_DATA) $(srcdir)/$(program).i* $(DESTDIR)/$(infodir)/
# Man pages.
- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
- rm -f $(man1dir)/o$(program).$(manext)
- ln -s $(program).$(manext) $(man1dir)/o$(program).$(manext)
- $(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(man1dir)/afm2tfm.$(manext)
+ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
+ rm -f ${DESTDIR}$(man1dir)/o$(program).$(manext)
+ ln -s $(program).$(manext) ${DESTDIR}$(man1dir)/o$(program).$(manext)
+ $(INSTALL_DATA) $(srcdir)/afm2tfm.1 ${DESTDIR}$(man1dir)/afm2tfm.$(manext)
# TeX macros.
# cd $(srcdir)/tex && for m in *.tex; do \
# $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done
+ $(INSTALL_DATA) $(srcdir)/$(program).1 \
+ $(DESTDIR)/$(man1dir)/$(program).$(manext)
+ rm -f $(DESTDIR)/$(man1dir)/o$(program).$(manext)
+ ln -s $(program).$(manext) \
+ $(DESTDIR)/$(man1dir)/o$(program).$(manext)
+ $(INSTALL_DATA) $(srcdir)/afm2tfm.1 \
+ $(DESTDIR)/$(man1dir)/afm2tfm.$(manext)
# Post.
$(POST_INSTALL)
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --info-dir=$(infodir) $(infodir)/$(program).info; \
+ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/$(program).info; \
+ install-info --info-dir=$(DESTDIR)/$(infodir) \
+ $(DESTDIR)/$(infodir)/$(program).info; \
else true; fi
uninstall-data:
$(PRE_UNINSTALL)
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --delete --info-dir=$(infodir) $(infodir)/$(program).info; \
+ install-info --delete --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/$(program).info; \
else true; fi
$(NORMAL_UNINSTALL)
- rm -f $(infodir)/dvips.i*
+ rm -f ${DESTDIR}$(infodir)/dvips.i*
# for h in $(prologues); do rm -f $(psheaderdir)/base/$$h; done
# cd $(srcdir)/reencode && for e in *.enc; do rm -f $(psheaderdir)/base/$$e; \
# done

View File

@ -1,30 +1,26 @@
$OpenBSD: patch-texk_gsftopk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/gsftopk/Makefile.in.orig Tue Jan 17 21:41:51 2006
+++ texk/gsftopk/Makefile.in Sat Apr 21 18:20:21 2007
@@ -34,18 +34,18 @@ install: install-exec install-data
$OpenBSD: patch-texk_gsftopk_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/gsftopk/Makefile.in.orig Wed Aug 27 09:41:10 2008
+++ texk/gsftopk/Makefile.in Wed Aug 27 09:41:42 2008
@@ -35,15 +35,17 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: $(program)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) $(DESTDIR)/$(bindir)
uninstall-exec:
- rm -f $(bindir)/$(program)
+ rm -f ${DESTDIR}$(bindir)/$(program)
rm -f $(bindir)/$(program)
install-data: gsftopk.1
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(gsftopkpsheaderdir)
- $(INSTALL_DATA) gsftopk.1 $(man1dir)/gsftopk.$(manext)
- $(INSTALL_DATA) $(srcdir)/render.ps $(gsftopkpsheaderdir)/render.ps
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(gsftopkpsheaderdir)
+ $(INSTALL_DATA) gsftopk.1 ${DESTDIR}$(man1dir)/gsftopk.$(manext)
+ $(INSTALL_DATA) $(srcdir)/render.ps ${DESTDIR}$(gsftopkpsheaderdir)/render.ps
+ $(SHELL) $(top_srcdir)/../mkinstalldirs \
+ $(DESTDIR)/$(man1dir) $(DESTDIR)/$(gsftopkpsheaderdir)
+ $(INSTALL_DATA) gsftopk.1 $(DESTDIR)/$(man1dir)/gsftopk.$(manext)
+ $(INSTALL_DATA) $(srcdir)/render.ps \
+ $(DESTDIR)/$(gsftopkpsheaderdir)/render.ps
uninstall-data:
- rm -f $(man1dir)/gsftopk.$(manext)
- rm -f $(gsftopkpsheaderdir)/render.ps
+ rm -f ${DESTDIR}$(man1dir)/gsftopk.$(manext)
+ rm -f ${DESTDIR}$(gsftopkpsheaderdir)/render.ps
kpse_include ../make/clean.mk
rm -f $(man1dir)/gsftopk.$(manext)
rm -f $(gsftopkpsheaderdir)/render.ps

View File

@ -1,46 +1,36 @@
$OpenBSD: patch-texk_kpathsea_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
--- texk/kpathsea/Makefile.in.orig Sun Jan 7 23:31:48 2007
+++ texk/kpathsea/Makefile.in Tue Apr 17 19:21:33 2007
@@ -154,73 +154,73 @@ install: install-exec install-data
$OpenBSD: patch-texk_kpathsea_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/kpathsea/Makefile.in.orig Sun Aug 24 20:26:34 2008
+++ texk/kpathsea/Makefile.in Sun Aug 24 21:25:06 2008
@@ -129,35 +129,40 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: kpsewhich
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir) \
- $(libdir) $(web2cdir)
- if grep 'original mktexpk --' $(scriptdir)/mktexpk >/dev/null 2>&1\
- || test ! -r $(scriptdir)/mktexpk; then \
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir) \
+ $(DESTDIR)/$(scriptdir) $(DESTDIR)/$(libdir) $(DESTDIR)/$(web2cdir)
if grep 'original mktexpk --' $(scriptdir)/mktexpk >/dev/null 2>&1\
|| test ! -r $(scriptdir)/mktexpk; then \
- $(INSTALL_SCRIPT) $(srcdir)/mktexpk $(scriptdir)/mktexpk; \
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir) \
+ ${DESTDIR}$(libdir) ${DESTDIR}$(web2cdir)
+ if grep 'original mktexpk --' ${DESTDIR}$(scriptdir)/mktexpk >/dev/null 2>&1\
+ || test ! -r ${DESTDIR}$(scriptdir)/mktexpk; then \
+ $(INSTALL_SCRIPT) $(srcdir)/mktexpk ${DESTDIR}$(scriptdir)/mktexpk; \
+ $(INSTALL_SCRIPT) $(srcdir)/mktexpk $(DESTDIR)/$(scriptdir)/mktexpk; \
else true; fi
- if grep 'original mktexmf --' $(scriptdir)/mktexmf >/dev/null 2>&1\
- || test ! -r $(scriptdir)/mktexmf; then \
if grep 'original mktexmf --' $(scriptdir)/mktexmf >/dev/null 2>&1\
|| test ! -r $(scriptdir)/mktexmf; then \
- $(INSTALL_SCRIPT) $(srcdir)/mktexmf $(scriptdir)/mktexmf; \
+ if grep 'original mktexmf --' ${DESTDIR}$(scriptdir)/mktexmf >/dev/null 2>&1\
+ || test ! -r ${DESTDIR}$(scriptdir)/mktexmf; then \
+ $(INSTALL_SCRIPT) $(srcdir)/mktexmf ${DESTDIR}$(scriptdir)/mktexmf; \
+ $(INSTALL_SCRIPT) $(srcdir)/mktexmf $(DESTDIR)/$(scriptdir)/mktexmf; \
else true; fi
- if grep 'original mktextfm --' $(scriptdir)/mktextfm >/dev/null 2>&1\
- || test ! -r $(scriptdir)/mktextfm; then \
if grep 'original mktextfm --' $(scriptdir)/mktextfm >/dev/null 2>&1\
|| test ! -r $(scriptdir)/mktextfm; then \
- $(INSTALL_SCRIPT) $(srcdir)/mktextfm $(scriptdir)/mktextfm; \
+ if grep 'original mktextfm --' ${DESTDIR}$(scriptdir)/mktextfm >/dev/null 2>&1\
+ || test ! -r ${DESTDIR}$(scriptdir)/mktextfm; then \
+ $(INSTALL_SCRIPT) $(srcdir)/mktextfm ${DESTDIR}$(scriptdir)/mktextfm; \
+ $(INSTALL_SCRIPT) $(srcdir)/mktextfm \
+ $(DESTDIR)/$(scriptdir)/mktextfm; \
else true; fi
- if grep 'original mktexlsr --' $(scriptdir)/mktexlsr >/dev/null 2>&1\
- || test ! -r $(scriptdir)/mktexlsr; then \
if grep 'original mktexlsr --' $(scriptdir)/mktexlsr >/dev/null 2>&1\
|| test ! -r $(scriptdir)/mktexlsr; then \
- $(INSTALL_SCRIPT) $(srcdir)/mktexlsr $(scriptdir)/mktexlsr; \
+ if grep 'original mktexlsr --' ${DESTDIR}$(scriptdir)/mktexlsr >/dev/null 2>&1\
+ || test ! -r ${DESTDIR}$(scriptdir)/mktexlsr; then \
+ $(INSTALL_SCRIPT) $(srcdir)/mktexlsr ${DESTDIR}$(scriptdir)/mktexlsr; \
+ $(INSTALL_SCRIPT) $(srcdir)/mktexlsr \
+ $(DESTDIR)/$(scriptdir)/mktexlsr; \
else true; fi
# if grep 'original mktexfmt --' $(scriptdir)/mktexfmt > /dev/null 2>&1\
# || test ! -r $(scriptdir)/mktexfmt; then \
# $(INSTALL_SCRIPT) $(srcdir)/mktexfmt $(scriptdir)/mktexfmt; \
# else true; fi
- $(INSTALL_DATA) $(srcdir)/mktex.opt $(web2cdir)/mktex.opt
- $(INSTALL_SCRIPT) $(srcdir)/mktexdir $(web2cdir)/mktexdir
- $(INSTALL_DATA) $(srcdir)/mktexdir.opt $(web2cdir)/mktexdir.opt
@ -52,68 +42,61 @@ $OpenBSD: patch-texk_kpathsea_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper E
- $(INSTALL_PROGRAM) kpsestat $(bindir)
- $(INSTALL_PROGRAM) kpseaccess $(bindir)
- $(INSTALL_PROGRAM) kpsereadlink $(bindir)
+ $(INSTALL_DATA) $(srcdir)/mktex.opt ${DESTDIR}$(web2cdir)/mktex.opt
+ $(INSTALL_SCRIPT) $(srcdir)/mktexdir ${DESTDIR}$(web2cdir)/mktexdir
+ $(INSTALL_DATA) $(srcdir)/mktexdir.opt ${DESTDIR}$(web2cdir)/mktexdir.opt
+ $(INSTALL_SCRIPT) $(srcdir)/mktexnam ${DESTDIR}$(web2cdir)/mktexnam
+ $(INSTALL_DATA) $(srcdir)/mktexnam.opt ${DESTDIR}$(web2cdir)/mktexnam.opt
+ $(INSTALL_SCRIPT) $(srcdir)/mktexupd ${DESTDIR}$(web2cdir)/mktexupd
+ $(INSTALL_LIBTOOL_LIBS) lib$(library).la ${DESTDIR}$(libdir)
+ $(INSTALL_LIBTOOL_PROG) kpsewhich ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) kpsestat ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) kpseaccess ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) kpsereadlink ${DESTDIR}$(bindir)
+ $(INSTALL_DATA) $(srcdir)/mktex.opt $(DESTDIR)/$(web2cdir)/mktex.opt
+ $(INSTALL_SCRIPT) $(srcdir)/mktexdir $(DESTDIR)/$(web2cdir)/mktexdir
+ $(INSTALL_DATA) $(srcdir)/mktexdir.opt \
+ $(DESTDIR)/$(web2cdir)/mktexdir.opt
+ $(INSTALL_SCRIPT) $(srcdir)/mktexnam \
+ $(DESTDIR)/$(web2cdir)/mktexnam
+ $(INSTALL_DATA) $(srcdir)/mktexnam.opt \
+ $(DESTDIR)/$(web2cdir)/mktexnam.opt
+ $(INSTALL_SCRIPT) $(srcdir)/mktexupd $(DESTDIR)/$(web2cdir)/mktexupd
+ $(INSTALL_LIBTOOL_LIBS) lib$(library).la $(DESTDIR)/$(libdir)
+ $(INSTALL_LIBTOOL_PROG) kpsewhich $(DESTDIR)/$(bindir)
+ $(INSTALL_PROGRAM) kpsestat $(DESTDIR)/$(bindir)
+ $(INSTALL_PROGRAM) kpseaccess $(DESTDIR)/$(bindir)
+ $(INSTALL_PROGRAM) kpsereadlink $(DESTDIR)/$(bindir)
uninstall-exec:
- $(UNINSTALL_LIBTOOL_LIBS) $(libdir)/lib$(library).la
- $(UNINSTALL_LIBTOOL_PROG) $(bindir)/kpsewhich
- $(UNINSTALL_PROGRAM) $(bindir)/kpsestat
- $(UNINSTALL_PROGRAM) $(bindir)/kpseaccess
- $(UNINSTALL_PROGRAM) $(bindir)/kpsereadlink
+ $(UNINSTALL_LIBTOOL_LIBS) ${DESTDIR}$(libdir)/lib$(library).la
+ $(UNINSTALL_LIBTOOL_PROG) ${DESTDIR}$(bindir)/kpsewhich
+ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpsestat
+ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpseaccess
+ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpsereadlink
$(UNINSTALL_LIBTOOL_LIBS) $(libdir)/lib$(library).la
$(UNINSTALL_LIBTOOL_PROG) $(bindir)/kpsewhich
@@ -166,29 +171,33 @@ uninstall-exec:
$(UNINSTALL_PROGRAM) $(bindir)/kpsereadlink
install-data: texmf.cnf kpathsea.info install-man
install-data: $(srcdir)/texmf.cnf kpathsea.info install-man
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf) $(infodir) $(web2cdir)
- if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
- || test ! -r $(web2cdir)/texmf.cnf; then \
- $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf) ${DESTDIR}$(infodir) ${DESTDIR}$(web2cdir)
+ if grep 'original texmf.cnf --' ${DESTDIR}$(web2cdir)/texmf.cnf >/dev/null 2>&1 \
+ || test ! -r ${DESTDIR}$(web2cdir)/texmf.cnf; then \
+ $(INSTALL_DATA) texmf.cnf ${DESTDIR}$(web2cdir)/texmf.cnf; \
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(texmf) \
+ $(DESTDIR)/$(infodir) $(DESTDIR)/$(web2cdir)
if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
|| test ! -r $(web2cdir)/texmf.cnf; then \
- $(INSTALL_DATA) $(srcdir)/texmf.cnf $(web2cdir)/texmf.cnf; \
+ $(INSTALL_DATA) $(srcdir)/texmf.cnf \
+ $(DESTDIR)/$(web2cdir)/texmf.cnf; \
else true; fi
test -r ./kpathsea.info || cd $(srcdir) && for i in kpathsea.i*; do \
- $(INSTALL_DATA) $$i $(infodir)/$$i; done
+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
# Info files.
- $(INSTALL_DATA) $(srcdir)/kpathsea.i* $(infodir)/
+ $(INSTALL_DATA) $(srcdir)/kpathsea.i* $(DESTDIR)/$(infodir)/
# Should we install the headers? They are not just system-dependent,
# which is bad enough, but even compiler-dependent.
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(includedir)/kpathsea
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(includedir)/kpathsea
+ $(SHELL) $(top_srcdir)/../mkinstalldirs \
+ $(DESTDIR)/$(includedir)/kpathsea
for f in $(install_headers); do \
- $(INSTALL_DATA) $$f $(includedir)/kpathsea/; done
- rm -f $(includedir)/kpathsea/acconfig.h
+ $(INSTALL_DATA) $$f ${DESTDIR}$(includedir)/kpathsea/; done
+ rm -f ${DESTDIR}$(includedir)/kpathsea/acconfig.h
+ $(INSTALL_DATA) $$f $(DESTDIR)/$(includedir)/kpathsea/; done
rm -f $(includedir)/kpathsea/acconfig.h
# Post.
$(POST_INSTALL)
- test -r $(infodir)/dir || $(INSTALL_DATA) $(top_srcdir)/../dir $(infodir)
+ test -r ${DESTDIR}$(infodir)/dir || $(INSTALL_DATA) $(top_srcdir)/../dir ${DESTDIR}$(infodir)
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --info-dir=$(infodir) $(infodir)/kpathsea.info; \
+ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/kpathsea.info; \
+ install-info --info-dir=$(DESTDIR)/$(infodir) \
+ $(DESTDIR)/$(infodir)/kpathsea.info; \
else true; fi
uninstall-data:
$(PRE_UNINSTALL)
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --delete --info-dir=$(infodir) $(infodir)/kpathsea.info; \
+ install-info --delete --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/kpathsea.info; \
+ install-info --delete --info-dir=$(DESTDIR)/$(infodir) $(infodir)/kpathsea.info; \
else true; fi
$(NORMAL_UNINSTALL)
- rm -f $(infodir)/kpathsea.i*
+ rm -f ${DESTDIR}$(infodir)/kpathsea.i*
# for f in $(install_headers); do rm -f $(includedir)/`basename $$f`; done
# distdir is used by other distributions; they define $(distdir).
rm -f $(infodir)/kpathsea.i*

View File

@ -0,0 +1,49 @@
$OpenBSD: patch-texk_kpathsea_texmf_cnf,v 1.1 2008/10/21 20:57:57 steven Exp $
--- texk/kpathsea/texmf.cnf.orig Sat Jul 26 22:39:36 2008
+++ texk/kpathsea/texmf.cnf Wed Sep 17 02:09:49 2008
@@ -42,20 +42,23 @@
% find where to look dynamically. See the manual and the definition
% below of TEXMFCNF.
+% Edd - OpenBSD Patch - Put exact path in instead of SELFAUTO
+OBSD_TMF = /usr/local/share
+
% The tree containing the runtime files closely related to the specific
% program version used:
-TEXMFMAIN = $SELFAUTOPARENT/texmf
+TEXMFMAIN = $OBSD_TMF/texmf
% The main distribution tree:
-TEXMFDIST = $SELFAUTOPARENT/texmf-dist
+TEXMFDIST = $OBSD_TMF/texmf-dist
% Our documentation-only tree, arranged by language:
-TEXMFDOC = $SELFAUTOPARENT/texmf-doc
+TEXMFDOC = $OBSD_TMF/texmf-doc
% 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 = $SELFAUTOPARENT/../texmf-local
+TEXMFLOCAL = $OBSD_TMF/texmf-local
% TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
% With teTeX-3.0 or later, this must be set.
@@ -63,7 +66,7 @@ TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
% TEXMFSYSVAR = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
-TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
+TEXMFSYSVAR = $OBSD_TMF/texmf-var
% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
% With teTeX-3.0 or later, this must be set.
@@ -71,7 +74,7 @@ TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
% TEXMFSYSCONFIG = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
+TEXMFSYSCONFIG = $TEXMFMAIN
% User texmf trees are allowed as follows.
% This used to be HOMETEXMF.

View File

@ -1,27 +1,23 @@
$OpenBSD: patch-texk_lacheck_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
--- texk/lacheck/Makefile.in.orig Sat Apr 21 17:57:36 2007
+++ texk/lacheck/Makefile.in Sat Apr 21 17:58:10 2007
@@ -28,17 +28,17 @@ install: install-exec install-data
$OpenBSD: patch-texk_lacheck_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/lacheck/Makefile.in.orig Wed Aug 27 09:45:12 2008
+++ texk/lacheck/Makefile.in Wed Aug 27 09:46:22 2008
@@ -29,14 +29,15 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) \
+ $$p $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
for p in $(programs); do rm -f $(bindir)/$$p; done
install-data: lacheck.1
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) lacheck.1 $(man1dir)/lacheck.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) lacheck.1 ${DESTDIR}$(man1dir)/lacheck.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) lacheck.1 $(DESTDIR)/$(man1dir)/lacheck.1
uninstall-data:
- rm -f $(man1dir)/lacheck.1
+ rm -f ${DESTDIR}$(man1dir)/lacheck.1
lacheck.1: lacheck.man
-sed -e "s!%%LACHECKREV%%!Release $(REV)!" $(srcdir)/lacheck.man |\
rm -f $(man1dir)/lacheck.1

View File

@ -1,23 +1,16 @@
$OpenBSD: patch-texk_make_man_mk,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
--- texk/make/man.mk.orig Tue Apr 17 20:28:51 2007
+++ texk/make/man.mk Tue Apr 17 20:35:25 2007
@@ -51,16 +51,16 @@ sedscript:
$OpenBSD: patch-texk_make_man_mk,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/make/man.mk.orig Sun Aug 24 20:57:45 2008
+++ texk/make/man.mk Sun Aug 24 20:58:53 2008
@@ -51,10 +51,10 @@ sedscript:
echo 's%@LOCALMODES@%$(localmodes)%' >>sedscript
install-man: manfiles
- $(top_srcdir)/../mkinstalldirs $(man1dir)
+ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
for nameone in $(manfiles); do \
name=`basename $${nameone} .1`; \
- $(INSTALL_DATA) $${name}.1 $(man1dir)/$${name}.$(manext); \
+ $(INSTALL_DATA) $${name}.1 ${DESTDIR}$(man1dir)/$${name}.$(manext); \
+ $(INSTALL_DATA) $${name}.1 $(DESTDIR)/$(man1dir)/$${name}.$(manext); \
done
uninstall-man:
for nameone in $(manfiles); do \
name=`basename $${nameone} .1`; \
- rm -f $(man1dir)/$${name}.$(manext); \
+ rm -f ${DESTDIR}$(man1dir)/$${name}.$(manext); \
done
install-data: install-man

View File

@ -1,29 +1,29 @@
$OpenBSD: patch-texk_makeindexk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
--- texk/makeindexk/Makefile.in.orig Sat Apr 21 18:21:52 2007
+++ texk/makeindexk/Makefile.in Sat Apr 21 18:23:14 2007
@@ -19,17 +19,17 @@ install: install-exec install-data
$OpenBSD: patch-texk_makeindexk_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/makeindexk/Makefile.in.orig Wed Aug 27 09:47:30 2008
+++ texk/makeindexk/Makefile.in Wed Aug 27 09:48:11 2008
@@ -20,17 +20,19 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: $(programs)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
- $(INSTALL_SCRIPT) $(srcdir)/mkindex $(scriptdir)/mkindex
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ $(INSTALL_SCRIPT) $(srcdir)/mkindex ${DESTDIR}$(scriptdir)/mkindex
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) $(DESTDIR)/$(bindir)
+ $(INSTALL_SCRIPT) $(srcdir)/mkindex $(DESTDIR)/$(scriptdir)/mkindex
uninstall-exec:
- cd $(bindir) && rm -f $(program)
- cd $(scriptdir) && rm -f mkindex
+ cd ${DESTDIR}$(bindir) && rm -f $(program)
+ cd ${DESTDIR}$(scriptdir) && rm -f mkindex
cd $(bindir) && rm -f $(program)
cd $(scriptdir) && rm -f mkindex
install-data: makeindex.1
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/makeindex.1 $(man1dir)/makeindex.$(manext)
- $(INSTALL_DATA) $(srcdir)/mkindex.1 $(man1dir)/mkindex.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/makeindex.1 ${DESTDIR}$(man1dir)/makeindex.$(manext)
+ $(INSTALL_DATA) $(srcdir)/mkindex.1 ${DESTDIR}$(man1dir)/mkindex.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/makeindex.1 \
+ $(DESTDIR)/$(man1dir)/makeindex.$(manext)
+ $(INSTALL_DATA) $(srcdir)/mkindex.1 \
+ $(DESTDIR)/$(man1dir)/mkindex.$(manext)
uninstall-data:

View File

@ -1,17 +1,15 @@
$OpenBSD: patch-texk_musixflx_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
--- texk/musixflx/Makefile.in.orig Sat Apr 21 18:24:29 2007
+++ texk/musixflx/Makefile.in Sat Apr 21 18:24:52 2007
@@ -21,10 +21,10 @@ install: install-exec
$OpenBSD: patch-texk_musixflx_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/musixflx/Makefile.in.orig Wed Aug 27 09:48:56 2008
+++ texk/musixflx/Makefile.in Wed Aug 27 09:49:13 2008
@@ -22,8 +22,9 @@ install: install-exec
uninstall: uninstall-exec
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
install-data:
for p in $(programs); do rm -f $(bindir)/$$p; done

View File

@ -1,17 +1,17 @@
$OpenBSD: patch-texk_ps2pkm_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
--- texk/ps2pkm/Makefile.in.orig Sat Apr 21 18:25:02 2007
+++ texk/ps2pkm/Makefile.in Sat Apr 21 18:26:32 2007
@@ -35,20 +35,20 @@ install: install-exec install-data
$OpenBSD: patch-texk_ps2pkm_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/ps2pkm/Makefile.in.orig Wed Aug 27 09:49:55 2008
+++ texk/ps2pkm/Makefile.in Wed Aug 27 09:50:42 2008
@@ -36,17 +36,21 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: $(programs)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
for p in $(programs); do rm -f $(bindir)/$$p; done
install-data: mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
@ -19,16 +19,14 @@ $OpenBSD: patch-texk_ps2pkm_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp
- $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 $(man1dir)/pfb2pfa.$(manext)
- $(INSTALL_DATA) $(srcdir)/pk2bm.1 $(man1dir)/pk2bm.$(manext)
- $(INSTALL_DATA) $(srcdir)/ps2pk.1 $(man1dir)/ps2pk.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/mag.1 ${DESTDIR}$(man1dir)/mag.$(manext)
+ $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 ${DESTDIR}$(man1dir)/pfb2pfa.$(manext)
+ $(INSTALL_DATA) $(srcdir)/pk2bm.1 ${DESTDIR}$(man1dir)/pk2bm.$(manext)
+ $(INSTALL_DATA) $(srcdir)/ps2pk.1 ${DESTDIR}$(man1dir)/ps2pk.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/mag.1 $(DESTDIR)/$(man1dir)/mag.$(manext)
+ $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 \
+ $(DESTDIR)/$(man1dir)/pfb2pfa.$(manext)
+ $(INSTALL_DATA) $(srcdir)/pk2bm.1 \
+ $(DESTDIR)/$(man1dir)/pk2bm.$(manext)
+ $(INSTALL_DATA) $(srcdir)/ps2pk.1 \
+ $(DESTDIR)/$(man1dir)/ps2pk.$(manext)
uninstall-data:
- rm -f $(man1dir)/ps2pk.$(manext) $(man1dir)/pk2bm.$(manext) \
- $(man1dir)/pfb2pfa.$(manext) $(man1dir)/mag.$(manext)
+ rm -f $(man1dir)/ps2pk.$(manext) ${DESTDIR}$(man1dir)/pk2bm.$(manext) \
+ $(man1dir)/pfb2pfa.$(manext) ${DESTDIR}$(man1dir)/mag.$(manext)
pre-dist-$(distname):
post-dist-$(distname):
rm -f $(man1dir)/ps2pk.$(manext) $(man1dir)/pk2bm.$(manext) \
$(man1dir)/pfb2pfa.$(manext) $(man1dir)/mag.$(manext)

View File

@ -1,17 +1,17 @@
$OpenBSD: patch-texk_seetexk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
--- texk/seetexk/Makefile.in.orig Sat Apr 21 18:26:53 2007
+++ texk/seetexk/Makefile.in Sat Apr 21 18:28:18 2007
@@ -51,23 +51,23 @@ install: install-exec install-data
$OpenBSD: patch-texk_seetexk_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/seetexk/Makefile.in.orig Wed Aug 27 09:51:43 2008
+++ texk/seetexk/Makefile.in Wed Aug 27 09:52:46 2008
@@ -52,17 +52,22 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
for p in $(programs); do rm -f $(bindir)/$$p; done
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
@ -19,21 +19,15 @@ $OpenBSD: patch-texk_seetexk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Ex
- $(INSTALL_DATA) $(srcdir)/dviconcat.man $(man1dir)/dviconcat.1
- $(INSTALL_DATA) $(srcdir)/dvibook.man $(man1dir)/dvibook.1
- $(INSTALL_DATA) $(srcdir)/dvitodvi.man $(man1dir)/dvitodvi.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dviselect.man ${DESTDIR}$(man1dir)/dviselect.1
+ $(INSTALL_DATA) $(srcdir)/dviconcat.man ${DESTDIR}$(man1dir)/dviconcat.1
+ $(INSTALL_DATA) $(srcdir)/dvibook.man ${DESTDIR}$(man1dir)/dvibook.1
+ $(INSTALL_DATA) $(srcdir)/dvitodvi.man ${DESTDIR}$(man1dir)/dvitodvi.1
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/dviselect.man \
+ $(DESTDIR)/$(man1dir)/dviselect.1
+ $(INSTALL_DATA) $(srcdir)/dviconcat.man \
+ $(DESTDIR)/$(man1dir)/dviconcat.1
+ $(INSTALL_DATA) $(srcdir)/dvibook.man \
+ $(DESTDIR)/$(man1dir)/dvibook.1
+ $(INSTALL_DATA) $(srcdir)/dvitodvi.man \
+ $(DESTDIR)/$(man1dir)/dvitodvi.1
uninstall-data:
- rm -f $(man1dir)/dviselect.1
- rm -f $(man1dir)/dviconcat.1
- rm -f $(man1dir)/dvibook.1
- rm -f $(man1dir)/dvitodvi.1
+ rm -f ${DESTDIR}$(man1dir)/dviselect.1
+ rm -f ${DESTDIR}$(man1dir)/dviconcat.1
+ rm -f ${DESTDIR}$(man1dir)/dvibook.1
+ rm -f ${DESTDIR}$(man1dir)/dvitodvi.1
distname = seetexk
rm -f $(man1dir)/dviselect.1

View File

@ -1,30 +1,38 @@
$OpenBSD: patch-texk_tetex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
--- texk/tetex/Makefile.in.orig Sat Apr 21 18:28:56 2007
+++ texk/tetex/Makefile.in Sat Apr 21 18:32:15 2007
@@ -39,76 +39,77 @@ check:
$OpenBSD: patch-texk_tetex_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/tetex/Makefile.in.orig Sat Jul 5 17:43:44 2008
+++ texk/tetex/Makefile.in Wed Aug 27 15:29:44 2008
@@ -34,62 +34,83 @@ install: install-data install-exec
# Auxiliary files.
install-data:: $(INFOFILES)
install-data::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(man5dir) ${DESTDIR}$(texpooldir) ${DESTDIR}$(texmf)/doc/tetex
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir) \
+ $(DESTDIR)/$(man5dir) $(DESTDIR)/$(texpooldir) \
+ $(DESTDIR)/$(texmf)/doc/tetex
for p in $(manpgs); do \
- $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
+ $(INSTALL_DATA) $(srcdir)/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ $(INSTALL_DATA) $(srcdir)/$$p.man \
+ $(DESTDIR)/$(man1dir)/$$p.$(manext); \
done
for p in $(contextmanpgs); do \
- $(INSTALL_DATA) $(srcdir)/context/$$p.man $(man1dir)/$$p.$(manext); \
+ $(INSTALL_DATA) $(srcdir)/context/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ $(INSTALL_DATA) $(srcdir)/context/$$p.man \
+ $(DESTDIR)/$(man1dir)/$$p.$(manext); \
done
- $(INSTALL_DATA) $(srcdir)/fmtutil.man $(man1dir)/fmtutil.1
- $(INSTALL_DATA) $(srcdir)/texlinks.man $(man1dir)/texlinks.1
- $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 $(man5dir)/fmtutil.cnf.5
- $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 $(man5dir)/updmap.cfg.5
- cd $(man1dir); rm -f allec.$(manext) texhash.$(manext) \
+ $(INSTALL_DATA) $(srcdir)/fmtutil.man ${DESTDIR}$(man1dir)/fmtutil.1
+ $(INSTALL_DATA) $(srcdir)/texlinks.man ${DESTDIR}$(man1dir)/texlinks.1
+ $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 ${DESTDIR}$(man5dir)/fmtutil.cnf.5
+ $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 ${DESTDIR}$(man5dir)/updmap.cfg.5
+ cd ${DESTDIR}$(man1dir); rm -f allec.$(manext) texhash.$(manext) \
+ $(INSTALL_DATA) $(srcdir)/fmtutil.man \
+ $(DESTDIR)/$(man1dir)/fmtutil.1
+ $(INSTALL_DATA) $(srcdir)/texlinks.man \
+ $(DESTDIR)/$(man1dir)/texlinks.1
+ $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 \
+ $(DESTDIR)/$(man5dir)/fmtutil.cnf.5
+ $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 \
+ $(DESTDIR)/$(man5dir)/updmap.cfg.5
+ cd $(DESTDIR)/$(man1dir); rm -f allec.$(manext) texhash.$(manext) \
lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \
kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \
cweave.$(manext) odvicopy.$(manext) \
@ -45,31 +53,25 @@ $OpenBSD: patch-texk_tetex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp
- ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext)
- ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext)
- ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext)
+ ln -s allcm.$(manext) ${DESTDIR}$(man1dir)/allec.$(manext)
+ ln -s mktexlsr.$(manext) ${DESTDIR}$(man1dir)/texhash.$(manext)
+ ln -s omega.$(manext) ${DESTDIR}$(man1dir)/lambda.$(manext)
+ ln -s pdftex.$(manext) ${DESTDIR}$(man1dir)/pdflatex.$(manext)
+ ln -s kpsetool.$(manext) ${DESTDIR}$(man1dir)/kpsepath.$(manext)
+ ln -s kpsetool.$(manext) ${DESTDIR}$(man1dir)/kpsexpand.$(manext)
+ ln -s mf.$(manext) ${DESTDIR}$(man1dir)/mf-nowin.$(manext)
+ ln -s cweb.$(manext) ${DESTDIR}$(man1dir)/ctangle.$(manext)
+ ln -s cweb.$(manext) ${DESTDIR}$(man1dir)/cweave.$(manext)
+ ln -s dvicopy.$(manext) ${DESTDIR}$(man1dir)/odvicopy.$(manext)
+ ln -s dvitype.$(manext) ${DESTDIR}$(man1dir)/odvitype.$(manext)
+ ln -s texconfig.$(manext) ${DESTDIR}$(man1dir)/texconfig-sys.$(manext)
+ ln -s updmap.$(manext) ${DESTDIR}$(man1dir)/updmap-sys.$(manext)
+ ln -s fmtutil.$(manext) ${DESTDIR}$(man1dir)/mktexfmt.$(manext)
+ ln -s fmtutil.$(manext) ${DESTDIR}$(man1dir)/fmtutil-sys.$(manext)
test -r ./latex.info || cd $(srcdir) && for i in latex.info*; do \
- $(INSTALL_DATA) $$i $(infodir)/$$i; done
+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --info-dir=$(infodir) $(infodir)/latex.info; \
+ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/latex.info; \
else true; fi
+ ln -s allcm.$(manext) $(DESTDIR)/$(man1dir)/allec.$(manext)
+ ln -s mktexlsr.$(manext) $(DESTDIR)/$(man1dir)/texhash.$(manext)
+ ln -s omega.$(manext) $(DESTDIR)/$(man1dir)/lambda.$(manext)
+ ln -s pdftex.$(manext) $(DESTDIR)/$(man1dir)/pdflatex.$(manext)
+ ln -s kpsetool.$(manext) $(DESTDIR)/$(man1dir)/kpsepath.$(manext)
+ ln -s kpsetool.$(manext) $(DESTDIR)/$(man1dir)/kpsexpand.$(manext)
+ ln -s mf.$(manext) $(DESTDIR)/$(man1dir)/mf-nowin.$(manext)
+ ln -s cweb.$(manext) $(DESTDIR)/$(man1dir)/ctangle.$(manext)
+ ln -s cweb.$(manext) $(DESTDIR)/$(man1dir)/cweave.$(manext)
+ ln -s dvicopy.$(manext) $(DESTDIR)/$(man1dir)/odvicopy.$(manext)
+ ln -s dvitype.$(manext) $(DESTDIR)/$(man1dir)/odvitype.$(manext)
+ ln -s texconfig.$(manext) \
+ $(DESTDIR)/$(man1dir)/texconfig-sys.$(manext)
+ ln -s updmap.$(manext) $(DESTDIR)/$(man1dir)/updmap-sys.$(manext)
+ ln -s fmtutil.$(manext) $(DESTDIR)/$(man1dir)/mktexfmt.$(manext)
+ ln -s fmtutil.$(manext) $(DESTDIR)/$(man1dir)/fmtutil-sys.$(manext)
for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
- $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
+ $(INSTALL_DATA) $(srcdir)/doc/$$p ${DESTDIR}$(texmf)/doc/tetex; \
+ $(INSTALL_DATA) $(srcdir)/doc/$$p $(DESTDIR)/$(texmf)/doc/tetex; \
done
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
@ -79,44 +81,55 @@ $OpenBSD: patch-texk_tetex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp
- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig
- $(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr
- $(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/texconfig \
+ ${DESTDIR}$(texmf)/texconfig/g ${DESTDIR}$(texmf)/texconfig/v ${DESTDIR}$(texmf)/texconfig/x
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic ${DESTDIR}$(texmf)/texconfig/g
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 ${DESTDIR}$(texmf)/texconfig/v
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/x/xterm ${DESTDIR}$(texmf)/texconfig/x
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/README ${DESTDIR}$(texmf)/texconfig
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic ${DESTDIR}$(texmf)/texconfig
+ $(INSTALL_SCRIPT) $(srcdir)/tcfmgr ${DESTDIR}$(texmf)/texconfig/tcfmgr
+ $(INSTALL_DATA) $(srcdir)/tcfmgr.map ${DESTDIR}$(texmf)/texconfig/tcfmgr.map
- $(INSTALL_DATA) $(srcdir)/fmtutil.cnf $(texmf)/web2c/fmtutil.cnf
+ $(SHELL) $(top_srcdir)/../mkinstalldirs \
+ $(DESTDIR)/$(texmf)/texconfig $(DESTDIR)/$(texmf)/texconfig/g \
+ $(DESTDIR)/$(texmf)/texconfig/v $(DESTDIR)/$(texmf)/texconfig/x
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic \
+ $(DESTDIR)/$(texmf)/texconfig/g
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 \
+ $(DESTDIR)/$(texmf)/texconfig/v
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/x/xterm \
+ $(DESTDIR)/$(texmf)/texconfig/x
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/README \
+ $(DESTDIR)/$(texmf)/texconfig
+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic \
+ $(DESTDIR)/$(texmf)/texconfig
+ $(INSTALL_SCRIPT) $(srcdir)/tcfmgr \
+ $(DESTDIR)/$(texmf)/texconfig/tcfmgr
+ $(INSTALL_DATA) $(srcdir)/tcfmgr.map \
+ $(DESTDIR)/$(texmf)/texconfig/tcfmgr.map
+ $(INSTALL_DATA) $(srcdir)/fmtutil.cnf \
+ $(DESTDIR)/$(texmf)/web2c/fmtutil.cnf
install-exec:
install-exec:
- -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
+ -$(SHELL) $(srcdir)/../mkinstalldirs ${DESTDIR}$(scriptdir)
+ -$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)/$(scriptdir)
for s in $(SCRIPTS); do \
- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$s $(DESTDIR)/$(scriptdir)/$$s; \
done
for s in $(CONTEXTSCRIPTS); do \
- $(INSTALL_SCRIPT) $(srcdir)/context/$$s $(scriptdir)/$$s; \
+ $(INSTALL_SCRIPT) $(srcdir)/context/$$s ${DESTDIR}$(scriptdir)/$$s; \
done
- if test -f $(bindir)/pdftex; then \
+ if test -f ${DESTDIR}$(bindir)/pdftex; then \
for s in $(PDFSCRIPTS); do \
- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
done; \
else \
true; \
fi
- cd $(scriptdir); rm -f allec kpsepath kpsexpand texhash; \
+ cd ${DESTDIR}$(scriptdir); rm -f allec kpsepath kpsexpand texhash; \
- cd $(scriptdir) && rm -f allec kpsepath kpsexpand texhash; \
+ cd $(DESTDIR)/$(scriptdir) && rm -f \
+ allec kpsepath kpsexpand texhash; \
ln -s allcm allec; \
ln -s kpsetool kpsepath; \
ln -s kpsetool kpsexpand; \
ln -s mktexlsr texhash
- cd $(scriptdir); rm -f mktexfmt; ln -s fmtutil mktexfmt
+ cd ${DESTDIR}$(scriptdir); rm -f mktexfmt; ln -s fmtutil mktexfmt
- cd $(scriptdir) && rm -f mktexfmt; ln -s fmtutil mktexfmt
+ cd $(DESTDIR)/$(scriptdir) && \
+ rm -f mktexfmt; ln -s fmtutil mktexfmt
#
# This target is invoked by the top-level make,
@@ -99,7 +120,9 @@ install-exec:
# we don't have to run mktexlsr also.
run_texlinks = $(bindir)/texlinks -f $(web2cdir)/fmtutil.cnf
run-texlinks:
- PATH=$(bindir):$(PATH); export PATH; $(run_texlinks)
+# PATH=$(bindir):$(PATH); export PATH; $(run_texlinks)
+# !!!OpenBSD
+# No texlinks yet, will be a @exec in the packing list
kpse_include ../make/clean.mk

View File

@ -1,140 +0,0 @@
$OpenBSD: patch-texk_tetex_texlinks,v 1.1 2007/10/19 22:14:13 steven Exp $
--- texk/tetex/texlinks.orig Wed Jan 17 16:31:31 2007
+++ texk/tetex/texlinks Mon Oct 15 09:49:15 2007
@@ -6,6 +6,9 @@
# the lines given in fmtutil.cnf.
# History:
+# Tue Oct 9 14:23:01 BST 2007
+# Added unlink option (-u) to aid OpenBSD package uninstall
+# Edd Barrett <vext01@gmail.com>
# Sun Aug 28 21:41:06 CEST 2005
# remove special cases for csplain,cslatex,pdfcslatex,pdfcsplain
# Fr Apr 8 19:15:05 CEST 2005
@@ -35,34 +38,31 @@ export PATH
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
cnf=fmtutil.cnf # name of the config file
-version=1169050907 # seconds since `00:00:00 1970-01-01 UTC'
+version=1192147136 # seconds since `00:00:00 1970-01-01 UTC'
# date '+%s' (with GNU date)
progname=texlinks
-usage='texlinks [options] [directories]
+usage='Usage: texlinks [OPTION]... [DIRECTORY]...
Create symbolic links format -> engine according to fmtutil setup.
-Valid options:
- --help
- -h show this help text
- --version show version string
- --cnffile file
- -f file use file as config file (default: fmtutil.cnf)
- --verbose
- -v set verbose mode on (default: off)
- --multiplatform
- -m operate in all platform specific directories
+Mandatory arguments to long options are mandatory for short options too.
+ -h, --help show this help text
+ --version show version string
+ -f, --cnffile FILE use FILE as config file (default: fmtutil.cnf)
+ -v, --verbose enable verbose messages (default: off)
+ -m, --multiplatform operate in all platform specific directories
(default: operate only in directory for this platform)
- --silent
- -s silently skip over existing scripts / binaries
- instead of creating a warning
+ -s, --silent silently skip existing scripts / binaries
+ (default: issue warning)
+ -u, --unlink remove symlinks created by texlinks
-directories is an optional list of directories in which to operate.
-If no directories are specified the list of directories depends on the
---multiplatform option.
-'
+The DIRECTORY arguments are an optional list of directories in which to
+operate. If no directories are specified the list of directories
+depends on the --multiplatform option.
+Report bugs to tex-k@tug.org.'
+
###############################################################################
# abort(errmsg)
# print `errmsg' to stderr and exit with error code 1
@@ -140,7 +140,7 @@ install_link()
fi
if test -f $selfautoloc/mf && test -f $selfautoloc/mf-nowin; then
# have both mf and mf-nowin binaries. no link.
- verbose_echo "metafont symlink $src -> $dest skipped (special case)"
+ verbose_echo "skipped metafont symlink $src -> $dest (special case)"
return
fi
fi
@@ -149,7 +149,7 @@ install_link()
case $src in
*/cont-??|*/metafun|*/mptopdf)
- verbose_echo "symlink $src -> $dest skipped (special case)"
+ verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
;;
*)
test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
@@ -205,6 +205,24 @@ upd_symlinkdir()
}
###############################################################################
+# rm_link()
+# Delete a previously installed link
+###############################################################################
+rm_link()
+{
+ link=$1;
+ if test -e $link; then
+ if test -h $link; then
+ verbose_do rm -Rf $link
+ else
+ verbose_echo "kept $link, since not a symlink"
+ fi
+ else
+ verbose_echo "skipped $link, non-existent"
+ fi
+}
+
+###############################################################################
# main()
# parse commandline arguments, initialize variables,
# switch into temp. direcrory, execute desired command
@@ -217,6 +235,7 @@ main()
multiplatform=false
verbose=false
+ unlink=false
silent=false
thisdir=`pwd`
: ${KPSE_DOT=$thisdir}; export KPSE_DOT
@@ -232,6 +251,7 @@ main()
--v*|-v) verbose=true;;
--s*|-s) silent=true;;
--m*|-m) multiplatform=true;;
+ --u*|-u) unlink=true;;
-*) errmsg "fmtutil: unknown option \`$1' ignored.";;
*) break;;
esac
@@ -278,9 +298,14 @@ main()
test "x$fmt" = "x$engine" && continue
if test -f "$d/$engine"; then
- install_link "$engine" "$d/$fmt"
+ case $unlink in
+ true)
+ rm_link "$d/$fmt";;
+ *)
+ install_link "$engine" "$d/$fmt";;
+ esac
else
- verbose_echo "$d/$engine: engine does not exist. Skipping..."
+ verbose_echo "skipped $d/$engine, engine does not exist"
fi
# restore positional arguments:

View File

@ -1,20 +1,41 @@
$OpenBSD: patch-texk_tex4htk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
--- texk/tex4htk/Makefile.in.orig Sat Apr 21 18:32:35 2007
+++ texk/tex4htk/Makefile.in Sat Apr 21 18:33:47 2007
@@ -29,12 +29,12 @@ install: install-exec install-data
$OpenBSD: patch-texk_tex4htk_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/tex4htk/Makefile.in.orig Wed Aug 27 12:43:01 2008
+++ texk/tex4htk/Makefile.in Wed Aug 27 12:45:10 2008
@@ -30,21 +30,28 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: all
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/$$p; done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(bindir)/$$p; done
- $(INSTALL) -d "$(prefix)/texmf-dist/scripts/tex4ht"
- for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(prefix)/texmf-dist/scripts/tex4ht/$$p.sh"; done
- for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(prefix)/texmf-dist/scripts/tex4ht/$$p.pl"; done
- if test -d "$(bindir)/../../texmf-dist/scripts/tex4ht"; then \
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
+ $(INSTALL) -d "$(DESTDIR)/$(prefix)/texmf-dist/scripts/tex4ht"
+ for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p \
+ "$(DESTDIR)/$(prefix)/texmf-dist/scripts/tex4ht/$$p.sh"; done
+ for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p \
+ "$(DESTDIR)/$(prefix)/texmf-dist/scripts/tex4ht/$$p.pl"; done
+ if test -d "$(DESTDIR)/$(bindir)/../../texmf-dist/scripts/tex4ht"; \
+ then \
d=../../texmf-dist/scripts/tex4ht; \
- elif test -d "$(bindir)/../texmf-dist/scripts/tex4ht"; then \
+ elif test -d "$(DESTDIR)/$(bindir)/../texmf-dist/scripts/tex4ht"; \
+ then \
d=../texmf-dist/scripts/tex4ht; \
else \
echo "Error: texmf-dist/scripts/tex4ht directory not found" >&2; \
exit 1; \
fi; \
- for p in $(shell_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.sh $(bindir)/$$p; done; \
- for p in $(perl_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.pl $(bindir)/$$p; done
+ for p in $(shell_scripts); do rm -f $(DESTDIR)/$(bindir)/$$p; \
+ ln -s $$d/$$p.sh $(DESTDIR)/$(bindir)/$$p; done; \
+ for p in $(perl_scripts); do rm -f $(DESTDIR)/$(bindir)/$$p; \
+ ln -s $$d/$$p.pl $(DESTDIR)/$(bindir)/$$p; done
uninstall-exec:
- for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done
+ for p in $(programs) $(scripts); do rm -f ${DESTDIR}$(bindir)/$$p; done
install-data:
for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done

View File

@ -1,27 +1,53 @@
$OpenBSD: patch-texk_texlive_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
--- texk/texlive/Makefile.in.orig Sat Apr 21 18:34:02 2007
+++ texk/texlive/Makefile.in Sat Apr 21 18:34:59 2007
@@ -19,17 +19,17 @@ install: install-data install-exec
$OpenBSD: patch-texk_texlive_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/texlive/Makefile.in.orig Wed Aug 27 13:40:05 2008
+++ texk/texlive/Makefile.in Wed Aug 27 13:43:20 2008
@@ -72,7 +72,8 @@ install: install-data install-exec
# Auxiliary files.
install-data::
for p in $(manpgs); do \
- $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
+ $(INSTALL_DATA) $(srcdir)/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ $(INSTALL_DATA) $(srcdir)/$$p.man \
+ $(DESTDIR)/$(man1dir)/$$p.$(manext); \
done
# The idea is to install the scripts themselves in texmf*/scripts, and
@@ -98,27 +99,31 @@ install-data::
# bin/i386-linux, not the texmf*/scripts dir.
#
install-exec:
- -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
+ -$(SHELL) $(srcdir)/../mkinstalldirs ${DESTDIR}$(scriptdir)
for s in $(LIVESCRIPTS); do \
- rm -f $(scriptdir)/$$s ; \
- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
+ rm -f ${DESTDIR}$(scriptdir)/$$s ; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
+ -$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)/$(scriptdir)
# - link to the basename, removing any extension, of the source.
# - we downcase for the sake of TeXcount.pl -> texcount.
# - the purpose of the case..esac is to support both multiplatform and
# non-multiplatform builds.
for s in $(LINKED_SCRIPTS); do \
- target=$(scriptdir)/`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
+ target=$(DESTDIR)/$(scriptdir)/`basename $$s | \
+ sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
target=$$target; \
rm -f $$target; \
- case "$(scriptdir)" in \
+ case "$(DESTDIR)/$(scriptdir)" in \
*/bin) d=..;; \
*/bin/*) d=../..;; \
- *) echo "$(scriptdir): strange directory for linked scripts" >&2;\
+ *) echo "$(DESTDIR)/$(scriptdir): \
+ strange directory for linked scripts" >&2;\
exit 1;; \
esac; \
- $(SHELL) $(srcdir)/../mkinstalldirs $(prefix)/`dirname $$s`; \
- $(INSTALL_SCRIPT) $(srcdir)/linked_scripts/`basename $$s` $(prefix)/$$s; \
+ $(SHELL) $(srcdir)/../mkinstalldirs \
+ $(DESTDIR)/$(prefix)/`dirname $$s`; \
+ $(INSTALL_SCRIPT) $(srcdir)/linked_scripts/`basename $$s` \
+ $(DESTDIR)/$(prefix)/$$s; \
ln -s $$d/$$s $$target; \
done
- rm -f $(scriptdir)/getnonfreefonts-sys
- ln -s getnonfreefonts $(scriptdir)/getnonfreefonts-sys
+ rm -f ${DESTDIR}$(scriptdir)/getnonfreefonts-sys
+ ln -s getnonfreefonts ${DESTDIR}$(scriptdir)/getnonfreefonts-sys
+ rm -f $(DESTDIR)/$(scriptdir)/getnonfreefonts-sys
+ ln -s getnonfreefonts $(DESTDIR)/$(scriptdir)/getnonfreefonts-sys
kpse_include ../make/clean.mk

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-texk_texlive_linked_scripts_texdoc_tlu,v 1.1 2008/10/21 20:57:57 steven Exp $
--- texk/texlive/linked_scripts/texdoc.tlu.orig Wed Sep 17 03:13:58 2008
+++ texk/texlive/linked_scripts/texdoc.tlu Wed Sep 17 03:15:26 2008
@@ -435,9 +435,10 @@ function complain_about_old_envvar ()
for ext in list {'pdf', 'pds', 'dvi', 'html', 'txt'} do
for var in list
{"TEXDOCVIEW_"..ext, "TEXDOC_VIEWER_"..string.upper(ext) } do
+ -- OpenBSD patch - better error
if os.getenv (var) then
err_print ("Environment variable "..var..
- " deprecated. See the manual\n\tsection ?.?, ?.? for details.",
+ " deprecated. See /usr/local/share/texmf/doc/man/man1/texdoc.pdf for details.",
"warning")
end
end

View File

@ -1,28 +1,27 @@
$OpenBSD: patch-texk_ttf2pk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
--- texk/ttf2pk/Makefile.in.orig Sat Apr 21 18:35:31 2007
+++ texk/ttf2pk/Makefile.in Sat Apr 21 18:36:09 2007
@@ -38,17 +38,17 @@ install: install-exec install-data
$OpenBSD: patch-texk_ttf2pk_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/ttf2pk/Makefile.in.orig Wed Aug 27 14:02:35 2008
+++ texk/ttf2pk/Makefile.in Wed Aug 27 14:03:08 2008
@@ -39,15 +39,18 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: $(programs)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
uninstall-exec:
- for p in $(programs); do rm -f $(bindir)/$$p; done
+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
for p in $(programs); do rm -f $(bindir)/$$p; done
install-data: ttf2pk.1 ttf2tfm.1
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(INSTALL_DATA) $(srcdir)/ttf2pk.1 $(man1dir)/ttf2pk.$(manext)
- $(INSTALL_DATA) $(srcdir)/ttf2tfm.1 $(man1dir)/ttf2tfm.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/ttf2pk.1 ${DESTDIR}$(man1dir)/ttf2pk.$(manext)
+ $(INSTALL_DATA) $(srcdir)/ttf2tfm.1 ${DESTDIR}$(man1dir)/ttf2tfm.$(manext)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(INSTALL_DATA) $(srcdir)/ttf2pk.1 \
+ $(DESTDIR)/$(man1dir)/ttf2pk.$(manext)
+ $(INSTALL_DATA) $(srcdir)/ttf2tfm.1 \
+ $(DESTDIR)/$(man1dir)/ttf2tfm.$(manext)
uninstall-data:
- rm -f $(man1dir)/ttf2pk.$(manext) $(man1dir)/ttf2tfm.$(manext)
+ rm -f $(man1dir)/ttf2pk.$(manext) ${DESTDIR}$(man1dir)/ttf2tfm.$(manext)
rm -f $(man1dir)/ttf2pk.$(manext) $(man1dir)/ttf2tfm.$(manext)
pre-dist-$(distname):
post-dist-$(distname):

View File

@ -1,116 +1,101 @@
$OpenBSD: patch-texk_web2c_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
--- texk/web2c/Makefile.in.orig Wed Jan 10 17:39:42 2007
+++ texk/web2c/Makefile.in Fri May 4 20:28:39 2007
@@ -788,25 +788,25 @@ install-dumps: install-tex-dumps install-mf-dumps inst
$OpenBSD: patch-texk_web2c_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/Makefile.in.orig Sun Aug 24 22:24:41 2008
+++ texk/web2c/Makefile.in Sun Aug 24 22:30:17 2008
@@ -817,28 +817,28 @@ install-exec:: install-programs
# Installation directories.
$(bindir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
$(texpooldir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texpooldir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texpooldir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(texpooldir)
$(mfpooldir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(mfpooldir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(mfpooldir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(mfpooldir)
$(mppooldir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(mppooldir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(mppooldir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(mppooldir)
$(fmtdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(fmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(fmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(fmtdir)
$(basedir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(basedir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(basedir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(basedir)
$(memdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(memdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(memdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(memdir)
$(web2cdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(web2cdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(web2cdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(web2cdir)
# Installing the programs.
install-programs: $(programs) $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
# Installing the binaries. Each of the *dir/*.mk files (except etex)
# add to this target via a dependency-only rule, to install their
# respective engines.
install-programs: $(programs) $(basic_engines) $(bindir)
for p in $(programs) $(basic_engines); do \
- $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(INSTALL_LIBTOOL_PROG) $$p $(DESTDIR)/$(bindir); done
# Installation of each of the three main engines.
install-tex: install-tex-exec install-tex-data
@@ -829,15 +829,15 @@ install-mpost-dumps: install-mpost-mems
install-programs: install-tex-programs
install-tex-programs: tex $(bindir)
tex="tex"; \
- for p in $$tex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in $$tex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
install-programs: install-mf-programs
install-mf-programs: mf $(mfn) $(bindir)
mf="mf $(mfn)"; \
- for p in $$mf; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in $$mf; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
install-programs: install-mpost-programs
install-mpost-programs: mpost $(bindir)
mpost="mpost"; \
- for p in $$mpost; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in $$mpost; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
# The links to {mf,mp,tex} for each format and for {ini,vir}{mf,mp,tex},
# plus the equivalents for e-TeX, Omega, and pdf[ex]TeX.
@@ -860,34 +860,34 @@ install-mpost-links: install-mpost-programs
# We do not attempt to install any of the per-format symlinks, leaving
# that to a separate run of texlinks.
@@ -849,38 +849,46 @@ install-programs: $(programs) $(basic_engines) $(bindi
install-fmts: install-tex-fmts
install-tex-fmts: fmts $(fmtdir)
fmts="$(all_fmts)"; \
- for f in $$fmts; do $(INSTALL_DATA) $$f $(fmtdir)/$$f; done
- cd $(fmtdir) && (rm -f plain.fmt; $(LN) tex.fmt plain.fmt)
+ for f in $$fmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(fmtdir)/$$f; done
+ cd ${DESTDIR}$(fmtdir) && (rm -f plain.fmt; $(LN) tex.fmt plain.fmt)
+ for f in $$fmts; do $(INSTALL_DATA) $$f \
+ $(DESTDIR)/$(fmtdir)/$$f; done
+ cd $(DESTDIR)/$(fmtdir) && (rm -f plain.fmt; $(LN) tex.fmt plain.fmt)
fmts="$(fmts)"; \
for f in $$fmts; do base=`basename $$f .fmt`; \
- (cd $(bindir) && (rm -f $$base; $(LN) tex $$base)); done
+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) tex $$base)); done
+ (cd $(DESTDIR)/$(bindir) && (rm -f $$base; $(LN) tex $$base)); done
install-bases: install-mf-bases
install-mf-bases: bases $(basedir)
bases="$(all_bases)"; \
- for f in $$bases; do $(INSTALL_DATA) $$f $(basedir)/$$f; done
- cd $(basedir) && (rm -f plain.base; $(LN) mf.base plain.base)
+ for f in $$bases; do $(INSTALL_DATA) $$f ${DESTDIR}$(basedir)/$$f; done
+ cd ${DESTDIR}$(basedir) && (rm -f plain.base; $(LN) mf.base plain.base)
+ for f in $$bases; do $(INSTALL_DATA) $$f \
+ $(DESTDIR)/$(basedir)/$$f; done
+ cd $(DESTDIR)/$(basedir) && (rm -f plain.base; $(LN) mf.base plain.base)
bases="$(bases)"; \
for f in $$bases; do base=`basename $$f .base`;\
- (cd $(bindir) && (rm -f $$base; $(LN) mf $$base)); done
+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) mf $$base)); done
+ (cd $(DESTDIR)/$(bindir) && (rm -f $$base; $(LN) mf $$base)); done
install-mems: install-mpost-mems
install-mpost-mems: mems $(memdir)
mems="$(all_mems)"; \
- for f in $$mems; do $(INSTALL_DATA) $$f $(memdir)/$$f; done
- cd $(memdir) && (rm -f plain.mem; $(LN) mpost.mem plain.mem)
+ for f in $$mems; do $(INSTALL_DATA) $$f ${DESTDIR}$(memdir)/$$f; done
+ cd ${DESTDIR}$(memdir) && (rm -f plain.mem; $(LN) mpost.mem plain.mem)
+ for f in $$mems; do $(INSTALL_DATA) $$f \
+ $(DESTDIR)/$(memdir)/$$f; done
+ cd $(DESTDIR)/$(memdir) && (rm -f plain.mem; $(LN) mpost.mem plain.mem)
mems="$(mems)"; \
for f in $$mems; do base=`basename $$f .mem`; \
- (cd $(bindir) && (rm -f $$base; $(LN) mpost $$base)); done
+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) mpost $$base)); done
+ (cd $(DESTDIR)/$(bindir) && \
+ (rm -f $$base; $(LN) mpost $$base)); done
install-tex-pool: tex.pool $(texpooldir)
- $(INSTALL_DATA) tex.pool $(texpooldir)/tex.pool
+ $(INSTALL_DATA) tex.pool ${DESTDIR}$(texpooldir)/tex.pool
install-mf-pool: mf.pool $(mfpooldir)
- $(INSTALL_DATA) mf.pool $(mfpooldir)/mf.pool
+ $(INSTALL_DATA) mf.pool ${DESTDIR}$(mfpooldir)/mf.pool
install-mpost-pool: # no longer used, the strings are in the binary
# install-mpost-pool: mp.pool $(mppooldir)
# $(INSTALL_DATA) mp.pool $(mppooldir)/mp.pool
@@ -896,9 +896,9 @@ install-mpost-pool: # no longer used, the strings are
# Auxiliary files.
install-data:: $(web2cdir)
cd doc && $(MAKE) $(install_makeargs) install-data
cd man && $(MAKE) $(install_makeargs) install-data
- $(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(man1dir)/tie.$(manext)
- $(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(man1dir)/ctie.$(manext)
- $(INSTALL_DATA) fmtutil.cnf $(web2cdir)/fmtutil.cnf
+ $(INSTALL_DATA) $(srcdir)/tiedir/tie.1 ${DESTDIR}$(man1dir)/tie.$(manext)
+ $(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 ${DESTDIR}$(man1dir)/ctie.$(manext)
+ $(INSTALL_DATA) fmtutil.cnf ${DESTDIR}$(web2cdir)/fmtutil.cnf
- $(INSTALL_DATA) $(srcdir)/synctexdir/man1/synctex.1 $(man1dir)/synctex.$(manext)
- $(INSTALL_DATA) $(srcdir)/synctexdir/man5/synctex.5 $(man5dir)/synctex.5
+ $(INSTALL_DATA) $(srcdir)/tiedir/tie.1 \
+ $(DESTDIR)/$(man1dir)/tie.$(manext)
+ $(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 \
+ $(DESTDIR)/$(man1dir)/ctie.$(manext)
+ $(INSTALL_DATA) $(srcdir)/synctexdir/man1/synctex.1 \
+ $(DESTDIR)/$(man1dir)/synctex.$(manext)
+ $(INSTALL_DATA) $(srcdir)/synctexdir/man5/synctex.5 \
+ $(DESTDIR)/$(man5dir)/synctex.5
# Dummy target.
uninstall uninstall-exec uninstall-data:

View File

@ -1,39 +1,21 @@
$OpenBSD: patch-texk_web2c_alephdir_aleph_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/web2c/alephdir/aleph.mk.orig Tue Jan 17 21:41:51 2006
+++ texk/web2c/alephdir/aleph.mk Fri May 4 20:28:39 2007
@@ -142,7 +142,7 @@ afmts: $(all_afmts)
$OpenBSD: patch-texk_web2c_alephdir_aleph_mk,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/alephdir/aleph.mk.orig Mon Aug 25 00:13:57 2008
+++ texk/web2c/alephdir/aleph.mk Mon Aug 25 00:15:09 2008
@@ -146,7 +146,7 @@ afmts: $(all_afmts)
afmtdir = $(web2cdir)/aleph
$(afmtdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(afmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(afmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(afmtdir)
aleph.fmt: aleph
$(dumpenv) $(MAKE) progname=aleph files="omega.ini" prereq-check
@@ -161,7 +161,7 @@ install-aleph-dumps: install-aleph-fmts
# The actual binary executables and pool files.
install-programs: @ALEPH@ install-aleph-programs
install-aleph-programs: aleph $(bindir)
@@ -160,6 +160,7 @@ lamed.fmt: aleph
install-aleph: install-aleph-exec
install-programs: @ALEPH@ install-aleph-exec
install-aleph-exec: aleph $(bindir)
- for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
install-links: @ALEPH@ install-aleph-links
install-aleph-links: install-aleph-programs
@@ -171,14 +171,14 @@ install-aleph-links: install-aleph-programs
install-fmts: @ALEPH@ install-aleph-fmts
install-aleph-fmts: afmts $(afmtdir)
afmts="$(all_afmts)"; \
- for f in $$afmts; do $(INSTALL_DATA) $$f $(afmtdir)/$$f; done
+ for f in $$afmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(afmtdir)/$$f; done
afmts="$(afmts)"; \
for f in $$afmts; do base=`basename $$f .fmt`; \
- (cd $(bindir) && (rm -f $$base; $(LN) aleph $$base)); done
+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) aleph $$base)); done
# Auxiliary files.
install-data:: @ALEPH@ install-aleph-data
install-aleph-pool: aleph.pool $(texpooldir)
- $(INSTALL_DATA) aleph.pool $(texpooldir)/aleph.pool
+ $(INSTALL_DATA) aleph.pool ${DESTDIR}$(texpooldir)/aleph.pool
+ for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
# end of aleph.mk

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-texk_web2c_configure,v 1.1 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/configure.orig Tue Jul 8 19:21:45 2008
+++ texk/web2c/configure Sun Aug 24 12:28:30 2008
@@ -6608,7 +6608,7 @@ else
if test "$with_system_freetype2" = yes; then
if test "x$with_freetype2_libdir" != x; then
- EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir"
+ EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir -lz" # hack just for the OpenBSD build
fi
if test "x$with_freetype2_include" != x; then
EXTRA_FREETYPE2_INCLUDE="-I$with_freetype2_include -I$with_freetype2_include/freetype2"

View File

@ -1,19 +1,20 @@
$OpenBSD: patch-texk_web2c_doc_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/web2c/doc/Makefile.in.orig Wed Apr 18 13:50:12 2007
+++ texk/web2c/doc/Makefile.in Wed Apr 18 13:51:09 2007
@@ -48,12 +48,12 @@ Makefile: Makefile.in ../config.status
$OpenBSD: patch-texk_web2c_doc_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/doc/Makefile.in.orig Mon Aug 25 00:33:28 2008
+++ texk/web2c/doc/Makefile.in Mon Aug 25 00:37:35 2008
@@ -49,12 +49,13 @@ Makefile: Makefile.in ../config.status
install: install-exec install-data
install-exec:
install-data: web2c.info
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(infodir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(infodir)
test -r ./web2c.info || cd $(srcdir) && for i in web2c.i*; do \
- $(INSTALL_DATA) $$i $(infodir)/$$i; done
+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
- $(INSTALL_DATA) $(srcdir)/web2c.i* $(infodir)/
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(infodir)
+ $(INSTALL_DATA) $(srcdir)/web2c.i* $(DESTDIR)/$(infodir)/
#
$(POST_INSTALL)
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --info-dir=$(infodir) $(infodir)/web2c.info; \
+ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/web2c.info; \
+ install-info --info-dir=$(DESTDIR)/$(infodir) \
+ $(DESTDIR)/$(infodir)/web2c.info; \
else true; fi
check: all

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-texk_web2c_luatexdir_luatex_mk,v 1.1 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/luatexdir/luatex.mk.orig Wed Aug 27 22:14:36 2008
+++ texk/web2c/luatexdir/luatex.mk Wed Aug 27 22:15:48 2008
@@ -110,7 +110,7 @@ luafmts: $(all_luafmts)
luafmtdir = $(web2cdir)/luatex
$(luafmtdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(luafmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(luafmtdir)
luatex.fmt: luatex
$(dumpenv) $(MAKE) progname=luatex files="etex.src plain.tex cmr10.tfm" prereq-check
@@ -122,7 +122,8 @@ install-luatex: install-luatex-exec
install-programs: @LTEX@ install-luatex-exec
install-luatex-exec: $(luatex) $(bindir)
- for p in luatex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in luatex; do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
cd $(DESTDIR)$(bindir) && rm -f texlua && $(LN) luatex texlua
cd $(DESTDIR)$(bindir) && rm -f texluac && $(LN) luatex texluac

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-texk_web2c_mpware_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/web2c/mpware/Makefile.in.orig Tue Apr 17 21:27:22 2007
+++ texk/web2c/mpware/Makefile.in Tue Apr 17 21:28:04 2007
@@ -45,11 +45,11 @@ Makefile: Makefile.in ../config.status
$OpenBSD: patch-texk_web2c_mpware_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/mpware/Makefile.in.orig Sun Aug 24 21:42:01 2008
+++ texk/web2c/mpware/Makefile.in Sun Aug 24 22:08:07 2008
@@ -46,11 +46,12 @@ Makefile: Makefile.in ../config.status
install: install-exec install-data
install-exec: $(programs)
@ -9,12 +9,13 @@ $OpenBSD: patch-texk_web2c_mpware_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasp
- $(INSTALL_PROGRAM) newer $(bindir)/newer
- $(INSTALL_LIBTOOL_PROG) dmp $(bindir)
- $(INSTALL_LIBTOOL_PROG) mpto $(bindir)
- $(INSTALL_SCRIPT) makempx $(scriptdir)/makempx
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir)
+ $(INSTALL_PROGRAM) newer ${DESTDIR}$(bindir)/newer
+ $(INSTALL_LIBTOOL_PROG) dmp ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) mpto ${DESTDIR}$(bindir)
+ $(INSTALL_SCRIPT) makempx ${DESTDIR}$(scriptdir)/makempx
- $(INSTALL_LIBTOOL_PROG) makempx $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs \
+ $(DESTDIR)/$(bindir) $(DESTDIR)/$(scriptdir)
+ $(INSTALL_PROGRAM) newer $(DESTDIR)/$(bindir)/newer
+ $(INSTALL_LIBTOOL_PROG) dmp $(DESTDIR)/$(bindir)
+ $(INSTALL_LIBTOOL_PROG) mpto $(DESTDIR)/$(bindir)
+ $(INSTALL_LIBTOOL_PROG) makempx $(DESTDIR)/$(bindir)
install-data:
kpse_include ../make/tkpathsea.mk

View File

@ -1,39 +1,22 @@
$OpenBSD: patch-texk_web2c_omegadir_omega_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/web2c/omegadir/omega.mk.orig Tue Jan 17 21:41:51 2006
+++ texk/web2c/omegadir/omega.mk Fri May 4 20:28:40 2007
@@ -183,7 +183,7 @@ ofmts: $(all_ofmts)
$OpenBSD: patch-texk_web2c_omegadir_omega_mk,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/omegadir/omega.mk.orig Sun Aug 24 22:47:09 2008
+++ texk/web2c/omegadir/omega.mk Sun Aug 24 23:08:18 2008
@@ -187,7 +187,7 @@ ofmts: $(all_ofmts)
ofmtdir = $(web2cdir)/omega
$(ofmtdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(ofmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(ofmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(ofmtdir)
omega.fmt: omega
$(dumpenv) $(MAKE) progname=omega files="omega.tex" prereq-check
@@ -213,7 +213,7 @@ install-omega-dumps: install-omega-fmts
# The actual binary executables and pool files.
install-programs: @OMEGA@ install-omega-programs
install-omega-programs: $(omega_programs) $(bindir)
@@ -213,7 +213,8 @@ omegafonts/omfonts:
install-omega: install-omega-exec
install-programs: @OMEGA@ install-omega-exec
install-omega-exec: $(omega_programs) $(bindir) install-omega-links
- for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
cd otps && $(MAKE) $(install_makeargs) install-programs
cd omegafonts && $(MAKE) $(install_makeargs) install-programs
@@ -227,14 +227,14 @@ install-omega-links: install-omega-programs
install-fmts: @OMEGA@ install-omega-fmts
install-omega-fmts: ofmts $(ofmtdir)
ofmts="$(all_ofmts)"; \
- for f in $$ofmts; do $(INSTALL_DATA) $$f $(ofmtdir)/$$f; done
+ for f in $$ofmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(ofmtdir)/$$f; done
ofmts="$(ofmts)"; \
for f in $$ofmts; do base=`basename $$f .fmt`; \
- (cd $(bindir) && (rm -f $$base; $(LN) omega $$base)); done
+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) omega $$base)); done
# Auxiliary files.
install-data:: @OMEGA@ install-omega-data
install-omega-pool: omega.pool $(texpooldir)
- $(INSTALL_DATA) omega.pool $(texpooldir)/omega.pool
+ $(INSTALL_DATA) omega.pool ${DESTDIR}$(texpooldir)/omega.pool
# end of omega.mk

View File

@ -1,19 +1,20 @@
$OpenBSD: patch-texk_web2c_omegafonts_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/web2c/omegafonts/Makefile.in.orig Wed Apr 18 13:29:36 2007
+++ texk/web2c/omegafonts/Makefile.in Wed Apr 18 13:31:07 2007
@@ -52,12 +52,12 @@ install: install-exec
$OpenBSD: patch-texk_web2c_omegafonts_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/omegafonts/Makefile.in.orig Sun Aug 24 22:10:29 2008
+++ texk/web2c/omegafonts/Makefile.in Sun Aug 24 22:11:52 2008
@@ -53,12 +53,13 @@ install: install-exec
install-exec:: install-links
install-programs: $(programs)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
install-links: install-programs
for f in ""$(linked_programs); do \
- cd $(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
+ cd ${DESTDIR}$(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
+ cd $(DESTDIR)/$(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
Makefile: Makefile.in ../config.status
cd .. && $(SHELL) config.status

View File

@ -1,16 +1,18 @@
$OpenBSD: patch-texk_web2c_otps_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/web2c/otps/Makefile.in.orig Wed Apr 18 03:05:43 2007
+++ texk/web2c/otps/Makefile.in Wed Apr 18 03:06:28 2007
@@ -35,9 +35,9 @@ outocp: outocp.o
$OpenBSD: patch-texk_web2c_otps_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/otps/Makefile.in.orig Sun Aug 24 23:17:49 2008
+++ texk/web2c/otps/Makefile.in Sun Aug 24 23:18:57 2008
@@ -36,9 +36,11 @@ outocp: outocp.o
$(programs): $(proglib) $(kpathsea)
install-programs: $(programs)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(scriptdir); done
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
+ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p \
+ $(DESTDIR)/$(scriptdir); done
Makefile: Makefile.in ../config.status
cd .. && $(SHELL) config.status

View File

@ -1,40 +1,22 @@
$OpenBSD: patch-texk_web2c_pdftexdir_pdftex_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/web2c/pdftexdir/pdftex.mk.orig Tue Dec 26 23:37:34 2006
+++ texk/web2c/pdftexdir/pdftex.mk Fri May 4 20:28:40 2007
@@ -92,7 +92,7 @@ pdfefmts: $(all_pdfefmts)
$OpenBSD: patch-texk_web2c_pdftexdir_pdftex_mk,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/web2c/pdftexdir/pdftex.mk.orig Mon Aug 25 00:24:55 2008
+++ texk/web2c/pdftexdir/pdftex.mk Mon Aug 25 00:25:27 2008
@@ -97,7 +97,7 @@ pdfefmts: $(all_pdfefmts)
pdfefmtdir = $(web2cdir)/pdfetex
$(pdfefmtdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(pdfefmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(pdfefmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(pdfefmtdir)
pdfetex.fmt: pdfetex
$(dumpenv) $(MAKE) progname=pdfetex files="etex.src plain.tex cmr10.tfm" prereq-check
@@ -112,7 +112,7 @@ install-pdftex-dumps: install-pdftex-fmts
# The actual binary executables and pool files.
install-programs: @PETEX@ install-pdftex-programs
install-pdftex-programs: $(pdftex) $(bindir)
@@ -112,7 +112,8 @@ pdflatex.fmt: pdftex
install-pdftex: install-pdftex-exec
install-programs: @PETEX@ install-pdftex-exec
install-pdftex-exec: $(pdftex) $(bindir)
- for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
install-links: @PETEX@ install-pdftex-links
install-pdftex-links: install-pdftex-programs
@@ -122,15 +122,15 @@ install-pdftex-links: install-pdftex-programs
install-fmts: @PETEX@ install-pdftex-fmts
install-pdftex-fmts: pdfefmts $(pdfefmtdir)
pdfefmts="$(all_pdfefmts)"; \
- for f in $$pdfefmts; do $(INSTALL_DATA) $$f $(pdfefmtdir)/$$f; done
+ for f in $$pdfefmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(pdfefmtdir)/$$f; done
pdfefmts="$(pdfefmts)"; \
for f in $$pdfefmts; do base=`basename $$f .fmt`; \
- (cd $(bindir) && (rm -f $$base; $(LN) pdftex $$base)); done
+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) pdftex $$base)); done
# Auxiliary files.
install-data:: @PETEX@ install-pdftex-data
install-pdftex-pool: pdftex.pool $(texpooldir)
- $(INSTALL_DATA) pdftex.pool $(texpooldir)/pdftex.pool
+ $(INSTALL_DATA) pdftex.pool ${DESTDIR}$(texpooldir)/pdftex.pool
+ for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p \
+ $(DESTDIR)/$(bindir); done
#
# ttf2afm

View File

@ -1,84 +0,0 @@
$OpenBSD: patch-texk_web2c_texmfmem_h,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
--- texk/web2c/texmfmem.h.orig Tue Jun 20 13:03:18 2006
+++ texk/web2c/texmfmem.h Fri Jun 22 10:51:56 2007
@@ -112,33 +112,20 @@ typedef union
#else
twohalves hhfield;
#endif
-#ifdef WORDS_BIGENDIAN
#ifdef XeTeX
- struct
- {
- integer CINT;
- integer CINT1;
- } x;
-#else
- integer cint;
+ voidpointer ptr;
#endif
+#ifdef WORDS_BIGENDIAN
+ integer cint;
fourquarters qqqq;
#else /* not WORDS_BIGENDIAN */
-#ifdef XeTeX
struct
{
- integer CINT1;
- integer CINT;
- } x;
-#else
- struct
- {
#if defined (TeX) && !defined (SMALLTeX) || defined (MF) && !defined (SMALLMF) || defined (MP) && !defined (SMALLMP)
halfword junk;
#endif /* big {TeX,MF,MP} */
integer CINT;
} u;
-#endif
struct
{
@@ -159,28 +146,13 @@ typedef union
typedef union
{
#ifdef WORDS_BIGENDIAN
-#ifdef XeTeX
- struct
- {
- integer CINT;
- } x;
-#else
integer cint;
-#endif
fourquarters qqqq;
#else /* not WORDS_BIGENDIAN */
-#ifdef XeTeX
struct
{
- halfword junk;
integer CINT;
- } x;
-#else
- struct
- {
- integer CINT;
} u;
-#endif
struct
{
@@ -199,14 +171,9 @@ typedef union
#define rh v.RH
#define lhfield v.LH
-#ifdef XeTeX
-#define cint x.CINT
-#define cint1 x.CINT1
-#else
#ifndef WORDS_BIGENDIAN
#define cint u.CINT
#endif
-#endif /* XeTeX */
#ifndef WORDS_BIGENDIAN
#define qqqq v.QQQQ

View File

@ -1,348 +0,0 @@
$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_ext_c,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
--- texk/web2c/xetexdir/XeTeX_ext.c.orig Mon Jan 15 13:04:36 2007
+++ texk/web2c/xetexdir/XeTeX_ext.c Fri Jun 22 10:51:56 2007
@@ -236,9 +236,9 @@ void initversionstring(char **versions)
}
-extern char* gettexstring(int strNumber);
+extern char* gettexstring(integer strNumber);
void
-setinputfileencoding(UFILE* f, int mode, int encodingData)
+setinputfileencoding(UFILE* f, integer mode, integer encodingData)
{
if ((f->encodingMode == ICUMAPPING) && (f->conversionData != NULL))
ucnv_close((UConverter*)(f->conversionData));
@@ -288,9 +288,9 @@ input_line_icu(UFILE* f)
static char* byteBuffer = NULL;
UInt32 bytesRead = 0;
- int i;
+ int i;
UConverter* cnv;
- long outLen;
+ int outLen;
UErrorCode errorCode = 0;
if (byteBuffer == NULL)
@@ -355,10 +355,9 @@ static UBreakIterator* brkIter = NULL;
static int brkLocaleStrNum = 0;
void
-linebreakstart(int localeStrNum, const UniChar* text, int textLength)
+linebreakstart(integer localeStrNum, const UniChar* text, integer textLength)
{
UErrorCode status = 0;
- int i;
if ((localeStrNum != brkLocaleStrNum) && (brkIter != NULL)) {
ubrk_close(brkIter);
@@ -392,8 +391,8 @@ linebreaknext()
return ubrk_next((UBreakIterator*)brkIter);
}
-long
-getencodingmodeandinfo(long* info)
+int
+getencodingmodeandinfo(integer* info)
{
/* \XeTeXinputencoding "enc-name"
* -> name is packed in |nameoffile| as a C string, starting at [1]
@@ -811,7 +810,7 @@ splitFontName(char* name, char** var, char** feat, cha
}
void*
-findnativefont(unsigned char* uname, long scaled_size)
+findnativefont(unsigned char* uname, integer scaled_size)
/* scaled_size here is in TeX points */
{
void* rval = 0;
@@ -950,7 +949,6 @@ void
otgetfontmetrics(void* pEngine, scaled* ascent, scaled* descent, scaled* xheight, scaled* capheight, scaled* slant)
{
XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
- long rval = 0;
float a, d;
int glyphID;
@@ -977,8 +975,8 @@ otgetfontmetrics(void* pEngine, scaled* ascent, scaled
*capheight = *ascent; /* arbitrary figure if there's no 'X' in the font */
}
-long
-otfontget(int what, void* pEngine)
+integer
+otfontget(integer what, void* pEngine)
{
XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
XeTeXFont fontInst = getFont(engine);
@@ -995,8 +993,8 @@ otfontget(int what, void* pEngine)
}
-long
-otfontget1(int what, void* pEngine, long param)
+integer
+otfontget1(integer what, void* pEngine, integer param)
{
XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
XeTeXFont fontInst = getFont(engine);
@@ -1013,8 +1011,8 @@ otfontget1(int what, void* pEngine, long param)
}
-long
-otfontget2(int what, void* pEngine, long param1, long param2)
+integer
+otfontget2(integer what, void* pEngine, integer param1, integer param2)
{
XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
XeTeXFont fontInst = getFont(engine);
@@ -1032,8 +1030,8 @@ otfontget2(int what, void* pEngine, long param1, long
}
-long
-otfontget3(int what, void* pEngine, long param1, long param2, long param3)
+integer
+otfontget3(integer what, void* pEngine, integer param1, integer param2, integer param3)
{
XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
XeTeXFont fontInst = getFont(engine);
@@ -1091,7 +1089,7 @@ makeXDVGlyphArrayData(void* pNode)
xdvbuffer = (char*)xmalloc(xdvBufSize);
}
- glyph_info = (void*)native_glyph_info_ptr(p);
+ glyph_info = native_glyph_info_ptr(p);
locations = (FixedPoint*)glyph_info;
glyphIDs = (UInt16*)(locations + glyphCount);
@@ -1138,8 +1136,8 @@ makeXDVGlyphArrayData(void* pNode)
return ((char*)cp - xdvbuffer);
}
-long
-makefontdef(long f)
+int
+makefontdef(integer f)
{
UInt16 flags = 0;
UInt32 variationCount = 0;
@@ -1349,7 +1347,7 @@ snap_zone(scaled* value, scaled snap_value, scaled fuz
}
void
-getnativecharheightdepth(int font, int ch, scaled* height, scaled* depth)
+getnativecharheightdepth(integer font, integer ch, scaled* height, scaled* depth)
{
#define QUAD(f) fontinfo[6+parambase[f]].cint
#define X_HEIGHT(f) fontinfo[5+parambase[f]].cint
@@ -1389,7 +1387,7 @@ getnativecharheightdepth(int font, int ch, scaled* hei
}
scaled
-getnativecharht(int f, int c)
+getnativecharht(integer f, integer c)
{
scaled h, d;
getnativecharheightdepth(f, c, &h, &d);
@@ -1397,7 +1395,7 @@ getnativecharht(int f, int c)
}
scaled
-getnativechardp(int f, int c)
+getnativechardp(integer f, integer c)
{
scaled h, d;
getnativecharheightdepth(f, c, &h, &d);
@@ -1405,7 +1403,7 @@ getnativechardp(int f, int c)
}
void
-getnativecharsidebearings(int font, int ch, scaled* lsb, scaled* rsb)
+getnativecharsidebearings(integer font, integer ch, scaled* lsb, scaled* rsb)
{
float l, r;
@@ -1432,7 +1430,7 @@ getnativecharsidebearings(int font, int ch, scaled* ls
}
scaled
-getnativecharic(int f, int c)
+getnativecharic(integer f, integer c)
{
scaled lsb, rsb;
getnativecharsidebearings(f, c, &lsb, &rsb);
@@ -1443,7 +1441,7 @@ getnativecharic(int f, int c)
}
scaled
-getnativecharwd(int f, int c)
+getnativecharwd(integer f, integer c)
{
scaled wd = 0;
#ifdef XETEX_MAC
@@ -1515,7 +1513,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
void* glyph_info = 0;
static float* positions = 0;
static UInt32* glyphs = 0;
- static long maxGlyphs = 0;
+ static int maxGlyphs = 0;
FixedPoint* locations;
UInt16* glyphIDs;
@@ -1591,7 +1589,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
node_width(node) = X2Fix(wid);
native_glyph_count(node) = realGlyphCount;
- native_glyph_info_ptr(node) = (long)glyph_info;
+ native_glyph_info_ptr(node) = glyph_info;
}
else {
int i;
@@ -1632,7 +1630,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
}
native_glyph_count(node) = realGlyphCount;
- native_glyph_info_ptr(node) = (long)glyph_info;
+ native_glyph_info_ptr(node) = glyph_info;
}
ubidi_close(pBiDi);
@@ -1787,8 +1785,8 @@ measure_native_glyph(void* pNode, int use_glyph_metric
}
}
-int
-mapchartoglyph(int font, unsigned int ch)
+integer
+mapchartoglyph(integer font, integer ch)
{
if (ch > 0x10ffff || ((ch >= 0xd800) && (ch <= 0xdfff)))
return 0;
@@ -1805,8 +1803,8 @@ mapchartoglyph(int font, unsigned int ch)
}
}
-int
-mapglyphtoindex(int font)
+integer
+mapglyphtoindex(integer font)
/* glyph name is at nameoffile+1 */
{
#ifdef XETEX_MAC
@@ -1822,8 +1820,8 @@ mapglyphtoindex(int font)
}
}
-int
-getfontcharrange(int font, int first)
+integer
+getfontcharrange(integer font, int first)
{
#ifdef XETEX_MAC
if (fontarea[font] == AAT_FONT_FLAG)
@@ -1928,10 +1926,10 @@ atsugetfontmetrics(ATSUStyle style, Fixed* ascent, Fix
#endif
}
-long
+int
atsufontget(int what, ATSUStyle style)
{
- long rval = -1;
+ int rval = -1;
#ifdef XETEX_MAC
ATSUFontID fontID;
@@ -1966,10 +1964,10 @@ atsufontget(int what, ATSUStyle style)
return rval;
}
-long
+int
atsufontget1(int what, ATSUStyle style, int param)
{
- long rval = -1;
+ int rval = -1;
#ifdef XETEX_MAC
ATSUFontID fontID;
@@ -2026,10 +2024,10 @@ atsufontget1(int what, ATSUStyle style, int param)
return rval;
}
-long
+int
atsufontget2(int what, ATSUStyle style, int param1, int param2)
{
- long rval = -1;
+ int rval = -1;
#ifdef XETEX_MAC
ATSUFontID fontID;
@@ -2063,10 +2061,10 @@ atsufontget2(int what, ATSUStyle style, int param1, in
return rval;
}
-long
+int
atsufontgetnamed(int what, ATSUStyle style)
{
- long rval = -1;
+ int rval = -1;
#ifdef XETEX_MAC
ATSUFontID fontID;
@@ -2090,10 +2088,10 @@ atsufontgetnamed(int what, ATSUStyle style)
return rval;
}
-long
+int
atsufontgetnamed1(int what, ATSUStyle style, int param)
{
- long rval = -1;
+ int rval = -1;
#ifdef XETEX_MAC
ATSUFontID fontID;
@@ -2220,7 +2218,7 @@ atsuprintfontname(int what, ATSUStyle style, int param
}
void
-printglyphname(int font, int gid)
+printglyphname(integer font, integer gid)
{
char* s;
int len = 0;
@@ -2243,8 +2241,8 @@ printglyphname(int font, int gid)
printchar(*s++);
}
-boolean
-u_open_in(unicodefile* f, int filefmt, const_string fopen_mode, int mode, int encodingData)
+int
+u_open_in(unicodefile* f, integer filefmt, const_string fopen_mode, integer mode, integer encodingData)
{
boolean rval;
*f = malloc(sizeof(UFILE));
@@ -2287,7 +2285,7 @@ u_open_in(unicodefile* f, int filefmt, const_string fo
return rval;
}
-boolean
+int
open_dvi_output(FILE** fptr)
{
if (nopdfoutput) {
@@ -2391,7 +2389,7 @@ get_uni_c(UFILE* f)
return rval;
}
-boolean
+int
input_line(UFILE* f)
{
int i;

View File

@ -1,109 +0,0 @@
$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_ext_h,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
--- texk/web2c/xetexdir/XeTeX_ext.h.orig Fri Dec 29 17:54:26 2006
+++ texk/web2c/xetexdir/XeTeX_ext.h Fri Jun 22 10:51:56 2007
@@ -141,10 +141,10 @@ typedef struct {
#define node_width(node) node[width_offset].cint
#define node_depth(node) node[depth_offset].cint
#define node_height(node) node[height_offset].cint
-#define native_length(node) node[native_info_offset].hh.v.RH
-#define native_font(node) node[native_info_offset].hh.b1
-#define native_glyph_count(node) node[native_glyph_info_offset].hh.v.LH
-#define native_glyph_info_ptr(node) node[native_glyph_info_offset].hh.v.RH
+#define native_length(node) node[native_info_offset].qqqq.b2
+#define native_font(node) node[native_info_offset].qqqq.b1
+#define native_glyph_count(node) node[native_info_offset].qqqq.b3
+#define native_glyph_info_ptr(node) node[native_glyph_info_offset].ptr
#define native_glyph_info_size 10 /* info for each glyph is location (FixedPoint) + glyph ID (UInt16) */
#define native_glyph(p) native_length(p) /* glyph ID field in a glyph_node */
@@ -206,6 +206,8 @@ extern const UInt32 kSurrogateLowEnd;
extern const UInt32 byteMask;
extern const UInt32 byteMark;
+#include <stdio.h> /* for FILE */
+
#include "trans.h"
#ifdef __cplusplus
@@ -213,51 +215,62 @@ extern "C" {
#endif
void initversionstring(char **versions);
- void setinputfileencoding(unicodefile f, int mode, int encodingData);
+ void setinputfileencoding(unicodefile f, integer mode, integer encodingData);
void uclose(unicodefile f);
int input_line_icu(unicodefile f);
- void linebreakstart(int localeStrNum, const UniChar* text, int textLength);
+ void linebreakstart(integer localeStrNum, const UniChar* text, integer textLength);
int linebreaknext();
- long getencodingmodeandinfo(long* info);
+ int getencodingmodeandinfo(integer* info);
void printutf8str(const unsigned char* str, int len);
void printchars(const unsigned short* str, int len);
void* load_mapping_file(const char* s, const char* e);
- void* findnativefont(unsigned char* name, long scaled_size);
+ void* findnativefont(unsigned char* name, integer scaled_size);
void releasefontengine(void* engine, int type_flag);
- /* 'integer' params here are really TeX 'scaled' values, but that typedef isn't available every place this is included */
+ /* the metrics params here are really TeX 'scaled' values, but that typedef isn't available every place this is included */
void otgetfontmetrics(void* engine, integer* ascent, integer* descent, integer* xheight, integer* capheight, integer* slant);
- void getnativecharheightdepth(int font, int ch, integer* height, integer* depth);
- void getnativecharsidebearings(int font, int ch, integer* lsb, integer* rsb);
+ void getnativecharheightdepth(integer font, integer ch, integer* height, integer* depth);
+ void getnativecharsidebearings(integer font, integer ch, integer* lsb, integer* rsb);
/* single-purpose metrics accessors */
- integer getnativecharwd(int font, int ch);
- integer getnativecharht(int font, int ch);
- integer getnativechardp(int font, int ch);
- integer getnativecharic(int font, int ch);
+ integer getnativecharwd(integer font, integer ch);
+ integer getnativecharht(integer font, integer ch);
+ integer getnativechardp(integer font, integer ch);
+ integer getnativecharic(integer font, integer ch);
- long otfontget(int what, void* engine);
- long otfontget1(int what, void* engine, long param);
- long otfontget2(int what, void* engine, long param1, long param2);
- long otfontget3(int what, void* engine, long param1, long param2, long param3);
+ integer otfontget(integer what, void* engine);
+ integer otfontget1(integer what, void* engine, integer param);
+ integer otfontget2(integer what, void* engine, integer param1, integer param2);
+ integer otfontget3(integer what, void* engine, integer param1, integer param2, integer param3);
int makeXDVGlyphArrayData(void* p);
- long makefontdef(long f);
+ int makefontdef(integer f);
int applymapping(void* cnv, const UniChar* txtPtr, int txtLen);
void store_justified_native_glyphs(void* node);
void measure_native_node(void* node, int use_glyph_metrics);
Fixed get_native_ital_corr(void* node);
Fixed get_native_glyph_ital_corr(void* node);
void measure_native_glyph(void* node, int use_glyph_metrics);
- int mapchartoglyph(int font, unsigned int ch);
- int mapglyphtoindex(int font);
+ integer mapchartoglyph(integer font, integer ch);
+ integer mapglyphtoindex(integer font);
+ integer getfontcharrange(integer font, int first);
+ void printglyphname(integer font, integer gid);
+ double read_double(const char** s);
+ unsigned int read_rgb_a(const char** cp);
+
const char* getGlyphNamePtr(const char* buffer, int tableSize, UInt16 gid, int* len);
int find_pic_file(char** path, realrect* bounds, int pdfBoxType, int page);
+ int u_open_in(unicodefile* f, integer filefmt, const char* fopen_mode, integer mode, integer encodingData);
+ int open_dvi_output(FILE** fptr);
+ void dviclose(FILE* fptr);
+ int get_uni_c(UFILE* f);
+ int input_line(UFILE* f);
+ void makeutf16name();
#ifdef XETEX_MAC
/* functions in XeTeX_mac.c */
- void* loadAATfont(ATSFontRef fontRef, long scaled_size, const char* cp1);
+ void* loadAATfont(ATSFontRef fontRef, integer scaled_size, const char* cp1);
void DoAtsuiLayout(void* node, int justify);
void GetGlyphBBox_AAT(ATSUStyle style, UInt16 gid, GlyphBBox* bbox);
float GetGlyphWidth_AAT(ATSUStyle style, UInt16 gid);

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_mac_c,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
--- texk/web2c/xetexdir/XeTeX_mac.c.orig Wed Dec 6 17:29:15 2006
+++ texk/web2c/xetexdir/XeTeX_mac.c Fri Jun 22 10:51:56 2007
@@ -162,7 +162,7 @@ DoAtsuiLayout(void* p, int justify)
lsDelta -= lsUnit;
native_glyph_count(node) = realGlyphCount;
- native_glyph_info_ptr(node) = (long)glyph_info;
+ native_glyph_info_ptr(node) = glyph_info;
if (!justify)
node_width(node) = FixedPStoTeXPoints(layoutRec[count-1].realPos) + lsDelta;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-texk_web2c_xetexdir_jpegimage_c,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
--- texk/web2c/xetexdir/jpegimage.c.orig Wed Jul 26 17:19:45 2006
+++ texk/web2c/xetexdir/jpegimage.c Wed Jun 27 13:17:43 2007
@@ -81,6 +81,8 @@
#include <memory.h>
+#include "kpathsea/lib.h" /* for xmalloc/xrealloc prototypes */
+
#define JPEG_DEBUG_STR "JPEG"
#define JPEG_DEBUG 3

View File

@ -1,267 +0,0 @@
$OpenBSD: patch-texk_web2c_xetexdir_xetex-new_ch,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
--- texk/web2c/xetexdir/xetex-new.ch.orig Wed Jan 3 16:25:04 2007
+++ texk/web2c/xetexdir/xetex-new.ch Fri Jun 22 10:51:56 2007
@@ -56,7 +56,7 @@
@d XeTeX_version=0
@d XeTeX_revision==".996"
-@d XeTeX_version_string=='-0.996' {current \XeTeX\ version}
+@d XeTeX_version_string=='-0.996-patch1' {current \XeTeX\ version}
@z
@x
@@ -706,29 +706,28 @@ if max_quarterword-min_quarterword<@"FFFF then bad:=19
To support ``native'' fonts, we build |native_word_nodes|, which are variable size whatsits.
These have the same |width|, |depth|, and |height| fields as a |box_node|, at offsets 1-3,
-and then a word containing a size field for the node, a font number, and a length.
-Then there is a field containing two halfwords, a glyph count and a C pointer to a glyph info array;
-these are set by |set_native_metrics|. Copying and freeing of these nodes needs to take account of this!
+and then a word containing a size field for the node, a font number, a length, and a glyph count.
+Then there is a field containing a C pointer to a glyph info array;
+this and the glyph count are set by |set_native_metrics|.
+Copying and freeing of these nodes needs to take account of this!
This is followed by |length| bytes, for the actual characters of the string.
(Yes, we count in bytes, even though what we store there is UTF-16.)
So |native_node_size|, which does not include any space for the actual text, is 6.}
-@d deleted_native_node=41 {native words that have been superseded by their successors}
-
@d native_node_size=6 {size of a native_word node (plus the actual chars) -- see also xetex.h}
-@d native_size(#)==mem[#+4].hh.b0
-@d native_font(#)==mem[#+4].hh.b1
-@d native_length(#)==mem[#+4].hh.rh
-@d native_glyph_count(#)==mem[#+5].hh.lh
-@d native_glyph_info_ptr(#)==mem[#+5].hh.rh
+@d native_size(#)==mem[#+4].qqqq.b0
+@d native_font(#)==mem[#+4].qqqq.b1
+@d native_length(#)==mem[#+4].qqqq.b2
+@d native_glyph_count(#)==mem[#+4].qqqq.b3
+@d native_glyph_info_ptr(#)==mem[#+5].ptr
@d native_glyph_info_size=10 { number of bytes of info per glyph: 16-bit glyph ID, 32-bit x and y coords }
@d free_native_glyph_info(#) ==
begin
- if native_glyph_info_ptr(#) <> 0 then begin
- libc_free(cast_to_ptr(native_glyph_info_ptr(#)));
- native_glyph_info_ptr(#) := 0;
+ if native_glyph_info_ptr(#) <> null_ptr then begin
+ libc_free(native_glyph_info_ptr(#));
+ native_glyph_info_ptr(#) := null_ptr;
native_glyph_count(#) := 0;
end
end
@@ -736,10 +735,10 @@ So |native_node_size|, which does not include any spac
@p procedure copy_native_glyph_info(src:pointer; dest:pointer);
var glyph_count:integer;
begin
- if native_glyph_info_ptr(src) <> 0 then begin
+ if native_glyph_info_ptr(src) <> null_ptr then begin
glyph_count := native_glyph_count(src);
- native_glyph_info_ptr(dest) := cast_to_integer(xmalloc_array(char, glyph_count * native_glyph_info_size));
- memcpy(cast_to_ptr(native_glyph_info_ptr(dest)), cast_to_ptr(native_glyph_info_ptr(src)), glyph_count * native_glyph_info_size);
+ native_glyph_info_ptr(dest) := xmalloc_array(char, glyph_count * native_glyph_info_size);
+ memcpy(native_glyph_info_ptr(dest), native_glyph_info_ptr(src), glyph_count * native_glyph_info_size);
native_glyph_count(dest) := glyph_count;
end
end;
@@ -2936,8 +2935,7 @@ done:
end
@ @<Advance |q| past ignorable nodes@>=
-while (q <> null) and (not is_char_node(q))
- and ( (type(q) = disc_node) or ((type(q) = whatsit_node) and (subtype(q) = deleted_native_node)) ) do
+while (q <> null) and (not is_char_node(q)) and (type(q) = disc_node) do
q := link(q)
@ We ought to give special care to the efficiency of one part of |hlist_out|,
@@ -3293,7 +3291,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
or (subtype(v)=pic_node)
or (subtype(v)=pdf_node)
then break_width[1]:=break_width[1]-width(v)
- else if subtype(v)=deleted_native_node then do_nothing
else confusion("disc1a");
othercases confusion("disc1")
@z
@@ -3307,7 +3304,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
or (subtype(s)=pic_node)
or (subtype(s)=pdf_node)
then break_width[1]:=break_width[1]+width(s)
- else if subtype(s)=deleted_native_node then do_nothing
else confusion("disc2a");
othercases confusion("disc2")
@z
@@ -3327,7 +3323,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
or (subtype(s)=pic_node)
or (subtype(s)=pdf_node)
then disc_width:=disc_width+width(s)
- else if subtype(s)=deleted_native_node then do_nothing
else confusion("disc3a");
othercases confusion("disc3")
@z
@@ -3341,7 +3336,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
or (subtype(s)=pic_node)
or (subtype(s)=pdf_node)
then act_width:=act_width+width(s)
- else if subtype(s)=deleted_native_node then do_nothing
else confusion("disc4a");
othercases confusion("disc4")
@z
@@ -3784,7 +3778,7 @@ hmode+char_num: begin scan_usv_num; cur_chr:=cur_val;
@!main_p:pointer; {temporary register for list manipulation}
@y
@!main_p:pointer; {temporary register for list manipulation}
-@!main_pp:pointer; {another temporary register for list manipulation}
+@!main_pp,@!main_ppp:pointer; {more temporary registers for list manipulation}
@!main_h:pointer; {temp for hyphen offset in native-font text}
@!is_hyph:boolean; {whether the last char seen is the font's hyphenchar}
@z
@@ -3859,11 +3853,22 @@ collect_native:
if mode=hmode then begin
+ main_ppp := head;
+ if main_ppp<>main_pp then
+ while (link(main_ppp)<>main_pp) do
+ main_ppp:=link(main_ppp); { find node preceding tail }
+
temp_ptr := str_start_macro(str_ptr);
repeat
if main_h = 0 then main_h := main_k;
- if (not is_char_node(main_pp)) and (type(main_pp)=whatsit_node) and (subtype(main_pp)=native_word_node) and (native_font(main_pp)=main_f) then begin
+ if (not is_char_node(main_pp))
+ and (type(main_pp)=whatsit_node)
+ and (subtype(main_pp)=native_word_node)
+ and (native_font(main_pp)=main_f)
+ and (main_ppp<>main_pp)
+ and type(main_ppp)<>disc_node
+ then begin
{ make a new temp string that contains the concatenated text of |tail| + the current word/fragment }
main_k := main_h + native_length(main_pp);
@@ -3888,9 +3893,13 @@ collect_native:
do incr(main_h); { look for next hyphen or end of text }
if (main_h < main_k) then incr(main_h);
- { flag the previous node as no longer valid }
- free_native_glyph_info(main_pp);
- subtype(main_pp) := deleted_native_node;
+ { remove the preceding node from the list }
+ link(main_ppp) := link(main_pp);
+ link(main_pp) := null;
+ flush_node_list(main_pp);
+ main_pp := tail;
+ while (link(main_ppp)<>main_pp) do
+ main_ppp:=link(main_ppp);
end else begin
@@ -3929,9 +3938,14 @@ collect_native:
set_native_char(tail, main_p + native_length(main_pp), str_pool[str_start_macro(str_ptr) + main_p]);
set_native_metrics(tail, XeTeX_use_glyph_metrics);
- { flag the previous node as no longer valid }
- free_native_glyph_info(main_pp);
- subtype(main_pp) := deleted_native_node;
+ { remove the preceding node from the list }
+ main_p := head;
+ if main_p<>main_pp then
+ while link(main_p)<>main_pp do
+ main_p := link(main_p);
+ link(main_p) := link(main_pp);
+ link(main_pp) := null;
+ flush_node_list(main_pp);
end else begin
{ package the current string into a |native_word| whatsit }
link(main_pp) := new_native_word_node(main_f, main_k);
@@ -3997,7 +4011,6 @@ begin if tail<>head then
@y
if type(p)<>kern_node then if type(p)<>ligature_node then
if (type(p)<>whatsit_node) or ((subtype(p)<>native_word_node)
- and (subtype(p)<>deleted_native_node)
and (subtype(p)<>glyph_node)) then
begin print_err("Improper discretionary list");
@z
@@ -4802,8 +4815,10 @@ native_word_node:begin
print_char(" ");
print_native_word(p);
end;
+@{
deleted_native_node:
print("[DELETED]");
+@}
glyph_node:begin
print_esc(font_id_text(native_font(p)));
print(" glyph#");
@@ -4837,12 +4852,9 @@ native_word_node: begin words:=native_size(p);
r:=get_node(words);
while words > 0 do
begin decr(words); mem[r+words]:=mem[p+words]; end;
- native_glyph_info_ptr(r):=0; native_glyph_count(r):=0;
+ native_glyph_info_ptr(r):=null_ptr; native_glyph_count(r):=0;
copy_native_glyph_info(p, r);
end;
-deleted_native_node: begin words:=native_size(p);
- r:=get_node(words);
- end;
glyph_node: begin r:=get_node(glyph_node_size);
words:=glyph_node_size;
end;
@@ -4858,7 +4870,6 @@ othercases confusion("ext2")
othercases confusion("ext3")
@y
native_word_node: begin free_native_glyph_info(p); free_node(p,native_size(p)); end;
-deleted_native_node: free_node(p,native_size(p));
glyph_node: free_node(p,glyph_node_size);
pic_node,pdf_node: free_node(p,total_pic_node_size(p));
pdf_save_pos_node:
@@ -5106,7 +5117,7 @@ begin
dvi_two(native_glyph(p));
cur_h := cur_h + width(p);
end else begin
- if native_glyph_info_ptr(p) <> 0 then begin
+ if native_glyph_info_ptr(p) <> null_ptr then begin
len := make_xdv_glyph_array_data(p);
for k := 0 to len-1 do
dvi_out(xdv_buffer_byte(k));
@@ -5231,7 +5242,7 @@ end;
@x
language_node:do_nothing;
@y
-language_node,deleted_native_node:do_nothing;
+language_node:do_nothing;
@z
@x
@@ -6012,6 +6023,11 @@ whatsit_node:
goto next_p;
@ Here we compute the effective width of a glue node as in |hlist_out|.
+
+@<Cases of |reverse|...@>=
+glue_node: begin round_glue;
+ @<Handle a glue node for mixed...@>;
+ end;
@z
@x
@@ -6106,7 +6122,7 @@ begin
native_length(q) := n;
native_glyph_count(q) := 0;
- native_glyph_info_ptr(q) := 0;
+ native_glyph_info_ptr(q) := null_ptr;
new_native_word_node := q;
end;
@@ -6163,7 +6179,7 @@ begin
native_size(p) := native_node_size + 1;
native_glyph_count(p) := 0;
- native_glyph_info_ptr(p) := 0;
+ native_glyph_info_ptr(p) := null_ptr;
native_font(p) := f;
if c > @"FFFF then begin

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-texk_web2c_xetexdir_xetex_defines,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
--- texk/web2c/xetexdir/xetex.defines.orig Wed Dec 6 17:29:15 2006
+++ texk/web2c/xetexdir/xetex.defines Fri Jun 22 10:51:56 2007
@@ -32,6 +32,8 @@ authorization from SIL International.
{ xetex.defines: additions for xetex }
+@define @field ptr;
+@define const nullptr;
@define type voidpointer;
@define function getnativechar();
@define procedure setnativechar();

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-texk_web2c_xetexdir_xetex_h,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
--- texk/web2c/xetexdir/xetex.h.orig Wed Dec 6 17:29:15 2006
+++ texk/web2c/xetexdir/xetex.h Fri Jun 22 10:51:56 2007
@@ -63,8 +63,7 @@ void* getotassemblyptr(int f, int g); /* function in X
#define dviopenout(f) open_dvi_output(&(f))
-#define casttoptr(x) (void*)(x)
-#define casttointeger(x) (long)(x)
+#define nullptr (NULL)
#define glyphinfobyte(p,k) ((unsigned char*)p)[k]
#define casttoushort(x) (unsigned short)(x)

View File

@ -1,38 +0,0 @@
$OpenBSD: patch-texk_web2c_xetexdir_xetex_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
--- texk/web2c/xetexdir/xetex.mk.orig Sat Jan 20 12:44:35 2007
+++ texk/web2c/xetexdir/xetex.mk Fri May 4 20:28:40 2007
@@ -275,7 +275,7 @@ xefmts: $(all_xefmts)
xefmtdir = $(web2cdir)/xetex
$(xefmtdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(xefmtdir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(xefmtdir)
xetex.fmt: xetex
$(dumpenv) $(MAKE) progname=xetex files="xetex.ini unicode-letters.tex plain.tex cmr10.tfm" prereq-check
@@ -294,7 +294,7 @@ install-xetex-dumps: install-xetex-fmts
install-programs: @XETEX@ install-xetex-programs
install-xetex-programs: xetex $(bindir)
- for p in xetex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+ for p in xetex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
install-links: @XETEX@ install-xetex-links
install-xetex-links: install-xetex-programs
@@ -304,13 +304,13 @@ install-xetex-links: install-xetex-programs
install-fmts: @XETEX@ install-xetex-fmts
install-xetex-fmts: xefmts $(xefmtdir)
xefmts="$(all_xefmts)"; \
- for f in $$xefmts; do $(INSTALL_DATA) $$f $(xefmtdir)/$$f; done
+ for f in $$xefmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(xefmtdir)/$$f; done
xefmts="$(xefmts)"; \
for f in $$xefmts; do base=`basename $$f .fmt`; \
- (cd $(bindir) && (rm -f $$base; $(LN) xetex $$base)); done
+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) xetex $$base)); done
install-data:: @XETEX@ install-xetex-data
install-xetex-pool: xetex.pool $(texpooldir)
- $(INSTALL_DATA) xetex.pool $(texpooldir)/xetex.pool
+ $(INSTALL_DATA) xetex.pool ${DESTDIR}$(texpooldir)/xetex.pool
# end of xetex.mk

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-texk_xdv2pdf_Makefile_in,v 1.1.1.1 2007/07/17 21:53:25 jasper Exp $
--- texk/xdv2pdf/Makefile.in.orig Sat Apr 21 18:37:26 2007
+++ texk/xdv2pdf/Makefile.in Sat Apr 21 18:38:20 2007
@@ -57,15 +57,15 @@ distclean::
$(RM) config.h
install-exec:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
- $(INSTALL) $(t1wrap) $(bindir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ $(INSTALL) $(t1wrap) ${DESTDIR}$(bindir)
uninstall-exec:
- cd $(bindir); rm -f $(programs)
+ cd ${DESTDIR}$(bindir); rm -f $(programs)
install-data:
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
uninstall-data:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-texk_xdvik_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
--- texk/xdvik/Makefile.in.orig Sat Apr 21 18:39:04 2007
+++ texk/xdvik/Makefile.in Sat Apr 21 18:41:40 2007
@@ -125,51 +125,51 @@ install: install-exec install-data
$OpenBSD: patch-texk_xdvik_Makefile_in,v 1.2 2008/10/21 20:57:57 steven Exp $
--- texk/xdvik/Makefile.in.orig Wed Aug 27 15:22:01 2008
+++ texk/xdvik/Makefile.in Wed Aug 27 15:24:18 2008
@@ -146,29 +146,35 @@ install: install-exec install-data
uninstall: uninstall-exec uninstall-data
install-exec: @final_exec_name@
@ -10,22 +10,15 @@ $OpenBSD: patch-texk_xdvik_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp
- $(INSTALL_SCRIPT) xdvi-sh $(scriptdir)/@wrapper_script@
- rm -f $(scriptdir)/o@wrapper_script@
- ln -s @wrapper_script@ $(scriptdir)/o@wrapper_script@
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_LIBTOOL_PROG) @final_exec_name@ ${DESTDIR}$(bindir)
+ $(INSTALL_SCRIPT) xdvi-sh ${DESTDIR}$(scriptdir)/@wrapper_script@
+ rm -f ${DESTDIR}$(scriptdir)/o@wrapper_script@
+ ln -s @wrapper_script@ ${DESTDIR}$(scriptdir)/o@wrapper_script@
### fix wrong CVS permissions for shell script
- $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
- chmod +x $(scriptdir)/xdvizilla
+ $(INSTALL_SCRIPT) $(srcdir)/xdvizilla ${DESTDIR}$(scriptdir)/xdvizilla
+ chmod +x ${DESTDIR}$(scriptdir)/xdvizilla
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(bindir)
+ $(INSTALL_LIBTOOL_PROG) @final_exec_name@ $(DESTDIR)/$(bindir)
+ $(INSTALL_SCRIPT) xdvi-sh $(DESTDIR)/$(scriptdir)/@wrapper_script@
+ rm -f $(DESTDIR)/$(scriptdir)/o@wrapper_script@
+ ln -s @wrapper_script@ $(DESTDIR)/$(scriptdir)/o@wrapper_script@
uninstall-exec:
- for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
- for p in @wrapper_script@ o@wrapper_script@; do rm -f $(scriptdir)/$$p; done
+ for p in @final_exec_name@; do rm -f ${DESTDIR}$(bindir)/$$p; done
+ for p in @wrapper_script@ o@wrapper_script@; do rm -f ${DESTDIR}$(scriptdir)/$$p; done
for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
for p in @wrapper_script@ o@wrapper_script@; do rm -f $(scriptdir)/$$p; done
install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
@ -35,49 +28,27 @@ $OpenBSD: patch-texk_xdvik_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp
- ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
- $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
- $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/xdvi/pixmaps
+ $(INSTALL_DATA) $(manpage).1 ${DESTDIR}$(man1dir)/$(manpage).$(manext)
+ rm -f ${DESTDIR}$(man1dir)/o$(manpage).$(manext)
+ ln -s $(manpage).$(manext) ${DESTDIR}$(man1dir)/o$(manpage).$(manext)
+ $(INSTALL_DATA) $(srcdir)/texmf/XDvi ${DESTDIR}$(texmf)/xdvi/XDvi
+ $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm ${DESTDIR}$(texmf)/xdvi/pixmaps
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)/$(man1dir)
+ $(SHELL) $(top_srcdir)/../mkinstalldirs \
+ $(DESTDIR)/$(texmf)/xdvi/pixmaps
+ $(INSTALL_DATA) $(manpage).1 \
+ $(DESTDIR)/$(man1dir)/$(manpage).$(manext)
+ rm -f $(DESTDIR)/$(man1dir)/o$(manpage).$(manext)
+ ln -s $(manpage).$(manext) \
+ $(DESTDIR)/$(man1dir)/o$(manpage).$(manext)
+ $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(DESTDIR)/$(texmf)/xdvi/XDvi
+ $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm \
+ $(srcdir)/pixmaps/toolbar2.xpm $(DESTDIR)/$(texmf)/xdvi/pixmaps
if \
- grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+ grep 'original xdvi.cfg --' ${DESTDIR}$(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
+ || test ! -r ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
+ grep 'original xdvi.cfg --' \
+ $(DESTDIR)/$(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
+ || test ! -r $(DESTDIR)/$(texmf)/xdvi/xdvi.cfg; \
then \
- $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \
+ $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
+ $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg \
+ $(DESTDIR)/$(texmf)/xdvi/xdvi.cfg; \
else \
true; \
fi
- $(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext)
+ $(INSTALL_DATA) $(srcdir)/xdvizilla.1 ${DESTDIR}$(man1dir)/xdvizilla.$(manext)
uninstall-data:
- rm -f $(man1dir)/$(manpage).$(manext) $(man1dir)/xdvizilla.$(manext) \
- $(scriptdir)/xdvizilla \
- $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
- $(texmf)/xdvi/XDvi
+ rm -f ${DESTDIR}$(man1dir)/$(manpage).$(manext) ${DESTDIR}$(man1dir)/xdvizilla.$(manext) \
+ ${DESTDIR}$(scriptdir)/xdvizilla \
+ ${DESTDIR}$(texmf)/xdvi/pixmaps/toolbar.xpm ${DESTDIR}$(texmf)/xdvi/pixmaps/toolbar2.xpm \
+ ${DESTDIR}$(texmf)/xdvi/XDvi
if \
- head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+ head -n 1 ${DESTDIR}$(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
+ || test ! -r ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
then \
- rm -f $(texmf)/xdvi/xdvi.cfg; \
+ rm -f ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
else \
true; \
fi
- rmdir $(texmf)/xdvi/pixmaps
+ rmdir ${DESTDIR}$(texmf)/xdvi/pixmaps
distname = xdvik
program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-texk_xdvipdfmx_Makefile_in,v 1.1 2008/10/21 20:57:57 steven Exp $
xdvipdfmx exposes gcc optimizer bugs
--- texk/xdvipdfmx/Makefile.in.orig Sat Oct 11 11:06:13 2008
+++ texk/xdvipdfmx/Makefile.in Sat Oct 11 11:06:47 2008
@@ -91,7 +91,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -O0
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-texk_xdvipdfmx_configure,v 1.1 2008/10/21 20:57:58 steven Exp $
--- texk/xdvipdfmx/configure.orig Thu Jun 26 11:21:46 2008
+++ texk/xdvipdfmx/configure Sun Aug 24 12:28:30 2008
@@ -25200,7 +25200,7 @@ else
if test "$with_system_freetype2" = yes; then
if test "x$with_freetype2_libdir" != x; then
- EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir"
+ EXTRA_FREETYPE2_LIBDIR="-L$with_freetype2_libdir -lz" # hack just for the OpenBSD build
fi
if test "x$with_freetype2_include" != x; then
EXTRA_FREETYPE2_INCLUDE="-I$with_freetype2_include -I$with_freetype2_include/freetype2"

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-texk_xdvipdfmx_src_tt_cmap_c,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
--- texk/xdvipdfmx/src/tt_cmap.c.orig Fri Sep 29 16:15:10 2006
+++ texk/xdvipdfmx/src/tt_cmap.c Tue Jun 26 14:53:54 2007
@@ -303,6 +303,9 @@ lookup_cmap4 (struct cmap4 *map, USHORT cc)
if (cc >= map->startCount[i]) {
if (map->idRangeOffset[i] == 0) {
gid = (cc + map->idDelta[i]) & 0xffff;
+ } else if (cc == 0xffff && map->idRangeOffset[i] == 0xffff) {
+ /* this is for protection against some old broken fonts... */
+ gid = 0;
} else {
j = map->idRangeOffset[i] - (segCount - i) * 2;
j = (cc - map->startCount[i]) + (j / 2);
@@ -630,6 +633,9 @@ load_cmap4 (struct cmap4 *map,
ch = c0 + j;
if (map->idRangeOffset[i] == 0) {
gid = (ch + map->idDelta[i]) & 0xffff;
+ } else if (c0 == 0xffff && c1 == 0xffff && map->idRangeOffset[i] == 0xffff) {
+ /* this is for protection against some old broken fonts... */
+ gid = 0;
} else {
gid = (map->glyphIndexArray[j+d] +
map->idDelta[i]) & 0xffff;
@@ -952,6 +958,9 @@ create_ToUnicode_cmap4 (struct cmap4 *map,
ch = c0 + j;
if (map->idRangeOffset[i] == 0) {
gid = (ch + map->idDelta[i]) & 0xffff;
+ } else if (c0 == 0xffff && c1 == 0xffff && map->idRangeOffset[i] == 0xffff) {
+ /* this is for protection against some old broken fonts... */
+ gid = 0;
} else {
gid = (map->glyphIndexArray[j+d] +
map->idDelta[i]) & 0xffff;

View File

@ -1,32 +1,25 @@
$OpenBSD: patch-utils_dialog_Makefile_in,v 1.2 2007/10/15 07:31:57 kili Exp $
--- utils/dialog/Makefile.in.orig Tue Jan 17 22:16:42 2006
+++ utils/dialog/Makefile.in Sun Oct 14 21:54:04 2007
@@ -104,23 +104,23 @@ SHELL = /bin/sh
$OpenBSD: patch-utils_dialog_Makefile_in,v 1.3 2008/10/21 20:57:58 steven Exp $
--- utils/dialog/Makefile.in.orig Tue Jan 17 21:16:42 2006
+++ utils/dialog/Makefile.in Wed Sep 24 16:38:54 2008
@@ -104,17 +104,17 @@ SHELL = /bin/sh
@SET_MAKE@
.PHONY: install installdirs install-exec
-install: install-exec $(man1dir)/tcdialog.$(manext)
+install: install-exec ${DESTDIR}$(man1dir)/tcdialog.$(manext)
+install: install-exec $(DESTDIR)/$(man1dir)/tcdialog.$(manext)
install-exec: installdirs $(bindir)/tcdialog
installdirs:
- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(man1dir)
+ $(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(man1dir)
+ $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(DESTDIR)/$(man1dir)
$(bindir)/tcdialog: dialog
- $(INSTALL_PROGRAM) dialog $@
+ $(INSTALL_PROGRAM) dialog ${DESTDIR}$@
+ $(INSTALL_PROGRAM) dialog $(DESTDIR)/$@
-$(man1dir)/tcdialog.$(manext): dialog.man
+${DESTDIR}$(man1dir)/tcdialog.$(manext): dialog.man
+$(DESTDIR)/$(man1dir)/tcdialog.$(manext): dialog.man
$(INSTALL_DATA) $(srcdir)/dialog.man $@
check:
uninstall:
- -rm -f $(bindir)/tcdialog $(man1dir)/tcdialog.$(manext)
+ -rm -f ${DESTDIR}$(bindir)/tcdialog ${DESTDIR}$(man1dir)/tcdialog.$(manext)
.PHONY: clean realclean distclean mostlyclean

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-utils_ps2eps_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
--- utils/ps2eps/Makefile.in.orig Wed Jan 10 01:13:09 2007
+++ utils/ps2eps/Makefile.in Tue Apr 17 17:24:46 2007
@@ -28,16 +28,16 @@ bbox: bbox.o
$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
install: bbox
- $(INSTALL) -d $(bindir) $(mandir)/man1
- $(INSTALL_SCRIPT) $(srcdir)/ps2eps $(bindir)/ps2eps
- $(INSTALL_PROGRAM) bbox $(bindir)/bbox
- $(INSTALL_DATA) $(srcdir)/ps2eps.1 $(mandir)/man1/ps2eps.1
- $(INSTALL_DATA) $(srcdir)/bbox.1 $(mandir)/man1/bbox.1
+ $(INSTALL) -d ${DESTDIR}$(bindir) ${DESTDIR}$(mandir)/man1
+ $(INSTALL_SCRIPT) $(srcdir)/ps2eps ${DESTDIR}$(bindir)/ps2eps
+ $(INSTALL_PROGRAM) bbox ${DESTDIR}$(bindir)/bbox
+ $(INSTALL_DATA) $(srcdir)/ps2eps.1 ${DESTDIR}$(mandir)/man1/ps2eps.1
+ $(INSTALL_DATA) $(srcdir)/bbox.1 ${DESTDIR}$(mandir)/man1/bbox.1
check:
uninstall:
- -rm -f $(bindir)/ps2eps $(bindir)/bbox $(mandir)/man1/ps2eps.1 $(mandir)/man1/bbox.1
+ -rm -f ${DESTDIR}$(bindir)/ps2eps ${DESTDIR}$(bindir)/bbox ${DESTDIR}$(mandir)/man1/ps2eps.1 ${DESTDIR}$(mandir)/man1/bbox.1
clean:
-rm -f bbox bbox.o

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-utils_psutils_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
--- utils/psutils/Makefile.in.orig Tue Apr 17 17:27:13 2007
+++ utils/psutils/Makefile.in Tue Apr 17 17:29:04 2007
@@ -193,14 +193,14 @@ SHELL = /bin/sh
install: install-exec install-man
install-exec: installdirs
- for p in $(BIN); do $(INSTALL_PROGRAM) $$p $(bindir)/$$p; done
- for p in $(SHELLSCRIPTS) $(PERLSCRIPTS); do $(INSTALL_PROGRAM) $$p $(scriptdir)/$$p; done
+ for p in $(BIN); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/$$p; done
+ for p in $(SHELLSCRIPTS) $(PERLSCRIPTS); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(scriptdir)/$$p; done
install-man: installdirs
- for p in $(MANPAGES); do $(INSTALL_DATA) $$p $(man1dir)/$$p; done
+ for p in $(MANPAGES); do $(INSTALL_DATA) $$p ${DESTDIR}$(man1dir)/$$p; done
installdirs:
- $(SHELL) ${srcdir}/../../texk/mkinstalldirs $(bindir) $(scriptdir) $(man1dir)
+ $(SHELL) ${srcdir}/../../texk/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir) ${DESTDIR}$(man1dir)
clean:
rm -f *.o $(BIN) $(SHELLSCRIPTS) $(PERLSCRIPTS) $(MANPAGES)
@@ -210,6 +210,8 @@ distclean: mostlyclean
realclean: distclean
mostlyclean: clean
+
+# TODO UPSTREAM! - uninstall: !!!
Makefile: config.status $(srcdir)/Makefile.in
$(SHELL) config.status

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-utils_tpic2pdftex_Makefile_in,v 1.1 2008/10/21 20:57:58 steven Exp $
--- utils/tpic2pdftex/Makefile.in.orig Sun Aug 24 20:23:30 2008
+++ utils/tpic2pdftex/Makefile.in Sun Aug 24 20:24:07 2008
@@ -39,8 +39,8 @@ beamerexample.pdf: beamerexample.tex
$(srcdir)/tpic2pdftex $< > $@
install:
- $(INSTALL) -d $(bindir)
- $(INSTALL_SCRIPT) $(srcdir)/tpic2pdftex $(bindir)/tpic2pdftex
+ $(INSTALL) -d $(DESTDIR)/$(bindir)
+ $(INSTALL_SCRIPT) $(srcdir)/tpic2pdftex $(DESTDIR)/$(bindir)/tpic2pdftex
clean:
- rm *.tex

View File

@ -1,8 +1,2 @@
If you require anything other than the minimal texmf tree then you
should also install texlive_texmf-full (for ConTeXt, XeTeX etc.). If
you require documentation you should also install texlive_texmf-docs.
This will enable you to use 'texdoc'.
Please backup your TeX configuration files (texmf.cnf, fmtutil.cnf, etc.)
before adding/deleting texlive related packages. It is necessary for the
package tools to manipulate these files.
Please see ${PREFIX}/share/doc/texlive/README.OpenBSD for information on
running TeX Live on OpenBSD.

View File

@ -1,106 +1,99 @@
@comment $OpenBSD: PLIST,v 1.6 2008/05/04 20:45:30 okan Exp $
@comment $OpenBSD: PLIST,v 1.7 2008/10/21 20:57:58 steven Exp $
@conflict teTeX_base-*
@conflict ht-<2
@unexec texlinks -u
%%SHARED%%
bin/a2ping
bin/afm2pl
bin/afm2tfm
bin/aleph
@bin bin/afm2pl
@bin bin/afm2tfm
@bin bin/aleph
bin/allcm
bin/allec
bin/allneeded
bin/bg5+latex
bin/bg5+pdflatex
bin/bg5conv
bin/bg5latex
bin/bg5pdflatex
bin/bibtex
bin/bibtex8
bin/cef5conv
bin/cef5latex
bin/cef5pdflatex
bin/cefconv
bin/ceflatex
bin/cefpdflatex
bin/cefsconv
bin/cefslatex
bin/cefspdflatex
bin/cfftot1
bin/ctangle
bin/ctie
@bin bin/bibtex
@bin bin/bibtex8
@bin bin/cfftot1
bin/context
@bin bin/ctangle
@bin bin/ctie
bin/ctxtools
bin/cweave
bin/devnag
bin/dmp
bin/dt2dv
bin/dv2dt
@bin bin/cweave
@bin bin/devnag
@bin bin/dmp
@bin bin/dt2dv
@bin bin/dv2dt
bin/dvi2fax
bin/dvibook
bin/dviconcat
bin/dvicopy
bin/dvidvi
bin/dviasm
@bin bin/dvibook
@bin bin/dviconcat
@bin bin/dvicopy
@bin bin/dvidvi
bin/dvigif
bin/dvihp
bin/dvilj
bin/dvilj2p
bin/dvilj4
bin/dvilj4l
@bin bin/dvilj
@bin bin/dvilj2p
@bin bin/dvilj4
@bin bin/dvilj4l
bin/dvilj6
bin/dvipdfm
bin/dvipdfmx
@bin bin/dvipdfm
@bin bin/dvipdfmx
bin/dvipdft
bin/dvipng
bin/dvipos
bin/dvips
@bin bin/dvipng
@bin bin/dvipos
@bin bin/dvips
bin/dvired
bin/dviselect
bin/dvitodvi
bin/dvitomp
bin/dvitype
@bin bin/dviselect
@bin bin/dvitodvi
@bin bin/dvitomp
@bin bin/dvitype
bin/e2pall
bin/ebb
bin/ebong
bin/epspdf
bin/epspdftk
bin/epstopdf
bin/exatools
bin/extconv
bin/extractbb
bin/fmtutil
bin/fmtutil-sys
bin/fontinst
bin/gbklatex
bin/gbkpdflatex
bin/getnonfreefonts
bin/getnonfreefonts-sys
bin/gftodvi
bin/gftopk
bin/gftype
bin/giftopng
bin/gsftopk
bin/hbf2gf
@bin bin/gftodvi
@bin bin/gftopk
@bin bin/gftype
@bin bin/gsftopk
@bin bin/hbf2gf
bin/ht
bin/htcontext
bin/htlatex
bin/htmex
bin/httex
bin/httexi
bin/kpseaccess
bin/htxelatex
bin/htxetex
@bin bin/kpseaccess
bin/kpsepath
bin/kpsereadlink
bin/kpsestat
@bin bin/kpsereadlink
@bin bin/kpsestat
bin/kpsetool
bin/kpsewhere
bin/kpsewhich
@bin bin/kpsewhich
bin/kpsexpand
bin/lacheck
bin/luatools
bin/mag
bin/makeindex
bin/makempx
@bin bin/lacheck
@comment @bin bin/luatex
@comment @bin bin/luatools
@bin bin/mag
bin/makeglossaries
@bin bin/makeindex
@bin bin/makempx
bin/makempy
bin/mf
bin/mf-nowin
bin/mft
@bin bin/mf
@bin bin/mf-nowin
@bin bin/mft
bin/mk4ht
bin/mkindex
bin/mkjobtexmf
bin/mkocp
bin/mkofm
bin/mktexfmt
@ -108,100 +101,111 @@ bin/mktexlsr
bin/mktexmf
bin/mktexpk
bin/mktextfm
bin/mmafm
bin/mmpfb
bin/mpost
@bin bin/mmafm
@bin bin/mmpfb
@bin bin/mpost
bin/mpstools
bin/mpto
bin/mptopdf
@bin bin/mpto
@comment bin/mptopdf
bin/mtxrun
bin/mtxtools
bin/musixflx
bin/newer
bin/odvicopy
@bin bin/musixflx
@bin bin/newer
@bin bin/odvicopy
bin/odvips
bin/odvitype
@bin bin/odvitype
bin/ofm2opl
bin/omega
bin/omfonts
@bin bin/omega
@bin bin/omfonts
bin/opl2ofm
bin/otangle
bin/otfinfo
bin/otftotfm
bin/otp2ocp
bin/outocp
@bin bin/otangle
@bin bin/otfinfo
@bin bin/otftotfm
@bin bin/otp2ocp
@bin bin/outocp
bin/ovf2ovp
bin/ovp2ovf
bin/oxdvi
bin/patgen
bin/pdfclose
@bin bin/patgen
bin/pdfatfi
@bin bin/pdfclose
bin/pdfcrop
bin/pdfopen
bin/pdftex
@bin bin/pdfopen
@bin bin/pdftex
bin/pdfthumb
bin/pdftools
bin/pdftosrc
@bin bin/pdftosrc
bin/pdftrimwhite
bin/perltex
bin/pfb2pfa
bin/pk2bm
@bin bin/pfb2pfa
@bin bin/pk2bm
bin/pkfix
bin/pktogf
bin/pktype
bin/pltotf
bin/pooltype
@bin bin/pktogf
@bin bin/pktype
@bin bin/pltotf
@bin bin/pooltype
bin/ppower4
@comment bin/ps2eps
bin/ps2frag
bin/ps2pk
@bin bin/ps2pk
bin/ps4pdf
bin/pslatex
bin/pst2pdf
bin/pstopdf
bin/rlxtools
bin/rubibtex
bin/rumakeindex
bin/rungs
bin/runtools
bin/simpdftex
bin/sjisconv
bin/sjislatex
bin/sjispdflatex
bin/t1dotlessj
bin/t1lint
bin/t1reencode
bin/t1testpage
bin/t4ht
bin/tangle
bin/tcdialog
bin/tex
bin/tex4ht
@bin bin/synctex
@bin bin/t1dotlessj
@bin bin/t1lint
@bin bin/t1reencode
@bin bin/t1testpage
@bin bin/t4ht
@bin bin/tangle
@bin bin/tcdialog
@bin bin/tex
@bin bin/tex4ht
bin/texconfig
bin/texconfig-dialog
bin/texconfig-sys
bin/texcount
bin/texdoc
bin/texdoctk
bin/texexec
bin/texfind
bin/texfont
bin/texhash
bin/texlinks
@comment bin/texlua
@comment bin/texluac
bin/texmfstart
bin/texshow
bin/textools
bin/texutil
bin/tftopl
@bin bin/tftopl
bin/thumbpdf
bin/tie
@bin bin/tie
bin/tlmgr
bin/tmftools
bin/ttf2afm
bin/ttf2pk
bin/ttf2tfm
bin/ttftotype42
bin/tpic2pdftex
@bin bin/ttf2afm
@bin bin/ttf2pk
@bin bin/ttf2tfm
@bin bin/ttftotype42
bin/updmap
bin/updmap-sys
bin/vftovp
@bin bin/vftovp
@bin bin/vlna
bin/vpe
bin/vptovf
bin/weave
@bin bin/vptovf
@bin bin/weave
bin/xdvi
bin/xdvi-xaw.bin
bin/xdvipdfmx
bin/xdvizilla
bin/xetex
@bin bin/xdvi-xaw
@bin bin/xdvipdfmx
@bin bin/xetex
bin/xmltools
include/kpathsea/
include/kpathsea/absolute.h
@ -241,7 +245,7 @@ include/kpathsea/pathsearch.h
include/kpathsea/proginit.h
include/kpathsea/progname.h
include/kpathsea/readable.h
include/kpathsea/remote.h
include/kpathsea/recorder.h
include/kpathsea/str-list.h
include/kpathsea/str-llist.h
include/kpathsea/systypes.h
@ -255,11 +259,9 @@ include/kpathsea/types.h
include/kpathsea/variable.h
include/kpathsea/xopendir.h
include/kpathsea/xstat.h
@comment info/dir
@info info/dvipng.info
@info info/dvips.info
@info info/kpathsea.info
@info info/latex.info
@info info/web2c.info
lib/libkpathsea.a
lib/libkpathsea.la
@ -284,6 +286,7 @@ lib/libkpathsea.la
@man man/man1/dviconcat.1
@man man/man1/dvicopy.1
@man man/man1/dvidvi.1
@man man/man1/dvigif.1
@man man/man1/dvihp.1
@man man/man1/dvilj.1
@man man/man1/dvilj2p.1
@ -305,7 +308,6 @@ lib/libkpathsea.la
@man man/man1/eplain.1
@man man/man1/epstopdf.1
@man man/man1/etex.1
@man man/man1/fdf2tex.1
@man man/man1/fmtutil-sys.1
@man man/man1/fmtutil.1
@man man/man1/fontinst.1
@ -335,6 +337,7 @@ lib/libkpathsea.la
@man man/man1/mf.1
@man man/man1/mft.1
@man man/man1/mkindex.1
@man man/man1/mkjobtexmf.1
@man man/man1/mkocp.1
@man man/man1/mkofm.1
@man man/man1/mktexfmt.1
@ -379,6 +382,7 @@ lib/libkpathsea.la
@man man/man1/pstopdf.1
@man man/man1/rubibtex.1
@man man/man1/rumakeindex.1
@man man/man1/synctex.1
@man man/man1/t1dotlessj.1
@man man/man1/t1lint.1
@man man/man1/t1reencode.1
@ -388,7 +392,6 @@ lib/libkpathsea.la
@man man/man1/tex.1
@man man/man1/texconfig-sys.1
@man man/man1/texconfig.1
@man man/man1/texdoc.1
@man man/man1/texdoctk.1
@man man/man1/texexec.1
@man man/man1/texfind.1
@ -408,16 +411,22 @@ lib/libkpathsea.la
@man man/man1/updmap-sys.1
@man man/man1/updmap.1
@man man/man1/vftovp.1
@man man/man1/vlna.1
@man man/man1/vptovf.1
@man man/man1/weave.1
@man man/man1/xdvi.1
@man man/man1/xdvizilla.1
@man man/man5/fmtutil.cnf.5
@man man/man5/synctex.5
@man man/man5/updmap.cfg.5
share/doc/texlive/
share/doc/texlive/README.OpenBSD
share/lcdf-typetools/
share/lcdf-typetools/7t.enc
share/lcdf-typetools/glyphlist.txt
share/lcdf-typetools/texglyphlist.txt
share/texmf/
share/texmf/bibtex/
share/texmf/bibtex/csf/
share/texmf/bibtex/csf/88591lat.csf
share/texmf/bibtex/csf/88591sca.csf
share/texmf/bibtex/csf/ascii.csf
@ -425,6 +434,7 @@ share/texmf/bibtex/csf/cp437lat.csf
share/texmf/bibtex/csf/cp850lat.csf
share/texmf/bibtex/csf/cp850sca.csf
share/texmf/bibtex/csf/cp866rus.csf
@comment share/texmf/doc/
share/texmf/doc/bibtex8/
share/texmf/doc/bibtex8/00readme.txt
share/texmf/doc/bibtex8/HISTORY
@ -435,12 +445,9 @@ share/texmf/doc/tetex/TETEXDOC.dvi
share/texmf/doc/tetex/TETEXDOC.pdf
share/texmf/doc/tetex/TETEXDOC.ps
share/texmf/doc/tetex/teTeX-FAQ
share/texmf/dvipdfm/EUC-UCS2
share/texmf/dvipdfm/UniKSCms-UCS2-H
share/texmf/dvipdfm/UniKSCms-UCS2-V
share/texmf/dvipdfm/cid-x.map
share/texmf/dvipdfm/dvipdfmx.cfg
share/texmf/dvipdfm/glyphlist.txt
share/texmf/dvipdfmx/
share/texmf/dvipdfmx/dvipdfmx.cfg
@comment share/texmf/dvips/
share/texmf/dvips/base/
share/texmf/dvips/base/color.pro
share/texmf/dvips/base/crop.pro
@ -450,7 +457,15 @@ share/texmf/dvips/base/special.pro
share/texmf/dvips/base/tex.pro
share/texmf/dvips/base/texc.pro
share/texmf/dvips/base/texps.pro
share/texmf/dvips/gsftopk/
share/texmf/dvips/gsftopk/render.ps
@comment share/texmf/fonts/
@comment share/texmf/fonts/map/
share/texmf/fonts/map/dvipdfmx/
share/texmf/fonts/map/dvipdfmx/cid-x.map
share/texmf/fonts/map/glyphlist/
share/texmf/fonts/map/glyphlist/glyphlist.txt
share/texmf/fonts/map/glyphlist/pdfglyphlist.txt
share/texmf/texconfig/
share/texmf/texconfig/README
share/texmf/texconfig/g/
@ -462,33 +477,121 @@ share/texmf/texconfig/v/
share/texmf/texconfig/v/vt100
share/texmf/texconfig/x/
share/texmf/texconfig/x/xterm
share/texmf/web2c/aleph.pool
@comment share/texmf/web2c/fmtutil.cnf
share/texmf/web2c/mf.pool
@comment share/texmf/web2c/
share/texmf/web2c/fmtutil.cnf-full
share/texmf/web2c/fmtutil.cnf-minimal
share/texmf/web2c/fmtutil.cnf-tetex
share/texmf/web2c/mktex.opt
share/texmf/web2c/mktexdir
share/texmf/web2c/mktexdir.opt
share/texmf/web2c/mktexnam
share/texmf/web2c/mktexnam.opt
share/texmf/web2c/mktexupd
share/texmf/web2c/omega.pool
share/texmf/web2c/pdftex.pool
share/texmf/web2c/tex.pool
share/texmf/web2c/texmf.cnf
share/texmf/web2c/xetex.pool
share/texmf/xdvi/
share/texmf/xdvi/XDvi
share/texmf/xdvi/pixmaps/
share/texmf/xdvi/pixmaps/toolbar.xpm
share/texmf/xdvi/pixmaps/toolbar2.xpm
share/texmf/xdvi/xdvi.cfg
texmf/
texmf-dist/
texmf-dist/scripts/
texmf-dist/scripts/bengali/
texmf-dist/scripts/bengali/ebong.py
texmf-dist/scripts/context/
texmf-dist/scripts/context/ruby/
texmf-dist/scripts/context/ruby/texmfstart.rb
texmf-dist/scripts/context/stubs/
texmf-dist/scripts/context/stubs/unix/
texmf-dist/scripts/context/stubs/unix/context
texmf-dist/scripts/context/stubs/unix/ctxtools
texmf-dist/scripts/context/stubs/unix/exatools
texmf-dist/scripts/context/stubs/unix/luatools
texmf-dist/scripts/context/stubs/unix/makempy
texmf-dist/scripts/context/stubs/unix/mpstools
texmf-dist/scripts/context/stubs/unix/mptopdf
texmf-dist/scripts/context/stubs/unix/mtxrun
texmf-dist/scripts/context/stubs/unix/mtxtools
texmf-dist/scripts/context/stubs/unix/pdftools
texmf-dist/scripts/context/stubs/unix/pdftrimwhite
texmf-dist/scripts/context/stubs/unix/pstopdf
texmf-dist/scripts/context/stubs/unix/rlxtools
texmf-dist/scripts/context/stubs/unix/runtools
texmf-dist/scripts/context/stubs/unix/texexec
texmf-dist/scripts/context/stubs/unix/texfind
texmf-dist/scripts/context/stubs/unix/texfont
texmf-dist/scripts/context/stubs/unix/texshow
texmf-dist/scripts/context/stubs/unix/textools
texmf-dist/scripts/context/stubs/unix/texutil
texmf-dist/scripts/context/stubs/unix/tmftools
texmf-dist/scripts/context/stubs/unix/xmltools
texmf-dist/scripts/dviasm/
texmf-dist/scripts/dviasm/dviasm.py
texmf-dist/scripts/epspdf/
texmf-dist/scripts/epspdf/epspdf
texmf-dist/scripts/epspdf/epspdftk
texmf-dist/scripts/glossaries/
texmf-dist/scripts/glossaries/makeglossaries
texmf-dist/scripts/mkjobtexmf/
texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl
texmf-dist/scripts/oberdiek/
texmf-dist/scripts/oberdiek/pdfatfi.pl
texmf-dist/scripts/pdfcrop/
texmf-dist/scripts/pdfcrop/pdfcrop.pl
texmf-dist/scripts/perltex/
texmf-dist/scripts/perltex/perltex.pl
texmf-dist/scripts/ppower4/
texmf-dist/scripts/ppower4/pdfthumb.texlua
texmf-dist/scripts/ppower4/ppower4.texlua
texmf-dist/scripts/pst-pdf/
texmf-dist/scripts/pst-pdf/ps4pdf
texmf-dist/scripts/pst2pdf/
texmf-dist/scripts/pst2pdf/pst2pdf.pl
texmf-dist/scripts/tex4ht/
texmf-dist/scripts/tex4ht/ht.sh
texmf-dist/scripts/tex4ht/htcontext.sh
texmf-dist/scripts/tex4ht/htlatex.sh
texmf-dist/scripts/tex4ht/htmex.sh
texmf-dist/scripts/tex4ht/httex.sh
texmf-dist/scripts/tex4ht/httexi.sh
texmf-dist/scripts/tex4ht/htxelatex.sh
texmf-dist/scripts/tex4ht/htxetex.sh
texmf-dist/scripts/tex4ht/mk4ht.pl
texmf-dist/scripts/texcount/
texmf-dist/scripts/texcount/TeXcount.pl
texmf-dist/scripts/thumbpdf/
texmf-dist/scripts/thumbpdf/thumbpdf.pl
texmf-dist/scripts/vpe/
texmf-dist/scripts/vpe/vpe.pl
texmf/scripts/
texmf/scripts/a2ping/
texmf/scripts/a2ping/a2ping.pl
texmf/scripts/epstopdf/
texmf/scripts/epstopdf/epstopdf.pl
texmf/scripts/pkfix/
texmf/scripts/pkfix/pkfix.pl
texmf/scripts/ps2eps/
texmf/scripts/ps2eps/ps2eps.pl
texmf/scripts/simpdftex/
texmf/scripts/simpdftex/simpdftex
texmf/scripts/tetex/
texmf/scripts/tetex/e2pall.pl
texmf/scripts/tetex/texdoctk.pl
texmf/scripts/texlive/
texmf/scripts/texlive/getnonfreefonts.pl
texmf/scripts/texlive/rungs.tlu
texmf/scripts/texlive/texdoc.tlu
texmf/scripts/texlive/tlmgr.pl
@exec ln -sf %D/share/texmf/web2c/fmtutil.cnf-minimal %D/share/texmf/web2c/fmtutil.cnf
@exec mktexlsr > /dev/null 2>&1
@exec fmtutil-sys --all > /dev/null 2>&1
@exec updmap-sys > /dev/null 2>&1
@exec texlinks
@exec fmtutil-sys --all > /dev/null 2>&1
@exec updmap-sys --syncwithtrees > /dev/null 2>&1
@extra share/texmf/ls-R
@extra share/texmf-dist/ls-R
@extra share/texmf-var/ls-R
@extra share/texmf-config/ls-R
@extraunexec rm -rf %D/share/texmf-var/
@extraunexec rm -rf %D/share/texmf-config/
@extra share/texmf/web2c/fmtutil.cnf
@extraunexec rm -Rf %D/share/texmf-var/
@extraunexec rm -Rf %D/share/texmf-config/

View File

@ -1,23 +0,0 @@
# $OpenBSD: Makefile,v 1.4 2007/09/16 08:09:57 steven Exp $
COMMENT= documentation texmf tree for TeXLive
V= 2007
DISTNAME= texlive_texmf-docs-${V}
PKGNAME= ${DISTNAME}p0
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
pre-install:
# man/info pages are installed with the base package
rm -Rf ${WRKDIST}/texmf/doc/man
rm -Rf ${WRKDIST}/texmf/doc/info
do-install:
mv ${WRKDIST}/texmf ${PREFIX}/share
mv ${WRKDIST}/texmf-dist ${PREFIX}/share
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/*
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
MD5 (texlive_texmf-docs-2007.tar.gz) = kGXhmk08rOGe8NdEKTbYDQ==
RMD160 (texlive_texmf-docs-2007.tar.gz) = SamjQkdoui+dtcDDJm3tZzMtcsk=
SHA1 (texlive_texmf-docs-2007.tar.gz) = RLq3h9r/JXXiw4ucJv7S9TGfRnw=
SHA256 (texlive_texmf-docs-2007.tar.gz) = lE+jMYTPgQIK32/5fw12Zy40w15exLbyZ029yYbFbcY=
SIZE (texlive_texmf-docs-2007.tar.gz) = 266976754

View File

@ -1,6 +0,0 @@
TeXLive is an easy way to get up and running with TeX. It provides a
comprehensive TeX system which includes all the major TeX-related
programs, macro packages, and fonts that are free software, including
support for many languages around the world.
This package contains the texmf documentation for TeXLive.

View File

@ -1,2 +0,0 @@
You may wish to alter you shell environment so that texdoc uses your
preferred PDF/DVI/HTML/Text viewer. See texdoc(1) for more information.

File diff suppressed because it is too large Load Diff

View File

@ -1,30 +0,0 @@
# $OpenBSD: Makefile,v 1.4 2007/12/09 10:49:34 steven Exp $
COMMENT= additional texmf functionality for TeXLive
V= 2007
# distfile generation number (distfiles can change for same TeXLive version)
G= g0
DISTNAME= texlive_texmf-full-$V$G
PKGNAME= texlive_texmf-full-$Vp1
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
RUN_DEPENDS= :texlive_base-${V}*:print/texlive/base \
::graphics/ImageMagick
pre-install:
rm -Rf ${WRKDIST}/texmf-dist/source
# man pages are installed by the base package
rm -Rf ${WRKDIST}/texmf/doc/man
# fix broken bbold font
rm -f ${WRKDIST}/texmf-dist/tex/latex/sauterfonts/subbold.fd
do-install:
mv ${WRKDIST}/texmf ${PREFIX}/share
mv ${WRKDIST}/texmf-dist ${PREFIX}/share
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/*
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
MD5 (texlive_texmf-full-2007g0.tar.gz) = e3ZvV1SLDk9MH+0PvI/yXw==
RMD160 (texlive_texmf-full-2007g0.tar.gz) = 0oBLup1IVv/DAQolcKulcE5cdCA=
SHA1 (texlive_texmf-full-2007g0.tar.gz) = xgW/w9uAbWA8QIiR5zvVbTqa+6w=
SHA256 (texlive_texmf-full-2007g0.tar.gz) = VFDN9YRxHFsVL5ml8lJ4kOoMgiGr8CDdFqWrvKYTlMM=
SIZE (texlive_texmf-full-2007g0.tar.gz) = 135792207

View File

@ -1,6 +0,0 @@
TeXLive is an easy way to get up and running with TeX. It provides a
comprehensive TeX system which includes all the major TeX-related
programs, macro packages, and fonts that are free software, including
support for many languages around the world.
This package contains a comprehensive texmf tree for TeXLive.

View File

@ -1,3 +0,0 @@
Please backup your TeX configuration files (texmf.cnf, fmtutil.cnf, etc.)
before adding/deleting texlive related packages. It is necessary for the
package tools to manipulate these files.

File diff suppressed because it is too large Load Diff

View File

@ -1,36 +0,0 @@
# $OpenBSD: Makefile,v 1.5 2008/01/26 13:07:23 steven Exp $
COMMENT= minimal texmf tree for TeXLive
V= 2007
# distfile generation number (distfiles can change for same TeXLive version)
G= g0
DISTNAME= texlive_texmf-minimal-$V$G
PKGNAME= texlive_texmf-minimal-$Vp2
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
pre-install:
rm -Rf ${WRKDIST}/texmf/doc/man
rm -Rf ${WRKDIST}/texmf-dist/source
# fix for broken bbold font
rm -f ${WRKDIST}/texmf-dist/tex/latex/jknapltx/ubbold.fd
cd ${WRKDIST}/texmf-dist/tex/latex/bbold/ && mv -f Ubbold.fd ubbold.fd
do-install:
mv ${WRKDIST}/texmf ${PREFIX}/share
mv ${WRKDIST}/texmf-dist ${PREFIX}/share
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/*
post-install:
# tweak fmtutil.cnf (e.g. there's no XeTeX support in this minimal texmf)
cp ${PREFIX}/share/texmf/web2c/fmtutil.cnf \
${PREFIX}/share/texmf/web2c/fmtutil.cnf-dist
mv ${PREFIX}/share/texmf/web2c/fmtutil.cnf \
${PREFIX}/share/texmf/web2c/fmtutil.cnf-full
sed -e 's/.*xetex.*//g' ${PREFIX}/share/texmf/web2c/fmtutil.cnf-full \
> ${PREFIX}/share/texmf/web2c/fmtutil.cnf-minimal
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
MD5 (texlive_texmf-minimal-2007g0.tar.gz) = 3Fl4XW7rfjgEb70JJPjA/w==
RMD160 (texlive_texmf-minimal-2007g0.tar.gz) = 76BmHIO1WLjEvRaXqqg12dwH87g=
SHA1 (texlive_texmf-minimal-2007g0.tar.gz) = 2ng4YJSrehw/aSu2xL21TfTW9/k=
SHA256 (texlive_texmf-minimal-2007g0.tar.gz) = /sn8S4JP92mq4hr0oU0zJJJsm4coaMDK07SDSVfpz8I=
SIZE (texlive_texmf-minimal-2007g0.tar.gz) = 131636881

View File

@ -1,632 +0,0 @@
$OpenBSD: patch-texmf_dvips_config_config_ps,v 1.1 2008/01/26 13:07:24 steven Exp $
--- texmf/dvips/config/config.ps.orig Fri Jan 25 11:45:26 2008
+++ texmf/dvips/config/config.ps Fri Jan 25 11:46:04 2008
@@ -1,4 +1,5 @@
-% teTeX's config.ps. Thomas Esser, 1998, public domain.
+% config.ps - configuration file for dvips.
+% Tomas Rokicki, Thomas Esser, Karl Berry, et al., 1986ff, public domain.
% Memory available. Download the three-line PostScript file:
% %! Hey, we're PostScript
@@ -7,8 +8,11 @@
% to determine this number. (It will be the only thing printed.)
m 3500000
-% z1 is "secure", i.e., inhibits execution of `shell commands` in
-% \specials. Dvips allows this by default.
+% Run securely. z2 disables both shell command execution in
+% `\special' and config files (via the `E' option) and opening of any
+% absolute filenames. z1, the default, forbids shell escapes but
+% allows absolute filenames. z0 allows both. The corresponding
+% command line options are -R0|-R1|-R2
z1
% How to print, maybe with lp instead lpr, etc. If commented-out, output
@@ -40,167 +44,534 @@ Z0
% Partially download Type 1 fonts by default. Only reason not to do
% this is if you encounter bugs. (Please report them to
-% @email{tex-k@@mail.tug.org} if you do.)
+% @email{tex-k@tug.org} if you do.)
j
% This shows how to add your own map file.
% Remove the comment and adjust the name:
% p +myfonts.map
-% 0 0 595 842 is the right bounding box that most applications expect
-% for A4. Since dvips always rounds up, choose something slightly smaller.
+% If we have setpagedevice, use that.
+% else if we have the a4 resp. letter operator, use that.
+% else do nothing to set the page size.
+%
+% In the past, the a4size and letterSize definitions did not set the
+% page size, but we want to set it if we can so that ps2pdf can work
+% properly. Here, a4 and a4size, and letter and letterSize, are
+% identical, and we prefer the a4/letter names -- texconfig uses them.
+
+% 0 0 595 842 is the right bounding box that applications expect
+% for A4. Since dvips always rounds up, choose something slightly
+% smaller for our paper size.
-@ A4size 594.99bp 841.99bp
+@ a4 210mm 297mm
@+ ! %%DocumentPaperSizes: a4
-@+ %%PaperSize: A4
+@+ %%BeginPaperSize: a4
+@+ /setpagedevice where
+@+ { pop << /PageSize [595 842] >> setpagedevice }
+@+ { /a4 where { pop a4 } if }
+@+ ifelse
+@+ %%EndPaperSize
-@ letterSize 8.5in 11in
+@ letter 8.5in 11in
@+ ! %%DocumentPaperSizes: Letter
+@+ %%BeginPaperSize: Letter
+@+ /setpagedevice where
+@+ { pop << /PageSize [612 792] >> setpagedevice }
+@+ { /letter where { pop letter } if }
+@+ ifelse
+@+ %%EndPaperSize
-@ letter 8.5in 11in
+@ a4size 210mm 297mm
+@+ ! %%DocumentPaperSizes: a4
+@+ %%BeginPaperSize: a4
+@+ /setpagedevice where
+@+ { pop << /PageSize [595 842] >> setpagedevice }
+@+ { /a4 where { pop a4 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ letterSize 8.5in 11in
@+ ! %%DocumentPaperSizes: Letter
@+ %%BeginPaperSize: Letter
-@+ letter
+@+ /setpagedevice where
+@+ { pop << /PageSize [612 792] >> setpagedevice }
+@+ { /letter where { pop letter } if }
+@+ ifelse
@+ %%EndPaperSize
+% The jacow paper size is the smaller of letter and a4 in both
+% dimensions, and can therefore hopefully be printed on either paper
+% size. As far as we know, Volker Schaa first used it for the JACOW
+% conference proceedings that he produced.
+@ jacow 210mm 11in
+@+ ! %%DocumentPaperSizes: jacow
+@+ %%BeginPaperSize: jacow
+@+ /setpagedevice where
+@+ { pop << /PageSize [595 792] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ halfexecutive 133mm 184mm
+@+ ! %%DocumentPaperSizes: halfexecutive
+@+ %%BeginPaperSize: halfexecutive
+@+ /setpagedevice where
+@+ { pop << /PageSize [378 522] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ halfletter 140mm 216mm
+@+ ! %%DocumentPaperSizes: halfletter
+@+ %%BeginPaperSize: halfletter
+@+ /setpagedevice where
+@+ { pop << /PageSize [396 612] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ statement 140mm 216mm
+@+ ! %%DocumentPaperSizes: statement
+@+ %%BeginPaperSize: statement
+@+ /setpagedevice where
+@+ { pop << /PageSize [396 612] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ executive 184mm 267mm
+@+ ! %%DocumentPaperSizes: executive
+@+ %%BeginPaperSize: executive
+@+ /setpagedevice where
+@+ { pop << /PageSize [522 756] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+% for powerdot
+@ screen 8.25in 11in
+@+ ! %%DocumentPaperSizes: Screen
+@+ %%BeginPaperSize: Screen
+@+ /setpagedevice where
+@+ { pop << /PageSize [594 792] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+% a common size for printers (in north america).
+@ sixbynine 6in 9in
+@+ ! %%DocumentPaperSizes: SixByNine
+@+ %%BeginPaperSize: SixByNine
+@+ /setpagedevice where
+@+ { pop << /PageSize [432 648] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ quarto 215mm 275mm
+@+ ! %%DocumentPaperSizes: quarto
+@+ %%BeginPaperSize: quarto
+@+ /setpagedevice where
+@+ { pop << /PageSize [610 780] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ note 216mm 279mm
+@+ ! %%DocumentPaperSizes: note
+@+ %%BeginPaperSize: note
+@+ /setpagedevice where
+@+ { pop << /PageSize [612 792] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ folio 216mm 330mm
+@+ ! %%DocumentPaperSizes: folio
+@+ %%BeginPaperSize: folio
+@+ /setpagedevice where
+@+ { pop << /PageSize [612 936] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
@ legal 8.5in 14in
@+ ! %%DocumentPaperSizes: Legal
@+ %%BeginPaperSize: Legal
-@+ legal
+@+ /setpagedevice where
+@+ { pop << /PageSize [612 1008] >> setpagedevice }
+@+ if
@+ %%EndPaperSize
+@ 10x14 10in 14in
+@+ ! %%DocumentPaperSizes: 10x14
+@+ %%BeginPaperSize: 10x14
+@+ /setpagedevice where
+@+ { pop << /PageSize [720 1008] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
@ ledger 17in 11in
@+ ! %%DocumentPaperSizes: Ledger
@+ %%BeginPaperSize: Ledger
-@+ ledger
+@+ /setpagedevice where
+@+ { pop << /PageSize [1224 792] >> setpagedevice }
+@+ if
@+ %%EndPaperSize
@ tabloid 11in 17in
@+ ! %%DocumentPaperSizes: Tabloid
@+ %%BeginPaperSize: Tabloid
-@+ 11x17
+@+ /setpagedevice where
+@+ { pop << /PageSize [792 1224] >> setpagedevice }
+@+ if
@+ %%EndPaperSize
-@ a6 105mm 148mm
-@+ ! %%DocumentPaperSizes: a6
-@+ %%BeginPaperSize: a6
-@+ a6
+@ 11x17 11in 17in
+@+ ! %%DocumentPaperSizes: 11x17
+@+ %%BeginPaperSize: 11x17
+@+ /setpagedevice where
+@+ { pop << /PageSize [792 1224] >> setpagedevice }
+@+ if
@+ %%EndPaperSize
-@ a5 148mm 210mm
-@+ ! %%DocumentPaperSizes: a5
-@+ %%BeginPaperSize: a5
-@+ a5
+@ a0 841mm 1189mm
+@+ ! %%DocumentPaperSizes: a0
+@+ %%BeginPaperSize: a0
+@+ /setpagedevice where
+@+ { pop << /PageSize [2384 3370] >> setpagedevice }
+@+ { /a0 where { pop a0 } if }
+@+ ifelse
@+ %%EndPaperSize
-@ a4 594.99bp 841.99bp
-@+ ! %%DocumentPaperSizes: a4
-@+ %%BeginPaperSize: a4
-@+ a4
+@ a1 594mm 841mm
+@+ ! %%DocumentPaperSizes: a1
+@+ %%BeginPaperSize: a1
+@+ /setpagedevice where
+@+ { pop << /PageSize [1684 2384] >> setpagedevice }
+@+ { /a1 where { pop a1 } if }
+@+ ifelse
@+ %%EndPaperSize
+@ a2 420mm 594mm
+@+ ! %%DocumentPaperSizes: a2
+@+ %%BeginPaperSize: a2
+@+ /setpagedevice where
+@+ { pop << /PageSize [1191 1684] >> setpagedevice }
+@+ { /a2 where { pop a2 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
@ a3 297mm 420mm
@+ ! %%DocumentPaperSizes: a3
@+ %%BeginPaperSize: a3
-@+ a3
+@+ /setpagedevice where
+@+ { pop << /PageSize [842 1191] >> setpagedevice }
+@+ { /a3 where { pop a3 } if }
+@+ ifelse
@+ %%EndPaperSize
-@ a2 420mm 595mm
-@+ ! %%DocumentPaperSizes: a2
-@+ %%BeginPaperSize: a2
-@+ a2
+@ a5 148mm 210mm
+@+ ! %%DocumentPaperSizes: a5
+@+ %%BeginPaperSize: a5
+@+ /setpagedevice where
+@+ { pop << /PageSize [420 595] >> setpagedevice }
+@+ { /a5 where { pop a5 } if }
+@+ ifelse
@+ %%EndPaperSize
-@ a1 595mm 841mm
-@+ ! %%DocumentPaperSizes: a1
-@+ %%BeginPaperSize: a1
-@+ a1
+@ a6 105mm 148mm
+@+ ! %%DocumentPaperSizes: a6
+@+ %%BeginPaperSize: a6
+@+ /setpagedevice where
+@+ { pop << /PageSize [298 420] >> setpagedevice }
+@+ { /a6 where { pop a6 } if }
+@+ ifelse
@+ %%EndPaperSize
-@ a0 841mm 1189mm
-@+ ! %%DocumentPaperSizes: a0
-@+ %%BeginPaperSize: a0
-@+ a0
+@ a7 74mm 105mm
+@+ ! %%DocumentPaperSizes: a7
+@+ %%BeginPaperSize: a7
+@+ /setpagedevice where
+@+ { pop << /PageSize [210 298] >> setpagedevice }
+@+ { /a7 where { pop a7 } if }
+@+ ifelse
@+ %%EndPaperSize
-@ b6 125mm 176mm
-@+ ! %%DocumentPaperSizes: b6
-@+ %%BeginPaperSize: b6
-@+ b6
+@ a8 52mm 74mm
+@+ ! %%DocumentPaperSizes: a8
+@+ %%BeginPaperSize: a8
+@+ /setpagedevice where
+@+ { pop << /PageSize [147 210] >> setpagedevice }
+@+ { /a8 where { pop a8 } if }
+@+ ifelse
@+ %%EndPaperSize
-@ b5 176mm 250mm
-@+ ! %%DocumentPaperSizes: b5
-@+ %%BeginPaperSize: b5
-@+ b5
+@ a9 37mm 52mm
+@+ ! %%DocumentPaperSizes: a9
+@+ %%BeginPaperSize: a9
+@+ /setpagedevice where
+@+ { pop << /PageSize [105 147] >> setpagedevice }
+@+ { /a9 where { pop a9 } if }
+@+ ifelse
@+ %%EndPaperSize
-@ b4 250mm 353mm
-@+ ! %%DocumentPaperSizes: b4
-@+ %%BeginPaperSize: b4
-@+ b4
+@ a10 26mm 37mm
+@+ ! %%DocumentPaperSizes: a10
+@+ %%BeginPaperSize: a10
+@+ /setpagedevice where
+@+ { pop << /PageSize [74 105] >> setpagedevice }
+@+ { /a10 where { pop a10 } if }
+@+ ifelse
@+ %%EndPaperSize
-@ b3 353mm 500mm
-@+ ! %%DocumentPaperSizes: b3
-@+ %%BeginPaperSize: b3
-@+ b3
-@+ %%EndPaperSize
-
@ jisb0 1030mm 1456mm
@+ ! %%DocumentPaperSizes: jisb0
@+ %%BeginPaperSize: jisb0
-@+ jisb0
+@+ /setpagedevice where
+@+ { pop << /PageSize [2920 4127] >> setpagedevice }
+@+ { /jisb0 where { pop jisb0 } if }
+@+ ifelse
@+ %%EndPaperSize
@ jisb1 728mm 1030mm
@+ ! %%DocumentPaperSizes: jisb1
@+ %%BeginPaperSize: jisb1
-@+ jisb1
+@+ /setpagedevice where
+@+ { pop << /PageSize [2064 2920] >> setpagedevice }
+@+ { /jisb1 where { pop jisb1 } if }
+@+ ifelse
@+ %%EndPaperSize
@ jisb2 515mm 728mm
@+ ! %%DocumentPaperSizes: jisb2
@+ %%BeginPaperSize: jisb2
-@+ jisb2
+@+ /setpagedevice where
+@+ { pop << /PageSize [1460 2064] >> setpagedevice }
+@+ { /jisb2 where { pop jisb2 } if }
+@+ ifelse
@+ %%EndPaperSize
@ jisb3 364mm 515mm
@+ ! %%DocumentPaperSizes: jisb3
@+ %%BeginPaperSize: jisb3
-@+ jisb3
+@+ /setpagedevice where
+@+ { pop << /PageSize [1032 1460] >> setpagedevice }
+@+ { /jisb3 where { pop jisb3 } if }
+@+ ifelse
@+ %%EndPaperSize
@ jisb4 257mm 364mm
@+ ! %%DocumentPaperSizes: jisb4
@+ %%BeginPaperSize: jisb4
-@+ jisb4
+@+ /setpagedevice where
+@+ { pop << /PageSize [729 1032] >> setpagedevice }
+@+ { /jisb4 where { pop jisb4 } if }
+@+ ifelse
@+ %%EndPaperSize
@ jisb5 182mm 257mm
@+ ! %%DocumentPaperSizes: jisb5
@+ %%BeginPaperSize: jisb5
-@+ jisb5
+@+ /setpagedevice where
+@+ { pop << /PageSize [516 729] >> setpagedevice }
+@+ { /jisb5 where { pop jisb5 } if }
+@+ ifelse
@+ %%EndPaperSize
@ jisb6 128mm 182mm
@+ ! %%DocumentPaperSizes: jisb6
@+ %%BeginPaperSize: jisb6
-@+ jisb6
+@+ /setpagedevice where
+@+ { pop << /PageSize [363 516] >> setpagedevice }
+@+ { /jisb6 where { pop jisb6 } if }
+@+ ifelse
@+ %%EndPaperSize
-% not defined in Ghostscript, per Akira.
-% @ jisb7 91mm 128mm
-% @+ ! %%DocumentPaperSizes: jisb7
-% @+ %%BeginPaperSize: jisb7
-% @+ jisb7
-% @+ %%EndPaperSize
-%
-% @ jisb8 64mm 91mm
-% @+ ! %%DocumentPaperSizes: jisb8
-% @+ %%BeginPaperSize: jisb8
-% @+ jisb8
-% @+ %%EndPaperSize
+@ jisb7 91mm 128mm
+@+ ! %%DocumentPaperSizes: jisb7
+@+ %%BeginPaperSize: jisb7
+@+ /setpagedevice where
+@+ { pop << /PageSize [258 363] >> setpagedevice }
+@+ { /jisb7 where { pop jisb7 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ jisb8 64mm 91mm
+@+ ! %%DocumentPaperSizes: jisb8
+@+ %%BeginPaperSize: jisb8
+@+ /setpagedevice where
+@+ { pop << /PageSize [181 258] >> setpagedevice }
+@+ { /jisb8 where { pop jisb8 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ b0 1000mm 1414mm
+@+ ! %%DocumentPaperSizes: b0
+@+ %%BeginPaperSize: b0
+@+ /setpagedevice where
+@+ { pop << /PageSize [2835 4008] >> setpagedevice }
+@+ { /b0 where { pop b0 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ b1 707mm 1000mm
+@+ ! %%DocumentPaperSizes: b1
+@+ %%BeginPaperSize: b1
+@+ /setpagedevice where
+@+ { pop << /PageSize [2004 2835] >> setpagedevice }
+@+ { /b1 where { pop b1 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ b2 500mm 707mm
+@+ ! %%DocumentPaperSizes: b2
+@+ %%BeginPaperSize: b2
+@+ /setpagedevice where
+@+ { pop << /PageSize [1417 2004] >> setpagedevice }
+@+ { /b2 where { pop b2 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ b3 353mm 500mm
+@+ ! %%DocumentPaperSizes: b3
+@+ %%BeginPaperSize: b3
+@+ /setpagedevice where
+@+ { pop << /PageSize [1001 1417] >> setpagedevice }
+@+ { /b3 where { pop b3 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ b4 250mm 353mm
+@+ ! %%DocumentPaperSizes: b4
+@+ %%BeginPaperSize: b4
+@+ /setpagedevice where
+@+ { pop << /PageSize [709 1001] >> setpagedevice }
+@+ { /b4 where { pop b4 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ b5 176mm 250mm
+@+ ! %%DocumentPaperSizes: b5
+@+ %%BeginPaperSize: b5
+@+ /setpagedevice where
+@+ { pop << /PageSize [499 709] >> setpagedevice }
+@+ { /b5 where { pop b5 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ b6 125mm 176mm
+@+ ! %%DocumentPaperSizes: b6
+@+ %%BeginPaperSize: b6
+@+ /setpagedevice where
+@+ { pop << /PageSize [354 499] >> setpagedevice }
+@+ { /b6 where { pop b6 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ c5 162mm 229mm
+@+ ! %%DocumentPaperSizes: c5
+@+ %%BeginPaperSize: c5
+@+ /setpagedevice where
+@+ { pop << /PageSize [459 649] >> setpagedevice }
+@+ { /c5 where { pop c5 } if }
+@+ ifelse
+@+ %%EndPaperSize
+
+@ DL 110mm 220mm
+@+ ! %%DocumentPaperSizes: DL
+@+ %%BeginPaperSize: DL
+@+ /setpagedevice where
+@+ { pop << /PageSize [312 624] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ Comm10 105mm 241mm
+@+ ! %%DocumentPaperSizes: Comm10
+@+ %%BeginPaperSize: Comm10
+@+ /setpagedevice where
+@+ { pop << /PageSize [297 684] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ Monarch 98.4mm 190.5mm
+@+ ! %%DocumentPaperSizes: Monarch
+@+ %%BeginPaperSize: Monarch
+@+ /setpagedevice where
+@+ { pop << /PageSize [279 540] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ archE 36in 48in
+@+ ! %%DocumentPaperSizes: archE
+@+ %%BeginPaperSize: archE
+@+ /setpagedevice where
+@+ { pop << /PageSize [2592 3456] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ archD 24in 36in
+@+ ! %%DocumentPaperSizes: archD
+@+ %%BeginPaperSize: archD
+@+ /setpagedevice where
+@+ { pop << /PageSize [1728 2592] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ archC 18in 24in
+@+ ! %%DocumentPaperSizes: archC
+@+ %%BeginPaperSize: archC
+@+ /setpagedevice where
+@+ { pop << /PageSize [1296 1728] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ archB 12in 18in
+@+ ! %%DocumentPaperSizes: archB
+@+ %%BeginPaperSize: archB
+@+ /setpagedevice where
+@+ { pop << /PageSize [864 1296] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ archA 9in 12in
+@+ ! %%DocumentPaperSizes: archA
+@+ %%BeginPaperSize: archA
+@+ /setpagedevice where
+@+ { pop << /PageSize [648 864] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ flsa 216mm 330.2mm
+@+ ! %%DocumentPaperSizes: flsa
+@+ %%BeginPaperSize: flsa
+@+ /setpagedevice where
+@+ { pop << /PageSize [612 936] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ flse 216mm 330.2mm
+@+ ! %%DocumentPaperSizes: flse
+@+ %%BeginPaperSize: flse
+@+ /setpagedevice where
+@+ { pop << /PageSize [612 936] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ csheet 431.8mm 558.8mm
+@+ ! %%DocumentPaperSizes: csheet
+@+ %%BeginPaperSize: csheet
+@+ /setpagedevice where
+@+ { pop << /PageSize [1224 1584] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ dsheet 558.8mm 863.6mm
+@+ ! %%DocumentPaperSizes: dsheet
+@+ %%BeginPaperSize: dsheet
+@+ /setpagedevice where
+@+ { pop << /PageSize [1584 2448] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
+
+@ esheet 863.6mm 1117.6mm
+@+ ! %%DocumentPaperSizes: esheet
+@+ %%BeginPaperSize: esheet
+@+ /setpagedevice where
+@+ { pop << /PageSize [2448 3168] >> setpagedevice }
+@+ if
+@+ %%EndPaperSize
@ unknown 0in 0in
@+ statusdict /setpageparams known { hsize vsize 0 1 statusdict begin {

View File

@ -1,6 +0,0 @@
TeXLive is an easy way to get up and running with TeX. It provides a
comprehensive TeX system which includes all the major TeX-related
programs, macro packages, and fonts that are free software, including
support for many languages around the world.
This package contains a teTeX like subset of the TeXLive texmf.

View File

@ -1,3 +0,0 @@
Please backup your TeX configuration files (texmf.cnf, fmtutil.cnf, etc.)
before adding/deleting texlive related packages. It is necessary for the
package tools to manipulate these files.

File diff suppressed because it is too large Load Diff