update to tetex-3.0, see included ChangeLog for details

the texmf-doc SUBPACKAGE is not distributed via ftp due to size constraints
This commit is contained in:
sturm 2005-02-21 21:36:06 +00:00
parent 8c56853913
commit 09e522ec98
32 changed files with 15699 additions and 12565 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.2 2003/02/19 12:14:45 sturm Exp $
# $OpenBSD: Makefile.inc,v 1.3 2005/02/21 21:36:06 sturm Exp $
HOMEPAGE= http://www.tug.org/tetex/
MAINTAINER= Nikolay Sturm <sturm@openbsd.org>
@ -7,9 +7,9 @@ MAINTAINER= Nikolay Sturm <sturm@openbsd.org>
PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_FTP?= Yes
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
DIST_SUBDIR= teTeX
TEXMF_DIR= ${PREFIX}/share/texmf
TEXMF_DIR= ${PREFIX}/share/texmf-dist

View File

@ -1,23 +1,24 @@
# $OpenBSD: Makefile,v 1.30 2005/01/27 05:03:27 brad Exp $
# $OpenBSD: Makefile,v 1.31 2005/02/21 21:36:07 sturm Exp $
COMMENT= "TeX distribution, executables"
VERSION= 2.0.2
VERSION= 3.0
DISTNAME= tetex-base-${VERSION}
PKGNAME= ${DISTNAME:S/tetex-/teTeX_/}p3
PKGNAME= ${DISTNAME:S/tetex-/teTeX_/}
CATEGORIES= print
DISTFILES= tetex-src-${VERSION}.tar.gz
BUILD_DEPENDS= :teTeX_texmf->=2.0:print/teTeX/texmf
RUN_DEPENDS= :teTeX_texmf->=2.0:print/teTeX/texmf \
WANTLIB= c m ncurses stdc++ z
BUILD_DEPENDS= :teTeX_texmf->=3.0:print/teTeX/texmf
RUN_DEPENDS= :teTeX_texmf->=3.0:print/teTeX/texmf \
:texi2html->=1.56:textproc/texi2html
LIB_DEPENDS= png.3::graphics/png
CONFIGURE_STYLE=gnu dest
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config \
${WRKSRC}/libs/libwww/config \
${WRKSRC}/libs/ncurses \
${WRKSRC}/texk \
${WRKSRC}/utils/texinfo
@ -35,9 +36,11 @@ FLAVOR?=
.if ${FLAVOR:L:Mno_x11}
CONFIGURE_ARGS+=--without-x
.else
WANTLIB+= ICE SM X11 Xaw Xext Xmu Xp Xpm Xt
CONFIGURE_ARGS+=--with-system-t1lib \
--with-t1lib-libdir=${PREFIX}/lib \
--with-t1lib-include=${PREFIX}/include
--with-t1lib-include=${PREFIX}/include \
--with-xdvi-x-toolkit=xaw
LIB_DEPENDS+= t1.4::devel/t1lib
RUN_DEPENDS+= :ghostscript-*:print/ghostscript/gnu
USE_X11= Yes
@ -50,18 +53,19 @@ TETEX_EXDIR= ${PREFIX}/share/examples/teTeX
REGRESS_FLAGS= DESTDIR="${WRKINST}"
post-configure:
@find ${WRKBUILD} -name Makefile -exec perl -i -pe \
's#^(texmf\s*\=\s*)${PREFIX}#$$1\$${${DESTDIRNAME}}${PREFIX}#' {} \;
@perl -pi -e "s,\@sysconfdir\@,${SYSCONFDIR}," \
${WRKSRC}/texk/kpathsea/texmf.in-teTeX
# need the texmf part visible...
pre-fake:
${INSTALL_DATA_DIR} ${TEXMF_DIR}
lndir ${TRUEPREFIX}/share/texmf ${TEXMF_DIR}
${INSTALL_DATA_DIR} ${WRKINST}/var/texmf
lndir ${TRUEPREFIX}/share/texmf-dist ${TEXMF_DIR}
# mktexlsr is too smart for its own good
rm ${TEXMF_DIR}/ls-R
post-install:
@mv ${PREFIX}/share/texmf/web2c/texmf.cnf \
@cp ${PREFIX}/share/texmf/web2c/texmf.cnf \
${PREFIX}/share/texmf/web2c/texmf.cnf.dist
${INSTALL_DATA_DIR} ${TETEX_EXDIR}
${INSTALL_DATA} files/tetex.cfg ${TETEX_EXDIR}/tetex.cfg
@ -70,6 +74,6 @@ post-install:
-e "s#%%PREFIX%%#${TRUEPREFIX}#;" ${PREFIX}/bin/tetex_setup
# need the texmf part visible...
pre-regress: fake
pre-regress: _internal-fake
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (teTeX/tetex-src-2.0.2.tar.gz) = a16f6bba227d55e79aeee46fbbd82d28
RMD160 (teTeX/tetex-src-2.0.2.tar.gz) = 9bbb274c0598547bcecb00ff48e459d41bc65e93
SHA1 (teTeX/tetex-src-2.0.2.tar.gz) = 6445206b14d659458ee352df78d2c2daf8e88ab3
SIZE (teTeX/tetex-src-2.0.2.tar.gz) = 11745933
MD5 (teTeX/tetex-src-3.0.tar.gz) = 944a4641e79e61043fdaf8f38ecbb4b3
RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
SIZE (teTeX/tetex-src-3.0.tar.gz) = 12749314

View File

@ -1,4 +1,4 @@
# $OpenBSD: tetex.cfg,v 1.2 2004/05/17 05:32:39 sturm Exp $
# $OpenBSD: tetex.cfg,v 1.3 2005/02/21 21:36:07 sturm Exp $
# teTeX is normally configured interactively through the use of
# texconfig. To make your configuration persistent between updates
@ -18,9 +18,9 @@ MODE="ljfour"
PS_DVIPDFM="a4" # texconfig dvipdfm paper
PS_DVIPS="a4" # texconfig dvips paper
PS_PDFTEX="a4" # texconfig pdftex paper
PS_XDVI="a4" # texconfig xdvi
PS_XDVI="a4" # texconfig xdvi paper
# For printing, the output will be piped to DVIPS_PRINTCMD.
# Typically, DVIPS_PRINTCMD is set to "lpr" or "lpr -P foo".
# Set to "-" to disable direct printing.
DVIPS_PRINTCMD="lpr"
DVIPS_PRINTCMD="-"

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: tetex_setup.sh,v 1.2 2004/05/17 05:32:39 sturm Exp $
# $OpenBSD: tetex_setup.sh,v 1.3 2005/02/21 21:36:07 sturm Exp $
#
# This file is NOT part of teTeX itself, but only of the OpenBSD port of
# teTeX. For questions please contact the port's MAINTAINER.
@ -8,7 +8,7 @@
. %%SYSCONFDIR%%/tetex.cfg
TEXCONFIG=%%PREFIX%%/bin/texconfig
TEXCONFIG=%%PREFIX%%/bin/texconfig-sys
if [ "X${MODE}" != "X" ]; then
$TEXCONFIG mode $MODE
@ -25,7 +25,7 @@ if [ "X${PS_PDFTEX}" != "X" ]; then
$TEXCONFIG pdftex paper $PS_PDFTEX
fi
if [ "X${PS_XDVI}" != "X" ]; then
$TEXCONFIG xdvi $PS_XDVI
$TEXCONFIG xdvi paper $PS_XDVI
fi
if [ "X${DVIPS_PRINTCMD}" != "X" ]; then

View File

@ -0,0 +1,41 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- Makefile.in.orig Sun Feb 20 09:21:55 2005
+++ Makefile.in Sun Feb 20 11:08:03 2005
@@ -47,6 +47,10 @@ LIBSDIRS = @LIBSDIRS@
# install kpathsea and friends by default.
INSTDIRS = @INSTDIRS@
+TETEXENV=TEXMFDIST="$(texmf)"-dist TEXMFLOCAL="$(texmf)"-local \
+ TEXMFSYSVAR=${PREFIX}/var/texmf \
+ TEXMFSYSCONFIG=${PREFIX}${SYSCONFDIR}/texmf
+
default: all
install: all
for dir in $(INSTDIRS); do \
@@ -65,22 +69,22 @@ install: all
$(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
- if test -f $(scriptdir)/mktexlsr; then \
TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/mktexlsr; \
+ ${TETEXENV} $(scriptdir)/mktexlsr; \
else :; fi
- if test -f $(scriptdir)/fmtutil-sys; then \
TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/fmtutil-sys --all; \
+ ${TETEXENV} $(scriptdir)/fmtutil-sys --all; \
else :; fi
- if test -f $(scriptdir)/texlinks; then \
TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/texlinks; \
+ ${TETEXENV} $(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; \
+ ${TETEXENV} $(scriptdir)/updmap-sys; \
else :; fi
install-exec:

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-config_ltconfig,v 1.1 2003/02/18 16:04:49 sturm Exp $
--- config/ltconfig.orig Sun Dec 15 21:01:17 2002
+++ config/ltconfig Sun Dec 15 21:01:59 2002
@@ -942,6 +942,10 @@ irix*)
solaris2*)
symcode='[BDTU]'
;;
+openbsd*)
+ sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
+ symxfrm='_\1 \1'
+ ;;
esac
# If we're using GNU nm, then use its standard symbol codes.

