cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to texlive-2011, OK kili@

Browse Source
This commit is contained in:
edd 2011-11-23 12:00:45 +00:00
parent b6c61ceb85
commit b9b0215735
39 changed files with 18033 additions and 6503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
print/texlive/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.7 2011/06/01 18:53:52 jasper Exp $
# $OpenBSD: Makefile.inc,v 1.8 2011/11/23 12:00:45 edd Exp $
CATEGORIES ?= print
HOMEPAGE ?= http://tug.org/texlive/
@ -12,8 +12,9 @@ PERMIT_DISTFILES_FTP ?= Yes
EXTRACT_SUFX ?= .tar.xz
V ?= 2010
DIST_V ?= ${V}0722
V ?= 2011
DIST_V ?= ${V}0705
MASTER_SITES ?= ftp://ftp.tug.org/texlive/historic/${V}/
MASTER_SITES ?= ftp://ftp.tug.org/texlive/historic/${V}/ \
http://spacehopper.org/mirrors/
PATCHORIG ?= .origy

73
print/texlive/README
View File

@ -1,49 +1,36 @@
$OpenBSD: README,v 1.2 2011/06/13 16:40:51 edd Exp $
$OpenBSD: README,v 1.3 2011/11/23 12:00:45 edd Exp $
Porting of TeX Live 2010 is now complete. Any remaining bugs will be
fixed in-tree. This file remains as a reference when the time comes to
port texlive 2011.
TeX Live 2010 - Porting progress.
TeX Live 2011 - Porting progress.
---------------------------------------
* Get base compilers working: done
* Get xindy linking against clisp: done
* Test build works. done
-> amd64 done
-> i386 done
-> sparc64 done
* Do texmf split: done
* Get basic texmf packaging: done
* Re-add depenedencies: done
* Get -full config working: done
* Hack configs for subsets: done
-> hack texmf.cnf: done
-> fix $HOME ls-R owned root bug: done
-> make fmtutil.cnf configs: not needed this year
* Implement remaining @xxx directives: done
* emulate texlinks done
* Test lots: done (several months)
* Link to build as print/texlive: done
* Get base compilers working: done
* Test build works.
-> amd64 done
-> i386 done
-> sparc64 done
-> others, anyone? XXX
* Do texmf split (see texmf/files/rblatter) done
* Move manuals and pdf manuals done
* Remove external deps done
-> texworks done
-> latexmk done
-> asymptote done
* Remove windows junk done
* Get basic texmf packaging: done
* Re-add depenedencies: done
* Hack configs for subsets: done
-> hack texmf.cnf: done
* Implement @xxx in plists done
* emulate texlinks done
* patch in ruby/python versions for texexec done
* Pull in perl modules needed for updmap done
* Generate texmf-var pregen done
(all as root) 'mktexlsr', 'fmtutil-sys --all',
'updmap-sys', rm ls-R and tar up texmf-var
* Apply any security/reliability patches done
Search here: http://tug.org/pipermail/tldistro/
* Test lots: XXX
--- KNOWN ISSUES ---
* gmverb is broken -- reported upstream, being ignored by package author.
* man pages make noise
At package time:
/usr/ports/pobj/texlive_base-2010/fake-i386//usr/local/man/man1/texmfstart.1 :5: can't find macro file `www.tmac'
At install/uninstall:
Can't parse /usr/local/man/cat1/mendex.0 (not a manpage ?)
* /usr/local/share/texmf* are left behind from previous texlive which cause
a conflict with new texlive2010.
--- EXTRA? ---
* Split down -docs even further this year: docs_srcs + docs_built (?)
Probably not.
* Pre-generate maps and formats and install from FILESDIR
-> check this is platform independent. done - works
None *yet*

39
print/texlive/base/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.51 2011/09/16 11:13:41 espie Exp $
# $OpenBSD: Makefile,v 1.52 2011/11/23 12:00:45 edd Exp $
COMMENT = base binaries for TeXLive typesetting distribution
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}
REVISION = 4
SHARED_LIBS = kpathsea 3.0
SHARED_LIBS += ptexenc 0.0
SHARED_LIBS = kpathsea 4.0
SHARED_LIBS += ptexenc 1.0
WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c expat
WANTLIB += fontconfig freetype gd jpeg lcms m ncurses
@ -20,8 +19,8 @@ RUN_DEPENDS = print/ghostscript/gnu \
print/ps2eps \
print/psutils \
print/t1utils \
texlive_texmf-minimal-${V}:print/texlive/texmf,-main \
print/latex-mk
print/latex-mk \
texlive_texmf-minimal-${V}:print/texlive/texmf,-main
LIB_DEPENDS = devel/t1lib \
graphics/png \
@ -30,11 +29,20 @@ LIB_DEPENDS = devel/t1lib \
print/poppler
MODULES = textproc/intltool converters/libiconv
# These following two modules are just for variable substitution in patches
# They are not real dependencies of _base, but of _texmf-full
MODULES += lang/ruby lang/python
MODRUBY_BUILDDEP = No
MODRUBY_RUNDEP = No
MODPY_BUILDDEP = No
MODPY_RUNDEP = No
SUBST_VARS += MODRUBY_BINREV MODPY_VERSION
# Never set SEPARATE_BUILD
CONFIGURE_STYLE = gnu
# Don't put ${PREFIX}/include in CPPFLAGS or system icu .h's are picked up
# TeX Live uses a modified version of icu.
CONFIGURE_ENV += TL_MAKE=${GMAKE} \
CPPFLAGS="-I${TRUEPREFIX}/include/poppler -I${X11BASE}/include"
@ -52,12 +60,13 @@ CFLAGS += -fPIC
.endif
# clisp limits which arches we can use xindy on
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE} == "powerpc" || ${MACHINE} == "sparc64"
BUILD_DEPENDS += lang/clisp
LIB_DEPENDS += devel/ffcall # XXX still needed? try build on fresh sys
RUN_DEPENDS += lang/clisp
CONFIGURE_ARGS += --enable-xindy \
--disable-xindy-rules
PKG_ARGS += -Dxindy=1
PKG_ARGS += -Dxindy=1 # Note. texmf-full required for xindy
.else
PKG_ARGS += -Dxindy=0
.endif
@ -102,6 +111,10 @@ CONFIGURE_ARGS += --mandir=${PREFIX}/man \
SUBST_VARS += TRUEPREFIX LOCALBASE
# substitute ruby and python binary names
pre-configure:
${SUBST_CMD} ${WRKSRC}/texk/texlive/context/mtxrun
# just to silence error - never used
pre-install:
mkdir -p ${WRKSRC}/inst
@ -111,12 +124,11 @@ pre-install:
# a fully hashed texmf tree and working kpse configuration.
ALEPH_LN = lamed
LUATEX_LN = dvilualatex dviluatex lualatex
MPOST_LN = metafun mfplain
PDFTEX_LN = amstex cslatex csplain eplain etex jadetex latex mex \
mllatex mltex pdfcslatex pdfcsplain pdfetex pdfjadetex \
pdflatex pdfmex pdfxmltex physe phyzzx texsis utf8mex \
xmltex
PTEX_LN = platex
EPTEX_LN = platex
XETEX_LN = xelatex
post-install:
@ -125,6 +137,7 @@ post-install:
# following tradition, texmf is in ${PREFIX}/share
mv ${PREFIX}/texmf ${PREFIX}/share/texmf
mv ${PREFIX}/texmf-dist ${PREFIX}/share/texmf-dist
# translate some sylinks from ../texmf* to ../share/texmf*
for link in `find ${PREFIX}/bin -type l`; do \
dest=`stat -f %Y $${link}`; \
@ -147,8 +160,8 @@ post-install:
for i in ${PDFTEX_LN}; do \
ln -s ${TRUEPREFIX}/bin/pdftex ${PREFIX}/bin/$$i; \
done
for i in ${PTEX_LN}; do \
ln -s ${TRUEPREFIX}/bin/ptex ${PREFIX}/bin/$$i; \
for i in ${EPTEX_LN}; do \
ln -s ${TRUEPREFIX}/bin/eptex ${PREFIX}/bin/$$i; \
done
for i in ${XETEX_LN}; do \
ln -s ${TRUEPREFIX}/bin/xetex ${PREFIX}/bin/$$i; \

10
print/texlive/base/distinfo
View File

@ -1,5 +1,5 @@
MD5 (texlive-20100722-source.tar.xz) = FW+jTFasuQH9xoe42YYPHw==
RMD160 (texlive-20100722-source.tar.xz) = GFnViGyEZ2MGgSDLkAXQnBK1mwk=
SHA1 (texlive-20100722-source.tar.xz) = xVc8BhfxpEI1ISJ3lZ9I+3ZZBUI=
SHA256 (texlive-20100722-source.tar.xz) = 2BPRSCu4LgLlx0BgH0qfxEQRUTykIYl6l9X2iqIhJBc=
SIZE (texlive-20100722-source.tar.xz) = 33482988
MD5 (texlive-20110705-source.tar.xz) = lo0jiUnoo0of10w3Td/m8Q==
RMD160 (texlive-20110705-source.tar.xz) = +8rUlMxHF6AjirJiTyWScPzpMys=
SHA1 (texlive-20110705-source.tar.xz) = ekfP6EeAHIbJjait4YG6+XM59uQ=
SHA256 (texlive-20110705-source.tar.xz) = dy0ZeV/YQXN/WwBHKBC0nZiztiNz+6Z8EsdX6VxRDaI=
SIZE (texlive-20110705-source.tar.xz) = 131207904

19
print/texlive/base/patches/patch-configure
View File

@ -1,16 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2011/03/08 00:09:42 edd Exp $
--- configure.origy Tue Jul 20 15:04:38 2010
+++ configure Thu Sep 23 15:04:33 2010
@@ -18918,7 +18918,7 @@ fi
if test "x$with_libpng_includes" != x && test "x$with_libpng_includes" != xyes; then
LIBPNG_INCLUDES="-I$with_libpng_includes"
fi
-LIBPNG_LIBS="-lpng"
+LIBPNG_LIBS="-lpng -lm"
if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then
LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS"
fi
@@ -19139,9 +19139,10 @@ else
$OpenBSD: patch-configure,v 1.5 2011/11/23 12:00:45 edd Exp $
--- configure.origy Mon May 2 14:04:59 2011
+++ configure Sat Aug 27 14:12:00 2011
@@ -19812,9 +19812,10 @@ if test "x$with_gd_libdir" != x && test "x$with_gd_lib
fi
if $PKG_CONFIG poppler --atleast-version=0.10; then
@ -20,5 +11,5 @@ $OpenBSD: patch-configure,v 1.4 2011/03/08 00:09:42 edd Exp $
XPDF_LIBS=`$PKG_CONFIG poppler --libs`
+ XPDF_LIBS="$XPDF_LIBS -pthread"
elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
as_fn_error "did not find poppler-0.10 or better" "$LINENO" 5
as_fn_error $? "did not find poppler-0.10 or better" "$LINENO" 5
fi

16
print/texlive/base/patches/patch-texk_dvipsk_dospecial_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-texk_dvipsk_dospecial_c,v 1.1 2011/11/23 12:00:45 edd Exp $
dvips, e-ptex fixes (buffer overflow/memory corruption) on tl11 branch.
http://tug.org/pipermail/tldistro/2011q4/000149.html
--- texk/dvipsk/dospecial.c.origy Mon May 10 16:47:35 2010
+++ texk/dvipsk/dospecial.c Sun Oct 23 20:54:17 2011
@@ -112,7 +112,7 @@ static void
fgetboundingbox(char *f, float *llx_p, float *lly_p, float *urx_p, float *ury_p)
{
FILE *fp;
- char buf[BUFSIZ];
+ char buf[BUFSIZ+1];
fp = search(figpath, f, READ);
if (fp == 0)

14
print/texlive/base/patches/patch-texk_texlive_context_mtxrun Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-texk_texlive_context_mtxrun,v 1.1 2011/11/23 12:00:45 edd Exp $
--- texk/texlive/context/mtxrun.origy Sat Sep 10 23:55:58 2011
+++ texk/texlive/context/mtxrun Sat Sep 10 23:57:10 2011
@@ -14424,8 +14424,8 @@ runners.applications = {
["lua"] = "luatex --luaonly",
["luc"] = "luatex --luaonly",
["pl"] = "perl",
- ["py"] = "python",
- ["rb"] = "ruby",
+ ["py"] = "python${MODPY_VERSION}",
+ ["rb"] = "ruby${MODRUBY_BINREV}",
}
runners.suffixes = {

8
print/texlive/base/patches/patch-texk_web2c_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-texk_web2c_Makefile_in,v 1.4 2011/03/08 00:09:42 edd Exp $
--- texk/web2c/Makefile.in.origy Tue Jul 6 10:17:20 2010
+++ texk/web2c/Makefile.in Thu Sep 23 16:53:27 2010
@@ -1080,7 +1080,7 @@ WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
$OpenBSD: patch-texk_web2c_Makefile_in,v 1.5 2011/11/23 12:00:45 edd Exp $
--- texk/web2c/Makefile.in.origy Sat Jun 4 14:36:26 2011
+++ texk/web2c/Makefile.in Sat Aug 27 14:12:00 2011
@@ -1131,7 +1131,7 @@ WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
WEB2CVERSION = @WEB2CVERSION@
XMKMF = @XMKMF@
XPDF_DEPEND = @XPDF_DEPEND@

15
print/texlive/base/patches/patch-texk_web2c_alephdir_com16bit_ch Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-texk_web2c_alephdir_com16bit_ch,v 1.1 2011/11/23 12:00:45 edd Exp $
line number fix on 2011 stable branch: http://tug.org/pipermail/tldistro/2011q4/000148.html
--- texk/web2c/alephdir/com16bit.ch.origy Tue Apr 19 14:44:09 2011
+++ texk/web2c/alephdir/com16bit.ch Sat Oct 1 13:48:55 2011
@@ -2784,7 +2784,7 @@ begin
else begin
print_nl (""); print (full_source_filename_stack[level]); print (":");
if level=in_open then print_int (line)
- else print_int (line_stack[index+1-(in_open-level)]);
+ else print_int (line_stack[level+1]);
print (": ");
end;
end;

20
print/texlive/base/patches/patch-texk_web2c_alephdir_eobase_ch Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-texk_web2c_alephdir_eobase_ch,v 1.1 2011/11/23 12:00:45 edd Exp $
line number fix on 2011 stable branch: http://tug.org/pipermail/tldistro/2011q4/000148.html
--- texk/web2c/alephdir/eobase.ch.origy Thu Mar 24 17:18:25 2011
+++ texk/web2c/alephdir/eobase.ch Sat Oct 1 13:48:55 2011
@@ -805,10 +805,9 @@ created by the \.{\\scantokens} command.
@x [22] m.313 l.6794 - e-TeX scan_tokens
else begin print_nl("l."); print_int(line);
@y
-else if index<>in_open then {input from a pseudo file}
- begin print_nl("l."); print_int(line_stack[index+1]);
- end
-else begin print_nl("l."); print_int(line);
+else begin print_nl("l.");
+ if index=in_open then print_int(line)
+ else print_int(line_stack[index+1]); {input from a pseudo file}
@z
%---------------------------------------
@x [22] m.314 l.6814 - e-TeX basic

16
print/texlive/base/patches/patch-texk_web2c_enctex_ch Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-texk_web2c_enctex_ch,v 1.1 2011/11/23 12:00:45 edd Exp $
Reliability fix from texlive 2011 stable branch. Off by one causes segfault:
http://tug.org/pipermail/tldistro/2011q3/000137.html
--- texk/web2c/enctex.ch.origy Sun Jan 9 15:18:42 2011
+++ texk/web2c/enctex.ch Tue Sep 6 14:57:22 2011
@@ -42,7 +42,7 @@ for i:=@'177 to @'377 do xchr[i]:=i;
{Initialize enc\TeX\ data.}
for i:=0 to 255 do mubyte_read[i]:=null;
for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
mubyte_keep := 0; mubyte_start := false;
write_noexpanding := false; cs_converting := false;
special_printing := false; message_printing := false;

27
print/texlive/base/patches/patch-texk_web2c_eptexdir_eptex_ech Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-texk_web2c_eptexdir_eptex_ech,v 1.1 2011/11/23 12:00:45 edd Exp $
dvips, e-ptex fixes (buffer overflow/memory corruption) on tl11 branch.
http://tug.org/pipermail/tldistro/2011q4/000149.html
--- texk/web2c/eptexdir/eptex.ech.origy Fri Apr 15 12:47:24 2011
+++ texk/web2c/eptexdir/eptex.ech Sun Oct 23 20:54:17 2011
@@ -283,6 +283,19 @@ disp_node: begin
othercases goto next_p
@z
+@x e-pTeX: just_copy
+ hlist_node,vlist_node: begin r:=get_node(box_node_size);
+@y
+ dir_node,
+ hlist_node,vlist_node: begin r:=get_node(box_node_size);
+@z
+@x e-pTeX: just_copy
+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+@y
+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+ add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+@z
+
@x e-pTeX: ifcsname l.28620
buffer[m]:=info(p) mod @'400; incr(m); p:=link(p);
@y

20
print/texlive/base/patches/patch-texk_web2c_etexdir_etex_ch Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-texk_web2c_etexdir_etex_ch,v 1.1 2011/11/23 12:00:45 edd Exp $
line number fix on 2011 stable branch: http://tug.org/pipermail/tldistro/2011q4/000148.html
--- texk/web2c/etexdir/etex.ch.origy Thu Apr 7 13:06:18 2011
+++ texk/web2c/etexdir/etex.ch Sat Oct 1 13:48:55 2011
@@ -871,10 +871,9 @@ corresponding token types must precede |write_text|.
@x [22] m.313 l.6809 - e-TeX scan_tokens
else begin print_nl("l."); print_int(line);
@y
-else if index<>in_open then {input from a pseudo file}
- begin print_nl("l."); print_int(line_stack[index+1]);
- end
-else begin print_nl("l."); print_int(line);
+else begin print_nl("l.");
+ if index=in_open then print_int(line)
+ else print_int(line_stack[index+1]); {input from a pseudo file}
@z
%---------------------------------------
@x [22] m.314 l.6831 - e-TeX basic

423
print/texlive/base/patches/patch-texk_web2c_luatexdir_image_writepng_w
View File

@ -1,423 +0,0 @@
$OpenBSD: patch-texk_web2c_luatexdir_image_writepng_w,v 1.1 2011/07/08 20:37:01 naddy Exp $
Fix build with png-1.5.
http://tug.org/svn/texlive?view=revision&revision=21250
--- texk/web2c/luatexdir/image/writepng.w.origy Tue Apr 13 04:01:03 2010
+++ texk/web2c/luatexdir/image/writepng.w Tue Jul 5 10:59:19 2011
@@ -67,7 +67,7 @@ void read_png_info(PDF pdf, image_dict * idict, img_re
if ((info_p = png_create_info_struct(png_p)) == NULL)
pdftex_fail("libpng: png_create_info_struct() failed");
img_png_info_ptr(idict) = info_p;
- if (setjmp(png_p->jmpbuf))
+ if (setjmp(png_jmpbuf(png_p)))
pdftex_fail("libpng: internal error");
png_init_io(png_p, img_file(idict));
png_read_info(png_p, info_p);
@@ -76,12 +76,12 @@ void read_png_info(PDF pdf, image_dict * idict, img_re
png_set_tRNS_to_alpha(png_p);
}
/* alpha channel support */
- if (pdf->minor_version < 4 && png_p->color_type | PNG_COLOR_MASK_ALPHA)
+ if (pdf->minor_version < 4 && png_get_color_type(png_p, info_p) | PNG_COLOR_MASK_ALPHA)
png_set_strip_alpha(png_p);
/* 16bit depth support */
if (pdf->minor_version < 5)
pdf->image_hicolor = 0;
- if ((info_p->bit_depth == 16) && (pdf->image_hicolor == 0))
+ if ((png_get_bit_depth(png_p, info_p) == 16) && (pdf->image_hicolor == 0))
png_set_strip_16(png_p);
/* gamma support */
if (pdf->image_apply_gamma) {
@@ -94,15 +94,15 @@ void read_png_info(PDF pdf, image_dict * idict, img_re
/* reset structure */
png_read_update_info(png_p, info_p);
/* resolution support */
- img_xsize(idict) = (int) info_p->width;
- img_ysize(idict) = (int) info_p->height;
- if (info_p->valid & PNG_INFO_pHYs) {
+ img_xsize(idict) = (int) png_get_image_width (png_p, info_p);
+ img_ysize(idict) = (int) png_get_image_height (png_p, info_p);
+ if (png_get_valid(png_p, info_p, PNG_INFO_pHYs)) {
img_xres(idict) =
round(0.0254 * (double) png_get_x_pixels_per_meter(png_p, info_p));
img_yres(idict) =
round(0.0254 * (double) png_get_y_pixels_per_meter(png_p, info_p));
}
- switch (info_p->color_type) {
+ switch (png_get_color_type(png_p, info_p)) {
case PNG_COLOR_TYPE_PALETTE:
img_procset(idict) |= PROCSET_IMAGE_C | PROCSET_IMAGE_I;
break;
@@ -115,9 +115,9 @@ void read_png_info(PDF pdf, image_dict * idict, img_re
img_procset(idict) |= PROCSET_IMAGE_C;
break;
default:
- pdftex_fail("unsupported type of color_type <%i>", info_p->color_type);
+ pdftex_fail("unsupported type of color_type <%i>", png_get_color_type(png_p, info_p));
}
- img_colordepth(idict) = info_p->bit_depth;
+ img_colordepth(idict) = png_get_bit_depth(png_p, info_p);
if (readtype == IMG_CLOSEINBETWEEN)
close_and_cleanup_png(idict);
}
@@ -142,10 +142,10 @@ void read_png_info(PDF pdf, image_dict * idict, img_re
#define write_simple_pixel(r) pdf_quick_out(pdf,*r++)
#define write_noninterlaced(outmac) \
- for (i = 0; i < (int)info_p->height; i++) { \
+ for (i = 0; i < (int)png_get_image_height (png_p, info_p); i++) { \
png_read_row(png_p, row, NULL); \
r = row; \
- k = (int)info_p->rowbytes; \
+ k = (int)png_get_rowbytes(png_p, info_p); \
while(k > 0) { \
l = (k > pdf->buf_size)? pdf->buf_size : k; \
pdf_room(pdf,l); \
@@ -157,9 +157,9 @@ void read_png_info(PDF pdf, image_dict * idict, img_re
}
#define write_interlaced(outmac) \
- for (i = 0; i < (int)info_p->height; i++) { \
+ for (i = 0; i < (int)png_get_image_height (png_p, info_p); i++) { \
row = rows[i]; \
- k = (int)info_p->rowbytes; \
+ k = (int)png_get_rowbytes(png_p, info_p); \
while(k > 0) { \
l = (k > pdf->buf_size)?pdf->buf_size: k;\
pdf_room(pdf,l); \
@@ -179,26 +179,31 @@ static void write_png_palette(PDF pdf, image_dict * id
png_infop info_p = img_png_info_ptr(idict);
png_bytep row, r, *rows;
int palette_objnum = 0;
+ png_colorp palette;
+ int num_palette;
+
+ png_get_PLTE(png_p, info_p, &palette, &num_palette);
+
if (img_colorspace(idict) != 0) {
pdf_printf(pdf, "%i 0 R\n", (int) img_colorspace(idict));
} else {
pdf_create_obj(pdf, obj_type_others, 0);
palette_objnum = pdf->obj_ptr;
pdf_printf(pdf, "[/Indexed /DeviceRGB %i %i 0 R]\n",
- (int) (info_p->num_palette - 1), (int) palette_objnum);
+ num_palette - 1, (int) palette_objnum);
}
pdf_begin_stream(pdf);
- if (info_p->interlace_type == PNG_INTERLACE_NONE) {
- row = xtalloc(info_p->rowbytes, png_byte);
+ if (png_get_interlace_type(png_p, info_p) == PNG_INTERLACE_NONE) {
+ row = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
write_noninterlaced(write_simple_pixel(r));
xfree(row);
} else {
- if (info_p->height * info_p->rowbytes >= 10240000L)
+ if (png_get_image_height (png_p, info_p) * png_get_rowbytes(png_p, info_p) >= 10240000L)
pdftex_warn
("large interlaced PNG might cause out of memory (use non-interlaced PNG to fix this)");
- rows = xtalloc(info_p->height, png_bytep);
- for (i = 0; (unsigned) i < info_p->height; i++)
- rows[i] = xtalloc(info_p->rowbytes, png_byte);
+ rows = xtalloc(png_get_image_height (png_p, info_p), png_bytep);
+ for (i = 0; (unsigned) i < png_get_image_height (png_p, info_p); i++)
+ rows[i] = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
png_read_image(png_p, rows);
write_interlaced(write_simple_pixel(row));
xfree(rows);
@@ -207,11 +212,11 @@ static void write_png_palette(PDF pdf, image_dict * id
if (palette_objnum > 0) {
pdf_begin_dict(pdf, palette_objnum, 0);
pdf_begin_stream(pdf);
- for (i = 0; (unsigned) i < info_p->num_palette; i++) {
+ for (i = 0; (unsigned) i < num_palette; i++) {
pdf_room(pdf, 3);
- pdf_quick_out(pdf, info_p->palette[i].red);
- pdf_quick_out(pdf, info_p->palette[i].green);
- pdf_quick_out(pdf, info_p->palette[i].blue);
+ pdf_quick_out(pdf, palette[i].red);
+ pdf_quick_out(pdf, palette[i].green);
+ pdf_quick_out(pdf, palette[i].blue);
}
pdf_end_stream(pdf);
}
@@ -230,17 +235,17 @@ static void write_png_gray(PDF pdf, image_dict * idict
pdf_puts(pdf, "/DeviceGray\n");
}
pdf_begin_stream(pdf);
- if (info_p->interlace_type == PNG_INTERLACE_NONE) {
- row = xtalloc(info_p->rowbytes, png_byte);
+ if (png_get_interlace_type(png_p, info_p) == PNG_INTERLACE_NONE) {
+ row = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
write_noninterlaced(write_simple_pixel(r));
xfree(row);
} else {
- if (info_p->height * info_p->rowbytes >= 10240000L)
+ if (png_get_image_height (png_p, info_p) * png_get_rowbytes(png_p, info_p) >= 10240000L)
pdftex_warn
("large interlaced PNG might cause out of memory (use non-interlaced PNG to fix this)");
- rows = xtalloc(info_p->height, png_bytep);
- for (i = 0; (unsigned) i < info_p->height; i++)
- rows[i] = xtalloc(info_p->rowbytes, png_byte);
+ rows = xtalloc(png_get_image_height (png_p, info_p), png_bytep);
+ for (i = 0; (unsigned) i < png_get_image_height (png_p, info_p); i++)
+ rows[i] = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
png_read_image(png_p, rows);
write_interlaced(write_simple_pixel(row));
xfree(rows);
@@ -268,26 +273,26 @@ static void write_png_gray_alpha(PDF pdf, image_dict *
pdf_create_obj(pdf, obj_type_others, 0);
smask_objnum = pdf->obj_ptr;
pdf_printf(pdf, "/SMask %i 0 R\n", (int) smask_objnum);
- smask_size = (int) ((info_p->rowbytes / 2) * info_p->height);
+ smask_size = (int) ((png_get_rowbytes(png_p, info_p) / 2) * png_get_image_height (png_p, info_p));
smask = xtalloc((unsigned) smask_size, png_byte);
pdf_begin_stream(pdf);
- if (info_p->interlace_type == PNG_INTERLACE_NONE) {
- row = xtalloc(info_p->rowbytes, png_byte);
- if ((info_p->bit_depth == 16) && (pdf->image_hicolor != 0)) {
+ if (png_get_interlace_type(png_p, info_p) == PNG_INTERLACE_NONE) {
+ row = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
+ if ((png_get_bit_depth(png_p, info_p) == 16) && (pdf->image_hicolor != 0)) {
write_noninterlaced(write_gray_pixel_16(r));
} else {
write_noninterlaced(write_gray_pixel_8(r));
}
xfree(row);
} else {
- if (info_p->height * info_p->rowbytes >= 10240000L)
+ if (png_get_image_height (png_p, info_p) * png_get_rowbytes(png_p, info_p) >= 10240000L)
pdftex_warn
("large interlaced PNG might cause out of memory (use non-interlaced PNG to fix this)");
- rows = xtalloc(info_p->height, png_bytep);
- for (i = 0; (unsigned) i < info_p->height; i++)
- rows[i] = xtalloc(info_p->rowbytes, png_byte);
+ rows = xtalloc(png_get_image_height (png_p, info_p), png_bytep);
+ for (i = 0; (unsigned) i < png_get_image_height (png_p, info_p); i++)
+ rows[i] = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
png_read_image(png_p, rows);
- if ((info_p->bit_depth == 16) && (pdf->image_hicolor != 0)) {
+ if ((png_get_bit_depth(png_p, info_p) == 16) && (pdf->image_hicolor != 0)) {
write_interlaced(write_gray_pixel_16(row));
} else {
write_interlaced(write_gray_pixel_8(row));
@@ -297,14 +302,15 @@ static void write_png_gray_alpha(PDF pdf, image_dict *
pdf_end_stream(pdf);
pdf_flush(pdf);
/* now write the Smask object */
- bitdepth = (int) info_p->bit_depth;
+ bitdepth = (int) png_get_bit_depth(png_p, info_p);
pdf_begin_dict(pdf, smask_objnum, 0);
pdf_puts(pdf, "/Type /XObject\n/Subtype /Image\n");
if (img_attr(idict) != NULL && strlen(img_attr(idict)) > 0)
pdf_printf(pdf, "%s\n", img_attr(idict));
pdf_printf(pdf, "/Width %i\n/Height %i\n/BitsPerComponent %i\n",
- (int) info_p->width,
- (int) info_p->height, (bitdepth == 16 ? 8 : bitdepth));
+ (int) png_get_image_width (png_p, info_p),
+ (int) png_get_image_height (png_p, info_p),
+ (bitdepth == 16 ? 8 : bitdepth));
pdf_puts(pdf, "/ColorSpace /DeviceGray\n");
pdf_begin_stream(pdf);
for (i = 0; i < smask_size; i++) {
@@ -331,17 +337,17 @@ static void write_png_rgb(PDF pdf, image_dict * idict)
pdf_puts(pdf, "/DeviceRGB\n");
}
pdf_begin_stream(pdf);
- if (info_p->interlace_type == PNG_INTERLACE_NONE) {
- row = xtalloc(info_p->rowbytes, png_byte);
+ if (png_get_interlace_type(png_p, info_p) == PNG_INTERLACE_NONE) {
+ row = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
write_noninterlaced(write_simple_pixel(r));
xfree(row);
} else {
- if (info_p->height * info_p->rowbytes >= 10240000L)
+ if (png_get_image_height (png_p, info_p) * png_get_rowbytes(png_p, info_p) >= 10240000L)
pdftex_warn
("large interlaced PNG might cause out of memory (use non-interlaced PNG to fix this)");
- rows = xtalloc(info_p->height, png_bytep);
- for (i = 0; (unsigned) i < info_p->height; i++)
- rows[i] = xtalloc(info_p->rowbytes, png_byte);
+ rows = xtalloc(png_get_image_height (png_p, info_p), png_bytep);
+ for (i = 0; (unsigned) i < png_get_image_height (png_p, info_p); i++)
+ rows[i] = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
png_read_image(png_p, rows);
write_interlaced(write_simple_pixel(row));
xfree(rows);
@@ -369,26 +375,26 @@ static void write_png_rgb_alpha(PDF pdf, image_dict *
pdf_create_obj(pdf, obj_type_others, 0);
smask_objnum = pdf->obj_ptr;
pdf_printf(pdf, "/SMask %i 0 R\n", (int) smask_objnum);
- smask_size = (int) ((info_p->rowbytes / 2) * info_p->height);
+ smask_size = (int) ((png_get_rowbytes(png_p, info_p) / 2) * png_get_image_height (png_p, info_p));
smask = xtalloc((unsigned) smask_size, png_byte);
pdf_begin_stream(pdf);
- if (info_p->interlace_type == PNG_INTERLACE_NONE) {
- row = xtalloc(info_p->rowbytes, png_byte);
- if ((info_p->bit_depth == 16) && (pdf->image_hicolor != 0)) {
+ if (png_get_interlace_type(png_p, info_p) == PNG_INTERLACE_NONE) {
+ row = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
+ if ((png_get_bit_depth(png_p, info_p) == 16) && (pdf->image_hicolor != 0)) {
write_noninterlaced(write_rgb_pixel_16(r));
} else {
write_noninterlaced(write_rgb_pixel_8(r));
}
xfree(row);
} else {
- if (info_p->height * info_p->rowbytes >= 10240000L)
+ if (png_get_image_height (png_p, info_p) * png_get_rowbytes(png_p, info_p) >= 10240000L)
pdftex_warn
("large interlaced PNG might cause out of memory (use non-interlaced PNG to fix this)");
- rows = xtalloc(info_p->height, png_bytep);
- for (i = 0; (unsigned) i < info_p->height; i++)
- rows[i] = xtalloc(info_p->rowbytes, png_byte);
+ rows = xtalloc(png_get_image_height (png_p, info_p), png_bytep);
+ for (i = 0; (unsigned) i < png_get_image_height (png_p, info_p); i++)
+ rows[i] = xtalloc(png_get_rowbytes(png_p, info_p), png_byte);
png_read_image(png_p, rows);
- if ((info_p->bit_depth == 16) && (pdf->image_hicolor != 0)) {
+ if ((png_get_bit_depth(png_p, info_p) == 16) && (pdf->image_hicolor != 0)) {
write_interlaced(write_rgb_pixel_16(row));
} else {
write_interlaced(write_rgb_pixel_8(row));
@@ -399,14 +405,15 @@ static void write_png_rgb_alpha(PDF pdf, image_dict *
pdf_flush(pdf);
/* now write the Smask object */
if (smask_objnum > 0) {
- bitdepth = (int) info_p->bit_depth;
+ bitdepth = (int) png_get_bit_depth(png_p, info_p);
pdf_begin_dict(pdf, smask_objnum, 0);
pdf_puts(pdf, "/Type /XObject\n/Subtype /Image\n");
if (img_attr(idict) != NULL && strlen(img_attr(idict)) > 0)
pdf_printf(pdf, "%s\n", img_attr(idict));
pdf_printf(pdf, "/Width %i\n/Height %i\n/BitsPerComponent %i\n",
- (int) info_p->width,
- (int) info_p->height, (bitdepth == 16 ? 8 : bitdepth));
+ (int) png_get_image_width (png_p, info_p),
+ (int) png_get_image_height (png_p, info_p),
+ (bitdepth == 16 ? 8 : bitdepth));
pdf_puts(pdf, "/ColorSpace /DeviceGray\n");
pdf_begin_stream(pdf);
for (i = 0; i < smask_size; i++) {
@@ -454,7 +461,7 @@ static void copy_png(PDF pdf, image_dict * idict)
assert(idict != NULL);
png_p = img_png_png_ptr(idict);
info_p = img_png_info_ptr(idict);
- fp = (FILE *) png_p->io_ptr;
+ fp = (FILE *) png_get_io_ptr(png_p);
/* 1st pass to find overall stream /Length */
if (fseek(fp, 8, SEEK_SET) != 0)
pdftex_fail("writepng: fseek in PNG file failed");
@@ -479,8 +486,9 @@ static void copy_png(PDF pdf, image_dict * idict)
"/Columns %d"
"/BitsPerComponent %i"
"/Predictor 10>>\n>>\nstream\n", streamlength,
- info_p->color_type == 2 ? 3 : 1,
- (int) info_p->width, info_p->bit_depth);
+ png_get_color_type(png_p, info_p) == 2 ? 3 : 1,
+ (int) png_get_image_width (png_p, info_p),
+ png_get_bit_depth(png_p, info_p));
/* 2nd pass to copy data */
endflag = false;
if (fseek(fp, 8, SEEK_SET) != 0)
@@ -553,8 +561,9 @@ void write_png(PDF pdf, image_dict * idict)
if (img_attr(idict) != NULL && strlen(img_attr(idict)) > 0)
pdf_printf(pdf, "%s\n", img_attr(idict));
pdf_printf(pdf, "/Width %i\n/Height %i\n/BitsPerComponent %i\n",
- (int) info_p->width,
- (int) info_p->height, (int) info_p->bit_depth);
+ (int) png_get_image_width (png_p, info_p),
+ (int) png_get_image_height (png_p, info_p),
+ (int) png_get_bit_depth(png_p, info_p));
pdf_puts(pdf, "/ColorSpace ");
checked_gamma = 1.0;
if (pdf->image_apply_gamma) {
@@ -566,23 +575,25 @@ void write_png(PDF pdf, image_dict * idict)
}
/* the switching between |info_p| and |png_p| queries has been trial and error.
*/
- if (pdf->minor_version > 1 && info_p->interlace_type == PNG_INTERLACE_NONE &&
- (png_p->transformations == 0 || png_p->transformations == 0x2000) /* gamma */
- &&!(png_p->color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
- png_p->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
- && ((pdf->image_hicolor != 0) || (png_p->bit_depth <= 8))
+ if (pdf->minor_version > 1 && png_get_interlace_type(png_p, info_p) == PNG_INTERLACE_NONE
+ &&!(png_get_color_type(png_p, info_p) == PNG_COLOR_TYPE_GRAY_ALPHA ||
+ png_get_color_type(png_p, info_p) == PNG_COLOR_TYPE_RGB_ALPHA)
+ && ((pdf->image_hicolor != 0) || (png_get_bit_depth(png_p, info_p) <= 8))
&& (checked_gamma <= 1.01 && checked_gamma > 0.99)
) {
+ png_colorp palette;
+ int num_palette;
+
+ png_get_PLTE(png_p, info_p, &palette, &num_palette);
if (img_colorspace(idict) != 0) {
pdf_printf(pdf, "%i 0 R\n", (int) img_colorspace(idict));
} else {
- switch (info_p->color_type) {
+ switch (png_get_color_type(png_p, info_p)) {
case PNG_COLOR_TYPE_PALETTE:
pdf_create_obj(pdf, obj_type_others, 0);
palette_objnum = pdf->obj_ptr;
pdf_printf(pdf, "[/Indexed /DeviceRGB %i %i 0 R]\n",
- (int) (info_p->num_palette - 1),
- (int) palette_objnum);
+ num_palette - 1, (int) palette_objnum);
break;
case PNG_COLOR_TYPE_GRAY:
pdf_puts(pdf, "/DeviceGray\n");
@@ -597,11 +608,11 @@ void write_png(PDF pdf, image_dict * idict)
if (palette_objnum > 0) {
pdf_begin_dict(pdf, palette_objnum, 0);
pdf_begin_stream(pdf);
- for (i = 0; (unsigned) i < info_p->num_palette; i++) {
+ for (i = 0; (unsigned) i < num_palette; i++) {
pdf_room(pdf, 3);
- pdf_quick_out(pdf, info_p->palette[i].red);
- pdf_quick_out(pdf, info_p->palette[i].green);
- pdf_quick_out(pdf, info_p->palette[i].blue);
+ pdf_quick_out(pdf, palette[i].red);
+ pdf_quick_out(pdf, palette[i].green);
+ pdf_quick_out(pdf, palette[i].blue);
}
pdf_end_stream(pdf);
}
@@ -611,22 +622,20 @@ void write_png(PDF pdf, image_dict * idict)
if ((pdf->image_apply_gamma != 0) &&
(checked_gamma > 1.01 || checked_gamma < 0.99))
tex_printf("gamma delta=%lf ", checked_gamma);
- if (png_p->transformations != PNG_TRANSFORM_IDENTITY)
- tex_printf("transform=%lu", (long) png_p->transformations);
- if ((info_p->color_type != PNG_COLOR_TYPE_GRAY)
- && (info_p->color_type != PNG_COLOR_TYPE_RGB)
- && (info_p->color_type != PNG_COLOR_TYPE_PALETTE))
+ if ((png_get_color_type(png_p, info_p) != PNG_COLOR_TYPE_GRAY)
+ && (png_get_color_type(png_p, info_p) != PNG_COLOR_TYPE_RGB)
+ && (png_get_color_type(png_p, info_p) != PNG_COLOR_TYPE_PALETTE))
tex_printf("colortype ");
if (pdf->minor_version <= 1)
tex_printf("version=%d ", pdf->minor_version);
- if (info_p->interlace_type != PNG_INTERLACE_NONE)
+ if (png_get_interlace_type(png_p, info_p) != PNG_INTERLACE_NONE)
tex_printf("interlaced ");
- if (info_p->bit_depth > 8)
- tex_printf("bitdepth=%d ", info_p->bit_depth);
+ if (png_get_bit_depth(png_p, info_p) > 8)
+ tex_printf("bitdepth=%d ", png_get_bit_depth(png_p, info_p));
if (png_get_valid(png_p, info_p, PNG_INFO_tRNS))
tex_printf("simple transparancy ");
}
- switch (info_p->color_type) {
+ switch (png_get_color_type(png_p, info_p)) {
case PNG_COLOR_TYPE_PALETTE:
write_png_palette(pdf, idict);
break;
@@ -652,7 +661,7 @@ void write_png(PDF pdf, image_dict * idict)
break;
default:
pdftex_fail("unsupported type of color_type <%i>",
- info_p->color_type);
+ png_get_color_type(png_p, info_p));
}
}
pdf_flush(pdf);

34
print/texlive/base/patches/patch-texk_web2c_luatexdir_luafontloader_fontforge_fontforge_psread_c Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-texk_web2c_luatexdir_luafontloader_fontforge_fontforge_psread_c,v 1.1 2011/11/23 12:00:45 edd Exp $
luatex psread.c array size fix
http://tug.org/pipermail/tldistro/2011q4/000152.html
--- texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c.origy Sun Apr 4 14:55:46 2010
+++ texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c Sun Oct 23 21:22:57 2011
@@ -385,7 +385,7 @@ return;
wrapper->top = io;
}
-static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp) {
+static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp, const size_t bsize) {
_IO *io = wrapper->top, *iop;
int wasstopped;
@@ -396,7 +396,7 @@ static int ioescapestopped(IO *wrapper, struct psstack
free(io);
if ( wasstopped ) {
wrapper->top = iop;
- if ( sp<(int)(sizeof(stack)/sizeof(stack[0])) ) {
+ if ( sp<(int)bsize ) {
stack[sp].type = ps_bool;
stack[sp++].u.tf = true;
}
@@ -1609,7 +1609,7 @@ static void _InterpretPS(IO *wrapper, EntityChar *ec,
}
break;
case pt_stop:
- sp = ioescapestopped(wrapper,stack,sp);
+ sp = ioescapestopped(wrapper,stack,sp,sizeof(stack)/sizeof(stack[0]));
break;
case pt_load:
if ( sp>=1 && stack[sp-1].type==ps_lit ) {

24
print/texlive/base/patches/patch-texk_web2c_luatexdir_tex_inputstack_w Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-texk_web2c_luatexdir_tex_inputstack_w,v 1.1 2011/11/23 12:00:45 edd Exp $
line number fix on 2011 stable branch: http://tug.org/pipermail/tldistro/2011q4/000148.html
--- texk/web2c/luatexdir/tex/inputstack.w.origy Tue Apr 12 15:17:47 2011
+++ texk/web2c/luatexdir/tex/inputstack.w Sat Oct 1 13:48:55 2011
@@ -307,12 +307,13 @@ void show_context(void)
print_int(iname - 1);
print_char('>');
};
- } else if (iindex != in_open) { /* input from a pseudo file */
- tprint_nl("l.");
- print_int(line_stack[iindex + 1]);
} else {
tprint_nl("l.");
- print_int(line);
+ if (iindex == in_open) {
+ print_int(line);
+ } else { /* input from a pseudo file */
+ print_int(line_stack[iindex + 1]);
+ }
}
print_char(' ');
PSEUDO_PRINT_THE_LINE();

15
print/texlive/base/patches/patch-texk_web2c_luatexdir_tex_printing_w Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-texk_web2c_luatexdir_tex_printing_w,v 1.1 2011/11/23 12:00:45 edd Exp $
line number fix on 2011 stable branch: http://tug.org/pipermail/tldistro/2011q4/000148.html
--- texk/web2c/luatexdir/tex/printing.w.origy Tue Apr 12 15:17:47 2011
+++ texk/web2c/luatexdir/tex/printing.w Sat Oct 1 13:48:55 2011
@@ -946,7 +946,7 @@ void print_file_line(void)
if (level == in_open)
print_int(line);
else
- print_int(line_stack[iindex + 1 - (in_open - level)]);
+ print_int(line_stack[level + 1]);
tprint(": ");
}
}

8
print/texlive/base/patches/patch-texk_web2c_pdftexdir_pdftoepdf_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-texk_web2c_pdftexdir_pdftoepdf_cc,v 1.2 2011/03/08 00:09:42 edd Exp $
--- texk/web2c/pdftexdir/pdftoepdf.cc.origy Fri Sep 24 11:10:16 2010
+++ texk/web2c/pdftexdir/pdftoepdf.cc Fri Sep 24 11:14:51 2010
@@ -61,6 +61,10 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 US
$OpenBSD: patch-texk_web2c_pdftexdir_pdftoepdf_cc,v 1.3 2011/11/23 12:00:45 edd Exp $
--- texk/web2c/pdftexdir/pdftoepdf.cc.origy Mon May 2 13:27:51 2011
+++ texk/web2c/pdftexdir/pdftoepdf.cc Sat Aug 27 14:12:00 2011
@@ -60,6 +60,10 @@ with this program. If not, see <http://www.gnu.org/li
#undef boolean

24
print/texlive/base/patches/patch-texk_web2c_pdftexdir_writeimg_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-texk_web2c_pdftexdir_writeimg_c,v 1.1 2011/07/08 20:37:01 naddy Exp $
Fix build with png-1.5.
--- texk/web2c/pdftexdir/writeimg.c.origy Mon Jul 4 23:50:50 2011
+++ texk/web2c/pdftexdir/writeimg.c Mon Jul 4 23:54:32 2011
@@ -137,7 +137,7 @@ integer imagecolordepth(integer img)
{
switch (img_type(img)) {
case IMAGE_TYPE_PNG:
- return png_info(img)->bit_depth;
+ return png_get_bit_depth(png_ptr(img), png_info(img));
case IMAGE_TYPE_JPG:
return jpg_ptr(img)->bits_per_component;
case IMAGE_TYPE_JBIG2:
@@ -389,7 +389,7 @@ void deleteimage(integer img)
epdf_delete();
break;
case IMAGE_TYPE_PNG:
- xfclose((FILE *) png_ptr(img)->io_ptr, cur_file_name);
+ xfclose((FILE *) png_get_io_ptr(png_ptr(img)), cur_file_name);
png_destroy_read_struct(&(png_ptr(img)), &(png_info(img)), NULL);
break;
case IMAGE_TYPE_JPG:

192
print/texlive/base/patches/patch-texk_web2c_pdftexdir_writepng_c
View File

@ -1,192 +0,0 @@
$OpenBSD: patch-texk_web2c_pdftexdir_writepng_c,v 1.1 2011/07/08 20:37:01 naddy Exp $
Fix build with png 1.5.
http://tug.org/svn/texlive?view=revision&revision=21237
--- texk/web2c/pdftexdir/writepng.c.origy Tue Jun 22 09:35:42 2010
+++ texk/web2c/pdftexdir/writepng.c Tue Jul 5 00:32:41 2011
@@ -21,47 +21,19 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 US
#include "ptexlib.h"
#include "image.h"
-#if PNG_LIBPNG_VER_MINOR > 2
-
/* ToDo:
- * use png_get_PLTE() to access num_palette and palette
- * use xxx to access transformations
+ * Check if multiple use of, e.g., png_bit_depth(img) should be
+ * replaced by
+ * int bitdepth = png_bit_depth(img);
+ * and subsequent use of bitdepth
*/
-
#define png_bit_depth(N) png_get_bit_depth(png_ptr(N), png_info(N))
#define png_color_type(N) png_get_color_type(png_ptr(N), png_info(N))
#define png_height(N) png_get_image_height(png_ptr(N), png_info(N))
#define png_interlace_type(N) png_get_interlace_type(png_ptr(N), png_info(N))
-#define png_io_ptr(N) png_get_io_ptr(png_ptr(N))
-#define png_num_palette(N) png_info(N)->num_palette
-#define png_palette(N) png_info(N)->palette
#define png_rowbytes(N) png_get_rowbytes(png_ptr(N), png_info(N))
-#define png_transformations(N) png_ptr(N)->transformations
-#define png_valid(N,flag) png_get_valid(png_ptr(N), png_info(N), flag)
#define png_width(N) png_get_image_width(png_ptr(N), png_info(N))
-#define png_ptr_bit_depth(N) png_get_bit_depth(png_ptr(N), png_info(N))
-#define png_ptr_color_type(N) png_get_color_type(png_ptr(N), png_info(N))
-
-#else
-
-#define png_bit_depth(N) png_info(N)->bit_depth
-#define png_color_type(N) png_info(N)->color_type
-#define png_height(N) png_info(N)->height
-#define png_interlace_type(N) png_info(N)->interlace_type
-#define png_io_ptr(N) png_ptr(N)->io_ptr
-#define png_num_palette(N) png_info(N)->num_palette
-#define png_palette(N) png_info(N)->palette
-#define png_rowbytes(N) png_info(N)->rowbytes
-#define png_transformations(N) png_ptr(N)->transformations
-#define png_valid(N,flag) png_info(N)->valid & (flag)
-#define png_width(N) png_info(N)->width
-
-#define png_ptr_bit_depth(N) png_ptr(N)->bit_depth
-#define png_ptr_color_type(N) png_ptr(N)->color_type
-
-#endif
-
static int transparent_page_group = -1;
void read_png_info(integer img)
@@ -84,7 +56,7 @@ void read_png_info(integer img)
}
/* alpha channel support */
if (fixedpdfminorversion < 4
- && png_ptr_color_type(img) | PNG_COLOR_MASK_ALPHA)
+ && png_color_type(img) | PNG_COLOR_MASK_ALPHA)
png_set_strip_alpha(png_ptr(img));
/* 16bit depth support */
if (fixedpdfminorversion < 5)
@@ -104,7 +76,7 @@ void read_png_info(integer img)
/* resolution support */
img_width(img) = png_width(img);
img_height(img) = png_height(img);
- if (png_valid(img, PNG_INFO_pHYs)) {
+ if (png_get_valid(png_ptr(img), png_info(img), PNG_INFO_pHYs)) {
img_xres(img) =
round(0.0254 *
png_get_x_pixels_per_meter(png_ptr(img), png_info(img)));
@@ -201,14 +173,18 @@ static void write_png_palette(integer img)
int i, j, k, l;
png_bytep row, r, *rows;
integer palette_objnum = 0;
+ png_colorp palette;
+ int num_palette;
+
+ png_get_PLTE(png_ptr(img), png_info(img), &palette, &num_palette);
+
pdfcreateobj(0, 0);
palette_objnum = objptr;
if (img_colorspace_ref(img) != 0) {
pdf_printf("%i 0 R\n", (int) img_colorspace_ref(img));
} else {
pdf_printf("[/Indexed /DeviceRGB %i %i 0 R]\n",
- (int) (png_num_palette(img) - 1),
- (int) palette_objnum);
+ num_palette -1, (int) palette_objnum);
}
pdfbeginstream();
if (png_interlace_type(img) == PNG_INTERLACE_NONE) {
@@ -230,11 +206,11 @@ static void write_png_palette(integer img)
if (palette_objnum > 0) {
pdfbegindict(palette_objnum, 0);
pdfbeginstream();
- for (i = 0; (unsigned) i < png_num_palette(img); i++) {
+ for (i = 0; (unsigned) i < num_palette; i++) {
pdfroom(3);
- pdfbuf[pdfptr++] = png_palette(img)[i].red;
- pdfbuf[pdfptr++] = png_palette(img)[i].green;
- pdfbuf[pdfptr++] = png_palette(img)[i].blue;
+ pdfbuf[pdfptr++] = palette[i].red;
+ pdfbuf[pdfptr++] = palette[i].green;
+ pdfbuf[pdfptr++] = palette[i].blue;
}
pdfendstream();
}
@@ -461,7 +437,7 @@ static int spng_getint(FILE * fp)
static void copy_png(integer img)
{
- FILE *fp = (FILE *) png_io_ptr(img);
+ FILE *fp = (FILE *) png_get_io_ptr(png_ptr(img));
int i, len, type, streamlength = 0;
boolean endflag = false;
int idat = 0; /* flag to check continuous IDAT chunks sequence */
@@ -553,7 +529,12 @@ void write_png(integer img)
double gamma, checked_gamma;
int i;
integer palette_objnum = 0;
+ png_colorp palette;
+ int num_palette;
last_png_needs_page_group = false;
+
+ png_get_PLTE(png_ptr(img), png_info(img), &palette, &num_palette);
+
if (fixedpdfminorversion < 5)
fixedimagehicolor = 0;
@@ -570,16 +551,12 @@ void write_png(integer img)
checked_gamma = (fixedgamma / 1000.0) * (1000.0 / fixedimagegamma);
}
}
- /* the switching between |png_info| and |png_ptr| queries has been trial and error.
- */
if (fixedpdfminorversion > 1
&& png_interlace_type(img) == PNG_INTERLACE_NONE
- && (png_transformations(img) == PNG_TRANSFORM_IDENTITY
- || png_transformations(img) == 0x2000)
/* gamma */
- && !(png_ptr_color_type(img) == PNG_COLOR_TYPE_GRAY_ALPHA ||
- png_ptr_color_type(img) == PNG_COLOR_TYPE_RGB_ALPHA)
- && (fixedimagehicolor || (png_ptr_bit_depth(img) <= 8))
+ && !(png_color_type(img) == PNG_COLOR_TYPE_GRAY_ALPHA ||
+ png_color_type(img) == PNG_COLOR_TYPE_RGB_ALPHA)
+ && (fixedimagehicolor || (png_bit_depth(img) <= 8))
&& (checked_gamma <= 1.01 && checked_gamma > 0.99)
) {
if (img_colorspace_ref(img) != 0) {
@@ -590,8 +567,7 @@ void write_png(integer img)
pdfcreateobj(0, 0);
palette_objnum = objptr;
pdf_printf("[/Indexed /DeviceRGB %i %i 0 R]\n",
- (int) (png_num_palette(img) - 1),
- (int) palette_objnum);
+ num_palette - 1, (int) palette_objnum);
break;
case PNG_COLOR_TYPE_GRAY:
pdf_puts("/DeviceGray\n");
@@ -605,11 +581,11 @@ void write_png(integer img)
if (palette_objnum > 0) {
pdfbegindict(palette_objnum, 0);
pdfbeginstream();
- for (i = 0; i < png_num_palette(img); i++) {
+ for (i = 0; i < num_palette; i++) {
pdfroom(3);
- pdfbuf[pdfptr++] = png_palette(img)[i].red;
- pdfbuf[pdfptr++] = png_palette(img)[i].green;
- pdfbuf[pdfptr++] = png_palette(img)[i].blue;
+ pdfbuf[pdfptr++] = palette[i].red;
+ pdfbuf[pdfptr++] = palette[i].green;
+ pdfbuf[pdfptr++] = palette[i].blue;
}
pdfendstream();
}
@@ -619,9 +595,6 @@ void write_png(integer img)
if (fixedimageapplygamma &&
(checked_gamma > 1.01 || checked_gamma < 0.99))
tex_printf("gamma delta=%lf ", checked_gamma);
- if (png_transformations(img) != PNG_TRANSFORM_IDENTITY)
- tex_printf("transform=%lu",
- (long) png_transformations(img));
if ((png_color_type(img) != PNG_COLOR_TYPE_GRAY)
&& (png_color_type(img) != PNG_COLOR_TYPE_RGB)
&& (png_color_type(img) != PNG_COLOR_TYPE_PALETTE))

15
print/texlive/base/patches/patch-texk_web2c_ptexdir_ptex-base_ch
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-texk_web2c_ptexdir_ptex-base_ch,v 1.1 2011/03/08 00:09:42 edd Exp $
Patch from upstream to workaround a seg fault when making format.
--- texk/web2c/ptexdir/ptex-base.ch.origy Sun Oct 31 20:28:16 2010
+++ texk/web2c/ptexdir/ptex-base.ch Sun Oct 31 20:28:56 2010
@@ -6719,7 +6719,7 @@ begin@/
jc:=toDVI(kcode);
sp:=1; { start position }
ep:=font_num_ext[f]-1; { end position }
-if (kchar_code(f)(sp)<=jc)and(jc<=kchar_code(f)(ep)) then
+if (ep>=1)and(kchar_code(f)(sp)<=jc)and(jc<=kchar_code(f)(ep)) then
begin while (sp <= ep) do
begin mp:=sp+((ep-sp) div 2);
if jc<kchar_code(f)(mp) then ep:=mp-1

36
print/texlive/base/patches/patch-texk_web2c_synctexdir_synctex-e-rec_ch0 Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-texk_web2c_synctexdir_synctex-e-rec_ch0,v 1.1 2011/11/23 12:00:45 edd Exp $
dvips, e-ptex fixes (buffer overflow/memory corruption) on tl11 branch.
http://tug.org/pipermail/tldistro/2011q4/000149.html
--- texk/web2c/synctexdir/synctex-e-rec.ch0.origy Wed Jul 8 12:35:32 2009
+++ texk/web2c/synctexdir/synctex-e-rec.ch0 Sun Oct 23 20:54:17 2011
@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
This file is part of the SyncTeX package.
@@ -82,21 +82,11 @@ MISSING IMPLEMENTATION: 0 synctag for medium sized nod
link(prev_p):=p;
@z
-@x etex.ch l.4126
- if is_char_node(p) then r:=get_avail
- else case type(p) of
+@x etex.ch l.4186
hlist_node,vlist_node: begin r:=get_node(box_node_size);
- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
- end;
@y
- if is_char_node(p) then r:=get_avail
- else case type(p) of
hlist_node,vlist_node: begin r:=get_node(box_node_size);
@<Copy the box {\sl Sync\TeX} information@>;
- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
- end;
@z
@x synctex-e-mem.ch0 l.100

29
print/texlive/base/patches/patch-texk_web2c_synctexdir_synctex-luatex_h Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-texk_web2c_synctexdir_synctex-luatex_h,v 1.1 2011/11/23 12:00:45 edd Exp $
Fix synctex co-ordinates. Critical patch from tl2011 stable branch:
http://tug.org/svn/texlive?view=revision&revision=23644
--- texk/web2c/synctexdir/synctex-luatex.h.origy Fri May 13 09:14:57 2011
+++ texk/web2c/synctexdir/synctex-luatex.h Tue Sep 6 15:07:13 2011
@@ -1,6 +1,6 @@
/* synctex-luatex.h
- Copyright (c) 2010 Taco Hoekwater <taco@luatex.org>
+ Copyright (c) 2010, 2011 Taco Hoekwater <taco@luatex.org>
This file is part of LuaTeX.
@@ -50,8 +50,11 @@ authorization from the copyright holder.
#define SYNCTEX_HEIGHT(NODE) height(NODE)
#define SYNCTEX_VALUE int_par(synctex_code)
-#define SYNCTEX_CURV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
-#define SYNCTEX_CURH static_pdf->posstruct->pos.h
+#define SYNCTEX_CURVV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
+#define SYNCTEX_CURHH static_pdf->posstruct->pos.h
+
+#define SYNCTEX_CURV (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURVV:SYNCTEX_CURVV-4736287)
+#define SYNCTEX_CURH (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURHH:SYNCTEX_CURHH-4736287)
#define SYNCTEX_GET_JOB_NAME() makecstring(job_name)
#define SYNCTEX_GET_LOG_NAME() get_full_log_name()

29
print/texlive/base/patches/patch-texk_web2c_synctexdir_synctex-xetex_h Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-texk_web2c_synctexdir_synctex-xetex_h,v 1.1 2011/11/23 12:00:45 edd Exp $
Fix synctex co-ordinates. Critical patch from tl2011 stable branch:
http://tug.org/svn/texlive?view=revision&revision=23644
--- texk/web2c/synctexdir/synctex-xetex.h.origy Thu May 12 10:09:29 2011
+++ texk/web2c/synctexdir/synctex-xetex.h Tue Sep 6 15:07:13 2011
@@ -1,9 +1,9 @@
/*
-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
This file is part of the SyncTeX package.
-Latest Revision: Wed Jul 1 11:16:29 UTC 2009
+Latest Revision: Wed Aug 22 07:20:29 UTC 2011
License:
--------
@@ -56,6 +56,9 @@ Thu Jun 19 09:39:21 UTC 2008
* pdf or xdv. */
# define SYNCTEX_OFFSET_IS_PDF (nopdfoutput==0)
# define SYNCTEX_OUTPUT (nopdfoutput!=0?"xdv":"pdf")
+
+#define SYNCTEX_CURH ((nopdfoutput==0)?(curh+4736287):curh)
+#define SYNCTEX_CURV ((nopdfoutput==0)?(curv+4736287):curv)
/* WARNING:
The definition below must be in sync with their eponym declarations in synctex-xetex.ch1

15
print/texlive/base/patches/patch-texk_web2c_tex_ch Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-texk_web2c_tex_ch,v 1.1 2011/11/23 12:00:45 edd Exp $
line number fix on 2011 stable branch: http://tug.org/pipermail/tldistro/2011q4/000148.html
--- texk/web2c/tex.ch.origy Tue Apr 19 14:44:09 2011
+++ texk/web2c/tex.ch Sat Oct 1 13:48:55 2011
@@ -4532,7 +4532,7 @@ begin
else begin
print_nl (""); print (full_source_filename_stack[level]); print (":");
if level=in_open then print_int (line)
- else print_int (line_stack[index+1-(in_open-level)]);
+ else print_int (line_stack[level+1]);
print (": ");
end;
end;

16
print/texlive/base/patches/patch-texk_web2c_xetexdir_xetex_ch Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-texk_web2c_xetexdir_xetex_ch,v 1.1 2011/11/23 12:00:45 edd Exp $
Reliability fix from texlive 2011 stable branch. Off by one causes segfault:
http://tug.org/pipermail/tldistro/2011q3/000137.html
--- texk/web2c/xetexdir/xetex.ch.origy Tue Apr 19 14:44:09 2011
+++ texk/web2c/xetexdir/xetex.ch Tue Sep 6 14:57:22 2011
@@ -328,7 +328,7 @@ for i:=@'177 to @'377 do xchr[i]:=i;
{Initialize enc\TeX\ data.}
for i:=0 to 255 do mubyte_read[i]:=null;
for i:=0 to 255 do mubyte_write[i]:=0;
-for i:=0 to 128 do mubyte_cswrite[i]:=null;
+for i:=0 to 127 do mubyte_cswrite[i]:=null;
mubyte_keep := 0; mubyte_start := false;
write_noexpanding := false; cs_converting := false;
special_printing := false; message_printing := false;

8
print/texlive/base/pkg/PFRAG.xindy
View File

@ -1,11 +1,5 @@
@comment $OpenBSD: PFRAG.xindy,v 1.2 2011/03/08 00:09:42 edd Exp $
@comment $OpenBSD: PFRAG.xindy,v 1.3 2011/11/23 12:00:45 edd Exp $
@bin bin/tex2xindy
bin/texindy
bin/xindy
bin/xindy.mem
@man man/man1/tex2xindy.1
@man man/man1/texindy.1
@man man/man1/xindy.1
share/texmf/scripts/xindy/
share/texmf/scripts/xindy/texindy.pl
share/texmf/scripts/xindy/xindy.pl

465
print/texlive/base/pkg/PLIST
View File

@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.18 2011/06/13 16:40:51 edd Exp $
@comment $OpenBSD: PLIST,v 1.19 2011/11/23 12:00:45 edd Exp $
@conflict teTeX_base-*
@conflict ht-<2
@pkgpath print/teTeX/base
@pkgpath print/teTeX/base,-fmt
%%SHARED%%
%%xindy%%
bin/a2ping
bin/afm2afm
@bin bin/afm2pl
@ -85,6 +87,7 @@ bin/eplain
bin/epspdf
bin/epspdftk
bin/epstopdf
@bin bin/eptex
bin/etex
@bin bin/extconv
bin/extractbb
@ -110,6 +113,9 @@ bin/httex
bin/httexi
bin/htxelatex
bin/htxetex
bin/inimf
bin/initex
bin/installfont-tl
bin/jadetex
@bin bin/kpseaccess
bin/kpsepath
@ -137,7 +143,6 @@ bin/makeglossaries
@bin bin/makejvf
bin/mathspic
@bin bin/mendex
bin/metafun
bin/mex
@bin bin/mf
@bin bin/mf-nowin
@ -161,11 +166,10 @@ bin/mltex
@bin bin/mmafm
@bin bin/mmpfb
@bin bin/mpost
%%SHARED%%
%%xindy%%
bin/mptopdf
bin/mtxrun
@bin bin/musixflx
bin/musixflx
bin/musixtex
@bin bin/odvicopy
@bin bin/odvitype
bin/ofm2opl
@ -181,29 +185,29 @@ bin/ovf2ovp
bin/ovp2ovf
@bin bin/patgen
@bin bin/pbibtex
@comment bin/pdf180
@comment bin/pdf270
@comment bin/pdf90
bin/pdf180
bin/pdf270
bin/pdf90
bin/pdfannotextractor
bin/pdfatfi
@comment bin/pdfbook
bin/pdfbook
@bin bin/pdfclose
bin/pdfcrop
bin/pdfcslatex
bin/pdfcsplain
bin/pdfetex
@comment bin/pdfflip
bin/pdfflip
bin/pdfjadetex
@comment bin/pdfjam
@comment bin/pdfjam-pocketmod
@comment bin/pdfjam-slides3up
@comment bin/pdfjam-slides6up
@comment bin/pdfjoin
bin/pdfjam
bin/pdfjam-pocketmod
bin/pdfjam-slides3up
bin/pdfjam-slides6up
bin/pdfjoin
bin/pdflatex
bin/pdfmex
@comment bin/pdfnup
bin/pdfnup
@bin bin/pdfopen
@comment bin/pdfpun
bin/pdfpun
@bin bin/pdftex
bin/pdfthumb
@bin bin/pdftosrc
@ -245,6 +249,7 @@ bin/simpdftex
bin/sjislatex
bin/sjispdflatex
bin/splitindex
bin/sty2dtx
bin/svn-multi
@bin bin/synctex
@bin bin/t1dotlessj
@ -262,6 +267,7 @@ bin/texconfig
bin/texconfig-dialog
bin/texconfig-sys
bin/texcount
bin/texdef
bin/texdiff
bin/texdirflatten
bin/texdoc
@ -357,433 +363,14 @@ include/kpathsea/xopendir.h
include/kpathsea/xstat.h
include/ptexenc/
include/ptexenc/ptexenc.h
@info info/dvipng.info
@info info/dvips.info
@info info/kpathsea.info
@info info/web2c.info
include/ptexenc/unicode.h
lib/libkpathsea.a
lib/libkpathsea.la
lib/libptexenc.a
lib/libptexenc.la
@man man/man1/afm2pl.1
@man man/man1/afm2tfm.1
@man man/man1/aleph.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/cfftot1.1
@man man/man1/chktex.1
@man man/man1/chkweb.1
@man man/man1/ctangle.1
@man man/man1/ctie.1
@man man/man1/ctxtools.1
@man man/man1/cweave.1
@man man/man1/cweb.1
@man man/man1/deweb.1
@man man/man1/dt2dv.1
@man man/man1/dv2dt.1
@man man/man1/dvi2fax.1
@man man/man1/dvibook.1
@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
@man man/man1/dvilj4.1
@man man/man1/dvilj4l.1
@man man/man1/dvilj6.1
@man man/man1/dvipng.1
@man man/man1/dvipos.1
@man man/man1/dvips.1
@man man/man1/dvired.1
@man man/man1/dviselect.1
@man man/man1/dvisvgm.1
@man man/man1/dvitodvi.1
@man man/man1/dvitomp.1
@man man/man1/dvitype.1
@man man/man1/e2pall.1
@man man/man1/eplain.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/hbf2gf.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/lacheck.1
@man man/man1/lamed.1
@man man/man1/latex.1
@man man/man1/luatex.1
@man man/man1/mag.1
@man man/man1/makeindex.1
@man man/man1/mendex.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/mkjobtexmf.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
@man man/man1/mktextfm.1
@man man/man1/mmafm.1
@man man/man1/mmpfb.1
@man man/man1/mpost.1
@man man/man1/mptopdf.1
@man man/man1/odvicopy.1
@man man/man1/odvitype.1
@man man/man1/ofm2opl.1
@man man/man1/opl2ofm.1
@man man/man1/otangle.1
@man man/man1/otfinfo.1
@man man/man1/otftotfm.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/pdflatex.1
@man man/man1/pdftex.1
@man man/man1/pdftosrc.1
@man man/man1/pfb2pfa.1
@man man/man1/pk2bm.1
@man man/man1/pktogf.1
@man man/man1/pktype.1
@man man/man1/pltotf.1
@man man/man1/pooltype.1
@man man/man1/ps2frag.1
@man man/man1/ps2pk.1
@man man/man1/pslatex.1
@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/t1rawafm.1
@man man/man1/t1reencode.1
@man man/man1/t1testpage.1
@man man/man1/tangle.1
@man man/man1/tcdialog.1
@man man/man1/tex.1
@comment @man man/man1/tex2xindy.1
@man man/man1/texconfig-sys.1
@man man/man1/texconfig.1
@man man/man1/texdoctk.1
@man man/man1/texexec.1
@man man/man1/texhash.1
@comment @man man/man1/texindy.1
@man man/man1/texlinks.1
@man man/man1/texmfstart.1
@man man/man1/tftopl.1
@man man/man1/thumbpdf.1
@man man/man1/tie.1
@man man/man1/tpic2pdftex.1
@man man/man1/ttf2afm.1
@man man/man1/ttf2pk.1
@man man/man1/ttf2tfm.1
@man man/man1/ttfdump.1
@man man/man1/ttftotype42.1
@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
@comment @man man/man1/xindy.1
@man man/man5/fmtutil.cnf.5
@man man/man5/synctex.5
@man man/man5/updmap.cfg.5
share/doc/pkg-readmes/${FULLPKGNAME}
share/lcdf-typetools-for-tex-live/
@exec mktexlsr > /dev/null 2>&1
@extraunexec rm -Rf %D/share/texmf-var/
@extraunexec rm -Rf %D/share/texmf-config/
@comment share/texmf-dist/bibtex/csf/base/88591lat.csf
@comment share/texmf-dist/bibtex/csf/base/88591sca.csf
@comment share/texmf-dist/bibtex/csf/base/ascii.csf
@comment share/texmf-dist/bibtex/csf/base/cp437lat.csf
@comment share/texmf-dist/bibtex/csf/base/cp850lat.csf
@comment share/texmf-dist/bibtex/csf/base/cp850sca.csf
@comment share/texmf-dist/bibtex/csf/base/cp866rus.csf
@comment share/texmf-dist/bibtex/csf/base/csfile.txt
@comment share/texmf-dist/fonts/enc/dvips/base/7t.enc
@comment share/texmf-dist/fonts/map/glyphlist/glyphlist.txt
@comment share/texmf-dist/fonts/map/glyphlist/pdfglyphlist.txt
@comment share/texmf-dist/fonts/map/glyphlist/texglyphlist.txt
share/texmf-dist/scripts/accfonts/mkt1font
share/texmf-dist/scripts/accfonts/vpl2ovp
share/texmf-dist/scripts/accfonts/vpl2vpl
share/texmf-dist/scripts/authorindex/
share/texmf-dist/scripts/authorindex/authorindex
share/texmf-dist/scripts/bengali/
share/texmf-dist/scripts/bengali/ebong.py
share/texmf-dist/scripts/bibexport/
share/texmf-dist/scripts/bibexport/bibexport.sh
share/texmf-dist/scripts/bundledoc/
share/texmf-dist/scripts/bundledoc/arlatex
share/texmf-dist/scripts/bundledoc/bundledoc
share/texmf-dist/scripts/cachepic/cachepic.tlu
share/texmf-dist/scripts/context/perl/mptopdf.pl
share/texmf-dist/scripts/de-macro/
share/texmf-dist/scripts/de-macro/de-macro
share/texmf-dist/scripts/dviasm/
share/texmf-dist/scripts/dviasm/dviasm.py
share/texmf-dist/scripts/epspdf/epspdf
share/texmf-dist/scripts/epspdf/epspdftk
share/texmf-dist/scripts/epstopdf/epstopdf.pl
share/texmf-dist/scripts/fig4latex/fig4latex
share/texmf-dist/scripts/findhyph/
share/texmf-dist/scripts/findhyph/findhyph
share/texmf-dist/scripts/fontools/
share/texmf-dist/scripts/fontools/afm2afm
share/texmf-dist/scripts/fontools/autoinst
share/texmf-dist/scripts/fontools/cmap2enc
share/texmf-dist/scripts/fontools/font2afm
share/texmf-dist/scripts/fontools/ot2kpx
share/texmf-dist/scripts/fontools/pfm2kpx
share/texmf-dist/scripts/fontools/showglyphs
share/texmf-dist/scripts/fragmaster/
share/texmf-dist/scripts/fragmaster/fragmaster.pl
share/texmf-dist/scripts/glossaries/
share/texmf-dist/scripts/glossaries/makeglossaries
share/texmf-dist/scripts/latex2man/
share/texmf-dist/scripts/latex2man/latex2man
share/texmf-dist/scripts/latexdiff/
share/texmf-dist/scripts/latexdiff/latexdiff-vc.pl
share/texmf-dist/scripts/latexdiff/latexdiff.pl
share/texmf-dist/scripts/latexdiff/latexrevise.pl
@comment share/texmf-dist/scripts/latexmk/
@comment share/texmf-dist/scripts/latexmk/latexmk.pl
share/texmf-dist/scripts/listings-ext/
share/texmf-dist/scripts/listings-ext/listings-ext.sh
share/texmf-dist/scripts/luaotfload/
share/texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
share/texmf-dist/scripts/mathspic/
share/texmf-dist/scripts/mathspic/mathspic.pl
share/texmf-dist/scripts/mkgrkindex/
share/texmf-dist/scripts/mkgrkindex/mkgrkindex
share/texmf-dist/scripts/mkjobtexmf/
share/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl
share/texmf-dist/scripts/oberdiek/pdfatfi.pl
share/texmf-dist/scripts/pax/
share/texmf-dist/scripts/pax/pdfannotextractor.pl
share/texmf-dist/scripts/pdfcrop/
share/texmf-dist/scripts/pdfcrop/pdfcrop.pl
@comment share/texmf-dist/scripts/pdfjam/
@comment share/texmf-dist/scripts/pdfjam/pdf180
@comment share/texmf-dist/scripts/pdfjam/pdf270
@comment share/texmf-dist/scripts/pdfjam/pdf90
@comment share/texmf-dist/scripts/pdfjam/pdfbook
@comment share/texmf-dist/scripts/pdfjam/pdfflip
@comment share/texmf-dist/scripts/pdfjam/pdfjam
@comment share/texmf-dist/scripts/pdfjam/pdfjam-pocketmod
@comment share/texmf-dist/scripts/pdfjam/pdfjam-slides3up
@comment share/texmf-dist/scripts/pdfjam/pdfjam-slides6up
@comment share/texmf-dist/scripts/pdfjam/pdfjoin
@comment share/texmf-dist/scripts/pdfjam/pdfnup
@comment share/texmf-dist/scripts/pdfjam/pdfpun
share/texmf-dist/scripts/perltex/
share/texmf-dist/scripts/perltex/perltex.pl
share/texmf-dist/scripts/pkfix/
share/texmf-dist/scripts/pkfix-helper/
share/texmf-dist/scripts/pkfix-helper/pkfix-helper
share/texmf-dist/scripts/pkfix/pkfix.pl
share/texmf-dist/scripts/ppower4/
share/texmf-dist/scripts/ppower4/pdfthumb.tlu
share/texmf-dist/scripts/ppower4/ppower4.tlu
share/texmf-dist/scripts/pst-pdf/ps4pdf
share/texmf-dist/scripts/pst2pdf/
share/texmf-dist/scripts/pst2pdf/pst2pdf
share/texmf-dist/scripts/purifyeps/
share/texmf-dist/scripts/purifyeps/purifyeps
share/texmf-dist/scripts/splitindex/
share/texmf-dist/scripts/splitindex/perl/
share/texmf-dist/scripts/splitindex/perl/splitindex.pl
share/texmf-dist/scripts/svn-multi/
share/texmf-dist/scripts/svn-multi/svn-multi.pl
share/texmf-dist/scripts/tex4ht/
share/texmf-dist/scripts/tex4ht/ht.sh
share/texmf-dist/scripts/tex4ht/htcontext.sh
share/texmf-dist/scripts/tex4ht/htlatex.sh
share/texmf-dist/scripts/tex4ht/htmex.sh
share/texmf-dist/scripts/tex4ht/httex.sh
share/texmf-dist/scripts/tex4ht/httexi.sh
share/texmf-dist/scripts/tex4ht/htxelatex.sh
share/texmf-dist/scripts/tex4ht/htxetex.sh
share/texmf-dist/scripts/tex4ht/mk4ht.pl
share/texmf-dist/scripts/texcount/
share/texmf-dist/scripts/texcount/texcount.pl
share/texmf-dist/scripts/texdiff/
share/texmf-dist/scripts/texdiff/texdiff
share/texmf-dist/scripts/texdirflatten/
share/texmf-dist/scripts/texdirflatten/texdirflatten
share/texmf-dist/scripts/texloganalyser/
share/texmf-dist/scripts/texloganalyser/texloganalyser
share/texmf-dist/scripts/thumbpdf/thumbpdf.pl
share/texmf-dist/scripts/ulqda/
share/texmf-dist/scripts/ulqda/ulqda.pl
share/texmf-dist/scripts/vpe/
share/texmf-dist/scripts/vpe/vpe.pl
@comment share/texmf/chktex/
@comment share/texmf/chktex/chktexrc
@comment share/texmf/doc/bibtex8/
@comment share/texmf/doc/bibtex8/00readme.txt
@comment share/texmf/doc/bibtex8/HISTORY
@comment share/texmf/doc/bibtex8/csfile.txt
@comment share/texmf/doc/bibtex8/file_id.diz
@comment share/texmf/doc/bibtexu/
@comment share/texmf/doc/bibtexu/00readme.txt
@comment share/texmf/doc/bibtexu/HISTORY
@comment share/texmf/doc/bibtexu/csfile.txt
@comment share/texmf/doc/bibtexu/file_id.diz
@comment share/texmf/doc/chktex/
@comment share/texmf/doc/chktex/ChkTeX.pdf
@comment share/texmf/doc/tetex/
@comment share/texmf/doc/tetex/TETEXDOC.pdf
@comment share/texmf/doc/tetex/teTeX-FAQ
@comment share/texmf/doc/xindy/
@comment share/texmf/doc/xindy/README
@comment share/texmf/doc/xindy/dataflow.gif
@comment share/texmf/doc/xindy/faq-1.html
@comment share/texmf/doc/xindy/faq-2.html
@comment share/texmf/doc/xindy/faq-3.html
@comment share/texmf/doc/xindy/faq-4.html
@comment share/texmf/doc/xindy/faq.html
@comment share/texmf/doc/xindy/index.gif
@comment share/texmf/doc/xindy/makeindex4.pdf
@comment share/texmf/doc/xindy/manual-1.html
@comment share/texmf/doc/xindy/manual-2.html
@comment share/texmf/doc/xindy/manual-3.html
@comment share/texmf/doc/xindy/manual-4.html
@comment share/texmf/doc/xindy/manual-5.html
@comment share/texmf/doc/xindy/manual-6.html
@comment share/texmf/doc/xindy/manual-7.html
@comment share/texmf/doc/xindy/manual.html
@comment share/texmf/doc/xindy/mappings.gif
@comment share/texmf/doc/xindy/next.gif
@comment share/texmf/doc/xindy/prev.gif
@comment share/texmf/doc/xindy/style-tutorial/
@comment share/texmf/doc/xindy/style-tutorial-1.html
@comment share/texmf/doc/xindy/style-tutorial-2.html
@comment share/texmf/doc/xindy/style-tutorial-3.html
@comment share/texmf/doc/xindy/style-tutorial-4.html
@comment share/texmf/doc/xindy/style-tutorial.html
@comment share/texmf/doc/xindy/style-tutorial/ex1.raw
@comment share/texmf/doc/xindy/style-tutorial/ex1.tex
@comment share/texmf/doc/xindy/style-tutorial/ex2.raw
@comment share/texmf/doc/xindy/style-tutorial/ex2.tex
@comment share/texmf/doc/xindy/style-tutorial/index.tex
@comment share/texmf/doc/xindy/style-tutorial/style1.xdy
@comment share/texmf/doc/xindy/style-tutorial/style2.xdy
@comment share/texmf/doc/xindy/tex2xindy.pdf
@comment share/texmf/doc/xindy/texindy.pdf
@comment share/texmf/doc/xindy/toc.gif
@comment share/texmf/doc/xindy/xindy.pdf
@comment share/texmf/dvipdfmx/dvipdfmx.cfg
@comment share/texmf/dvips/base/color.pro
@comment share/texmf/dvips/base/crop.pro
@comment share/texmf/dvips/base/finclude.pro
@comment share/texmf/dvips/base/hps.pro
@comment share/texmf/dvips/base/special.pro
@comment share/texmf/dvips/base/tex.pro
@comment share/texmf/dvips/base/texc.pro
@comment share/texmf/dvips/base/texps.pro
@comment share/texmf/dvips/gsftopk/render.ps
@comment share/texmf/fonts/cmap/dvipdfmx/EUC-UCS2
@comment share/texmf/fonts/map/dvipdfm/dvipdfmx/
@comment share/texmf/fonts/map/dvipdfm/dvipdfmx/cid-x.map
share/texmf/scripts/a2ping/
share/texmf/scripts/a2ping/a2ping.pl
share/texmf/scripts/simpdftex/
share/texmf/scripts/simpdftex/simpdftex
share/texmf/scripts/tetex/e2pall.pl
share/texmf/scripts/tetex/texdoctk.pl
share/texmf/scripts/texdoc/
share/texmf/scripts/texdoc/texdoc.tlu
share/texmf/scripts/texlive/
share/texmf/scripts/texlive/rungs.tlu
share/texmf/scripts/texlive/tlmgr.pl
@comment share/texmf/scripts/xindy/
@comment share/texmf/scripts/xindy/texindy.pl
@comment share/texmf/scripts/xindy/xindy.pl
@comment share/texmf/texconfig/README
@comment share/texmf/texconfig/g/generic
@comment share/texmf/texconfig/generic
@comment share/texmf/texconfig/tcfmgr
@comment share/texmf/texconfig/tcfmgr.map
@comment share/texmf/texconfig/v/vt100
@comment share/texmf/texconfig/x/xterm
@comment share/texmf/web2c/fmtutil.cnf
@comment share/texmf/web2c/mktex.opt
@comment share/texmf/web2c/mktexdir
@comment share/texmf/web2c/mktexdir.opt
@comment share/texmf/web2c/mktexnam
@comment share/texmf/web2c/mktexnam.opt
@comment share/texmf/web2c/mktexupd
@comment share/texmf/web2c/texmf.cnf
@comment share/texmf/xdvi/XDvi
@comment share/texmf/xdvi/pixmap/toolbar.xpm
@comment share/texmf/xdvi/pixmap/toolbar2.xpm
@comment share/texmf/xdvi/xdvi.cfg
@comment share/texmf/xindy/
@comment share/texmf/xindy/VERSION
@comment share/texmf/xindy/modules/
@comment share/texmf/xindy/modules/base/
@comment share/texmf/xindy/modules/base/book-order.xdy
@comment share/texmf/xindy/modules/base/ff-ranges-only.xdy
@comment share/texmf/xindy/modules/base/ff-ranges.xdy
@comment share/texmf/xindy/modules/base/german-sty.xdy
@comment share/texmf/xindy/modules/base/ignore-hyphen.xdy
@comment share/texmf/xindy/modules/base/ignore-punctuation.xdy
@comment share/texmf/xindy/modules/base/keep-blanks.xdy
@comment share/texmf/xindy/modules/base/latex-loc-fmts.xdy
@comment share/texmf/xindy/modules/base/latex.xdy
@comment share/texmf/xindy/modules/base/latin-lettergroups.xdy
@comment share/texmf/xindy/modules/base/letter-order.xdy
@comment share/texmf/xindy/modules/base/makeindex.xdy
@comment share/texmf/xindy/modules/base/numeric-sort.xdy
@comment share/texmf/xindy/modules/base/page-ranges.xdy
@comment share/texmf/xindy/modules/base/tex.xdy
@comment share/texmf/xindy/modules/base/texindy.xdy
@comment share/texmf/xindy/modules/base/word-order.xdy
@comment share/texmf/xindy/modules/class/
@comment share/texmf/xindy/modules/class/pagenums.xdy
@comment share/texmf/xindy/modules/lang/
@comment share/texmf/xindy/modules/lang/german/
@comment share/texmf/xindy/modules/lang/german/din5007.xdy
@comment share/texmf/xindy/modules/lang/german/duden.xdy
@comment share/texmf/xindy/modules/lang/german/tex.xdy
@comment share/texmf/xindy/modules/lang/latin/
@comment share/texmf/xindy/modules/lang/latin/caseisrt.xdy
@comment share/texmf/xindy/modules/lang/latin/letgroup.xdy
@comment share/texmf/xindy/modules/ord/
@comment share/texmf/xindy/modules/ord/letorder.xdy
@comment share/texmf/xindy/modules/rules/
@comment share/texmf/xindy/modules/rules/isolatin1-exchange.xdy
@comment share/texmf/xindy/modules/rules/isolatin1-tolower.xdy
@comment share/texmf/xindy/modules/rules/latin-exchange.xdy
@comment share/texmf/xindy/modules/rules/latin-tolower.xdy
@comment share/texmf/xindy/modules/styles/
@comment share/texmf/xindy/modules/styles/basic.xdy
@comment share/texmf/xindy/modules/styles/makeidx.xdy
@extra share/texmf/ls-R
@extra share/texmf-dist/ls-R
@extra share/texmf-var/ls-R
@extra share/texmf-config/ls-R

32
print/texlive/base/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.5 2011/06/14 21:11:24 edd Exp $
$OpenBSD: README,v 1.6 2011/11/23 12:00:45 edd Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -22,6 +22,10 @@ texmf-doc:
All sizes are compressed package sizes and the texmf package contents do
not overlap.
There is a *lot* of functionality in texmf-full, so before reportng
"missing" features, please try installing texmf-full first. Eg. xindy
requires texmf-full.
User Local Texmf Trees
======================
@ -42,11 +46,12 @@ installation by searching for the files using kpsewhich(1). Eg:
Upgrade From TeX Live 2009
==========================
Due to inconsistencies in the legacy TeX Live 2009 package, upgrades will
complain about non-empty directories. This is harmless, but can be silenced by
(having backed up anything manually added to texmfs) removing all
TeX Live packages, then `rm -Rf /usr/local/share/texmf*`. Now you can
install afresh the new TeX Live 2010 packages.
Due to inconsistencies in the legacy TeX Live 2009 package, if you
upgraded from TeX live 2009 (at some point in the past) you may see the
package tools complain about non-empty directories. This is harmless,
but can be silenced by (having backed up anything manually added to
texmfs) removing all TeX Live packages, then `rm -Rf /usr/local/share/texmf*`.
Now you can install afresh the new TeX Live packages.
Other Misc. Notes
=================
@ -54,14 +59,13 @@ Other Misc. Notes
Gmverb
------
Note that gmverb is broken upstream. When I see a fix, it will be fixed.
The gmverb package now works again, but requires xelatex.
Tlmgr
-----
The 'tlmgr' script was disabled in the OpenBSD package. This is because
updating TeX Live in this way will upset the package tools due to
differing file checksums.
The 'tlmgr' script is disabled in the OpenBSD package. If you were to use
tlmgr to alter/update your texmf, the package tools would become rather upset.
Soft Dependencies
-----------------
@ -71,11 +75,9 @@ 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.
Don't forget to link your chosen ruby version to the default as detailed in
the ruby package's installation message.
* asymptote is in ports: graphics/asymptote
* asymptote is in ports: graphics/asymptote
* TeX Works is editors/texworks
* latex-mk is print/latex-mk
If you know more, please mail the package maintainer: <edd@openbsd.org>

13
print/texlive/tests/gmverb/gmtest.tex Normal file
View File

@ -0,0 +1,13 @@
\documentclass{article}
\usepackage{gmverb}
\begin{document}
This is a test. This needs xelatex, it will not work in pdflatex.
\verb!test!
\verb!This should be in verbatim and the long line should be split properly, unlink with the stick verbatim functionality!
\end{document}

44
print/texlive/texmf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2011/09/16 11:13:41 espie Exp $
# $OpenBSD: Makefile,v 1.23 2011/11/23 12:00:45 edd Exp $
COMMENT-main = texlive texmf for laTeX/PdfTeX
COMMENT-full = texlive texmf for XeTeX/ConTeXt and extra macros
@ -8,16 +8,12 @@ DISTNAME = texlive-${DIST_V}-texmf
MASTER_SITES0 = http://spacehopper.org/mirrors/ \
http://theunixzoo.co.uk/distfiles/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
texmf-var-pregen-2010.1${EXTRACT_SUFX}:0
texmf-var-pregen-2011${EXTRACT_SUFX}:0
PKGNAME-main = texlive_texmf-minimal-${V}
PKGNAME-full = texlive_texmf-full-${V}
PKGNAME-docs = texlive_texmf-docs-${V}
REVISION-main = 1
REVISION-full = 1
REVISION-docs = 0
NO_BUILD = Yes
NO_REGRESS = Yes
PKG_ARCH = *
@ -25,6 +21,15 @@ PKG_ARCH = *
BUILD_DEPENDS = archivers/xz
RUN_DEPENDS-full = texlive_texmf-minimal-${V}:print/texlive/texmf,-main \
texlive_base-${V}:print/texlive/base
# We dont use auto module deps for these, as MODULES is not per SUBPACKAGE
MODULES += lang/ruby lang/python
MODRUBY_BUILDDEP = No
MODRUBY_RUNDEP = No
MODPY_BUILDDEP = No
MODPY_RUNDEP = No
RUN_DEPENDS-full += lang/python/${MODPY_VERSION} \
lang/ruby/${MODRUBY_REV}
RUN_DEPENDS-docs = texlive_base-${V}:print/texlive/base \
x11/p5-Tk
@ -33,11 +38,36 @@ MULTI_PACKAGES = -main -full -docs
SUBST_VARS += LOCALBASE
do-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${WRKDIST}
# manuals in the right place
mv ${WRKDIST}/texmf/doc/man/man1/*.1 ${PREFIX}/man/man1/
mv ${WRKDIST}/texmf/doc/man/man5/*.5 ${PREFIX}/man/man5/
# they really are scattered all over the place
for i in texmf-dist/doc/context/scripts/perl/texshow.1 \
texmf-dist/doc/latex/changebar/chbar.1 \
texmf-dist/doc/latex/eepic/fig2eepic/fig2epic.1 \
texmf-dist/doc/latex/mathspic/mathspic.1 \
texmf-dist/doc/latex/vxu/vxusymbol.1 \
texmf-dist/doc/otherformats/jadetex/base/jadetex.1 \
texmf-dist/doc/otherformats/jadetex/base/pdfjadetex.1 \
texmf-dist/doc/otherformats/texsis/base/texsis.1 \
texmf-dist/scripts/musixtex/doc/musixflx.1 \
texmf-dist/scripts/musixtex/doc/musixtex.1; do \
mv ${WRKDIST}/$$i ${PREFIX}/man/man1/; done
# The rest goes in share/texmf*
mv ${WRKDIST}/texmf ${PREFIX}/share
mv ${WRKDIST}/texmf-dist ${PREFIX}/share
# Some perl mods needed for updmap, but not included, silly
${INSTALL} -d ${PREFIX}/libdata/perl5/site_perl/TeXLive/
${INSTALL} ${FILESDIR}/TLUtils.pm \
${PREFIX}/libdata/perl5/site_perl/TeXLive/
${INSTALL} ${FILESDIR}/TLConfig.pm \
${PREFIX}/libdata/perl5/site_perl/TeXLive/
# plug in my pregenerated map and formats
chown -R ${SHAREOWN}:${SHAREGRP} ${WRKDIR}/texmf-var
mv ${WRKDIR}/texmf-var ${PREFIX}/share
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/*
post-install:
${SUBST_CMD} ${PREFIX}/share/texmf/web2c/texmf.cnf

20
print/texlive/texmf/distinfo
View File

@ -1,10 +1,10 @@
MD5 (texlive-20100722-texmf.tar.xz) = Et7DoyPE63W5ijFgxi3IZQ==
MD5 (texmf-var-pregen-2010.1.tar.xz) = VrbNMlORaiy5XzdYvPQG/g==
RMD160 (texlive-20100722-texmf.tar.xz) = YIwA8D1MDvCOlX7ABxIybnXu4E4=
RMD160 (texmf-var-pregen-2010.1.tar.xz) = jdgnDV7xK0YCiyuFPn3eN+3tDVQ=
SHA1 (texlive-20100722-texmf.tar.xz) = 32ugUJcFkvD184y53TbU0NZx+oA=
SHA1 (texmf-var-pregen-2010.1.tar.xz) = xzw3UZ69w105P/Svq05i20nWVtM=
SHA256 (texlive-20100722-texmf.tar.xz) = LTED3JEAqevQDbtQDWeInaLj096J+N8RGA1bSlLgD4U=
SHA256 (texmf-var-pregen-2010.1.tar.xz) = 6fDlUuDwbkPTJEntM1REVDs/xNqtrWhjy8p6g+jsLlg=
SIZE (texlive-20100722-texmf.tar.xz) = 1137115288
SIZE (texmf-var-pregen-2010.1.tar.xz) = 13086664
MD5 (texlive-20110705-texmf.tar.xz) = 7XtVi+Na3wCmwuaWCc1nmg==
MD5 (texmf-var-pregen-2011.tar.xz) = HrhrFXwGKBaWf6MBWkNrDA==
RMD160 (texlive-20110705-texmf.tar.xz) = ONYHOBWgIe/fDDwQtzoGGKOM6Gs=
RMD160 (texmf-var-pregen-2011.tar.xz) = wx8Pxr9TqWQK0fxoRfg/gl7ddj8=
SHA1 (texlive-20110705-texmf.tar.xz) = oBux7w9o/9gLqzY+g6ygMiYOG1k=
SHA1 (texmf-var-pregen-2011.tar.xz) = FeeouCS+Zc8PrsDk6R1oJLE7H94=
SHA256 (texlive-20110705-texmf.tar.xz) = SdQWHXMkaHupWcCP0NyjQYxXSHwMp6fEdgNE5pUSUl8=
SHA256 (texmf-var-pregen-2011.tar.xz) = qhEHN5AElUrqrxsFHt3MdDqh6eGmDl/YM0hp3ksTRps=
SIZE (texlive-20110705-texmf.tar.xz) = 1268839260
SIZE (texmf-var-pregen-2011.tar.xz) = 14279060

297
print/texlive/texmf/files/TLConfig.pm Normal file
View File

@ -0,0 +1,297 @@
# $Id: TLConfig.pm,v 1.1 2011/11/23 12:00:45 edd Exp $
# TeXLive::TLConfig.pm - module exporting configuration values
# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLConfig;
my $svnrev = '$Revision: 1.1 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
} else {
$_modulerevision = "unknown";
}
sub module_revision {
return $_modulerevision;
}
BEGIN {
use Exporter ();
use vars qw( @ISA @EXPORT_OK @EXPORT );
@ISA = qw(Exporter);
@EXPORT_OK = qw(
$ReleaseYear
@MetaCategories
@NormalCategories
@Categories
$MetaCategoriesRegexp
$CategoriesRegexp
$DefaultCategory
$DefaultContainerFormat
$DefaultContainerExtension
$InfraLocation
$DatabaseName
$PackageBackupDir
$BlockSize
$Archive
$TeXLiveServerURL
$TeXLiveServerPath
$TeXLiveURL
@CriticalPackagesList
$CriticalPackagesRegexp
$WindowsMainMenuName
$RelocPrefix
$RelocTree
%TLPDBOptions
%TLPDBSettings
%TLPDBConfigs
$NetworkTimeout
);
@EXPORT = @EXPORT_OK;
}
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
$ReleaseYear = 2011;
# users can upgrade from this year to the current year; maybe a spread
# of more than one year will be useful at some point, but not now.
$MinRelease = $ReleaseYear - 1;
# Meta Categories do not ship files, but only call for other packages.
our @MetaCategories = qw/Collection Scheme/;
our $MetaCategoriesRegexp = '(Collection|Scheme)';
#
# Normal Categories contain actial files and do not depend on other things.
our @NormalCategories = qw/Package TLCore ConTeXt/;
#
# list of all Categories
our @Categories = (@MetaCategories, @NormalCategories);
# repeat, as a regexp.
our $CategoriesRegexp = '(Collection|Scheme|Package|TLCore|ConTeXt)';
our $DefaultCategory = "Package";
# location of various infra files (texlive.tlpdb, .tlpobj etc)
# relative to a root (e.g., the Master/, or the installation path)
our $InfraLocation = "tlpkg";
our $DatabaseName = "texlive.tlpdb";
# location of backups in default autobackup setting (under tlpkg)
our $PackageBackupDir = "$InfraLocation/backups";
our $BlockSize = 4096;
our $Archive = "archive";
our $TeXLiveServerURL = "http://mirror.ctan.org";
# from 2009 on we try to put them all into tlnet directly without any
# release year since we hope that we can switch over to 2010 on the fly
# our $TeXLiveServerPath = "systems/texlive/tlnet/$ReleaseYear";
our $TeXLiveServerPath = "systems/texlive/tlnet";
our $TeXLiveURL = "$TeXLiveServerURL/$TeXLiveServerPath";
# Relocatable packages.
our $RelocTree = "texmf-dist";
our $RelocPrefix = "RELOC";
our @CriticalPackagesList = qw/texlive.infra/;
our $CriticalPackagesRegexp = '^(texlive\.infra)';
if ($^O =~ /^MSWin(32|64)$/i) {
push (@CriticalPackagesList, "tlperl.win32");
$CriticalPackagesRegexp = '^(texlive\.infra|tlperl\.win32$)';
}
# the way we package things on the web
our $DefaultContainerFormat = "xz";
our $DefaultContainerExtension = "tar.$DefaultContainerFormat";
# archive (not user) settings.
our %TLPDBConfigs = (
"container_split_src_files" => 1,
"container_split_doc_files" => 1,
"container_format" => $DefaultContainerFormat,
"minrelease" => $MinRelease,
"release" => $ReleaseYear,
);
# definition of the option strings and their value types
# possible types are:
# - u: url
# - b: boolean, saved as 0/1
# - p: path (local path)
# - n: natural number
# it allows n:[a]..[b]
# if a is empty start at -infty
# if b is empty end at +infty
# so "n:.." is equivalent to "n"
# $TLPDBOptions{"option"}->[0] --> type
# ->[1] --> default value
# ->[2] --> tlmgr name
# ->[3] --> tlmgr description
# the "option" is the value in the TLPDB
our %TLPDBOptions = (
"autobackup" =>
[ "n:-1..", 1, "autobackup",
"Number of backups to keep" ],
"backupdir" =>
[ "p", $PackageBackupDir, "backupdir",
"Directory for backups" ],
"create_formats" =>
[ "b", 1, "formats",
"Create formats on installation" ],
"desktop_integration" =>
[ "b", 1, "desktop_integration",
"Create Start menu shortcuts (w32)" ],
"file_assocs" =>
[ "n:0..2", 1, "fileassocs",
"Change file associations (w32)" ],
"install_docfiles" =>
[ "b", 1, "docfiles",
"Install documentation files" ],
"install_srcfiles" =>
[ "b", 1, "srcfiles",
"Install source files" ],
"location" =>
[ "u", "__MASTER__", "repository",
"Default package repository" ],
"post_code" =>
[ "b", 1, "postcode",
"Run postinst code blobs" ],
"sys_bin" =>
[ "p", "/usr/local/bin", "sys_bin",
"Destination for symlinks for binaries" ],
"sys_info" =>
[ "p", "/usr/local/info", "sys_info",
"Destination for symlinks for info docs" ],
"sys_man" =>
[ "p", "/usr/local/man", "sys_man",
"Destination for symlinks for man pages" ],
"w32_multi_user" =>
[ "b", 0, "multiuser",
"Install for all users (w32)" ],
"generate_updmap" =>
[ "b", 0, "generate_updmap",
"Run tlmgr generate updmap after maps have changed" ],
);
our %TLPDBSettings = (
"platform" => [ "s", "Main platform for this computer" ],
"available_architectures" => [ "l", "All available/installed architectures" ]
);
our $WindowsMainMenuName = "TeX Live $ReleaseYear";
#
# timeout for network connections (wget, LWP) in seconds
our $NetworkTimeout = 30;
1;
=head1 NAME
C<TeXLive::TLConfig> -- TeX Live Configurations
=head1 SYNOPSIS
use TeXLive::TLConfig;
=head1 DESCRIPTION
The L<TeXLive::TLConfig> module contains definitions of variables
configuring all of TeX Live.
=over 4
=head1 EXPORTED VARIABLES
All of the following variables are pulled into the callers namespace,
i.e., are declared with C<EXPORT> (and C<EXPORT_OK>).
=item C<@TeXLive::TLConfig::MetaCategories>
The list of meta categories, i.e., those categories whose packages only
depend on other packages, but don't ship any files. Currently
C<Collection> and <Scheme>.
=item C<@TeXLive::TLConfig::NormalCategories>
The list of normal categories, i.e., those categories whose packages do
ship files. Currently C<TLCore>, C<Package>, C<ConTeXt>.
=item C<@TeXLive::TLConfig::Categories>
The list of all categories, i.e., the union of the above.
=item C<$TeXLive::TLConfig::CategoriesRegexp>
A regexp matching any category.
=item C<$TeXLive::TLConfig::DefaultCategory>
The default category used when creating new packages.
=item C<$TeXLive::TLConfig::InfraLocation>
The subdirectory with various infrastructure files (C<texlive.tlpdb>,
tlpobj files, ...) relative to the root of the installation; currently
C<tlpkg>.
=item C<$TeXLive::TLConfig::BlockSize>
The assumed block size, currently 4k.
=item C<$TeXLive::TLConfig::Archive>
=item C<$TeXLive::TLConfig::TeXLiveURL>
These values specify where to find packages.
=item C<$TeXLive::TLConfig::TeXLiveServerURL>
=item C<$TeXLive::TLConfig::TeXLiveServerPath>
C<TeXLiveURL> is concatenated from these values, with a string between.
The defaults are respectively, C<http://mirror.ctan.org> and
C<systems/texlive/tlnet/>.
=item C<@TeXLive::TLConfig::CriticalPackagesList>
=item C<@TeXLive::TLConfig::CriticalPackagesRegexp>
A list of all those packages which we do not update regularly since they
are too central, currently texlive.infra and (for Windows) tlperl.win32.
=item C<$TeXLive::TLConfig::RelocTree>
The texmf-tree name that can be relocated, defaults to C<texmf-dist>.
=item C<$TeXLive::TLConfig::RelocPrefix>
The string that replaces the C<RelocTree> in the tlpdb if a package is
relocated, defaults to C<RELOC>".
=back
=head1 SEE ALSO
The modules L<TeXLive::TLUtils>, L<TeXLive::TLPSRC>,
L<TeXLive::TLPDB>, L<TeXLive::TLTREE>, L<TeXLive::TeXCatalogue>.
=head1 AUTHORS AND COPYRIGHT
This script and its documentation were written for the TeX Live
distribution (L<http://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
=cut
### Local Variables:
### perl-indent-level: 2
### tab-width: 2
### indent-tabs-mode: nil
### End:
# vim:set tabstop=2 expandtab: #

3765
print/texlive/texmf/files/TLUtils.pm Normal file
View File

File diff suppressed because it is too large Load Diff

30
print/texlive/texmf/files/rblatter/mk_openbsd_plists.sh
View File

@ -1,9 +1,14 @@
#!/bin/sh
# $OpenBSD: mk_openbsd_plists.sh,v 1.2 2011/03/08 00:09:42 edd Exp $
# $OpenBSD: mk_openbsd_plists.sh,v 1.3 2011/11/23 12:00:45 edd Exp $
#
# This is how the texlive port packing lists were generated.
# Please be aware that a *full* texmf/texmf-dist and tlpdb from the
# Please be aware that a *full* texmf/texmf-dist and texlive.tlpdb from the
# texlive svn are required.
#
# texlive.tlpdb does not come in the dist tarball, so you need to get
# it from svn from the release date. Eg:
# svn co -r {20110705} svn://tug.org/texlive/trunk/Master/tlpkg
# You can then copy tlpkg/texlive.tlpdb to ${TARBALL_ROOT}/tlpkg/texlive.tlpdb
if [ "$1" = "" ]; then
TMF="/usr/local/share";
@ -20,27 +25,16 @@ mkdir sets
echo "\nCalculating PLIST of texlive_texmf-minimal (tetex)..."
./rblatter -d -v -n -t ${TMF} -p share/ -o sets/tetex +scheme-tetex,run
cat sets/tetex/PLIST | sed 's/share\/texmf\/doc\/man/share\/man/g' \
| sort > sets/tetex/PLIST_final
cat sets/tetex/PLIST | sort > sets/tetex/PLIST_final
echo "\nCalculating PLIST of texlive_texmf-full..."
./rblatter -d -v -n -t ${TMF} -p share/ -o sets/full \
+scheme-full,run:-scheme-tetex,doc,src,run
cat sets/full/PLIST | sed 's/share\/texmf\/doc\/man/share\/man/g' \
| sort > sets/full/PLIST_final
cat sets/full/PLIST | sort > sets/full/PLIST_final
echo "\nCalculating PLIST of texlive_texmf-docs..."
./rblatter -d -v -n -t ${TMF} -p share/ -o sets/docs +scheme-full,doc
cat sets/docs/PLIST | sed 's/share\/texmf\/doc\/man/share\/man/g' \
| sort > sets/docs/PLIST_final
# XXX need to figure out how to futher split docs
#grep -ie '\.1$' -e '\.pdf$' -e '\.html$' -e '\.dvi$' -e '\.ps$' \
# sets/docs/PLIST | sed 's/share\/texmf\/doc\/man/share\/man/g' \
# | sort > sets/docs/PLIST_final
#grep -ive '\.1$' -e '\.pdf$' -e '\.html$' -e '\.dvi$' -e '\.ps$' \
# sets/docs/PLIST | sed 's/share\/texmf\/doc\/man/share\/man/g' \
# | sort > sets/docs/PLIST_final-sources
cat sets/docs/PLIST | sort > sets/docs/PLIST_final
echo "\ndone - PLISTS in sets/"
echo "now inspect:"
@ -49,6 +43,6 @@ echo " - *.exe obviously a waste of space"
echo " - search for 'win32' and 'w32' and 'windows'"
echo " - comment out manual pages and include in _base"
echo " - bibarts is a DOS program"
echo " - Not all texworks related stuff is needed"
echo " - make sure no tlpkg/ sneaked in"
echo " - not all texworks related stuff is needed"
echo " - move the manuals in the right place"
echo " - etc..."

82
print/texlive/texmf/patches/patch-texmf_web2c_texmf_cnf
View File

@ -1,52 +1,42 @@
$OpenBSD: patch-texmf_web2c_texmf_cnf,v 1.4 2011/03/09 14:43:59 edd Exp $
--- texmf/web2c/texmf.cnf.origy Wed Oct 20 22:10:45 2010
+++ texmf/web2c/texmf.cnf Wed Oct 20 22:13:34 2010
@@ -41,7 +41,11 @@
% separator as well as the comma for this: /usr/local/{mytex:othertex}
% also expands to /usr/local/mytex:/usr/local/othertex. We make
% extensive use of this.
+%
+% Hacked for OpenBSD ports
$OpenBSD: patch-texmf_web2c_texmf_cnf,v 1.5 2011/11/23 12:00:45 edd Exp $
--- texmf/web2c/texmf.cnf.origy Sat Jun 18 23:10:46 2011
+++ texmf/web2c/texmf.cnf Wed Aug 31 17:42:50 2011
@@ -1,6 +1,10 @@
% original texmf.cnf -- runtime path configuration file for kpathsea.
% Public domain.
%
+% ************************
+% HACKED FOR OPENBSD PORTS
+% ************************
+%
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if
@@ -39,7 +43,6 @@
% expands to /usr/local/mytex:/usr/local/othertex. We make extensive
% use of this.
+OBSD_TMF = ${LOCALBASE}/share
+
-
% Part 1: Search paths and directories.
% You can set an environment variable to override TEXMF if you're testing
@@ -53,15 +57,15 @@
% This is the parent directory of our several trees, i.e.,
@@ -48,8 +51,8 @@
% All trees must be organized according to the TeX Directory Structure
% (http://tug.org/tds), or files may not be found.
%
-% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
-TEXMFROOT = $SELFAUTOPARENT
+% We use the old teTeX paths in OpenBSD, respect the legacy.
+TEXMFROOT = ${LOCALBASE}/share
% The tree containing the runtime files closely related to the specific
% program version used:
-TEXMFMAIN = $SELFAUTOPARENT/texmf
+TEXMFMAIN = $OBSD_TMF/texmf
% The tree containing runtime files related to the specific
% distribution and version.
@@ -59,7 +62,7 @@ TEXMFMAIN = $TEXMFROOT/texmf
TEXMFDIST = $TEXMFROOT/texmf-dist
% The main distribution tree:
-TEXMFDIST = $SELFAUTOPARENT/texmf-dist
+TEXMFDIST = $OBSD_TMF/texmf-dist
% Local additions to the distribution trees.
-TEXMFLOCAL = $TEXMFROOT/../texmf-local
+TEXMFLOCAL = $TEXMFROOT/texmf-local
% 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.
@@ -69,7 +73,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.
@@ -77,7 +81,7 @@ TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
% TEXMFSYSCONFIG = $TEXMFMAIN
% For using a separate tree:
% TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
+TEXMFSYSCONFIG = $OBSD_TMF/texmf-config
% User texmf trees are allowed as follows.
% This used to be HOMETEXMF.
% TEXMFSYSVAR, where *-sys store cached runtime data.
TEXMFSYSVAR = $TEXMFROOT/texmf-var

9016
print/texlive/texmf/pkg/PLIST-docs
View File

File diff suppressed because it is too large Load Diff

7222
print/texlive/texmf/pkg/PLIST-full
View File

File diff suppressed because it is too large Load Diff

2396
print/texlive/texmf/pkg/PLIST-main
View File

File diff suppressed because it is too large Load Diff