View File

@ -1,91 +0,0 @@
$OpenBSD: patch-libs_libwww_HTInet_c,v 1.2 2003/06/18 13:53:33 avsm Exp $
--- libs/libwww/HTInet.c.orig Thu Jan 6 10:48:50 2000
+++ libs/libwww/HTInet.c Wed Jun 18 04:19:52 2003
@@ -599,71 +599,25 @@ PUBLIC time_t HTGetTimeZoneOffset (void)
*/
PUBLIC char * HTGetTmpFileName (const char * abs_dir)
{
- char * result = NULL;
-#ifdef HAVE_TEMPNAM
- static char * envtmpdir = NULL;
- size_t len = 0;
- if (abs_dir && *abs_dir) {
- char * tmpdir = getenv("TMPDIR");
- if (tmpdir)
- len = strlen(tmpdir);
- if (len) {
- if (!(envtmpdir = (char *) HT_REALLOC(envtmpdir, len + 8)))
- HT_OUTOFMEM("HTGetTmpFileName");
- strcpy(envtmpdir, "TMPDIR=");
- strcpy(envtmpdir + 7, tmpdir);
- putenv("TMPDIR=");
- }
- }
-#ifdef __CYGWIN__
- result = tempnam(abs_dir, "");
-#else
- result = tempnam(abs_dir, NULL);
-#endif /* __CYGWIN__ */
- if (len)
- putenv(envtmpdir);
-#else
- /*
- ** This is only approx. as we don't know if this file exists or not.
- ** Hopefully, tempnam() exists on enough platforms so that this is not
- ** a problem.
- */
- char * offset = NULL;
- if (!(result = (char *) HT_MALLOC((abs_dir ? strlen(abs_dir) : 0) +
- HT_MAX_TMPNAM + 2)))
- HT_OUTOFMEM("HTGetTmpFileName");
+ char * temp_name;
+ size_t temp_len;
+ int temp_fd;
-#ifdef WWW_MSWINDOWS
- if (abs_dir) {
-#else
- if (abs_dir && *abs_dir==DIR_SEPARATOR_CHAR) {
-#endif /* WWW_MSWINDOWS */
- strcpy(result, abs_dir);
- offset = result+strlen(result);
- if (*(offset-1) != DIR_SEPARATOR_CHAR) *offset++ = DIR_SEPARATOR_CHAR;
+ temp_len = (strlen(abs_dir) + HT_MAX_TMPNAM + 2) * sizeof(char);
+ temp_name = malloc(temp_len);
+ if (abs_dir != NULL) {
+ strlcpy(temp_name, abs_dir, temp_len);
+ if (abs_dir[strlen(abs_dir) - 1] != DIR_SEPARATOR_CHAR)
+ strlcat(temp_name, "/HT_TMP.XXXXXXXXXX", temp_len);
+ else
+ strlcat(temp_name, "HT_TMP.XXXXXXXXXX", temp_len);
+ } else
+ strlcpy(temp_name, "HT_TMP.XXXXXXXXXX", temp_len);
-#ifdef HT_REENTRANT
- tmpnam_r(offset);
-#else
- tmpnam(offset);
-#endif
+ temp_fd = mkstemp(temp_name);
+ close(temp_fd);
- {
- char * orig = strrchr(offset, DIR_SEPARATOR_CHAR);
- char * dest = offset;
- if (orig++) while ((*dest++ = *orig++));
- }
- } else {
- offset = result;
-#ifdef HT_REENTRANT
- tmpnam_r(offset);
-#else
- tmpnam(offset);
-#endif
- offset = result;
- }
-#endif /* HAVE_TEMPNAM */
- return result;
+ return temp_name;
}
/*

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-libs_libwww_configure,v 1.2 2004/10/25 18:55:36 sturm Exp $
# this has to fail, because bsd has timezone() returning char*
# while libwww really wants a long int timezone variable
--- libs/libwww/configure.orig Tue Feb 18 05:12:53 2003
+++ libs/libwww/configure Sun Sep 26 12:36:13 2004
@@ -3635,6 +3635,10 @@ case "$target" in
echo "$ac_t""Digital Unix's cc" 1>&6
fi
;;
+ hppa-unknown-openbsd*)
+ # OpenBSD is not HPUX
+ echo "$ac_t""no" 1>&6
+ ;;
hp*)
if test "$CC" = "cc"; then
CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
@@ -7219,7 +7223,6 @@ else
cat > conftest.$ac_ext <<EOF
#line 7221 "configure"
#include "confdefs.h"
-#include <time.h>
int main() {
return altzone;
; return 0; }

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libs_xpdf_xpdf_Catalog_cc,v 1.1 2004/11/27 14:15:04 sturm Exp $
--- libs/xpdf/xpdf/Catalog.cc.orig Sun Nov 3 23:15:36 2002
+++ libs/xpdf/xpdf/Catalog.cc Sat Nov 27 14:51:17 2004
$OpenBSD: patch-libs_xpdf_xpdf_Catalog_cc,v 1.2 2005/02/21 21:36:07 sturm Exp $
--- libs/xpdf/xpdf/Catalog.cc.orig Thu Jan 22 02:26:45 2004
+++ libs/xpdf/xpdf/Catalog.cc Thu Feb 10 22:18:02 2005
@@ -22,6 +22,7 @@
#include "Error.h"
#include "Link.h"
@ -9,9 +9,9 @@ $OpenBSD: patch-libs_xpdf_xpdf_Catalog_cc,v 1.1 2004/11/27 14:15:04 sturm Exp $
//------------------------------------------------------------------------
// Catalog
@@ -63,6 +64,12 @@ Catalog::Catalog(XRef *xrefA) {
@@ -64,6 +65,12 @@ Catalog::Catalog(XRef *xrefA) {
}
pagesSize = numPages0 = obj.getInt();
pagesSize = numPages0 = (int)obj.getNum();
obj.free();
+ if ((pagesSize >= INT_MAX / sizeof(Page *)) ||
+ (pagesSize >= INT_MAX / sizeof(Ref))) {
@ -22,7 +22,7 @@ $OpenBSD: patch-libs_xpdf_xpdf_Catalog_cc,v 1.1 2004/11/27 14:15:04 sturm Exp $
pages = (Page **)gmalloc(pagesSize * sizeof(Page *));
pageRefs = (Ref *)gmalloc(pagesSize * sizeof(Ref));
for (i = 0; i < pagesSize; ++i) {
@@ -190,6 +197,11 @@ int Catalog::readPageTree(Dict *pagesDic
@@ -191,6 +198,11 @@ int Catalog::readPageTree(Dict *pagesDic
}
if (start >= pagesSize) {
pagesSize += 32;

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-libs_xpdf_xpdf_GfxState_cc,v 1.1 2004/12/25 23:14:29 sturm Exp $
--- libs/xpdf/xpdf/GfxState.cc.orig Tue Jan 7 17:33:35 2003
+++ libs/xpdf/xpdf/GfxState.cc Sat Dec 25 23:44:41 2004
@@ -708,6 +708,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
}
nCompsA = obj2.getInt();
obj2.free();
+ if (nCompsA > gfxColorMaxComps) {
+ error(-1, "ICCBased color space with too many (%d > %d) components",
+ nCompsA, gfxColorMaxComps);
+ nCompsA = gfxColorMaxComps;
+ }
if (dict->lookup("Alternate", &obj2)->isNull() ||
!(altA = GfxColorSpace::parse(&obj2))) {
switch (nCompsA) {

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libs_xpdf_xpdf_Gfx_cc,v 1.1 2004/12/25 23:14:29 sturm Exp $
--- libs/xpdf/xpdf/Gfx.cc.orig Fri Dec 6 00:44:32 2002
+++ libs/xpdf/xpdf/Gfx.cc Sat Dec 25 23:48:18 2004
@@ -2381,7 +2381,9 @@ void Gfx::doImage(Object *ref, Stream *s
haveMask = gFalse;
dict->lookup("Mask", &maskObj);
if (maskObj.isArray()) {
- for (i = 0; i < maskObj.arrayGetLength(); ++i) {
+ for (i = 0;
+ i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
+ ++i) {
maskObj.arrayGet(i, &obj1);
maskColors[i] = obj1.getInt();
obj1.free();

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libs_xpdf_xpdf_XRef_cc,v 1.2 2005/01/27 05:03:28 brad Exp $
--- libs/xpdf/xpdf/XRef.cc.orig Sun Nov 3 17:15:37 2002
+++ libs/xpdf/xpdf/XRef.cc Wed Jan 26 21:47:22 2005
$OpenBSD: patch-libs_xpdf_xpdf_XRef_cc,v 1.3 2005/02/21 21:36:07 sturm Exp $
--- libs/xpdf/xpdf/XRef.cc.orig Wed Jan 19 13:09:57 2005
+++ libs/xpdf/xpdf/XRef.cc Thu Feb 10 22:18:03 2005
@@ -28,6 +28,7 @@
#include "Error.h"
#include "ErrorCodes.h"
@ -9,41 +9,7 @@ $OpenBSD: patch-libs_xpdf_xpdf_XRef_cc,v 1.2 2005/01/27 05:03:28 brad Exp $
//------------------------------------------------------------------------
@@ -76,6 +77,11 @@ XRef::XRef(BaseStream *strA, GString *ow
// trailer is ok - read the xref table
} else {
+ if ( size >= INT_MAX/sizeof(XRefEntry)) {
+ error(-1, "Invalid 'size' inside xref table.");
+ ok = gFalse;
+ return;
+ }
entries = (XRefEntry *)gmalloc(size * sizeof(XRefEntry));
for (i = 0; i < size; ++i) {
entries[i].offset = 0xffffffff;
@@ -267,6 +273,10 @@ GBool XRef::readXRef(Guint *pos) {
// table size
if (first + n > size) {
newSize = size + 256;
+ if (newSize >= INT_MAX/sizeof(XRefEntry)) {
+ error(-1, "Invalid 'newSize'");
+ goto err2;
+ }
entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
for (i = size; i < newSize; ++i) {
entries[i].offset = 0xffffffff;
@@ -410,6 +420,10 @@ GBool XRef::constructXRef() {
if (!strncmp(p, "obj", 3)) {
if (num >= size) {
newSize = (num + 1 + 255) & ~255;
+ if (newSize >= INT_MAX / sizeof(XRefEntry)) {
+ error(-1, "Invalid 'obj' parameters.");
+ return gFalse;
+ }
entries = (XRefEntry *)
grealloc(entries, newSize * sizeof(XRefEntry));
for (i = size; i < newSize; ++i) {
@@ -431,6 +445,10 @@ GBool XRef::constructXRef() {
@@ -741,6 +742,10 @@ GBool XRef::constructXRef() {
} else if (!strncmp(p, "endstream", 9)) {
if (streamEndsLen == streamEndsSize) {
streamEndsSize += 64;
@ -54,13 +20,3 @@ $OpenBSD: patch-libs_xpdf_xpdf_XRef_cc,v 1.2 2005/01/27 05:03:28 brad Exp $
streamEnds = (Guint *)grealloc(streamEnds,
streamEndsSize * sizeof(int));
}
@@ -480,6 +498,9 @@ GBool XRef::checkEncrypted(GString *owne
keyLength = lengthObj.getInt() / 8;
} else {
keyLength = 5;
+ }
+ if (keyLength > 16) {
+ keyLength = 16;
}
permFlags = permissions.getInt();
if (encVersion >= 1 && encVersion <= 2 &&

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-texk_dvipng_special_c,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/dvipng/special.c.orig Fri Feb 11 22:21:48 2005
+++ texk/dvipng/special.c Fri Feb 11 22:22:11 2005
@@ -103,13 +103,13 @@ ps2png(const char *psfile, int hresoluti
"-dBATCH", "-dNOPAUSE", "-q",
"-sOutputFile=-",
"-dTextAlphaBits=4", "-dGraphicsAlphaBits=4",
- "-",NULL);
+ "-",(void *)NULL);
else
execl (GS_PATH, GS_PATH, device, resolution, /*devicesize,*/
"-dBATCH", "-dNOPAUSE", "-dSAFER", "-q",
"-sOutputFile=-",
"-dTextAlphaBits=4", "-dGraphicsAlphaBits=4",
- "-",NULL);
+ "-",(void *)NULL);
_exit (EXIT_FAILURE);
}
/* Parent process. */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-texk_gsftopk_gsftopk_c,v 1.1 2003/10/28 20:01:12 sturm Exp $
--- texk/gsftopk/gsftopk.c.orig 2003-10-28 20:40:57.000000000 +0100
+++ texk/gsftopk/gsftopk.c 2003-10-28 20:41:32.000000000 +0100
@@ -2585,7 +2585,7 @@ Author of gsftopk: Paul Vojta.");
$OpenBSD: patch-texk_gsftopk_gsftopk_c,v 1.2 2005/02/21 21:36:07 sturm Exp $
--- texk/gsftopk/gsftopk.c.orig Fri Feb 6 22:20:54 2004
+++ texk/gsftopk/gsftopk.c Thu Feb 10 22:18:03 2005
@@ -2586,7 +2586,7 @@ Author of gsftopk: Paul Vojta.");
execlp(gspath, "gs", "-dNODISPLAY", "-dNOGC", substarg, "-q", "--",
/* render.ps */ searchpath,
PSname,

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-texk_kpathsea_texmf_in-teTeX,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/kpathsea/texmf.in-teTeX.orig Sun Feb 20 11:43:44 2005
+++ texk/kpathsea/texmf.in-teTeX Sun Feb 20 11:44:33 2005
@@ -72,7 +72,7 @@ TEXMFLOCAL = @texmf@-local
% TEXMFSYSVAR = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSVAR = @texmf@-var
-TEXMFSYSVAR = @texmf@-var
+TEXMFSYSVAR = /var/texmf
% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
% With teTeX-3.0 or later, this must be set.
@@ -80,7 +80,7 @@ TEXMFSYSVAR = @texmf@-var
% TEXMFSYSCONFIG = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSCONFIG = @texmf@-config
-TEXMFSYSCONFIG = @texmf@-config
+TEXMFSYSCONFIG = @sysconfdir@/texmf
% User texmf trees can be catered for like this...
% This used to be HOMETEXMF.

View File

@ -0,0 +1,44 @@
$OpenBSD: patch-texk_ltmain_sh,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/ltmain.sh.orig Sun Feb 13 18:40:23 2005
+++ texk/ltmain.sh Sun Feb 13 18:41:44 2005
@@ -4569,40 +4569,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

View File

@ -0,0 +1,228 @@
$OpenBSD: patch-texk_ps2pkm_paths_c,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/ps2pkm/paths.c.orig Sun Feb 13 13:23:21 2005
+++ texk/ps2pkm/paths.c Sun Feb 13 13:39:00 2005
@@ -215,7 +215,7 @@ struct segment *t1_Loc(S, x, y)
register struct segment *r;
- IfTrace3((MustTraceCalls),"..Loc(S=%z, x=%f, y=%f)\n", S, &x, &y);
+ IfTrace3((MustTraceCalls),"..Loc(S=%p, x=%f, y=%f)\n", S, x, y);
r = (struct segment *)Allocate(sizeof(struct segment), &movetemplate, 0);
TYPECHECK("Loc", S, SPACETYPE, r, (0), struct segment *);
@@ -236,7 +236,7 @@ struct segment *ILoc(S, x, y)
{
register struct segment *r;
- IfTrace3((MustTraceCalls),"..ILoc(S=%z, x=%d, y=%d)\n",
+ IfTrace3((MustTraceCalls),"..ILoc(S=%p, x=%d, y=%d)\n",
S, (LONG) x, (LONG) y);
r = (struct segment *)Allocate(sizeof(struct segment), &movetemplate, 0);
TYPECHECK("Loc", S, SPACETYPE, r, (0), struct segment *);
@@ -262,7 +262,7 @@ struct segment *SubLoc(p1, p2)
register struct segment *p1;
register struct segment *p2;
{
- IfTrace2((MustTraceCalls),"SubLoc(%z, %z)\n", p1, p2);
+ IfTrace2((MustTraceCalls),"SubLoc(%p, %p)\n", p1, p2);
ARGCHECK(!ISLOCATION(p1), "SubLoc: bad first arg", p1, NULL, (0), struct segment *);
ARGCHECK(!ISLOCATION(p2), "SubLoc: bad second arg", p2, NULL, (0), struct segment *);
@@ -307,7 +307,7 @@ struct segment *Line(P)
register struct segment *P; /* relevant coordinate space */
{
- IfTrace1((MustTraceCalls),"..Line(%z)\n", P);
+ IfTrace1((MustTraceCalls),"..Line(%p)\n", P);
ARGCHECK(!ISLOCATION(P), "Line: arg not a location", P, NULL, (0), struct segment *);
P = UniquePath(P);
@@ -350,7 +350,7 @@ struct beziersegment *Bezier(B, C, D)
register struct beziersegment *r; /* output segment */
- IfTrace3((MustTraceCalls),"..Bezier(%z, %z, %z)\n", B, C, D);
+ IfTrace3((MustTraceCalls),"..Bezier(%p, %p, %p)\n", B, C, D);
ARGCHECK(!ISLOCATION(B), "Bezier: bad B", B, NULL, (2,C,D), struct beziersegment *);
ARGCHECK(!ISLOCATION(C), "Bezier: bad C", C, NULL, (2,B,D), struct beziersegment *);
ARGCHECK(!ISLOCATION(D), "Bezier: bad D", D, NULL, (2,B,C), struct beziersegment *);
@@ -457,8 +457,8 @@ rules.
struct segment *Join(p1, p2)
register struct segment *p1,*p2;
{
- IfTrace2((MustTraceCalls && PathDebug > 1),"..Join(%z, %z)\n", p1, p2);
- IfTrace2((MustTraceCalls && PathDebug <=1),"..Join(%x, %x)\n", p1, p2);
+ IfTrace2((MustTraceCalls && PathDebug > 1),"..Join(%p, %p)\n", p1, p2);
+ IfTrace2((MustTraceCalls && PathDebug <=1),"..Join(%p, %p)\n", p1, p2);
/*
We start with a whole bunch of very straightforward argument tests:
*/
@@ -613,7 +613,7 @@ struct segment *t1_ClosePath(p0,lastonly
register fractpel firstx,firsty; /* start position of sub path */
register struct segment *lastnonhint; /* last non-hint segment in path */
- IfTrace1((MustTraceCalls),"ClosePath(%z)\n", p0);
+ IfTrace1((MustTraceCalls),"ClosePath(%p)\n", p0);
if (p0 != NULL && p0->type == TEXTTYPE)
return(UniquePath(p0));
if (p0->type == STROKEPATHTYPE)
@@ -661,7 +661,7 @@ At each break, we insert a close segment
if (r->dest.x <= CLOSEFUDGE && r->dest.x >= -CLOSEFUDGE
&& r->dest.y <= CLOSEFUDGE && r->dest.y >= -CLOSEFUDGE) {
IfTrace2((PathDebug),
- "ClosePath forced closed by (%p,%p)\n",
+ "ClosePath forced closed by (%d,%d)\n",
r->dest.x, r->dest.y);
lastnonhint->dest.x += r->dest.x;
lastnonhint->dest.y += r->dest.y;
@@ -713,7 +713,7 @@ struct segment *Reverse(p)
register struct segment *r; /* output path built here */
register struct segment *nextp; /* contains next sub-path */
- IfTrace1((MustTraceCalls),"Reverse(%z)\n", p);
+ IfTrace1((MustTraceCalls),"Reverse(%p)\n", p);
if (p == NULL)
return(NULL);
@@ -877,7 +877,7 @@ struct segment *ReverseSubPaths(p)
register struct segment *nomove; /* the part of sub-path without move segment */
struct fractpoint delta;
- IfTrace1((MustTraceCalls),"ReverseSubPaths(%z)\n", p);
+ IfTrace1((MustTraceCalls),"ReverseSubPaths(%p)\n", p);
if (p == NULL)
return(NULL);
@@ -1032,7 +1032,7 @@ struct segment *PathTransform(p0, S)
}
default:
- IfTrace1(TRUE,"path = %z\n", p);
+ IfTrace1(TRUE,"path = %p\n", p);
t1_abort("PathTransform: invalid segment");
}
oldx += savex;
@@ -1099,7 +1099,7 @@ void QueryLoc(P, S, xP, yP)
register struct XYspace *S; /* XY space to return coordinates in */
register DOUBLE *xP,*yP; /* coordinates returned here */
{
- IfTrace4((MustTraceCalls),"QueryLoc(P=%z, S=%z, (%x, %x))\n",
+ IfTrace4((MustTraceCalls),"QueryLoc(P=%p, S=%p, (%p, %p))\n",
P, S, xP, yP);
if (!ISLOCATION(P)) {
ArgErr("QueryLoc: first arg not a location", P, NULL);
@@ -1132,7 +1132,7 @@ void QueryPath(path, typeP, Bp, Cp, Dp,
{
register int coerced = FALSE; /* did I coerce a text path? */
- IfTrace3((MustTraceCalls), "QueryPath(%z, %x, %x, ...)\n",
+ IfTrace3((MustTraceCalls), "QueryPath(%p, %p, %p, ...)\n",
path, typeP, Bp);
if (path == NULL) {
*typeP = -1;
@@ -1210,8 +1210,8 @@ void QueryBounds(p0, S, xminP, yminP, xm
int coerced = FALSE; /* we have coerced the path from another object */
DOUBLE x1,y1,x2,y2,x3,y3,x4,y4; /* corners of rectangle in space X */
- IfTrace2((MustTraceCalls), "QueryBounds(%z, %z,", p0, S);
- IfTrace4((MustTraceCalls), " %x, %x, %x, %x)\n",
+ IfTrace2((MustTraceCalls), "QueryBounds(%p, %p,", p0, S);
+ IfTrace4((MustTraceCalls), " %p, %p, %p, %p)\n",
xminP, yminP, xmaxP, ymaxP);
if (S->type != SPACETYPE) {
ArgErr("QueryBounds: bad XYspace", S, NULL);
@@ -1386,7 +1386,7 @@ to ask about an entire path.
struct segment *DropSegment(path)
register struct segment *path;
{
- IfTrace1((MustTraceCalls),"DropSegment(%z)\n", path);
+ IfTrace1((MustTraceCalls),"DropSegment(%p)\n", path);
if (path != NULL && path->type == STROKEPATHTYPE)
path = CoercePath(path);
ARGCHECK((path == NULL || !ISPATHANCHOR(path)),
@@ -1408,7 +1408,7 @@ first segment only.
struct segment *HeadSegment(path)
register struct segment *path; /* input path */
{
- IfTrace1((MustTraceCalls),"HeadSegment(%z)\n", path);
+ IfTrace1((MustTraceCalls),"HeadSegment(%p)\n", path);
if (path == NULL)
return(NULL);
if (path->type == STROKEPATHTYPE)
@@ -1438,7 +1438,7 @@ void DumpPath(p)
register fractpel lastx,lasty;
DOUBLE roundness;
- IfTrace1(TRUE,"Dumping path, anchor=%x:\n", p);
+ IfTrace1(TRUE,"Dumping path, anchor=%p:\n", p);
lastx = lasty = 0;
for (;p != NULL; p=p->link) {
@@ -1450,13 +1450,13 @@ void DumpPath(p)
case LINETYPE:
IfTrace1(TRUE,". line<%x> to", (LONG) p->flag);
- IfTrace4(TRUE," (%p,%p), delta=(%p,%p)",
+ IfTrace4(TRUE," (%d,%d), delta=(%d,%d)",
x + lastx, y + lasty, x, y);
break;
case MOVETYPE:
IfTrace1(TRUE,"MOVE<%x> to", (LONG) p->flag);
- IfTrace4(TRUE,"(%p,%p), delta=(%p,%p)",
+ IfTrace4(TRUE,"(%d,%d), delta=(%d,%d)",
x + lastx, y + lasty, x, y);
break;
@@ -1465,10 +1465,10 @@ void DumpPath(p)
register struct conicsegment *cp = (struct conicsegment *) p;
roundness = cp->roundness;
- IfTrace2(TRUE, ". conic to (%p,%p),",
+ IfTrace2(TRUE, ". conic to (%d,%d),",
x + lastx, y + lasty);
- IfTrace3(TRUE," M=(%p,%p), r=%f", cp->M.x + lastx,
- cp->M.y + lasty, &roundness);
+ IfTrace3(TRUE," M=(%d,%d), r=%f", cp->M.x + lastx,
+ cp->M.y + lasty, roundness);
}
break;
@@ -1476,10 +1476,10 @@ void DumpPath(p)
{
register struct beziersegment *bp = (struct beziersegment *) p;
- IfTrace4(TRUE,". bezier to (%p,%p), B=(%p,%p)",
+ IfTrace4(TRUE,". bezier to (%d,%d), B=(%d,%d)",
x + lastx, y + lasty,
bp->B.x + lastx, bp->B.y + lasty);
- IfTrace2(TRUE, ", C=(%p,%p)",
+ IfTrace2(TRUE, ", C=(%d,%d)",
bp->C.x + lastx, bp->C.y + lasty);
}
break;
@@ -1488,13 +1488,13 @@ void DumpPath(p)
{
register struct hintsegment *hp = (struct hintsegment *) p;
- IfTrace4(TRUE,". hint ref=(%p,%p), width=(%p,%p)",
+ IfTrace4(TRUE,". hint ref=(%d,%d), width=(%d,%d)",
hp->ref.x + lastx, hp->ref.y + lasty,
hp->width.x, hp->width.y);
IfTrace4(TRUE, ", %c %c %c %c",
hp->orientation, hp->hinttype,
hp->adjusttype, hp->direction);
- IfTrace1(TRUE, ", %ld", (LONG) hp->label);
+ IfTrace1(TRUE, ", %d", (LONG) hp->label);
}
break;
@@ -1505,7 +1505,7 @@ void DumpPath(p)
default:
IfTrace0(TRUE, "bad path segment?");
}
- IfTrace1(TRUE," at %x\n", p);
+ IfTrace1(TRUE," at %p\n", p);
lastx += x;
lasty += y;
}

View File

@ -0,0 +1,201 @@
$OpenBSD: patch-texk_ps2pkm_regions_c,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/ps2pkm/regions.c.orig Sun Feb 13 13:40:10 2005
+++ texk/ps2pkm/regions.c Sun Feb 13 13:46:34 2005
@@ -343,7 +343,7 @@ Allocate() makes everything it allocates
*/
LONGCOPY(&r[1], xvalues, (ymax - iy) * sizeof(pel) + sizeof(LONG) - 1);
- IfTrace1((RegionDebug),"result=%x\n", r);
+ IfTrace1((RegionDebug),"result=%p\n", r);
return(r);
}
@@ -387,7 +387,7 @@ struct region *Interior(p, fillrule)
char tempflag; /* flag; is path temporary? */
char Cflag; /* flag; should we apply continuity? */
- IfTrace2((MustTraceCalls),". INTERIOR(%x, %d)\n", p, (LONG) fillrule);
+ IfTrace2((MustTraceCalls),". INTERIOR(%p, %d)\n", p, (LONG) fillrule);
if (p == NULL)
return(NULL);
@@ -464,7 +464,7 @@ The hints data structure must be initial
x = lastx + p->dest.x;
y = lasty + p->dest.y;
- IfTrace2((HintDebug > 0),"Ending point = (%p,%p)\n", x, y);
+ IfTrace2((HintDebug > 0),"Ending point = (%d,%d)\n", x, y);
nextP = p->link;
@@ -484,7 +484,7 @@ the first on the path), we need to close
if (ProcessHints)
if ((p->type == MOVETYPE) && (p->last == NULL)) {
CloseHints(&hint);
- IfTrace2((HintDebug>0),"Closed point= (%p,%p)\n",
+ IfTrace2((HintDebug>0),"Closed point= (%d,%d)\n",
x+hint.x, y+hint.y);
}
@@ -515,7 +515,7 @@ We now apply the full hint value to the
x += hint.x;
y += hint.y;
- IfTrace2((HintDebug>0),"Hinted ending point = (%p,%p)\n", x, y);
+ IfTrace2((HintDebug>0),"Hinted ending point = (%d,%d)\n", x, y);
switch(p->type) {
@@ -607,7 +607,7 @@ static int Unwind(area)
register int y; /* ymin of current swath */
register int count,newcount; /* winding count registers */
- IfTrace1((RegionDebug>0),"...Unwind(%x)\n", area);
+ IfTrace1((RegionDebug>0),"...Unwind(%p)\n", area);
while (VALIDEDGE(area)) {
@@ -672,7 +672,7 @@ void ChangeDirection(type, R, x, y, dy)
register pel idy; /* nearest integer pel to 'dy' */
register int ydiff; /* allowed Y difference in 'currentworkarea' */
- IfTrace4((RegionDebug>0),"Change Y direction (%d) from (%p,%p), dy=%p\n",
+ IfTrace4((RegionDebug>0),"Change Y direction (%d) from (%d,%d), dy=%d\n",
(LONG) type, x, y, dy);
if (type != CD_FIRST) {
@@ -820,11 +820,11 @@ struct edgelist *SortSwath(anchor, edge,
if (RegionDebug > 0) {
if (RegionDebug > 2) {
- IfTrace3(TRUE,"SortSwath(anchor=%x, edge=%x, fcn=%x)\n",
+ IfTrace3(TRUE,"SortSwath(anchor=%p, edge=%p, fcn=%p)\n",
anchor, edge, swathfcn);
}
else {
- IfTrace3(TRUE,"SortSwath(anchor=%x, edge=%x, fcn=%x)\n",
+ IfTrace3(TRUE,"SortSwath(anchor=%p, edge=%p, fcn=%p)\n",
anchor, edge, swathfcn);
}
}
@@ -902,11 +902,11 @@ contains all the edges before. Whew! A
*/
before->link = edge;
if (RegionDebug > 1) {
- IfTrace3(TRUE,"SortSwath: in between %x and %x are %x",
+ IfTrace3(TRUE,"SortSwath: in between %p and %p are %p",
before, after, edge);
while (edge->link != NULL) {
edge = edge->link;
- IfTrace1(TRUE," and %x", edge);
+ IfTrace1(TRUE," and %p", edge);
}
IfTrace0(TRUE,"\n");
}
@@ -934,7 +934,7 @@ static struct edgelist *splitedge(list,
register struct edgelist *r; /* temp pointer to new structure */
register struct edgelist *lastlist; /* temp pointer to last 'list' value */
- IfTrace2((RegionDebug > 1),"splitedge of %x at %d ", list, (LONG) y);
+ IfTrace2((RegionDebug > 1),"splitedge of %p at %d ", list, (LONG) y);
lastlist = new = NULL;
@@ -987,7 +987,7 @@ Then, we return the caller a pointer to
t1_abort("null splitedge");
lastlist->link = NULL;
last->link = list;
- IfTrace1((RegionDebug > 1),"yields %x\n", new);
+ IfTrace1((RegionDebug > 1),"yields %p\n", new);
return(new);
}
@@ -1109,7 +1109,7 @@ struct edgelist *SwathUnion(before0, edg
register struct edgelist *before,*after; /* edge before and after */
int h0; /* saves initial height */
- IfTrace2((RegionDebug > 1),"SwathUnion entered, before=%x, edge=%x\n",
+ IfTrace2((RegionDebug > 1),"SwathUnion entered, before=%p, edge=%p\n",
before0, edge);
h0 = h = edge->ymax - edge->ymin;
@@ -1150,7 +1150,7 @@ the height by that amount.
if (after == NULL || TOP(after) != TOP(edge) ||
after->xvalues[0] > rightedge->xvalues[0]) {
IfTrace2((RegionDebug > 1),
- "SwathUnion starts disjoint: before=%x after=%x\n",
+ "SwathUnion starts disjoint: before=%p after=%p\n",
before, after);
/*
On this side of the the above 'if', the new edge is disjoint from the
@@ -1217,7 +1217,7 @@ out the new situation:
h -= touches(h, rightedge->xvalues, after->xvalues);
IfTrace3((RegionDebug > 1),
- "SwathUnion is overlapped until %d: before=%x after=%x\n",
+ "SwathUnion is overlapped until %d: before=%p after=%p\n",
(LONG) TOP(edge) + h, before, after);
/*
OK, if we touched either of our neighbors we need to split at that point
@@ -1370,7 +1370,7 @@ static discard(left, right)
{
register struct edgelist *beg,*end,*p;
- IfTrace2((RegionDebug > 0),"discard: l=%x, r=%x\n", left, right);
+ IfTrace2((RegionDebug > 0),"discard: l=%p, r=%p\n", left, right);
beg = left->link;
if (beg == right)
@@ -1379,7 +1379,7 @@ static discard(left, right)
for (p = beg; p != right; p = p->link) {
if (p->link == NULL && right != NULL)
t1_abort("discard(): ran off end");
- IfTrace1((RegionDebug > 0),"discarding %x\n", p);
+ IfTrace1((RegionDebug > 0),"discarding %p\n", p);
p->ymin = p->ymax = 32767;
end = p;
}
@@ -1564,7 +1564,7 @@ struct region *BoxClip(R, xmin, ymin, xm
struct edgelist anchor; /* pretend edgelist to facilitate discards */
register struct edgelist *e,*laste;
- IfTrace1((OffPageDebug),"BoxClip of %x:\n", R);
+ IfTrace1((OffPageDebug),"BoxClip of %p:\n", R);
R = UniqueRegion(R);
@@ -1674,10 +1674,10 @@ struct segment *RegionBounds(R)
void DumpArea(area)
register struct region *area;
{
- IfTrace1(TRUE,"Dumping area %x,", area);
+ IfTrace1(TRUE,"Dumping area %p,", area);
IfTrace4(TRUE," X %d:%d Y %d:%d;", (LONG) area->xmin,
(LONG) area->xmax, (LONG) area->ymin,(LONG) area->ymax);
- IfTrace4(TRUE," origin=(%p,%p), ending=(%p,%p)\n",
+ IfTrace4(TRUE," origin=(%d,%d), ending=(%d,%d)\n",
area->origin.x, area->origin.y, area->ending.x, area->ending.y);
DumpEdges(area->anchor);
}
@@ -1706,7 +1706,7 @@ void DumpEdges(edges)
for (p=edges; p != NULL; p = p->link) {
edgecheck(p, ymin, ymax);
ymin = p->ymin; ymax = p->ymax;
- IfTrace3(TRUE,". at %x type=%d flag=%x",
+ IfTrace3(TRUE,". at %p type=%x flag=%x",
p, (LONG) p->type,(LONG) p->flag);
IfTrace4(TRUE," bounding box HxW is %dx%d at (%d,%d)\n",
(LONG) ymax - ymin, (LONG) p->xmax - p->xmin,
@@ -1726,10 +1726,10 @@ void DumpEdges(edges)
IfTrace2 (TRUE,". Swath from %d to %d:\n",
ymin, ymax);
for (p=p2; INSWATH(p,ymin,ymax); p = p->link) {
- IfTrace4(TRUE,". . at %x[%x] range %d:%d, ",
+ IfTrace4(TRUE,". . at %p[%x] range %d:%d, ",
p, (LONG) p->flag,
(LONG) p->xmin, (LONG)p->xmax);
- IfTrace1(TRUE, "subpath=%x,\n", p->subpath);
+ IfTrace1(TRUE, "subpath=%p,\n", p->subpath);
}
}
for (y=MAX(ymin,RegionDebugYMin); y < MIN(ymax, RegionDebugYMax); y++) {

View File

@ -0,0 +1,50 @@
$OpenBSD: patch-texk_ps2pkm_spaces_c,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/ps2pkm/spaces.c.orig Sun Feb 13 13:47:19 2005
+++ texk/ps2pkm/spaces.c Sun Feb 13 13:51:47 2005
@@ -741,8 +741,8 @@ struct xobject *t1_Transform(obj, cxx, c
{
DOUBLE M[2][2];
- IfTrace1((MustTraceCalls),"Transform(%z,", obj);
- IfTrace4((MustTraceCalls)," %f %f %f %f)\n", &cxx, &cyx, &cxy, &cyy);
+ IfTrace1((MustTraceCalls),"Transform(%p,", obj);
+ IfTrace4((MustTraceCalls)," %f %f %f %f)\n", cxx, cyx, cxy, cyy);
M[0][0] = cxx;
M[0][1] = cyx;
@@ -762,7 +762,7 @@ struct xobject *t1_Scale(obj, sx, sy)
DOUBLE sx,sy; /* scale factors in x and y */
{
DOUBLE M[2][2];
- IfTrace3((MustTraceCalls),"Scale(%z, %f, %f)\n", obj, &sx, &sy);
+ IfTrace3((MustTraceCalls),"Scale(%p, %f, %f)\n", obj, sx, sy);
M[0][0] = sx;
M[1][1] = sy;
M[1][0] = M[0][1] = 0.0;
@@ -785,7 +785,7 @@ struct xobject *xiRotate(obj, degrees)
DOUBLE M[2][2];
- IfTrace2((MustTraceCalls),"Rotate(%z, %f)\n", obj, &degrees);
+ IfTrace2((MustTraceCalls),"Rotate(%p, %f)\n", obj, degrees);
M[0][0] = M[1][1] = DegreeCos(degrees);
M[1][0] = - (M[0][1] = DegreeSin(degrees));
@@ -990,12 +990,12 @@ void FormatFP(str, fpel)
void DumpSpace(S)
register struct XYspace *S;
{
- IfTrace4(TRUE,"--Coordinate space at %x,ID=%d,convert=%x,iconvert=%x\n",
+ IfTrace4(TRUE,"--Coordinate space at %p,ID=%d,convert=%p,iconvert=%p\n",
S, S->ID, S->convert, S->iconvert);
IfTrace2(TRUE," | %12.3f %12.3f |",
- &S->tofract.normal[0][0], &S->tofract.normal[0][1]);
- IfTrace2(TRUE," [ %p %p ]\n", S->itofract[0][0], S->itofract[0][1]);
+ S->tofract.normal[0][0], S->tofract.normal[0][1]);
+ IfTrace2(TRUE," [ %d %d ]\n", S->itofract[0][0], S->itofract[0][1]);
IfTrace2(TRUE," | %12.3f %12.3f |",
- &S->tofract.normal[1][0], &S->tofract.normal[1][1]);
- IfTrace2(TRUE," [ %p %p ]\n", S->itofract[1][0], S->itofract[1][1]);
+ S->tofract.normal[1][0], S->tofract.normal[1][1]);
+ IfTrace2(TRUE," [ %d %d ]\n", S->itofract[1][0], S->itofract[1][1]);
}

View File

@ -0,0 +1,86 @@
$OpenBSD: patch-texk_ps2pkm_type1_c,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/ps2pkm/type1.c.orig Sun Feb 13 13:54:33 2005
+++ texk/ps2pkm/type1.c Sun Feb 13 13:55:57 2005
@@ -1155,7 +1155,7 @@ static void Escape(Code)
static void HStem(y, dy)
DOUBLE y, dy;
{
- IfTrace2((FontDebug), "Hstem %f %f\n", &y, &dy);
+ IfTrace2((FontDebug), "Hstem %f %f\n", y, dy);
if (ProcessHints) {
if (numstems >= MAXSTEMS) Error0("HStem: Too many hints\n");
if (dy < 0.0) {y += dy; dy = -dy;}
@@ -1176,7 +1176,7 @@ static void HStem(y, dy)
static void VStem(x, dx)
DOUBLE x, dx;
{
- IfTrace2((FontDebug), "Vstem %f %f\n", &x, &dx);
+ IfTrace2((FontDebug), "Vstem %f %f\n", x, dx);
if (ProcessHints) {
if (numstems >= MAXSTEMS) Error0("VStem: Too many hints\n");
if (dx < 0.0) {x += dx; dx = -dx;}
@@ -1197,7 +1197,7 @@ static void RLineTo(dx, dy)
{
struct segment *B;
- IfTrace2((FontDebug), "RLineTo %f %f\n", &dx, &dy);
+ IfTrace2((FontDebug), "RLineTo %f %f\n", dx, dy);
B = Loc(CharSpace, dx, dy);
@@ -1220,8 +1220,8 @@ static void RRCurveTo(dx1, dy1, dx2, dy2
{
struct segment *B, *C, *D;
- IfTrace4((FontDebug), "RRCurveTo %f %f %f %f ", &dx1, &dy1, &dx2, &dy2);
- IfTrace2((FontDebug), "%f %f\n", &dx3, &dy3);
+ IfTrace4((FontDebug), "RRCurveTo %f %f %f %f ", dx1, dy1, dx2, dy2);
+ IfTrace2((FontDebug), "%f %f\n", dx3, dy3);
B = Loc(CharSpace, dx1, dy1);
C = Loc(CharSpace, dx2, dy2);
@@ -1311,7 +1311,7 @@ static void RMoveTo(dx,dy)
{
struct segment *B;
- IfTrace2((FontDebug), "RMoveTo %f %f\n", &dx, &dy);
+ IfTrace2((FontDebug), "RMoveTo %f %f\n", dx, dy);
B = Loc(CharSpace, dx, dy);
@@ -1342,7 +1342,7 @@ static void Seac(DOUBLE asb, DOUBLE adx,
int Code;
struct segment *mypath;
- IfTrace4((FontDebug), "SEAC %f %f %f %d ", &asb, &adx, &ady, bchar);
+ IfTrace4((FontDebug), "SEAC %f %f %f %d ", asb, adx, ady, bchar);
IfTrace1((FontDebug), "%d\n", achar);
/* Move adx - asb, ady over and up from base char's sbpoint. */
@@ -1406,7 +1406,7 @@ static void Seac(DOUBLE asb, DOUBLE adx,
static void Sbw(sbx, sby, wx, wy)
DOUBLE sbx, sby, wx, wy;
{
- IfTrace4((FontDebug), "SBW %f %f %f %f\n", &sbx, &sby, &wx, &wy);
+ IfTrace4((FontDebug), "SBW %f %f %f %f\n", sbx, sby, wx, wy);
escapementX = wx; /* Character width vector */
escapementY = wy;
@@ -1424,7 +1424,7 @@ static void Sbw(sbx, sby, wx, wy)
static DOUBLE Div(num1, num2)
DOUBLE num1, num2;
{
- IfTrace2((FontDebug), "Div %f %f\n", &num1, &num2);
+ IfTrace2((FontDebug), "Div %f %f\n", num1, num2);
return(num1 / num2);
}
@@ -1754,7 +1754,7 @@ static void CallOtherSubr(othersubrno)
static void SetCurrentPoint(x, y)
DOUBLE x, y;
{
- IfTrace2((FontDebug), "SetCurrentPoint %f %f\n", &x, &y);
+ IfTrace2((FontDebug), "SetCurrentPoint %f %f\n", x, y);
currx = x;
curry = y;

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-texk_web2c_Makefile_in,v 1.1 2003/02/18 16:04:50 sturm Exp $
# mf-check needs a pascal compiler (pc by default)
--- texk/web2c/Makefile.in.orig Sat Feb 1 17:51:16 2003
+++ texk/web2c/Makefile.in Mon Feb 3 10:29:50 2003
@@ -857,7 +857,7 @@ ac_include ../make/config.mk
@ETEX@etex_check = etex-check
check: bibtex-check dvicopy-check dvitomp-check dvitype-check \
$(etex_check) gftodvi-check gftopk-check gftype-check \
- mf-check mft-check mpost-check patgen-check pktogf-check \
+ mft-check mpost-check patgen-check pktogf-check \
pktype-check pltotf-check pooltype-check $(tex_check) tftopl-check \
vftovp-check vptovf-check weave-check

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-texk_web2c_config_h,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/web2c/config.h.orig Sat Feb 19 16:42:55 2005
+++ texk/web2c/config.h Sat Feb 19 16:45:19 2005
@@ -62,6 +62,11 @@ typedef SCHAR_TYPE schar;
If you define your own INTEGER_TYPE, you have to define your own
INTEGER_MAX and INTEGER_MIN, too. */
+#ifdef __OpenBSD__
+#define INTEGER_TYPE int
+#define INTEGER_MAX INT_MAX
+#define INTEGER_MIN INT_MIN
+#endif
#ifndef INTEGER_TYPE
#if SIZEOF_LONG > 4 && !defined (NO_DUMP_SHARE)

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-texk_web2c_lib_input2int_c,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/web2c/lib/input2int.c.orig Sat Feb 19 15:58:06 2005
+++ texk/web2c/lib/input2int.c Sat Feb 19 15:58:26 2005
@@ -11,7 +11,7 @@ zinput2ints P2C(integer *, a, integer *
{
int ch;
- while (scanf ("%ld %ld", a, b) != 2)
+ while (scanf ("%d %d", a, b) != 2)
{
while ((ch = getchar ()) != EOF && ch != '\n');
if (ch == EOF) return;
@@ -29,7 +29,7 @@ zinput3ints P3C(integer *, a, integer *
{
int ch;
- while (scanf ("%ld %ld %ld", a, b, c) != 3)
+ while (scanf ("%d %d %d", a, b, c) != 3)
{
while ((ch = getchar ()) != EOF && ch != '\n');
if (ch == EOF) return;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-texk_xdvik_xdvi_c,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/xdvik/xdvi.c.orig Fri Feb 11 21:44:27 2005
+++ texk/xdvik/xdvi.c Fri Feb 11 21:44:52 2005
@@ -1559,7 +1559,7 @@ display_version_info(void)
#else
printf("%s\n", XDVI_GUI);
#endif
- printf("Libraries: %s, T1lib version %s\n", kpathsea_version_string, T1LIB_VERSIONSTRING);
+ printf("Libraries: %s, T1lib version 5.0.0\n", kpathsea_version_string);
}
static void

View File

@ -1,15 +1,15 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.4 2004/08/11 10:42:55 espie Exp $
@comment $OpenBSD: PFRAG.no-no_x11,v 1.5 2005/02/21 21:36:07 sturm Exp $
bin/mf-nowin
bin/mfw
bin/oxdvi
bin/oxdvi.bin
bin/t1mapper
bin/xdvi
bin/xdvi.bin
bin/xdvi-xaw.bin
bin/xdvizilla
@man man/man1/t1mapper.1
@man man/man1/oxdvi.1
@man man/man1/xdvi.1
@man man/man1/xdvizilla.1
@comment no checksum
share/texmf/web2c/mfw.base
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

View File

@ -1,17 +1,18 @@
@comment $OpenBSD: PLIST,v 1.18 2004/12/26 14:01:36 sturm Exp $
@conflict dvipdfm-*
bin/MakeTeXPK
bin/access
@comment $OpenBSD: PLIST,v 1.19 2005/02/21 21:36:07 sturm Exp $
bin/a2ping
bin/afm2tfm
bin/aleph
bin/allcm
bin/allec
bin/allneeded
bin/bibtex
bin/ctangle
bin/ctie
bin/cweave
bin/dmp
bin/dvi2fax
bin/dvicopy
bin/dvigif
bin/dvihp
bin/dvilj
bin/dvilj2p
@ -20,36 +21,34 @@ bin/dvilj4l
bin/dvilj6
bin/dvipdfm
bin/dvipdft
bin/dvipng
bin/dvips
bin/dvired
bin/dvitomp
bin/dvitype
bin/e2pall
bin/ebb
bin/einitex
bin/elatex
bin/epstopdf
bin/etex
bin/evirtex
bin/fdf2tan
bin/fdf2tex
bin/fmtutil
bin/fontexport
bin/fontimport
bin/fmtutil-sys
bin/fontinst
bin/gftodvi
bin/gftopk
bin/gftype
bin/gsftopk
bin/inimf
bin/inimpost
bin/iniomega
bin/initex
bin/kpseaccess
bin/kpsepath
bin/kpsereadlink
bin/kpsestat
bin/kpsetool
bin/kpsewhere
bin/kpsewhich
bin/kpsexpand
bin/lambda
bin/lamed
bin/latex
bin/mag
bin/makeindex
@ -57,7 +56,6 @@ bin/makempx
bin/makempy
bin/mf
bin/mft
bin/mkfontdesc
bin/mkindex
bin/mkocp
bin/mkofm
@ -83,15 +81,11 @@ bin/outocp
bin/ovf2ovp
bin/ovp2ovf
bin/patgen
bin/pdfeinitex
bin/pdfelatex
bin/pdfcrop
bin/pdfetex
bin/pdfevirtex
bin/pdfinitex
bin/pdflatex
bin/pdftex
bin/pdftosrc
bin/pdfvirtex
bin/pdfxtex
bin/pfb2pfa
bin/pk2bm
bin/pktogf
@ -100,8 +94,8 @@ bin/pltotf
bin/pooltype
bin/ps2frag
bin/ps2pk
bin/ps4pdf
bin/pslatex
@comment bin/readlink
bin/rubibtex
bin/rumakeindex
bin/tangle
@ -109,14 +103,14 @@ bin/tcdialog
bin/tetex_setup
bin/tex
bin/texconfig
bin/texconfig-dialog
bin/texconfig-sys
bin/texdoc
bin/texdoctk
bin/texexec
bin/texfind
bin/texfont
bin/texhash
@comment bin/texi2html
bin/texi2pdf
bin/texlinks
bin/texshow
bin/texutil
@ -124,12 +118,10 @@ bin/tftopl
bin/thumbpdf
bin/tie
bin/ttf2afm
bin/uniqleaf
bin/updmap
bin/updmap-sys
bin/vftovp
bin/virmf
bin/virmpost
bin/viromega
bin/virtex
bin/vptovf
bin/weave
include/kpathsea/
@ -183,54 +175,58 @@ include/kpathsea/types.h
include/kpathsea/variable.h
include/kpathsea/xopendir.h
include/kpathsea/xstat.h
@comment info/dir
@info info/dvips.info
@info info/kpathsea.info
@info info/latex.info
@info info/web2c.info
lib/libkpathsea.a
@man man/man1/MakeTeXPK.1
@man man/man1/access.1
lib/libkpathsea.la
@man man/man1/afm2tfm.1
@man man/man1/allcm.1
@man man/man1/allec.1
@man man/man1/allneeded.1
@man man/man1/amstex.1
@man man/man1/bibtex.1
@man man/man1/cont-de.1
@man man/man1/cont-en.1
@man man/man1/cont-nl.1
@man man/man1/ctangle.1
@man man/man1/ctie.1
@man man/man1/cweave.1
@man man/man1/cweb.1
@man man/man1/dmp.1
@man man/man1/dvi2fax.1
@man man/man1/dvicopy.1
@man man/man1/dvihp.1
@man man/man1/dvilj.1
@man man/man1/dvilj2p.1
@man man/man1/dvilj4.1
@man man/man1/dvilj4l.1
@man man/man1/dvilj6.1
@man man/man1/dvipdfm.1
@man man/man1/dvipdft.1
@man man/man1/dvipng.1
@man man/man1/dvips.1
@man man/man1/dvired.1
@man man/man1/dvitomp.1
@man man/man1/dvitype.1
@man man/man1/e2pall.1
@man man/man1/einitex.1
@man man/man1/elatex.1
@man man/man1/ebb.1
@man man/man1/eplain.1
@man man/man1/epstopdf.1
@man man/man1/etex.1
@man man/man1/evirtex.1
@man man/man1/fontexport.1
@man man/man1/fontimport.1
@man man/man1/fdf2tex.1
@man man/man1/fmtutil-sys.1
@man man/man1/fmtutil.1
@man man/man1/fontinst.1
@man man/man1/gftodvi.1
@man man/man1/gftopk.1
@man man/man1/gftype.1
@man man/man1/gsftopk.1
@man man/man1/inimf.1
@man man/man1/inimpost.1
@man man/man1/iniomega.1
@man man/man1/initex.1
@man man/man1/kpseaccess.1
@man man/man1/kpsepath.1
@man man/man1/kpsereadlink.1
@man man/man1/kpsestat.1
@man man/man1/kpsetool.1
@man man/man1/kpsewhere.1
@man man/man1/kpsewhich.1
@man man/man1/kpsexpand.1
@man man/man1/lambda.1
@ -238,9 +234,14 @@ lib/libkpathsea.a
@man man/man1/mag.1
@man man/man1/makeindex.1
@man man/man1/makempx.1
@man man/man1/makempy.1
@man man/man1/mf-nowin.1
@man man/man1/mf.1
@man man/man1/mft.1
@man man/man1/mkindex.1
@man man/man1/mkocp.1
@man man/man1/mkofm.1
@man man/man1/mktexfmt.1
@man man/man1/mktexlsr.1
@man man/man1/mktexmf.1
@man man/man1/mktexpk.1
@ -248,13 +249,21 @@ lib/libkpathsea.a
@man man/man1/mpost.1
@man man/man1/mpto.1
@man man/man1/newer.1
@man man/man1/odvicopy.1
@man man/man1/odvips.1
@man man/man1/odvitype.1
@man man/man1/ofm2opl.1
@man man/man1/omega.1
@man man/man1/opl2ofm.1
@man man/man1/otp2ocp.1
@man man/man1/outocp.1
@man man/man1/ovf2ovp.1
@man man/man1/ovp2ovf.1
@man man/man1/patgen.1
@man man/man1/pdfetex.1
@man man/man1/pdfinitex.1
@man man/man1/pdflatex.1
@man man/man1/pdftex.1
@man man/man1/pdfvirtex.1
@man man/man1/pdfxtex.1
@man man/man1/pfb2pfa.1
@man man/man1/pk2bm.1
@man man/man1/pktogf.1
@ -264,43 +273,43 @@ lib/libkpathsea.a
@man man/man1/ps2frag.1
@man man/man1/ps2pk.1
@man man/man1/pslatex.1
@comment @man man/man1/readlink.1
@man man/man1/rubibtex.1
@man man/man1/rumakeindex.1
@man man/man1/tangle.1
@man man/man1/tcdialog.1
@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
@man man/man1/texfont.1
@man man/man1/texhash.1
@comment @man man/man1/texi2html.1
@man man/man1/texi2pdf.1
@man man/man1/texlinks.1
@man man/man1/texshow.1
@man man/man1/texutil.1
@man man/man1/tftopl.1
@man man/man1/thumbpdf.1
@man man/man1/tie.1
@man man/man1/ttf2afm.1
@man man/man1/updmap-sys.1
@man man/man1/updmap.1
@man man/man1/vftovp.1
@man man/man1/virmf.1
@man man/man1/virmpost.1
@man man/man1/viromega.1
@man man/man1/virtex.1
@man man/man1/vptovf.1
@man man/man1/weave.1
@man man/man5/fmtutil.cnf.5
@man man/man8/fmtutil.8
@man man/man8/mkfontdesc.8
@man man/man8/texlinks.8
share/examples/teTeX/
share/examples/teTeX/tetex.cfg
@sample ${SYSCONFDIR}/tetex.cfg
share/texmf/doc/
share/texmf/doc/tetex/
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/dvips/
share/texmf/dvips/base/
share/texmf/dvips/base/color.pro
share/texmf/dvips/base/crop.pro
share/texmf/dvips/base/finclude.pro
@ -312,42 +321,21 @@ share/texmf/dvips/base/texps.pro
share/texmf/dvips/gsftopk/
share/texmf/dvips/gsftopk/render.ps
@comment share/texmf/ls-R
share/texmf/release-tetex-src.txt
share/texmf/texconfig/
share/texmf/texconfig/README
share/texmf/texconfig/g/
share/texmf/texconfig/g/generic
share/texmf/texconfig/generic
share/texmf/texconfig/tcfmgr
share/texmf/texconfig/tcfmgr.map
share/texmf/texconfig/v/
share/texmf/texconfig/v/vt100
share/texmf/texconfig/x/
share/texmf/texconfig/x/xterm
share/texmf/web2c/cont-en.efmt
@comment no checksum
share/texmf/web2c/cont-en.log
share/texmf/web2c/elatex.efmt
@comment no checksum
share/texmf/web2c/elatex.log
share/texmf/web2c/etex-pl.pool
share/texmf/web2c/etex.efmt
@comment no checksum
share/texmf/web2c/etex.log
share/texmf/web2c/etex.pool
share/texmf/web2c/
share/texmf/web2c/aleph.pool
share/texmf/web2c/fmtutil.cnf
@comment no checksum
share/texmf/web2c/lambda.log
share/texmf/web2c/lambda.oft
share/texmf/web2c/latex.fmt
@comment no checksum
share/texmf/web2c/latex.log
@comment no checksum
share/texmf/web2c/metafun.log
share/texmf/web2c/metafun.mem
@comment no checksum
share/texmf/web2c/mf-nowin.base
@comment no checksum
share/texmf/web2c/mf.base
@comment no checksum
share/texmf/web2c/mf.log
share/texmf/web2c/mf.pool
share/texmf/web2c/mktex.opt
share/texmf/web2c/mktexdir
@ -356,45 +344,17 @@ share/texmf/web2c/mktexnam
share/texmf/web2c/mktexnam.opt
share/texmf/web2c/mktexupd
share/texmf/web2c/mp.pool
@comment no checksum
share/texmf/web2c/mpost.log
share/texmf/web2c/mpost.mem
share/texmf/web2c/mptopdf.efmt
@comment no checksum
share/texmf/web2c/mptopdf.log
@comment no checksum
share/texmf/web2c/omega.log
share/texmf/web2c/omega.oft
share/texmf/web2c/omega.pool
share/texmf/web2c/pdfelatex.efmt
@comment no checksum
share/texmf/web2c/pdfelatex.log
share/texmf/web2c/pdfetex-pl.pool
share/texmf/web2c/pdfetex.efmt
@comment no checksum
share/texmf/web2c/pdfetex.log
share/texmf/web2c/pdfetex.pool
share/texmf/web2c/pdflatex.fmt
@comment no checksum
share/texmf/web2c/pdflatex.log
share/texmf/web2c/pdftex-pl.pool
share/texmf/web2c/pdftex.fmt
@comment no checksum
share/texmf/web2c/pdftex.log
share/texmf/web2c/pdftex.pool
share/texmf/web2c/plain.base
share/texmf/web2c/plain.fmt
share/texmf/web2c/plain.mem
share/texmf/web2c/tex-pl.pool
share/texmf/web2c/tex.fmt
@comment no checksum
share/texmf/web2c/tex.log
share/texmf/web2c/pdfxtex.pool
share/texmf/web2c/tex.pool
@comment share/texmf/web2c/texmf.cnf
share/texmf/web2c/texmf.cnf.dist
@sample share/texmf/web2c/texmf.cnf
@sample share/texmf-local/
@extra share/texmf-local/ls-R
@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr
!%%no_x11%%
@extraunexec rm -f %D/share/texmf/web2c/texmf.cnf.dist
@extraunexec rm -f %D/share/texmf/web2c/texmf.cnf.old
@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr
@exec TEXMFMAIN=%D/share/texmf %D/bin/fmtutil-sys --all
@exec TEXMFMAIN=%D/share/texmf %D/bin/updmap-sys
@extraunexec rm -fr /var/texmf
@extraunexec rm -fr ${SYSCONFDIR}/texmf

View File

@ -1,23 +1,29 @@
# $OpenBSD: Makefile,v 1.19 2004/02/01 20:40:46 sturm Exp $
# $OpenBSD: Makefile,v 1.20 2005/02/21 21:36:07 sturm Exp $
COMMENT= "TeX distribution, common support files"
COMMENT-doc= "TeX distribution, documentation"
DISTNAME= tetex-texmf-2.0.2
PKGNAME= ${DISTNAME:S/tetex-/teTeX_/}p0
V= 3.0
DISTNAME= tetex-texmf-${V}
PKGNAME= teTeX_texmf-${V}
PKGNAME-doc= teTeX_texmf-doc-${V}
CATEGORIES= print
MASTER_SITES0= ftp://ftp.erisiandiscord.de/pub/OpenBSD/distfiles/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} listings-1.1.tar.gz:0
WRKDIST= ${WRKDIR}
MULTI_PACKAGES= -doc
SUBPACKAGE?=
# better than NO_EXTRACT, as this builds WRKDIR correctly for us.
EXTRACT_ONLY=
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
.if defined(PACKAGING) && ${SUBPACKAGE} == "-doc"
PERMIT_PACKAGE_FTP= "Removed for space constraints"
.endif
do-install:
@${INSTALL_DATA_DIR} ${TEXMF_DIR}
@cd ${TEXMF_DIR}; \

View File

@ -1,8 +1,4 @@
MD5 (teTeX/listings-1.1.tar.gz) = 1eb98c8eb48273a9396a18f299257c96
MD5 (teTeX/tetex-texmf-2.0.2.tar.gz) = d3bdb96f9077e43b2115d3cc471743b3
RMD160 (teTeX/listings-1.1.tar.gz) = d2b6d99bca7612859320953dd41fd7ae6818b22a
RMD160 (teTeX/tetex-texmf-2.0.2.tar.gz) = ff88622c2d97416a4f67fbdf7a00d837af35d94e
SHA1 (teTeX/listings-1.1.tar.gz) = 449df983e3e34118e8d71a5549b055a312581b8d
SHA1 (teTeX/tetex-texmf-2.0.2.tar.gz) = 9ad88d5fc1df7e10b3538f7b5e3871ceefe8ee2f
SIZE (teTeX/listings-1.1.tar.gz) = 435263
SIZE (teTeX/tetex-texmf-2.0.2.tar.gz) = 52424280
MD5 (teTeX/tetex-texmf-3.0.tar.gz) = 11aa15c8d3e28ee7815e0d5fcdf43fd4
RMD160 (teTeX/tetex-texmf-3.0.tar.gz) = 67cb6325f1edbea89c4723791116717190ec73c4
SHA1 (teTeX/tetex-texmf-3.0.tar.gz) = 10f7d2fa007c95ca066d899fca0e9a8446108824
SIZE (teTeX/tetex-texmf-3.0.tar.gz) = 91762123

View File

@ -0,0 +1 @@
Documentation subtree for teTeX.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff