[30885] trunk/dports/tex/texlive
source_changes at macosforge.org
source_changes at macosforge.org
Fri Nov 9 23:13:17 PST 2007
Revision: 30885
http://trac.macosforge.org/projects/macports/changeset/30885
Author: milosh at macports.org
Date: 2007-11-09 23:13:16 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
move patches
Added Paths:
-----------
trunk/dports/tex/texlive/files/patch-Makefile_in
trunk/dports/tex/texlive/files/patch-libs_icu-xetex_Makefile_in
trunk/dports/tex/texlive/files/patch-libs_icu-xetex_layout_KernTable_cpp
trunk/dports/tex/texlive/files/patch-texk_afm2pl_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_bibtex8_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_cjkutils_conv_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_cjkutils_hbf2gf_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_cjkutils_scripts_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_detex_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_dtl_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_dvi2tty_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_dvidvi_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_dviljk_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_dvipdfm_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_dvipos_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_dvipsk_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_gsftopk_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_kpathsea_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_lacheck_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_make_man_mk
trunk/dports/tex/texlive/files/patch-texk_makeindexk_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_musixflx_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_ps2pkm_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_seetexk_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_tetex_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_tetex_texlinks
trunk/dports/tex/texlive/files/patch-texk_tex4htk_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_texlive_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_ttf2pk_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_web2c_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_web2c_alephdir_aleph_mk
trunk/dports/tex/texlive/files/patch-texk_web2c_doc_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_web2c_mpware_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_web2c_omegadir_omega_mk
trunk/dports/tex/texlive/files/patch-texk_web2c_omegafonts_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_web2c_otps_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_web2c_pdftexdir_pdftex_mk
trunk/dports/tex/texlive/files/patch-texk_web2c_texmfmem_h
trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_ext_c
trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_ext_h
trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_mac_c
trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_jpegimage_c
trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex-new_ch
trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_defines
trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_h
trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_mk
trunk/dports/tex/texlive/files/patch-texk_xdv2pdf_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_xdvik_Makefile_in
trunk/dports/tex/texlive/files/patch-texk_xdvipdfmx_src_tt_cmap_c
trunk/dports/tex/texlive/files/patch-utils_dialog_Makefile_in
trunk/dports/tex/texlive/files/patch-utils_ps2eps_Makefile_in
trunk/dports/tex/texlive/files/patch-utils_psutils_Makefile_in
Removed Paths:
-------------
trunk/dports/tex/texlive/patch-Makefile_in
trunk/dports/tex/texlive/patch-libs_icu-xetex_Makefile_in
trunk/dports/tex/texlive/patch-libs_icu-xetex_layout_KernTable_cpp
trunk/dports/tex/texlive/patch-texk_afm2pl_Makefile_in
trunk/dports/tex/texlive/patch-texk_bibtex8_Makefile_in
trunk/dports/tex/texlive/patch-texk_cjkutils_conv_Makefile_in
trunk/dports/tex/texlive/patch-texk_cjkutils_hbf2gf_Makefile_in
trunk/dports/tex/texlive/patch-texk_cjkutils_scripts_Makefile_in
trunk/dports/tex/texlive/patch-texk_detex_Makefile_in
trunk/dports/tex/texlive/patch-texk_dtl_Makefile_in
trunk/dports/tex/texlive/patch-texk_dvi2tty_Makefile_in
trunk/dports/tex/texlive/patch-texk_dvidvi_Makefile_in
trunk/dports/tex/texlive/patch-texk_dviljk_Makefile_in
trunk/dports/tex/texlive/patch-texk_dvipdfm_Makefile_in
trunk/dports/tex/texlive/patch-texk_dvipos_Makefile_in
trunk/dports/tex/texlive/patch-texk_dvipsk_Makefile_in
trunk/dports/tex/texlive/patch-texk_gsftopk_Makefile_in
trunk/dports/tex/texlive/patch-texk_kpathsea_Makefile_in
trunk/dports/tex/texlive/patch-texk_lacheck_Makefile_in
trunk/dports/tex/texlive/patch-texk_make_man_mk
trunk/dports/tex/texlive/patch-texk_makeindexk_Makefile_in
trunk/dports/tex/texlive/patch-texk_musixflx_Makefile_in
trunk/dports/tex/texlive/patch-texk_ps2pkm_Makefile_in
trunk/dports/tex/texlive/patch-texk_seetexk_Makefile_in
trunk/dports/tex/texlive/patch-texk_tetex_Makefile_in
trunk/dports/tex/texlive/patch-texk_tetex_texlinks
trunk/dports/tex/texlive/patch-texk_tex4htk_Makefile_in
trunk/dports/tex/texlive/patch-texk_texlive_Makefile_in
trunk/dports/tex/texlive/patch-texk_ttf2pk_Makefile_in
trunk/dports/tex/texlive/patch-texk_web2c_Makefile_in
trunk/dports/tex/texlive/patch-texk_web2c_alephdir_aleph_mk
trunk/dports/tex/texlive/patch-texk_web2c_doc_Makefile_in
trunk/dports/tex/texlive/patch-texk_web2c_mpware_Makefile_in
trunk/dports/tex/texlive/patch-texk_web2c_omegadir_omega_mk
trunk/dports/tex/texlive/patch-texk_web2c_omegafonts_Makefile_in
trunk/dports/tex/texlive/patch-texk_web2c_otps_Makefile_in
trunk/dports/tex/texlive/patch-texk_web2c_pdftexdir_pdftex_mk
trunk/dports/tex/texlive/patch-texk_web2c_texmfmem_h
trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_c
trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_h
trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_mac_c
trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_jpegimage_c
trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex-new_ch
trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_defines
trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_h
trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_mk
trunk/dports/tex/texlive/patch-texk_xdv2pdf_Makefile_in
trunk/dports/tex/texlive/patch-texk_xdvik_Makefile_in
trunk/dports/tex/texlive/patch-texk_xdvipdfmx_src_tt_cmap_c
trunk/dports/tex/texlive/patch-utils_dialog_Makefile_in
trunk/dports/tex/texlive/patch-utils_ps2eps_Makefile_in
trunk/dports/tex/texlive/patch-utils_psutils_Makefile_in
Copied: trunk/dports/tex/texlive/files/patch-Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,103 @@
+$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- Makefile.in.orig Tue Dec 26 23:37:34 2006
++++ Makefile.in Thu May 24 15:28:58 2007
+@@ -52,6 +52,20 @@ LIBSDIRS = @LIBSDIRS@
+ # install kpathsea and friends by default.
+ INSTDIRS = @INSTDIRS@
+
++# OpenBSD fake env patch
++MK_TEXMFDIST= ${DESTDIR}$(texmf)-dist
++MK_TEXMFLOCAL= ${DESTDIR}$(texmf)-local
++MK_TEXMFSYSVAR= ${DESTDIR}/var
++MK_TEXMFSYSCONFIG= ${DESTDIR}${SYSCONFDIR}/texmf
++MK_TEXMFMAIN= ${DESTDIR}$(texmf)
++
++TETEXENV= TEXMFDIST=${MK_TEXMFDIST} \
++ TEXMFLOCAL=${MK_TEXMFLOCAL} \
++ TEXMFSYSVAR=${MK_TEXMFSYSVAR} \
++ TEXMFSYSCONFIG=${MK_TEXMFSYSCONFIG} \
++ TEXMFMAIN=${MK_TEXMFMAIN} \
++ PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH)
++
+ default: all
+ install: all
+ for dir in $(INSTDIRS); do \
+@@ -64,35 +78,41 @@ install: all
+ fi
+ @FMU@
+ @FMU at install-extra:
++
++# MESS - Will be @exec anyway...
+ # temporary fix for missing links
+- - if test -f texk/web2c/omegafonts/omfonts; then \
+- cd texk/web2c/omegafonts && $(MAKE) install-links; \
+- else :; fi
+- $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
+- - if test -f $(scriptdir)/mktexlsr; then \
+- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+- $(scriptdir)/mktexlsr; \
+- else :; fi
+- - if test -f $(scriptdir)/fmtutil-sys; then \
+- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+- $(scriptdir)/fmtutil-sys --all; \
+- else :; fi
+- - if test -f $(scriptdir)/texlinks; then \
+- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+- $(scriptdir)/texlinks; \
+- else :; fi
+- - if test -f $(scriptdir)/updmap-sys \
+- && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+- $(scriptdir)/kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
+- then \
+- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+- $(scriptdir)/updmap-sys; \
+- else :; fi
++# - if test -f texk/web2c/omegafonts/omfonts; then \
++# cd texk/web2c/omegafonts && $(MAKE) install-links; \
++# else :; fi
++# $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
++# - if test -f $(scriptdir)/mktexlsr; then \
++# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++# $(scriptdir)/mktexlsr; \
++# else :; fi
++# - if test -f $(scriptdir)/fmtutil-sys; then \
++# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++# $(scriptdir)/fmtutil-sys --all; \
++# else :; fi
++# - if test -f $(scriptdir)/texlinks; then \
++# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++# $(scriptdir)/texlinks; \
++# else :; fi
++# - if test -f $(scriptdir)/updmap-sys \
++# && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++# $(scriptdir)/kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
++# then \
++# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++# $(scriptdir)/updmap-sys; \
++# else :; fi
+
++ # OpenBSD (All non @exec stuff here, see PLIST for the rest)
++ cd texk/web2c/omegafonts && $(MAKE) install-links
++ ${TETEXENV} $(srcdir)/selfautofix "${DESTDIR}$(bindir)" "${DESTDIR}$(texmf)/web2c"
++
+ install-exec:
+ for dir in $(INSTDIRS); do \
+ echo making $@ in $$dir; \
+- (cd $$dir && PATH=$(scriptdir):$(bindir):$(PATH) \
++ (cd $$dir && PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH) \
+ $(MAKE) $@) || exit 1; \
+ done
+ @FMU@
+@@ -101,9 +121,9 @@ install-exec:
+ - if test -f texk/web2c/omegafonts/omfonts; then \
+ cd texk/web2c/omegafonts && $(MAKE) install-links; \
+ else :; fi
+- - if test -f $(scriptdir)/texlinks; then \
+- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+- $(scriptdir)/texlinks; \
++ - if test -f ${DESTDIR}$(scriptdir)/texlinks; then \
++ TEXMFMAIN=${DESTDIR}$(texmf) PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH) \
++ ${DESTDIR}$(scriptdir)/texlinks; \
+ else :; fi
+
+ strip: install
Copied: trunk/dports/tex/texlive/files/patch-libs_icu-xetex_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-libs_icu-xetex_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-libs_icu-xetex_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-libs_icu-xetex_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,14 @@
+$OpenBSD: patch-libs_icu-xetex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
+--- libs/icu-xetex/Makefile.in.orig Fri May 11 12:34:40 2007
++++ libs/icu-xetex/Makefile.in Fri May 11 12:35:58 2007
+@@ -174,7 +174,9 @@ $(top_builddir)/config/Makefile.inc: $(srcdir)/config/
+
+ $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
+ -$(RMV) $@
+- $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
++ # OpenBSD - Cant use /usr/bin/install at build stage if in sudo build
++ # $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
++ cp $(top_srcdir)/config/icu-config-top $@
+ @echo "# Following from @platform_make_fragment@" >> $@
+ sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
+ sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
Copied: trunk/dports/tex/texlive/files/patch-libs_icu-xetex_layout_KernTable_cpp (from rev 30880, trunk/dports/tex/texlive/patch-libs_icu-xetex_layout_KernTable_cpp)
===================================================================
--- trunk/dports/tex/texlive/files/patch-libs_icu-xetex_layout_KernTable_cpp (rev 0)
+++ trunk/dports/tex/texlive/files/patch-libs_icu-xetex_layout_KernTable_cpp 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,74 @@
+$OpenBSD: patch-libs_icu-xetex_layout_KernTable_cpp,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
+--- libs/icu-xetex/layout/KernTable.cpp.orig Wed Jun 27 09:59:39 2007
++++ libs/icu-xetex/layout/KernTable.cpp Wed Jun 27 10:00:16 2007
+@@ -16,8 +16,10 @@
+ U_NAMESPACE_BEGIN
+
+ struct PairInfo {
+- le_uint32 key; // sigh, MSVC compiler gags on union here
++ le_uint16 left;
++ le_uint16 right;
+ le_int16 value; // fword, kern value in funits
++ le_uint32 key() const { return ((le_uint32)SWAPW(left) << 16) | SWAPW(right); }
+ };
+ #define KERN_PAIRINFO_SIZE 6
+
+@@ -81,9 +83,24 @@ KernTable::KernTable(const LEFontInstance* font, const
+ if (coverage & COVERAGE_HORIZONTAL) { // only handle horizontal kerning
+ const Subtable_0* table = (const Subtable_0*)((char*)subhead + KERN_SUBTABLE_HEADER_SIZE);
+ nPairs = SWAPW(table->nPairs);
++#if 0 // don't trust these fields as some old TTF fonts have bad data here
+ searchRange = SWAPW(table->searchRange);
+ entrySelector = SWAPW(table->entrySelector);
+ rangeShift = SWAPW(table->rangeShift);
++#else // recompute the binary search header fields
++ if (nPairs == 0) { // this probably shouldn't happen
++ searchRange = entrySelector = 0;
++ } else {
++ searchRange = 1;
++ entrySelector = 0;
++ while (searchRange * 2 <= nPairs) {
++ searchRange *= 2;
++ entrySelector += 1;
++ }
++ }
++ rangeShift = (nPairs - searchRange) * KERN_PAIRINFO_SIZE;
++ searchRange *= KERN_PAIRINFO_SIZE;
++#endif
+ pairs = (const PairInfo*)((char*)table + KERN_SUBTABLE_0_HEADER_SIZE);
+
+ #if DEBUG
+@@ -103,9 +120,8 @@ KernTable::KernTable(const LEFontInstance* font, const
+
+ const PairInfo* p = pairs;
+ for (i = 0; i < nPairs; ++i, p = (const PairInfo*)((char*)p+KERN_PAIRINFO_SIZE)) {
+- le_uint32 k = SWAPL(p->key);
+- le_uint16 left = (k >> 16) & 0xffff;
+- le_uint16 right = k & 0xffff;
++ le_uint16 left = SWAPW(p->left);
++ le_uint16 right = SWAPW(p->right);
+ if (left < 256 && right < 256) {
+ char c = ids[left];
+ if (c > 0x20 && c < 0x7f) {
+@@ -149,10 +165,11 @@ void KernTable::process(LEGlyphStorage& storage)
+ // but it is not in sorted order on win32 platforms because of the endianness difference
+ // so either I have to swap the element each time I examine it, or I have to swap
+ // all the elements ahead of time and store them in the font
++ // The key() accessor on PairInfo handles the swapping if needed
+
+ const PairInfo* p = pairs;
+ const PairInfo* tp = (const PairInfo*)((char*)p + rangeShift);
+- if (key > SWAPL(tp->key)) {
++ if (key > tp->key()) {
+ p = tp;
+ }
+
+@@ -165,7 +182,7 @@ void KernTable::process(LEGlyphStorage& storage)
+ while (probe > KERN_PAIRINFO_SIZE) {
+ probe >>= 1;
+ tp = (const PairInfo*)((char*)p + probe);
+- le_uint32 tkey = SWAPL(tp->key);
++ le_uint32 tkey = tp->key();
+ #if DEBUG
+ fprintf(stdout, " %.3d (%0.8x)\n", ((char*)tp - (char*)pairs)/KERN_PAIRINFO_SIZE, tkey);
+ fflush(stdout);
Copied: trunk/dports/tex/texlive/files/patch-texk_afm2pl_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_afm2pl_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_afm2pl_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_afm2pl_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,26 @@
+$OpenBSD: patch-texk_afm2pl_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/afm2pl/Makefile.in.orig Wed Apr 18 13:54:33 2007
++++ texk/afm2pl/Makefile.in Wed Apr 18 13:55:25 2007
+@@ -22,16 +22,16 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: $(program)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ uninstall-exec:
+- rm -f $(bindir)/$(program)
++ rm -f ${DESTDIR}$(bindir)/$(program)
+
+ install-data: $(program).1
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
+ uninstall-data:
+- rm -f $(man1dir)/$(program).$(manext)
++ rm -f ${DESTDIR}$(man1dir)/$(program).$(manext)
+
+ kpse_include ../make/clean.mk
+ kpse_include ../make/config.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_bibtex8_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_bibtex8_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_bibtex8_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_bibtex8_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,27 @@
+$OpenBSD: patch-texk_bibtex8_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/bibtex8/Makefile.in.orig Wed Apr 18 14:04:09 2007
++++ texk/bibtex8/Makefile.in Wed Apr 18 14:05:17 2007
+@@ -29,17 +29,17 @@ bibtex8: $(OBJS) $(kpathsea)
+ $(kpathsea_link) $(OBJS) $(LOADLIBES)
+
+ install: all install-data install-doc
+- -$(top_srcdir)/../mkinstalldirs $(bindir)
+- -$(INSTALL_LIBTOOL_PROG) bibtex8 $(bindir)/bibtex8
++ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) bibtex8 ${DESTDIR}$(bindir)/bibtex8
+
+ install-data:
+- -$(top_srcdir)/../mkinstalldirs $(texmf)/bibtex/csf
+- -$(INSTALL) -m 644 $(srcdir)/csf/*.csf $(texmf)/bibtex/csf
++ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/bibtex/csf
++ $(INSTALL) -m 644 $(srcdir)/csf/*.csf ${DESTDIR}$(texmf)/bibtex/csf
+
+ install-doc:
+- -$(top_srcdir)/../mkinstalldirs $(texmf)/doc/bibtex8
++ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/doc/bibtex8
+ for i in 00readme.txt HISTORY csfile.txt file_id.diz ; \
+- do $(INSTALL) -m 644 $(srcdir)/$$i $(texmf)/doc/bibtex8; \
++ do $(INSTALL) -m 644 $(srcdir)/$$i ${DESTDIR}$(texmf)/doc/bibtex8; \
+ done
+
+ kpse_include ../make/tkpathsea.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_cjkutils_conv_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_cjkutils_conv_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_cjkutils_conv_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_cjkutils_conv_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,17 @@
+$OpenBSD: patch-texk_cjkutils_conv_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/cjkutils/conv/Makefile.in.orig Wed Apr 18 18:58:48 2007
++++ texk/cjkutils/conv/Makefile.in Wed Apr 18 18:59:45 2007
+@@ -23,10 +23,10 @@ sjisconv: sjisconv.o
+ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_PROGRAM) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do $(RM) $(bindir)/$$p; done
++ for p in $(programs); do $(RM) ${DESTDIR}$(bindir)/$$p; done
+
+ install-data:
+ uninstall-data:
Copied: trunk/dports/tex/texlive/files/patch-texk_cjkutils_hbf2gf_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_cjkutils_hbf2gf_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_cjkutils_hbf2gf_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_cjkutils_hbf2gf_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,26 @@
+$OpenBSD: patch-texk_cjkutils_hbf2gf_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/cjkutils/hbf2gf/Makefile.in.orig Wed Apr 18 19:00:52 2007
++++ texk/cjkutils/hbf2gf/Makefile.in Wed Apr 18 19:01:31 2007
+@@ -43,16 +43,16 @@ $(CWEAVE):
+ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do $(RM) $(bindir)/$$p; done
++ for p in $(programs); do $(RM) ${DESTDIR}$(bindir)/$$p; done
+
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
+ uninstall-data:
+- $(RM) $(man1dir)/$(program).$(manext)
++ $(RM) ${DESTDIR}$(man1dir)/$(program).$(manext)
+
+ kpse_include ../make/dist.mk
+ kpse_include ../make/clean.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_cjkutils_scripts_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_cjkutils_scripts_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_cjkutils_scripts_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_cjkutils_scripts_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,21 @@
+$OpenBSD: patch-texk_cjkutils_scripts_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/cjkutils/scripts/Makefile.in.orig Wed Apr 18 19:44:57 2007
++++ texk/cjkutils/scripts/Makefile.in Wed Apr 18 19:45:22 2007
+@@ -14,12 +14,12 @@ default all:
+ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
+- ln -sf gbklatex $(scriptdir)/bg5+latex
+- ln -sf gbkpdflatex $(scriptdir)/bg5+pdflatex
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(scriptdir); done
++ ln -sf gbklatex ${DESTDIR}$(scriptdir)/bg5+latex
++ ln -sf gbkpdflatex ${DESTDIR}$(scriptdir)/bg5+pdflatex
+ uninstall-exec:
+- for p in $(scripts); do $(RM) $(scriptdir)/$$p; done
++ for p in $(scripts); do $(RM) ${DESTDIR}$(scriptdir)/$$p; done
+
+ install-data:
+ uninstall-data:
Copied: trunk/dports/tex/texlive/files/patch-texk_detex_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_detex_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_detex_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_detex_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,23 @@
+$OpenBSD: patch-texk_detex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/detex/Makefile.in.orig Wed Apr 18 20:37:27 2007
++++ texk/detex/Makefile.in Wed Apr 18 20:37:56 2007
+@@ -39,13 +39,13 @@ distclean::
+ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+ install-exec: $(program)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ uninstall-exec:
+- rm -f $(bindir)/$(program)
++ rm -f ${DESTDIR}$(bindir)/$(program)
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/detex.man $(man1dir)/detex.$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/detex.man ${DESTDIR}$(man1dir)/detex.$(manext)
+ uninstall-data:
+- rm -f $(man1dir)/detex.$(manext)
++ rm -f ${DESTDIR}$(man1dir)/detex.$(manext)
+ depend info dvi check:
Copied: trunk/dports/tex/texlive/files/patch-texk_dtl_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_dtl_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_dtl_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_dtl_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,31 @@
+$OpenBSD: patch-texk_dtl_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/dtl/Makefile.in.orig Sat Apr 21 17:33:16 2007
++++ texk/dtl/Makefile.in Sat Apr 21 17:38:50 2007
+@@ -29,19 +29,19 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/dv2dt.man $(man1dir)/dv2dt.1
+- $(INSTALL_DATA) $(srcdir)/dt2dv.man $(man1dir)/dt2dv.1
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/dv2dt.man ${DESTDIR}$(man1dir)/dv2dt.1
++ $(INSTALL_DATA) $(srcdir)/dt2dv.man ${DESTDIR}$(man1dir)/dt2dv.1
+
+ uninstall-data:
+- rm -f $(man1dir)/dv2dt.1
+- rm -f $(man1dir)/dt2dv.1
++ rm -f ${DESTDIR}$(man1dir)/dv2dt.1
++ rm -f ${DESTDIR}$(man1dir)/dt2dv.1
+
+ kpse_include ../make/dist.mk
+ kpse_include ../make/config.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_dvi2tty_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_dvi2tty_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_dvi2tty_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_dvi2tty_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,27 @@
+$OpenBSD: patch-texk_dvi2tty_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/dvi2tty/Makefile.in.orig Sat Apr 21 17:35:32 2007
++++ texk/dvi2tty/Makefile.in Sat Apr 21 17:38:01 2007
+@@ -20,17 +20,17 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: $(programs)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data: dvi2tty.1
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/dvi2tty.1 $(man1dir)/dvi2tty.$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/dvi2tty.1 ${DESTDIR}$(man1dir)/dvi2tty.$(manext)
+
+ uninstall-data:
+- rm -f $(man1dir)/dvi2tty.$(manext)
++ rm -f ${DESTDIR}$(man1dir)/dvi2tty.$(manext)
+ pre-dist-$(distname):
+ post-dist-$(distname):
+
Copied: trunk/dports/tex/texlive/files/patch-texk_dvidvi_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_dvidvi_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_dvidvi_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_dvidvi_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,27 @@
+$OpenBSD: patch-texk_dvidvi_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
+--- texk/dvidvi/Makefile.in.orig Sat Apr 21 17:39:12 2007
++++ texk/dvidvi/Makefile.in Sat Apr 21 17:42:36 2007
+@@ -25,17 +25,17 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/dvidvi.1 $(man1dir)/dvidvi.1
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/dvidvi.1 ${DESTDIR}$(man1dir)/dvidvi.1
+
+ uninstall-data:
+- rm -f $(man1dir)/dvidvi.1
++ rm -f ${DESTDIR}$(man1dir)/dvidvi.1
+
+ kpse_include ../make/dist.mk
+ kpse_include ../make/config.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_dviljk_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_dviljk_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_dviljk_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_dviljk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,54 @@
+$OpenBSD: patch-texk_dviljk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/dviljk/Makefile.in.orig Sat Apr 21 17:43:02 2007
++++ texk/dviljk/Makefile.in Sat Apr 21 17:44:56 2007
+@@ -52,28 +52,28 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ test ! -f $(program) \
+- || $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
++ || $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ test ! -f $(program2p) \
+- || $(INSTALL_LIBTOOL_PROG) $(program2p) $(bindir)
++ || $(INSTALL_LIBTOOL_PROG) $(program2p) ${DESTDIR}$(bindir)
+ test ! -f $(program4) \
+- || $(INSTALL_LIBTOOL_PROG) $(program4) $(bindir)
++ || $(INSTALL_LIBTOOL_PROG) $(program4) ${DESTDIR}$(bindir)
+ test ! -f $(program4l) \
+- || $(INSTALL_LIBTOOL_PROG) $(program4l) $(bindir)
+- $(INSTALL_SCRIPT) $(srcdir)/dvihp $(scriptdir)/dvihp
+- cd $(bindir) && (rm -f $(program6); $(LN) $(program4) $(program6))
++ || $(INSTALL_LIBTOOL_PROG) $(program4l) ${DESTDIR}$(bindir)
++ $(INSTALL_SCRIPT) $(srcdir)/dvihp ${DESTDIR}$(scriptdir)/dvihp
++ cd ${DESTDIR}$(bindir) && (rm -f $(program6); $(LN) $(program4) $(program6))
+ uninstall-exec:
+- cd $(bindir); rm -f $(programs)
++ cd ${DESTDIR}$(bindir); rm -f $(programs)
+
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/dvilj.man $(man1dir)/dvilj.$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/dvilj.man ${DESTDIR}$(man1dir)/dvilj.$(manext)
+ for p in dvilj2p dvilj4 dvilj4l dvilj6; do \
+- rm -f $(man1dir)/$$p.$(manext); \
+- ln -s dvilj.$(manext) $(man1dir)/$$p.$(manext); \
++ rm -f ${DESTDIR}$(man1dir)/$$p.$(manext); \
++ ln -s dvilj.$(manext) ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ done
+- $(INSTALL_DATA) $(srcdir)/dvihp.man $(man1dir)/dvihp.$(manext)
++ $(INSTALL_DATA) $(srcdir)/dvihp.man ${DESTDIR}$(man1dir)/dvihp.$(manext)
+
+ # It seems simplest to keep this separate. Use find and cpio instead of
+ # just cp -r in case the source hierarchy is cvs- or rcs-ified.
+@@ -83,7 +83,7 @@ install-fonts:
+ find fonts -name \( "*.tfm" -o -name "*.vf" \) -print | cpio -pld $(texmf)
+
+ uninstall-data:
+- rm -f $(man1dir)/dvilj.$(manext)
++ rm -f ${DESTDIR}$(man1dir)/dvilj.$(manext)
+
+
+ distname = dviljk
Copied: trunk/dports/tex/texlive/files/patch-texk_dvipdfm_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_dvipdfm_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_dvipdfm_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_dvipdfm_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,40 @@
+$OpenBSD: patch-texk_dvipdfm_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
+--- texk/dvipdfm/Makefile.in.orig Sat Apr 21 17:45:31 2007
++++ texk/dvipdfm/Makefile.in Sat Apr 21 17:46:16 2007
+@@ -49,24 +49,24 @@ distclean::
+ $(RM) config.h
+
+ install-exec:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+- $(INSTALL_LIBTOOL_PROG) ebb $(bindir)
+- $(INSTALL_SCRIPT) $(srcdir)/dvipdft $(bindir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) ebb ${DESTDIR}$(bindir)
++ $(INSTALL_SCRIPT) $(srcdir)/dvipdft ${DESTDIR}$(bindir)
+
+ uninstall-exec:
+- cd $(bindir); rm -f $(programs)
++ cd ${DESTDIR}$(bindir); rm -f $(programs)
+
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
+- $(INSTALL_DATA) $(srcdir)/dvipdft.1 $(man1dir)/dvipdft.$(manext)
+- $(INSTALL_DATA) $(srcdir)/ebb.1 $(man1dir)/ebb.$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
++ $(INSTALL_DATA) $(srcdir)/dvipdft.1 ${DESTDIR}$(man1dir)/dvipdft.$(manext)
++ $(INSTALL_DATA) $(srcdir)/ebb.1 ${DESTDIR}$(man1dir)/ebb.$(manext)
+
+ uninstall-data:
+- rm -f $(man1dir)/dvilj.$(manext)
+- rm -f $(man1dir)/dvipdft.$(manext)
+- rm -f $(man1dir)/ebb.$(manext)
++ rm -f ${DESTDIR}$(man1dir)/dvilj.$(manext)
++ rm -f ${DESTDIR}$(man1dir)/dvipdft.$(manext)
++ rm -f ${DESTDIR}$(man1dir)/ebb.$(manext)
+
+ kpse_include ../make/config.mk
+
Copied: trunk/dports/tex/texlive/files/patch-texk_dvipos_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_dvipos_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_dvipos_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_dvipos_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,28 @@
+$OpenBSD: patch-texk_dvipos_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/dvipos/Makefile.in.orig Sat Apr 21 17:49:47 2007
++++ texk/dvipos/Makefile.in Sat Apr 21 17:50:20 2007
+@@ -22,18 +22,18 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/dvipos.1 $(man1dir)/dvipos.1
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/dvipos.1 ${DESTDIR}$(man1dir)/dvipos.1
+
+ uninstall-data:
+- rm -f $(man1dir)/dvipos.1
++ rm -f ${DESTDIR}$(man1dir)/dvipos.1
+
+ kpse_include ../make/dist.mk
+ kpse_include ../make/config.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_dvipsk_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_dvipsk_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_dvipsk_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_dvipsk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,66 @@
+$OpenBSD: patch-texk_dvipsk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/dvipsk/Makefile.in.orig Sat Apr 21 17:50:40 2007
++++ texk/dvipsk/Makefile.in Sat Apr 21 17:53:12 2007
+@@ -85,18 +85,18 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+- rm -f $(bindir)/o$(program)
+- ln -s $(program) $(bindir)/o$(program)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
++ rm -f ${DESTDIR}$(bindir)/o$(program)
++ ln -s $(program) ${DESTDIR}$(bindir)/o$(program)
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
+- rm -f $(bindir)/o$(program)
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
++ rm -f ${DESTDIR}$(bindir)/o$(program)
+
+ install-data: $(program).info
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(infodir) $(psheaderdir)/base
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(infodir) ${DESTDIR}$(psheaderdir)/base
+ # PostScript prologues and encodings.
+- for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
++ for h in $(prologues); do $(INSTALL_DATA) $$h ${DESTDIR}$(psheaderdir)/base/$$h; done
+ # cd $(srcdir)/reencode && \
+ # for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
+ # config.ps. Any one config.ps will be wrong for most people, so don't
+@@ -114,27 +114,27 @@ install-data: $(program).info
+ # else true; fi
+ # Info files.
+ cd $(srcdir) && for i in $(program).i*; do \
+- $(INSTALL_DATA) $$i $(infodir)/$$i; done
++ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
+ # Man pages.
+- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
+- rm -f $(man1dir)/o$(program).$(manext)
+- ln -s $(program).$(manext) $(man1dir)/o$(program).$(manext)
+- $(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(man1dir)/afm2tfm.$(manext)
++ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
++ rm -f ${DESTDIR}$(man1dir)/o$(program).$(manext)
++ ln -s $(program).$(manext) ${DESTDIR}$(man1dir)/o$(program).$(manext)
++ $(INSTALL_DATA) $(srcdir)/afm2tfm.1 ${DESTDIR}$(man1dir)/afm2tfm.$(manext)
+ # TeX macros.
+ # cd $(srcdir)/tex && for m in *.tex; do \
+ # $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done
+ $(POST_INSTALL)
+ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+- install-info --info-dir=$(infodir) $(infodir)/$(program).info; \
++ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/$(program).info; \
+ else true; fi
+
+ uninstall-data:
+ $(PRE_UNINSTALL)
+ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+- install-info --delete --info-dir=$(infodir) $(infodir)/$(program).info; \
++ install-info --delete --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/$(program).info; \
+ else true; fi
+ $(NORMAL_UNINSTALL)
+- rm -f $(infodir)/dvips.i*
++ rm -f ${DESTDIR}$(infodir)/dvips.i*
+ # for h in $(prologues); do rm -f $(psheaderdir)/base/$$h; done
+ # cd $(srcdir)/reencode && for e in *.enc; do rm -f $(psheaderdir)/base/$$e; \
+ # done
Copied: trunk/dports/tex/texlive/files/patch-texk_gsftopk_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_gsftopk_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_gsftopk_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_gsftopk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,30 @@
+$OpenBSD: patch-texk_gsftopk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/gsftopk/Makefile.in.orig Tue Jan 17 21:41:51 2006
++++ texk/gsftopk/Makefile.in Sat Apr 21 18:20:21 2007
+@@ -34,18 +34,18 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: $(program)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
+ uninstall-exec:
+- rm -f $(bindir)/$(program)
++ rm -f ${DESTDIR}$(bindir)/$(program)
+
+ install-data: gsftopk.1
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(gsftopkpsheaderdir)
+- $(INSTALL_DATA) gsftopk.1 $(man1dir)/gsftopk.$(manext)
+- $(INSTALL_DATA) $(srcdir)/render.ps $(gsftopkpsheaderdir)/render.ps
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(gsftopkpsheaderdir)
++ $(INSTALL_DATA) gsftopk.1 ${DESTDIR}$(man1dir)/gsftopk.$(manext)
++ $(INSTALL_DATA) $(srcdir)/render.ps ${DESTDIR}$(gsftopkpsheaderdir)/render.ps
+ uninstall-data:
+- rm -f $(man1dir)/gsftopk.$(manext)
+- rm -f $(gsftopkpsheaderdir)/render.ps
++ rm -f ${DESTDIR}$(man1dir)/gsftopk.$(manext)
++ rm -f ${DESTDIR}$(gsftopkpsheaderdir)/render.ps
+
+ kpse_include ../make/clean.mk
+
Copied: trunk/dports/tex/texlive/files/patch-texk_kpathsea_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_kpathsea_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_kpathsea_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_kpathsea_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,119 @@
+$OpenBSD: patch-texk_kpathsea_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
+--- texk/kpathsea/Makefile.in.orig Sun Jan 7 23:31:48 2007
++++ texk/kpathsea/Makefile.in Tue Apr 17 19:21:33 2007
+@@ -154,73 +154,73 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: kpsewhich
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir) \
+- $(libdir) $(web2cdir)
+- if grep 'original mktexpk --' $(scriptdir)/mktexpk >/dev/null 2>&1\
+- || test ! -r $(scriptdir)/mktexpk; then \
+- $(INSTALL_SCRIPT) $(srcdir)/mktexpk $(scriptdir)/mktexpk; \
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir) \
++ ${DESTDIR}$(libdir) ${DESTDIR}$(web2cdir)
++ if grep 'original mktexpk --' ${DESTDIR}$(scriptdir)/mktexpk >/dev/null 2>&1\
++ || test ! -r ${DESTDIR}$(scriptdir)/mktexpk; then \
++ $(INSTALL_SCRIPT) $(srcdir)/mktexpk ${DESTDIR}$(scriptdir)/mktexpk; \
+ else true; fi
+- if grep 'original mktexmf --' $(scriptdir)/mktexmf >/dev/null 2>&1\
+- || test ! -r $(scriptdir)/mktexmf; then \
+- $(INSTALL_SCRIPT) $(srcdir)/mktexmf $(scriptdir)/mktexmf; \
++ if grep 'original mktexmf --' ${DESTDIR}$(scriptdir)/mktexmf >/dev/null 2>&1\
++ || test ! -r ${DESTDIR}$(scriptdir)/mktexmf; then \
++ $(INSTALL_SCRIPT) $(srcdir)/mktexmf ${DESTDIR}$(scriptdir)/mktexmf; \
+ else true; fi
+- if grep 'original mktextfm --' $(scriptdir)/mktextfm >/dev/null 2>&1\
+- || test ! -r $(scriptdir)/mktextfm; then \
+- $(INSTALL_SCRIPT) $(srcdir)/mktextfm $(scriptdir)/mktextfm; \
++ if grep 'original mktextfm --' ${DESTDIR}$(scriptdir)/mktextfm >/dev/null 2>&1\
++ || test ! -r ${DESTDIR}$(scriptdir)/mktextfm; then \
++ $(INSTALL_SCRIPT) $(srcdir)/mktextfm ${DESTDIR}$(scriptdir)/mktextfm; \
+ else true; fi
+- if grep 'original mktexlsr --' $(scriptdir)/mktexlsr >/dev/null 2>&1\
+- || test ! -r $(scriptdir)/mktexlsr; then \
+- $(INSTALL_SCRIPT) $(srcdir)/mktexlsr $(scriptdir)/mktexlsr; \
++ if grep 'original mktexlsr --' ${DESTDIR}$(scriptdir)/mktexlsr >/dev/null 2>&1\
++ || test ! -r ${DESTDIR}$(scriptdir)/mktexlsr; then \
++ $(INSTALL_SCRIPT) $(srcdir)/mktexlsr ${DESTDIR}$(scriptdir)/mktexlsr; \
+ else true; fi
+ # if grep 'original mktexfmt --' $(scriptdir)/mktexfmt > /dev/null 2>&1\
+ # || test ! -r $(scriptdir)/mktexfmt; then \
+ # $(INSTALL_SCRIPT) $(srcdir)/mktexfmt $(scriptdir)/mktexfmt; \
+ # else true; fi
+- $(INSTALL_DATA) $(srcdir)/mktex.opt $(web2cdir)/mktex.opt
+- $(INSTALL_SCRIPT) $(srcdir)/mktexdir $(web2cdir)/mktexdir
+- $(INSTALL_DATA) $(srcdir)/mktexdir.opt $(web2cdir)/mktexdir.opt
+- $(INSTALL_SCRIPT) $(srcdir)/mktexnam $(web2cdir)/mktexnam
+- $(INSTALL_DATA) $(srcdir)/mktexnam.opt $(web2cdir)/mktexnam.opt
+- $(INSTALL_SCRIPT) $(srcdir)/mktexupd $(web2cdir)/mktexupd
+- $(INSTALL_LIBTOOL_LIBS) lib$(library).la $(libdir)
+- $(INSTALL_LIBTOOL_PROG) kpsewhich $(bindir)
+- $(INSTALL_PROGRAM) kpsestat $(bindir)
+- $(INSTALL_PROGRAM) kpseaccess $(bindir)
+- $(INSTALL_PROGRAM) kpsereadlink $(bindir)
++ $(INSTALL_DATA) $(srcdir)/mktex.opt ${DESTDIR}$(web2cdir)/mktex.opt
++ $(INSTALL_SCRIPT) $(srcdir)/mktexdir ${DESTDIR}$(web2cdir)/mktexdir
++ $(INSTALL_DATA) $(srcdir)/mktexdir.opt ${DESTDIR}$(web2cdir)/mktexdir.opt
++ $(INSTALL_SCRIPT) $(srcdir)/mktexnam ${DESTDIR}$(web2cdir)/mktexnam
++ $(INSTALL_DATA) $(srcdir)/mktexnam.opt ${DESTDIR}$(web2cdir)/mktexnam.opt
++ $(INSTALL_SCRIPT) $(srcdir)/mktexupd ${DESTDIR}$(web2cdir)/mktexupd
++ $(INSTALL_LIBTOOL_LIBS) lib$(library).la ${DESTDIR}$(libdir)
++ $(INSTALL_LIBTOOL_PROG) kpsewhich ${DESTDIR}$(bindir)
++ $(INSTALL_PROGRAM) kpsestat ${DESTDIR}$(bindir)
++ $(INSTALL_PROGRAM) kpseaccess ${DESTDIR}$(bindir)
++ $(INSTALL_PROGRAM) kpsereadlink ${DESTDIR}$(bindir)
+ uninstall-exec:
+- $(UNINSTALL_LIBTOOL_LIBS) $(libdir)/lib$(library).la
+- $(UNINSTALL_LIBTOOL_PROG) $(bindir)/kpsewhich
+- $(UNINSTALL_PROGRAM) $(bindir)/kpsestat
+- $(UNINSTALL_PROGRAM) $(bindir)/kpseaccess
+- $(UNINSTALL_PROGRAM) $(bindir)/kpsereadlink
++ $(UNINSTALL_LIBTOOL_LIBS) ${DESTDIR}$(libdir)/lib$(library).la
++ $(UNINSTALL_LIBTOOL_PROG) ${DESTDIR}$(bindir)/kpsewhich
++ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpsestat
++ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpseaccess
++ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpsereadlink
+
+ install-data: texmf.cnf kpathsea.info install-man
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf) $(infodir) $(web2cdir)
+- if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
+- || test ! -r $(web2cdir)/texmf.cnf; then \
+- $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf) ${DESTDIR}$(infodir) ${DESTDIR}$(web2cdir)
++ if grep 'original texmf.cnf --' ${DESTDIR}$(web2cdir)/texmf.cnf >/dev/null 2>&1 \
++ || test ! -r ${DESTDIR}$(web2cdir)/texmf.cnf; then \
++ $(INSTALL_DATA) texmf.cnf ${DESTDIR}$(web2cdir)/texmf.cnf; \
+ else true; fi
+ test -r ./kpathsea.info || cd $(srcdir) && for i in kpathsea.i*; do \
+- $(INSTALL_DATA) $$i $(infodir)/$$i; done
++ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
+ # Should we install the headers? They are not just system-dependent,
+ # which is bad enough, but even compiler-dependent.
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(includedir)/kpathsea
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(includedir)/kpathsea
+ for f in $(install_headers); do \
+- $(INSTALL_DATA) $$f $(includedir)/kpathsea/; done
+- rm -f $(includedir)/kpathsea/acconfig.h
++ $(INSTALL_DATA) $$f ${DESTDIR}$(includedir)/kpathsea/; done
++ rm -f ${DESTDIR}$(includedir)/kpathsea/acconfig.h
+ $(POST_INSTALL)
+- test -r $(infodir)/dir || $(INSTALL_DATA) $(top_srcdir)/../dir $(infodir)
++ test -r ${DESTDIR}$(infodir)/dir || $(INSTALL_DATA) $(top_srcdir)/../dir ${DESTDIR}$(infodir)
+ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+- install-info --info-dir=$(infodir) $(infodir)/kpathsea.info; \
++ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/kpathsea.info; \
+ else true; fi
+
+ uninstall-data:
+ $(PRE_UNINSTALL)
+ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+- install-info --delete --info-dir=$(infodir) $(infodir)/kpathsea.info; \
++ install-info --delete --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/kpathsea.info; \
+ else true; fi
+ $(NORMAL_UNINSTALL)
+- rm -f $(infodir)/kpathsea.i*
++ rm -f ${DESTDIR}$(infodir)/kpathsea.i*
+ # for f in $(install_headers); do rm -f $(includedir)/`basename $$f`; done
+
+ # distdir is used by other distributions; they define $(distdir).
Copied: trunk/dports/tex/texlive/files/patch-texk_lacheck_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_lacheck_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_lacheck_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_lacheck_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,27 @@
+$OpenBSD: patch-texk_lacheck_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
+--- texk/lacheck/Makefile.in.orig Sat Apr 21 17:57:36 2007
++++ texk/lacheck/Makefile.in Sat Apr 21 17:58:10 2007
+@@ -28,17 +28,17 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data: lacheck.1
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) lacheck.1 $(man1dir)/lacheck.1
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) lacheck.1 ${DESTDIR}$(man1dir)/lacheck.1
+
+ uninstall-data:
+- rm -f $(man1dir)/lacheck.1
++ rm -f ${DESTDIR}$(man1dir)/lacheck.1
+
+ lacheck.1: lacheck.man
+ -sed -e "s!%%LACHECKREV%%!Release $(REV)!" $(srcdir)/lacheck.man |\
Copied: trunk/dports/tex/texlive/files/patch-texk_make_man_mk (from rev 30880, trunk/dports/tex/texlive/patch-texk_make_man_mk)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_make_man_mk (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_make_man_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,23 @@
+$OpenBSD: patch-texk_make_man_mk,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
+--- texk/make/man.mk.orig Tue Apr 17 20:28:51 2007
++++ texk/make/man.mk Tue Apr 17 20:35:25 2007
+@@ -51,16 +51,16 @@ sedscript:
+ echo 's%@LOCALMODES@%$(localmodes)%' >>sedscript
+
+ install-man: manfiles
+- $(top_srcdir)/../mkinstalldirs $(man1dir)
++ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+ for nameone in $(manfiles); do \
+ name=`basename $${nameone} .1`; \
+- $(INSTALL_DATA) $${name}.1 $(man1dir)/$${name}.$(manext); \
++ $(INSTALL_DATA) $${name}.1 ${DESTDIR}$(man1dir)/$${name}.$(manext); \
+ done
+
+ uninstall-man:
+ for nameone in $(manfiles); do \
+ name=`basename $${nameone} .1`; \
+- rm -f $(man1dir)/$${name}.$(manext); \
++ rm -f ${DESTDIR}$(man1dir)/$${name}.$(manext); \
+ done
+
+ install-data: install-man
Copied: trunk/dports/tex/texlive/files/patch-texk_makeindexk_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_makeindexk_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_makeindexk_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_makeindexk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,29 @@
+$OpenBSD: patch-texk_makeindexk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
+--- texk/makeindexk/Makefile.in.orig Sat Apr 21 18:21:52 2007
++++ texk/makeindexk/Makefile.in Sat Apr 21 18:23:14 2007
+@@ -19,17 +19,17 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: $(programs)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+- $(INSTALL_SCRIPT) $(srcdir)/mkindex $(scriptdir)/mkindex
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
++ $(INSTALL_SCRIPT) $(srcdir)/mkindex ${DESTDIR}$(scriptdir)/mkindex
+ uninstall-exec:
+- cd $(bindir) && rm -f $(program)
+- cd $(scriptdir) && rm -f mkindex
++ cd ${DESTDIR}$(bindir) && rm -f $(program)
++ cd ${DESTDIR}$(scriptdir) && rm -f mkindex
+
+ install-data: makeindex.1
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/makeindex.1 $(man1dir)/makeindex.$(manext)
+- $(INSTALL_DATA) $(srcdir)/mkindex.1 $(man1dir)/mkindex.$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/makeindex.1 ${DESTDIR}$(man1dir)/makeindex.$(manext)
++ $(INSTALL_DATA) $(srcdir)/mkindex.1 ${DESTDIR}$(man1dir)/mkindex.$(manext)
+
+ uninstall-data:
+
Copied: trunk/dports/tex/texlive/files/patch-texk_musixflx_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_musixflx_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_musixflx_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_musixflx_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,17 @@
+$OpenBSD: patch-texk_musixflx_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
+--- texk/musixflx/Makefile.in.orig Sat Apr 21 18:24:29 2007
++++ texk/musixflx/Makefile.in Sat Apr 21 18:24:52 2007
+@@ -21,10 +21,10 @@ install: install-exec
+ uninstall: uninstall-exec
+
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data:
+
Copied: trunk/dports/tex/texlive/files/patch-texk_ps2pkm_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_ps2pkm_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_ps2pkm_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_ps2pkm_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,34 @@
+$OpenBSD: patch-texk_ps2pkm_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
+--- texk/ps2pkm/Makefile.in.orig Sat Apr 21 18:25:02 2007
++++ texk/ps2pkm/Makefile.in Sat Apr 21 18:26:32 2007
+@@ -35,20 +35,20 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: $(programs)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data: mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/mag.1 $(man1dir)/mag.$(manext)
+- $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 $(man1dir)/pfb2pfa.$(manext)
+- $(INSTALL_DATA) $(srcdir)/pk2bm.1 $(man1dir)/pk2bm.$(manext)
+- $(INSTALL_DATA) $(srcdir)/ps2pk.1 $(man1dir)/ps2pk.$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/mag.1 ${DESTDIR}$(man1dir)/mag.$(manext)
++ $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 ${DESTDIR}$(man1dir)/pfb2pfa.$(manext)
++ $(INSTALL_DATA) $(srcdir)/pk2bm.1 ${DESTDIR}$(man1dir)/pk2bm.$(manext)
++ $(INSTALL_DATA) $(srcdir)/ps2pk.1 ${DESTDIR}$(man1dir)/ps2pk.$(manext)
+ uninstall-data:
+- rm -f $(man1dir)/ps2pk.$(manext) $(man1dir)/pk2bm.$(manext) \
+- $(man1dir)/pfb2pfa.$(manext) $(man1dir)/mag.$(manext)
++ rm -f $(man1dir)/ps2pk.$(manext) ${DESTDIR}$(man1dir)/pk2bm.$(manext) \
++ $(man1dir)/pfb2pfa.$(manext) ${DESTDIR}$(man1dir)/mag.$(manext)
+
+ pre-dist-$(distname):
+ post-dist-$(distname):
Copied: trunk/dports/tex/texlive/files/patch-texk_seetexk_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_seetexk_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_seetexk_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_seetexk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,39 @@
+$OpenBSD: patch-texk_seetexk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
+--- texk/seetexk/Makefile.in.orig Sat Apr 21 18:26:53 2007
++++ texk/seetexk/Makefile.in Sat Apr 21 18:28:18 2007
+@@ -51,23 +51,23 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/dviselect.man $(man1dir)/dviselect.1
+- $(INSTALL_DATA) $(srcdir)/dviconcat.man $(man1dir)/dviconcat.1
+- $(INSTALL_DATA) $(srcdir)/dvibook.man $(man1dir)/dvibook.1
+- $(INSTALL_DATA) $(srcdir)/dvitodvi.man $(man1dir)/dvitodvi.1
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/dviselect.man ${DESTDIR}$(man1dir)/dviselect.1
++ $(INSTALL_DATA) $(srcdir)/dviconcat.man ${DESTDIR}$(man1dir)/dviconcat.1
++ $(INSTALL_DATA) $(srcdir)/dvibook.man ${DESTDIR}$(man1dir)/dvibook.1
++ $(INSTALL_DATA) $(srcdir)/dvitodvi.man ${DESTDIR}$(man1dir)/dvitodvi.1
+
+ uninstall-data:
+- rm -f $(man1dir)/dviselect.1
+- rm -f $(man1dir)/dviconcat.1
+- rm -f $(man1dir)/dvibook.1
+- rm -f $(man1dir)/dvitodvi.1
++ rm -f ${DESTDIR}$(man1dir)/dviselect.1
++ rm -f ${DESTDIR}$(man1dir)/dviconcat.1
++ rm -f ${DESTDIR}$(man1dir)/dvibook.1
++ rm -f ${DESTDIR}$(man1dir)/dvitodvi.1
+
+ distname = seetexk
+
Copied: trunk/dports/tex/texlive/files/patch-texk_tetex_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_tetex_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_tetex_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_tetex_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,122 @@
+$OpenBSD: patch-texk_tetex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
+--- texk/tetex/Makefile.in.orig Sat Apr 21 18:28:56 2007
++++ texk/tetex/Makefile.in Sat Apr 21 18:32:15 2007
+@@ -39,76 +39,77 @@ check:
+
+ # Auxiliary files.
+ install-data:: $(INFOFILES)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(man5dir) ${DESTDIR}$(texpooldir) ${DESTDIR}$(texmf)/doc/tetex
+ for p in $(manpgs); do \
+- $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
++ $(INSTALL_DATA) $(srcdir)/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ done
+ for p in $(contextmanpgs); do \
+- $(INSTALL_DATA) $(srcdir)/context/$$p.man $(man1dir)/$$p.$(manext); \
++ $(INSTALL_DATA) $(srcdir)/context/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ done
+- $(INSTALL_DATA) $(srcdir)/fmtutil.man $(man1dir)/fmtutil.1
+- $(INSTALL_DATA) $(srcdir)/texlinks.man $(man1dir)/texlinks.1
+- $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 $(man5dir)/fmtutil.cnf.5
+- $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 $(man5dir)/updmap.cfg.5
+- cd $(man1dir); rm -f allec.$(manext) texhash.$(manext) \
++ $(INSTALL_DATA) $(srcdir)/fmtutil.man ${DESTDIR}$(man1dir)/fmtutil.1
++ $(INSTALL_DATA) $(srcdir)/texlinks.man ${DESTDIR}$(man1dir)/texlinks.1
++ $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 ${DESTDIR}$(man5dir)/fmtutil.cnf.5
++ $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 ${DESTDIR}$(man5dir)/updmap.cfg.5
++ cd ${DESTDIR}$(man1dir); rm -f allec.$(manext) texhash.$(manext) \
+ lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \
+ kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \
+ cweave.$(manext) odvicopy.$(manext) \
+ odvitype.$(manext) texconfig-sys.$(manext) \
+ updmap-sys.$(manext) mktexfmt.$(manext) fmtutil-sys.$(manext)
+- ln -s allcm.$(manext) $(man1dir)/allec.$(manext)
+- ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext)
+- ln -s omega.$(manext) $(man1dir)/lambda.$(manext)
+- ln -s pdftex.$(manext) $(man1dir)/pdflatex.$(manext)
+- ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext)
+- ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext)
+- ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext)
+- ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext)
+- ln -s cweb.$(manext) $(man1dir)/cweave.$(manext)
+- ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext)
+- ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext)
+- ln -s texconfig.$(manext) $(man1dir)/texconfig-sys.$(manext)
+- ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext)
+- ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext)
+- ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext)
++ ln -s allcm.$(manext) ${DESTDIR}$(man1dir)/allec.$(manext)
++ ln -s mktexlsr.$(manext) ${DESTDIR}$(man1dir)/texhash.$(manext)
++ ln -s omega.$(manext) ${DESTDIR}$(man1dir)/lambda.$(manext)
++ ln -s pdftex.$(manext) ${DESTDIR}$(man1dir)/pdflatex.$(manext)
++ ln -s kpsetool.$(manext) ${DESTDIR}$(man1dir)/kpsepath.$(manext)
++ ln -s kpsetool.$(manext) ${DESTDIR}$(man1dir)/kpsexpand.$(manext)
++ ln -s mf.$(manext) ${DESTDIR}$(man1dir)/mf-nowin.$(manext)
++ ln -s cweb.$(manext) ${DESTDIR}$(man1dir)/ctangle.$(manext)
++ ln -s cweb.$(manext) ${DESTDIR}$(man1dir)/cweave.$(manext)
++ ln -s dvicopy.$(manext) ${DESTDIR}$(man1dir)/odvicopy.$(manext)
++ ln -s dvitype.$(manext) ${DESTDIR}$(man1dir)/odvitype.$(manext)
++ ln -s texconfig.$(manext) ${DESTDIR}$(man1dir)/texconfig-sys.$(manext)
++ ln -s updmap.$(manext) ${DESTDIR}$(man1dir)/updmap-sys.$(manext)
++ ln -s fmtutil.$(manext) ${DESTDIR}$(man1dir)/mktexfmt.$(manext)
++ ln -s fmtutil.$(manext) ${DESTDIR}$(man1dir)/fmtutil-sys.$(manext)
+ test -r ./latex.info || cd $(srcdir) && for i in latex.info*; do \
+- $(INSTALL_DATA) $$i $(infodir)/$$i; done
++ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
+ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+- install-info --info-dir=$(infodir) $(infodir)/latex.info; \
++ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/latex.info; \
+ else true; fi
+ for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
+- $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
++ $(INSTALL_DATA) $(srcdir)/doc/$$p ${DESTDIR}$(texmf)/doc/tetex; \
+ done
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
+- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
+- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 $(texmf)/texconfig/v
+- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/x/xterm $(texmf)/texconfig/x
+- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/README $(texmf)/texconfig
+- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig
+- $(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr
+- $(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/texconfig \
++ ${DESTDIR}$(texmf)/texconfig/g ${DESTDIR}$(texmf)/texconfig/v ${DESTDIR}$(texmf)/texconfig/x
++ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic ${DESTDIR}$(texmf)/texconfig/g
++ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 ${DESTDIR}$(texmf)/texconfig/v
++ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/x/xterm ${DESTDIR}$(texmf)/texconfig/x
++ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/README ${DESTDIR}$(texmf)/texconfig
++ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic ${DESTDIR}$(texmf)/texconfig
++ $(INSTALL_SCRIPT) $(srcdir)/tcfmgr ${DESTDIR}$(texmf)/texconfig/tcfmgr
++ $(INSTALL_DATA) $(srcdir)/tcfmgr.map ${DESTDIR}$(texmf)/texconfig/tcfmgr.map
+
+ install-exec:
+- -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
++ -$(SHELL) $(srcdir)/../mkinstalldirs ${DESTDIR}$(scriptdir)
+ for s in $(SCRIPTS); do \
+- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
++ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
+ done
+ for s in $(CONTEXTSCRIPTS); do \
+- $(INSTALL_SCRIPT) $(srcdir)/context/$$s $(scriptdir)/$$s; \
++ $(INSTALL_SCRIPT) $(srcdir)/context/$$s ${DESTDIR}$(scriptdir)/$$s; \
+ done
+- if test -f $(bindir)/pdftex; then \
++ if test -f ${DESTDIR}$(bindir)/pdftex; then \
+ for s in $(PDFSCRIPTS); do \
+- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
++ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
+ done; \
+ else \
+ true; \
+ fi
+- cd $(scriptdir); rm -f allec kpsepath kpsexpand texhash; \
++ cd ${DESTDIR}$(scriptdir); rm -f allec kpsepath kpsexpand texhash; \
+ ln -s allcm allec; \
+ ln -s kpsetool kpsepath; \
+ ln -s kpsetool kpsexpand; \
+ ln -s mktexlsr texhash
+- cd $(scriptdir); rm -f mktexfmt; ln -s fmtutil mktexfmt
++ cd ${DESTDIR}$(scriptdir); rm -f mktexfmt; ln -s fmtutil mktexfmt
+
+ kpse_include ../make/clean.mk
+
Copied: trunk/dports/tex/texlive/files/patch-texk_tetex_texlinks (from rev 30880, trunk/dports/tex/texlive/patch-texk_tetex_texlinks)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_tetex_texlinks (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_tetex_texlinks 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,140 @@
+$OpenBSD: patch-texk_tetex_texlinks,v 1.1 2007/10/19 22:14:13 steven Exp $
+--- texk/tetex/texlinks.orig Wed Jan 17 16:31:31 2007
++++ texk/tetex/texlinks Mon Oct 15 09:49:15 2007
+@@ -6,6 +6,9 @@
+ # the lines given in fmtutil.cnf.
+
+ # History:
++# Tue Oct 9 14:23:01 BST 2007
++# Added unlink option (-u) to aid OpenBSD package uninstall
++# Edd Barrett <vext01 at gmail.com>
+ # Sun Aug 28 21:41:06 CEST 2005
+ # remove special cases for csplain,cslatex,pdfcslatex,pdfcsplain
+ # Fr Apr 8 19:15:05 CEST 2005
+@@ -35,34 +38,31 @@ export PATH
+ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+
+ cnf=fmtutil.cnf # name of the config file
+-version=1169050907 # seconds since `00:00:00 1970-01-01 UTC'
++version=1192147136 # seconds since `00:00:00 1970-01-01 UTC'
+ # date '+%s' (with GNU date)
+ progname=texlinks
+
+-usage='texlinks [options] [directories]
++usage='Usage: texlinks [OPTION]... [DIRECTORY]...
+
+ Create symbolic links format -> engine according to fmtutil setup.
+
+-Valid options:
+- --help
+- -h show this help text
+- --version show version string
+- --cnffile file
+- -f file use file as config file (default: fmtutil.cnf)
+- --verbose
+- -v set verbose mode on (default: off)
+- --multiplatform
+- -m operate in all platform specific directories
++Mandatory arguments to long options are mandatory for short options too.
++ -h, --help show this help text
++ --version show version string
++ -f, --cnffile FILE use FILE as config file (default: fmtutil.cnf)
++ -v, --verbose enable verbose messages (default: off)
++ -m, --multiplatform operate in all platform specific directories
+ (default: operate only in directory for this platform)
+- --silent
+- -s silently skip over existing scripts / binaries
+- instead of creating a warning
++ -s, --silent silently skip existing scripts / binaries
++ (default: issue warning)
++ -u, --unlink remove symlinks created by texlinks
+
+-directories is an optional list of directories in which to operate.
+-If no directories are specified the list of directories depends on the
+---multiplatform option.
+-'
++The DIRECTORY arguments are an optional list of directories in which to
++operate. If no directories are specified the list of directories
++depends on the --multiplatform option.
+
++Report bugs to tex-k at tug.org.'
++
+ ###############################################################################
+ # abort(errmsg)
+ # print `errmsg' to stderr and exit with error code 1
+@@ -140,7 +140,7 @@ install_link()
+ fi
+ if test -f $selfautoloc/mf && test -f $selfautoloc/mf-nowin; then
+ # have both mf and mf-nowin binaries. no link.
+- verbose_echo "metafont symlink $src -> $dest skipped (special case)"
++ verbose_echo "skipped metafont symlink $src -> $dest (special case)"
+ return
+ fi
+ fi
+@@ -149,7 +149,7 @@ install_link()
+
+ case $src in
+ */cont-??|*/metafun|*/mptopdf)
+- verbose_echo "symlink $src -> $dest skipped (special case)"
++ verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
+ ;;
+ *)
+ test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
+@@ -205,6 +205,24 @@ upd_symlinkdir()
+ }
+
+ ###############################################################################
++# rm_link()
++# Delete a previously installed link
++###############################################################################
++rm_link()
++{
++ link=$1;
++ if test -e $link; then
++ if test -h $link; then
++ verbose_do rm -Rf $link
++ else
++ verbose_echo "kept $link, since not a symlink"
++ fi
++ else
++ verbose_echo "skipped $link, non-existent"
++ fi
++}
++
++###############################################################################
+ # main()
+ # parse commandline arguments, initialize variables,
+ # switch into temp. direcrory, execute desired command
+@@ -217,6 +235,7 @@ main()
+
+ multiplatform=false
+ verbose=false
++ unlink=false
+ silent=false
+ thisdir=`pwd`
+ : ${KPSE_DOT=$thisdir}; export KPSE_DOT
+@@ -232,6 +251,7 @@ main()
+ --v*|-v) verbose=true;;
+ --s*|-s) silent=true;;
+ --m*|-m) multiplatform=true;;
++ --u*|-u) unlink=true;;
+ -*) errmsg "fmtutil: unknown option \`$1' ignored.";;
+ *) break;;
+ esac
+@@ -278,9 +298,14 @@ main()
+
+ test "x$fmt" = "x$engine" && continue
+ if test -f "$d/$engine"; then
+- install_link "$engine" "$d/$fmt"
++ case $unlink in
++ true)
++ rm_link "$d/$fmt";;
++ *)
++ install_link "$engine" "$d/$fmt";;
++ esac
+ else
+- verbose_echo "$d/$engine: engine does not exist. Skipping..."
++ verbose_echo "skipped $d/$engine, engine does not exist"
+ fi
+
+ # restore positional arguments:
Copied: trunk/dports/tex/texlive/files/patch-texk_tex4htk_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_tex4htk_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_tex4htk_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_tex4htk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,20 @@
+$OpenBSD: patch-texk_tex4htk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
+--- texk/tex4htk/Makefile.in.orig Sat Apr 21 18:32:35 2007
++++ texk/tex4htk/Makefile.in Sat Apr 21 18:33:47 2007
+@@ -29,12 +29,12 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: all
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/$$p; done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
++ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(bindir)/$$p; done
+
+ uninstall-exec:
+- for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done
++ for p in $(programs) $(scripts); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data:
+
Copied: trunk/dports/tex/texlive/files/patch-texk_texlive_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_texlive_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_texlive_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_texlive_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,27 @@
+$OpenBSD: patch-texk_texlive_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
+--- texk/texlive/Makefile.in.orig Sat Apr 21 18:34:02 2007
++++ texk/texlive/Makefile.in Sat Apr 21 18:34:59 2007
+@@ -19,17 +19,17 @@ install: install-data install-exec
+ # Auxiliary files.
+ install-data::
+ for p in $(manpgs); do \
+- $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
++ $(INSTALL_DATA) $(srcdir)/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
+ done
+
+ install-exec:
+- -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
++ -$(SHELL) $(srcdir)/../mkinstalldirs ${DESTDIR}$(scriptdir)
+ for s in $(LIVESCRIPTS); do \
+- rm -f $(scriptdir)/$$s ; \
+- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
++ rm -f ${DESTDIR}$(scriptdir)/$$s ; \
++ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
+ done
+- rm -f $(scriptdir)/getnonfreefonts-sys
+- ln -s getnonfreefonts $(scriptdir)/getnonfreefonts-sys
++ rm -f ${DESTDIR}$(scriptdir)/getnonfreefonts-sys
++ ln -s getnonfreefonts ${DESTDIR}$(scriptdir)/getnonfreefonts-sys
+
+ kpse_include ../make/clean.mk
+
Copied: trunk/dports/tex/texlive/files/patch-texk_ttf2pk_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_ttf2pk_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_ttf2pk_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_ttf2pk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,28 @@
+$OpenBSD: patch-texk_ttf2pk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
+--- texk/ttf2pk/Makefile.in.orig Sat Apr 21 18:35:31 2007
++++ texk/ttf2pk/Makefile.in Sat Apr 21 18:36:09 2007
+@@ -38,17 +38,17 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: $(programs)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ uninstall-exec:
+- for p in $(programs); do rm -f $(bindir)/$$p; done
++ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
+
+ install-data: ttf2pk.1 ttf2tfm.1
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(INSTALL_DATA) $(srcdir)/ttf2pk.1 $(man1dir)/ttf2pk.$(manext)
+- $(INSTALL_DATA) $(srcdir)/ttf2tfm.1 $(man1dir)/ttf2tfm.$(manext)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(INSTALL_DATA) $(srcdir)/ttf2pk.1 ${DESTDIR}$(man1dir)/ttf2pk.$(manext)
++ $(INSTALL_DATA) $(srcdir)/ttf2tfm.1 ${DESTDIR}$(man1dir)/ttf2tfm.$(manext)
+ uninstall-data:
+- rm -f $(man1dir)/ttf2pk.$(manext) $(man1dir)/ttf2tfm.$(manext)
++ rm -f $(man1dir)/ttf2pk.$(manext) ${DESTDIR}$(man1dir)/ttf2tfm.$(manext)
+
+ pre-dist-$(distname):
+ post-dist-$(distname):
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,116 @@
+$OpenBSD: patch-texk_web2c_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
+--- texk/web2c/Makefile.in.orig Wed Jan 10 17:39:42 2007
++++ texk/web2c/Makefile.in Fri May 4 20:28:39 2007
+@@ -788,25 +788,25 @@ install-dumps: install-tex-dumps install-mf-dumps inst
+
+ # Installation directories.
+ $(bindir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
+ $(texpooldir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texpooldir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texpooldir)
+ $(mfpooldir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(mfpooldir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(mfpooldir)
+ $(mppooldir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(mppooldir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(mppooldir)
+ $(fmtdir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(fmtdir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(fmtdir)
+ $(basedir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(basedir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(basedir)
+ $(memdir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(memdir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(memdir)
+ $(web2cdir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(web2cdir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(web2cdir)
+
+ # Installing the programs.
+ install-programs: $(programs) $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+
+ # Installation of each of the three main engines.
+ install-tex: install-tex-exec install-tex-data
+@@ -829,15 +829,15 @@ install-mpost-dumps: install-mpost-mems
+ install-programs: install-tex-programs
+ install-tex-programs: tex $(bindir)
+ tex="tex"; \
+- for p in $$tex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ for p in $$tex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ install-programs: install-mf-programs
+ install-mf-programs: mf $(mfn) $(bindir)
+ mf="mf $(mfn)"; \
+- for p in $$mf; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ for p in $$mf; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ install-programs: install-mpost-programs
+ install-mpost-programs: mpost $(bindir)
+ mpost="mpost"; \
+- for p in $$mpost; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ for p in $$mpost; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+
+ # The links to {mf,mp,tex} for each format and for {ini,vir}{mf,mp,tex},
+ # plus the equivalents for e-TeX, Omega, and pdf[ex]TeX.
+@@ -860,34 +860,34 @@ install-mpost-links: install-mpost-programs
+ install-fmts: install-tex-fmts
+ install-tex-fmts: fmts $(fmtdir)
+ fmts="$(all_fmts)"; \
+- for f in $$fmts; do $(INSTALL_DATA) $$f $(fmtdir)/$$f; done
+- cd $(fmtdir) && (rm -f plain.fmt; $(LN) tex.fmt plain.fmt)
++ for f in $$fmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(fmtdir)/$$f; done
++ cd ${DESTDIR}$(fmtdir) && (rm -f plain.fmt; $(LN) tex.fmt plain.fmt)
+ fmts="$(fmts)"; \
+ for f in $$fmts; do base=`basename $$f .fmt`; \
+- (cd $(bindir) && (rm -f $$base; $(LN) tex $$base)); done
++ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) tex $$base)); done
+
+ install-bases: install-mf-bases
+ install-mf-bases: bases $(basedir)
+ bases="$(all_bases)"; \
+- for f in $$bases; do $(INSTALL_DATA) $$f $(basedir)/$$f; done
+- cd $(basedir) && (rm -f plain.base; $(LN) mf.base plain.base)
++ for f in $$bases; do $(INSTALL_DATA) $$f ${DESTDIR}$(basedir)/$$f; done
++ cd ${DESTDIR}$(basedir) && (rm -f plain.base; $(LN) mf.base plain.base)
+ bases="$(bases)"; \
+ for f in $$bases; do base=`basename $$f .base`;\
+- (cd $(bindir) && (rm -f $$base; $(LN) mf $$base)); done
++ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) mf $$base)); done
+
+ install-mems: install-mpost-mems
+ install-mpost-mems: mems $(memdir)
+ mems="$(all_mems)"; \
+- for f in $$mems; do $(INSTALL_DATA) $$f $(memdir)/$$f; done
+- cd $(memdir) && (rm -f plain.mem; $(LN) mpost.mem plain.mem)
++ for f in $$mems; do $(INSTALL_DATA) $$f ${DESTDIR}$(memdir)/$$f; done
++ cd ${DESTDIR}$(memdir) && (rm -f plain.mem; $(LN) mpost.mem plain.mem)
+ mems="$(mems)"; \
+ for f in $$mems; do base=`basename $$f .mem`; \
+- (cd $(bindir) && (rm -f $$base; $(LN) mpost $$base)); done
++ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) mpost $$base)); done
+
+ install-tex-pool: tex.pool $(texpooldir)
+- $(INSTALL_DATA) tex.pool $(texpooldir)/tex.pool
++ $(INSTALL_DATA) tex.pool ${DESTDIR}$(texpooldir)/tex.pool
+ install-mf-pool: mf.pool $(mfpooldir)
+- $(INSTALL_DATA) mf.pool $(mfpooldir)/mf.pool
++ $(INSTALL_DATA) mf.pool ${DESTDIR}$(mfpooldir)/mf.pool
+ install-mpost-pool: # no longer used, the strings are in the binary
+ # install-mpost-pool: mp.pool $(mppooldir)
+ # $(INSTALL_DATA) mp.pool $(mppooldir)/mp.pool
+@@ -896,9 +896,9 @@ install-mpost-pool: # no longer used, the strings are
+ install-data:: $(web2cdir)
+ cd doc && $(MAKE) $(install_makeargs) install-data
+ cd man && $(MAKE) $(install_makeargs) install-data
+- $(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(man1dir)/tie.$(manext)
+- $(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(man1dir)/ctie.$(manext)
+- $(INSTALL_DATA) fmtutil.cnf $(web2cdir)/fmtutil.cnf
++ $(INSTALL_DATA) $(srcdir)/tiedir/tie.1 ${DESTDIR}$(man1dir)/tie.$(manext)
++ $(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 ${DESTDIR}$(man1dir)/ctie.$(manext)
++ $(INSTALL_DATA) fmtutil.cnf ${DESTDIR}$(web2cdir)/fmtutil.cnf
+
+ # Dummy target.
+ uninstall uninstall-exec uninstall-data:
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_alephdir_aleph_mk (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_alephdir_aleph_mk)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_alephdir_aleph_mk (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_alephdir_aleph_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,39 @@
+$OpenBSD: patch-texk_web2c_alephdir_aleph_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/web2c/alephdir/aleph.mk.orig Tue Jan 17 21:41:51 2006
++++ texk/web2c/alephdir/aleph.mk Fri May 4 20:28:39 2007
+@@ -142,7 +142,7 @@ afmts: $(all_afmts)
+
+ afmtdir = $(web2cdir)/aleph
+ $(afmtdir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(afmtdir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(afmtdir)
+
+ aleph.fmt: aleph
+ $(dumpenv) $(MAKE) progname=aleph files="omega.ini" prereq-check
+@@ -161,7 +161,7 @@ install-aleph-dumps: install-aleph-fmts
+ # The actual binary executables and pool files.
+ install-programs: @ALEPH@ install-aleph-programs
+ install-aleph-programs: aleph $(bindir)
+- for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+
+ install-links: @ALEPH@ install-aleph-links
+ install-aleph-links: install-aleph-programs
+@@ -171,14 +171,14 @@ install-aleph-links: install-aleph-programs
+ install-fmts: @ALEPH@ install-aleph-fmts
+ install-aleph-fmts: afmts $(afmtdir)
+ afmts="$(all_afmts)"; \
+- for f in $$afmts; do $(INSTALL_DATA) $$f $(afmtdir)/$$f; done
++ for f in $$afmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(afmtdir)/$$f; done
+ afmts="$(afmts)"; \
+ for f in $$afmts; do base=`basename $$f .fmt`; \
+- (cd $(bindir) && (rm -f $$base; $(LN) aleph $$base)); done
++ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) aleph $$base)); done
+
+ # Auxiliary files.
+ install-data:: @ALEPH@ install-aleph-data
+ install-aleph-pool: aleph.pool $(texpooldir)
+- $(INSTALL_DATA) aleph.pool $(texpooldir)/aleph.pool
++ $(INSTALL_DATA) aleph.pool ${DESTDIR}$(texpooldir)/aleph.pool
+
+ # end of aleph.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_doc_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_doc_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_doc_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_doc_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,19 @@
+$OpenBSD: patch-texk_web2c_doc_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/web2c/doc/Makefile.in.orig Wed Apr 18 13:50:12 2007
++++ texk/web2c/doc/Makefile.in Wed Apr 18 13:51:09 2007
+@@ -48,12 +48,12 @@ Makefile: Makefile.in ../config.status
+ install: install-exec install-data
+ install-exec:
+ install-data: web2c.info
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(infodir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(infodir)
+ test -r ./web2c.info || cd $(srcdir) && for i in web2c.i*; do \
+- $(INSTALL_DATA) $$i $(infodir)/$$i; done
++ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
+ $(POST_INSTALL)
+ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+- install-info --info-dir=$(infodir) $(infodir)/web2c.info; \
++ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/web2c.info; \
+ else true; fi
+
+ check: all
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_mpware_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_mpware_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_mpware_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_mpware_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,20 @@
+$OpenBSD: patch-texk_web2c_mpware_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/web2c/mpware/Makefile.in.orig Tue Apr 17 21:27:22 2007
++++ texk/web2c/mpware/Makefile.in Tue Apr 17 21:28:04 2007
+@@ -45,11 +45,11 @@ Makefile: Makefile.in ../config.status
+
+ install: install-exec install-data
+ install-exec: $(programs)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir)
+- $(INSTALL_PROGRAM) newer $(bindir)/newer
+- $(INSTALL_LIBTOOL_PROG) dmp $(bindir)
+- $(INSTALL_LIBTOOL_PROG) mpto $(bindir)
+- $(INSTALL_SCRIPT) makempx $(scriptdir)/makempx
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir)
++ $(INSTALL_PROGRAM) newer ${DESTDIR}$(bindir)/newer
++ $(INSTALL_LIBTOOL_PROG) dmp ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) mpto ${DESTDIR}$(bindir)
++ $(INSTALL_SCRIPT) makempx ${DESTDIR}$(scriptdir)/makempx
+ install-data:
+
+ kpse_include ../make/tkpathsea.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_omegadir_omega_mk (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_omegadir_omega_mk)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_omegadir_omega_mk (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_omegadir_omega_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,39 @@
+$OpenBSD: patch-texk_web2c_omegadir_omega_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/web2c/omegadir/omega.mk.orig Tue Jan 17 21:41:51 2006
++++ texk/web2c/omegadir/omega.mk Fri May 4 20:28:40 2007
+@@ -183,7 +183,7 @@ ofmts: $(all_ofmts)
+
+ ofmtdir = $(web2cdir)/omega
+ $(ofmtdir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(ofmtdir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(ofmtdir)
+
+ omega.fmt: omega
+ $(dumpenv) $(MAKE) progname=omega files="omega.tex" prereq-check
+@@ -213,7 +213,7 @@ install-omega-dumps: install-omega-fmts
+ # The actual binary executables and pool files.
+ install-programs: @OMEGA@ install-omega-programs
+ install-omega-programs: $(omega_programs) $(bindir)
+- for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+ cd otps && $(MAKE) $(install_makeargs) install-programs
+ cd omegafonts && $(MAKE) $(install_makeargs) install-programs
+
+@@ -227,14 +227,14 @@ install-omega-links: install-omega-programs
+ install-fmts: @OMEGA@ install-omega-fmts
+ install-omega-fmts: ofmts $(ofmtdir)
+ ofmts="$(all_ofmts)"; \
+- for f in $$ofmts; do $(INSTALL_DATA) $$f $(ofmtdir)/$$f; done
++ for f in $$ofmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(ofmtdir)/$$f; done
+ ofmts="$(ofmts)"; \
+ for f in $$ofmts; do base=`basename $$f .fmt`; \
+- (cd $(bindir) && (rm -f $$base; $(LN) omega $$base)); done
++ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) omega $$base)); done
+
+ # Auxiliary files.
+ install-data:: @OMEGA@ install-omega-data
+ install-omega-pool: omega.pool $(texpooldir)
+- $(INSTALL_DATA) omega.pool $(texpooldir)/omega.pool
++ $(INSTALL_DATA) omega.pool ${DESTDIR}$(texpooldir)/omega.pool
+
+ # end of omega.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_omegafonts_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_omegafonts_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_omegafonts_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_omegafonts_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,19 @@
+$OpenBSD: patch-texk_web2c_omegafonts_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/web2c/omegafonts/Makefile.in.orig Wed Apr 18 13:29:36 2007
++++ texk/web2c/omegafonts/Makefile.in Wed Apr 18 13:31:07 2007
+@@ -52,12 +52,12 @@ install: install-exec
+ install-exec:: install-links
+
+ install-programs: $(programs)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+
+ install-links: install-programs
+ for f in ""$(linked_programs); do \
+- cd $(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
++ cd ${DESTDIR}$(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
+
+ Makefile: Makefile.in ../config.status
+ cd .. && $(SHELL) config.status
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_otps_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_otps_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_otps_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_otps_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,16 @@
+$OpenBSD: patch-texk_web2c_otps_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/web2c/otps/Makefile.in.orig Wed Apr 18 03:05:43 2007
++++ texk/web2c/otps/Makefile.in Wed Apr 18 03:06:28 2007
+@@ -35,9 +35,9 @@ outocp: outocp.o
+ $(programs): $(proglib) $(kpathsea)
+
+ install-programs: $(programs)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
+- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
++ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(scriptdir); done
+
+ Makefile: Makefile.in ../config.status
+ cd .. && $(SHELL) config.status
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_pdftexdir_pdftex_mk (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_pdftexdir_pdftex_mk)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_pdftexdir_pdftex_mk (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_pdftexdir_pdftex_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,40 @@
+$OpenBSD: patch-texk_web2c_pdftexdir_pdftex_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/web2c/pdftexdir/pdftex.mk.orig Tue Dec 26 23:37:34 2006
++++ texk/web2c/pdftexdir/pdftex.mk Fri May 4 20:28:40 2007
+@@ -92,7 +92,7 @@ pdfefmts: $(all_pdfefmts)
+
+ pdfefmtdir = $(web2cdir)/pdfetex
+ $(pdfefmtdir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(pdfefmtdir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(pdfefmtdir)
+
+ pdfetex.fmt: pdfetex
+ $(dumpenv) $(MAKE) progname=pdfetex files="etex.src plain.tex cmr10.tfm" prereq-check
+@@ -112,7 +112,7 @@ install-pdftex-dumps: install-pdftex-fmts
+ # The actual binary executables and pool files.
+ install-programs: @PETEX@ install-pdftex-programs
+ install-pdftex-programs: $(pdftex) $(bindir)
+- for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+
+ install-links: @PETEX@ install-pdftex-links
+ install-pdftex-links: install-pdftex-programs
+@@ -122,15 +122,15 @@ install-pdftex-links: install-pdftex-programs
+ install-fmts: @PETEX@ install-pdftex-fmts
+ install-pdftex-fmts: pdfefmts $(pdfefmtdir)
+ pdfefmts="$(all_pdfefmts)"; \
+- for f in $$pdfefmts; do $(INSTALL_DATA) $$f $(pdfefmtdir)/$$f; done
++ for f in $$pdfefmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(pdfefmtdir)/$$f; done
+ pdfefmts="$(pdfefmts)"; \
+ for f in $$pdfefmts; do base=`basename $$f .fmt`; \
+- (cd $(bindir) && (rm -f $$base; $(LN) pdftex $$base)); done
++ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) pdftex $$base)); done
+
+ # Auxiliary files.
+ install-data:: @PETEX@ install-pdftex-data
+ install-pdftex-pool: pdftex.pool $(texpooldir)
+- $(INSTALL_DATA) pdftex.pool $(texpooldir)/pdftex.pool
++ $(INSTALL_DATA) pdftex.pool ${DESTDIR}$(texpooldir)/pdftex.pool
+
+ #
+ # ttf2afm
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_texmfmem_h (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_texmfmem_h)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_texmfmem_h (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_texmfmem_h 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,84 @@
+$OpenBSD: patch-texk_web2c_texmfmem_h,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
+--- texk/web2c/texmfmem.h.orig Tue Jun 20 13:03:18 2006
++++ texk/web2c/texmfmem.h Fri Jun 22 10:51:56 2007
+@@ -112,33 +112,20 @@ typedef union
+ #else
+ twohalves hhfield;
+ #endif
+-#ifdef WORDS_BIGENDIAN
+ #ifdef XeTeX
+- struct
+- {
+- integer CINT;
+- integer CINT1;
+- } x;
+-#else
+- integer cint;
++ voidpointer ptr;
+ #endif
++#ifdef WORDS_BIGENDIAN
++ integer cint;
+ fourquarters qqqq;
+ #else /* not WORDS_BIGENDIAN */
+-#ifdef XeTeX
+ struct
+ {
+- integer CINT1;
+- integer CINT;
+- } x;
+-#else
+- struct
+- {
+ #if defined (TeX) && !defined (SMALLTeX) || defined (MF) && !defined (SMALLMF) || defined (MP) && !defined (SMALLMP)
+ halfword junk;
+ #endif /* big {TeX,MF,MP} */
+ integer CINT;
+ } u;
+-#endif
+
+ struct
+ {
+@@ -159,28 +146,13 @@ typedef union
+ typedef union
+ {
+ #ifdef WORDS_BIGENDIAN
+-#ifdef XeTeX
+- struct
+- {
+- integer CINT;
+- } x;
+-#else
+ integer cint;
+-#endif
+ fourquarters qqqq;
+ #else /* not WORDS_BIGENDIAN */
+-#ifdef XeTeX
+ struct
+ {
+- halfword junk;
+ integer CINT;
+- } x;
+-#else
+- struct
+- {
+- integer CINT;
+ } u;
+-#endif
+
+ struct
+ {
+@@ -199,14 +171,9 @@ typedef union
+ #define rh v.RH
+ #define lhfield v.LH
+
+-#ifdef XeTeX
+-#define cint x.CINT
+-#define cint1 x.CINT1
+-#else
+ #ifndef WORDS_BIGENDIAN
+ #define cint u.CINT
+ #endif
+-#endif /* XeTeX */
+
+ #ifndef WORDS_BIGENDIAN
+ #define qqqq v.QQQQ
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_ext_c (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_c)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_ext_c (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_ext_c 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,348 @@
+$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_ext_c,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
+--- texk/web2c/xetexdir/XeTeX_ext.c.orig Mon Jan 15 13:04:36 2007
++++ texk/web2c/xetexdir/XeTeX_ext.c Fri Jun 22 10:51:56 2007
+@@ -236,9 +236,9 @@ void initversionstring(char **versions)
+ }
+
+
+-extern char* gettexstring(int strNumber);
++extern char* gettexstring(integer strNumber);
+ void
+-setinputfileencoding(UFILE* f, int mode, int encodingData)
++setinputfileencoding(UFILE* f, integer mode, integer encodingData)
+ {
+ if ((f->encodingMode == ICUMAPPING) && (f->conversionData != NULL))
+ ucnv_close((UConverter*)(f->conversionData));
+@@ -288,9 +288,9 @@ input_line_icu(UFILE* f)
+ static char* byteBuffer = NULL;
+
+ UInt32 bytesRead = 0;
+- int i;
++ int i;
+ UConverter* cnv;
+- long outLen;
++ int outLen;
+ UErrorCode errorCode = 0;
+
+ if (byteBuffer == NULL)
+@@ -355,10 +355,9 @@ static UBreakIterator* brkIter = NULL;
+ static int brkLocaleStrNum = 0;
+
+ void
+-linebreakstart(int localeStrNum, const UniChar* text, int textLength)
++linebreakstart(integer localeStrNum, const UniChar* text, integer textLength)
+ {
+ UErrorCode status = 0;
+- int i;
+
+ if ((localeStrNum != brkLocaleStrNum) && (brkIter != NULL)) {
+ ubrk_close(brkIter);
+@@ -392,8 +391,8 @@ linebreaknext()
+ return ubrk_next((UBreakIterator*)brkIter);
+ }
+
+-long
+-getencodingmodeandinfo(long* info)
++int
++getencodingmodeandinfo(integer* info)
+ {
+ /* \XeTeXinputencoding "enc-name"
+ * -> name is packed in |nameoffile| as a C string, starting at [1]
+@@ -811,7 +810,7 @@ splitFontName(char* name, char** var, char** feat, cha
+ }
+
+ void*
+-findnativefont(unsigned char* uname, long scaled_size)
++findnativefont(unsigned char* uname, integer scaled_size)
+ /* scaled_size here is in TeX points */
+ {
+ void* rval = 0;
+@@ -950,7 +949,6 @@ void
+ otgetfontmetrics(void* pEngine, scaled* ascent, scaled* descent, scaled* xheight, scaled* capheight, scaled* slant)
+ {
+ XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
+- long rval = 0;
+ float a, d;
+ int glyphID;
+
+@@ -977,8 +975,8 @@ otgetfontmetrics(void* pEngine, scaled* ascent, scaled
+ *capheight = *ascent; /* arbitrary figure if there's no 'X' in the font */
+ }
+
+-long
+-otfontget(int what, void* pEngine)
++integer
++otfontget(integer what, void* pEngine)
+ {
+ XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
+ XeTeXFont fontInst = getFont(engine);
+@@ -995,8 +993,8 @@ otfontget(int what, void* pEngine)
+ }
+
+
+-long
+-otfontget1(int what, void* pEngine, long param)
++integer
++otfontget1(integer what, void* pEngine, integer param)
+ {
+ XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
+ XeTeXFont fontInst = getFont(engine);
+@@ -1013,8 +1011,8 @@ otfontget1(int what, void* pEngine, long param)
+ }
+
+
+-long
+-otfontget2(int what, void* pEngine, long param1, long param2)
++integer
++otfontget2(integer what, void* pEngine, integer param1, integer param2)
+ {
+ XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
+ XeTeXFont fontInst = getFont(engine);
+@@ -1032,8 +1030,8 @@ otfontget2(int what, void* pEngine, long param1, long
+ }
+
+
+-long
+-otfontget3(int what, void* pEngine, long param1, long param2, long param3)
++integer
++otfontget3(integer what, void* pEngine, integer param1, integer param2, integer param3)
+ {
+ XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
+ XeTeXFont fontInst = getFont(engine);
+@@ -1091,7 +1089,7 @@ makeXDVGlyphArrayData(void* pNode)
+ xdvbuffer = (char*)xmalloc(xdvBufSize);
+ }
+
+- glyph_info = (void*)native_glyph_info_ptr(p);
++ glyph_info = native_glyph_info_ptr(p);
+ locations = (FixedPoint*)glyph_info;
+ glyphIDs = (UInt16*)(locations + glyphCount);
+
+@@ -1138,8 +1136,8 @@ makeXDVGlyphArrayData(void* pNode)
+ return ((char*)cp - xdvbuffer);
+ }
+
+-long
+-makefontdef(long f)
++int
++makefontdef(integer f)
+ {
+ UInt16 flags = 0;
+ UInt32 variationCount = 0;
+@@ -1349,7 +1347,7 @@ snap_zone(scaled* value, scaled snap_value, scaled fuz
+ }
+
+ void
+-getnativecharheightdepth(int font, int ch, scaled* height, scaled* depth)
++getnativecharheightdepth(integer font, integer ch, scaled* height, scaled* depth)
+ {
+ #define QUAD(f) fontinfo[6+parambase[f]].cint
+ #define X_HEIGHT(f) fontinfo[5+parambase[f]].cint
+@@ -1389,7 +1387,7 @@ getnativecharheightdepth(int font, int ch, scaled* hei
+ }
+
+ scaled
+-getnativecharht(int f, int c)
++getnativecharht(integer f, integer c)
+ {
+ scaled h, d;
+ getnativecharheightdepth(f, c, &h, &d);
+@@ -1397,7 +1395,7 @@ getnativecharht(int f, int c)
+ }
+
+ scaled
+-getnativechardp(int f, int c)
++getnativechardp(integer f, integer c)
+ {
+ scaled h, d;
+ getnativecharheightdepth(f, c, &h, &d);
+@@ -1405,7 +1403,7 @@ getnativechardp(int f, int c)
+ }
+
+ void
+-getnativecharsidebearings(int font, int ch, scaled* lsb, scaled* rsb)
++getnativecharsidebearings(integer font, integer ch, scaled* lsb, scaled* rsb)
+ {
+ float l, r;
+
+@@ -1432,7 +1430,7 @@ getnativecharsidebearings(int font, int ch, scaled* ls
+ }
+
+ scaled
+-getnativecharic(int f, int c)
++getnativecharic(integer f, integer c)
+ {
+ scaled lsb, rsb;
+ getnativecharsidebearings(f, c, &lsb, &rsb);
+@@ -1443,7 +1441,7 @@ getnativecharic(int f, int c)
+ }
+
+ scaled
+-getnativecharwd(int f, int c)
++getnativecharwd(integer f, integer c)
+ {
+ scaled wd = 0;
+ #ifdef XETEX_MAC
+@@ -1515,7 +1513,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
+ void* glyph_info = 0;
+ static float* positions = 0;
+ static UInt32* glyphs = 0;
+- static long maxGlyphs = 0;
++ static int maxGlyphs = 0;
+
+ FixedPoint* locations;
+ UInt16* glyphIDs;
+@@ -1591,7 +1589,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
+
+ node_width(node) = X2Fix(wid);
+ native_glyph_count(node) = realGlyphCount;
+- native_glyph_info_ptr(node) = (long)glyph_info;
++ native_glyph_info_ptr(node) = glyph_info;
+ }
+ else {
+ int i;
+@@ -1632,7 +1630,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
+ }
+
+ native_glyph_count(node) = realGlyphCount;
+- native_glyph_info_ptr(node) = (long)glyph_info;
++ native_glyph_info_ptr(node) = glyph_info;
+ }
+
+ ubidi_close(pBiDi);
+@@ -1787,8 +1785,8 @@ measure_native_glyph(void* pNode, int use_glyph_metric
+ }
+ }
+
+-int
+-mapchartoglyph(int font, unsigned int ch)
++integer
++mapchartoglyph(integer font, integer ch)
+ {
+ if (ch > 0x10ffff || ((ch >= 0xd800) && (ch <= 0xdfff)))
+ return 0;
+@@ -1805,8 +1803,8 @@ mapchartoglyph(int font, unsigned int ch)
+ }
+ }
+
+-int
+-mapglyphtoindex(int font)
++integer
++mapglyphtoindex(integer font)
+ /* glyph name is at nameoffile+1 */
+ {
+ #ifdef XETEX_MAC
+@@ -1822,8 +1820,8 @@ mapglyphtoindex(int font)
+ }
+ }
+
+-int
+-getfontcharrange(int font, int first)
++integer
++getfontcharrange(integer font, int first)
+ {
+ #ifdef XETEX_MAC
+ if (fontarea[font] == AAT_FONT_FLAG)
+@@ -1928,10 +1926,10 @@ atsugetfontmetrics(ATSUStyle style, Fixed* ascent, Fix
+ #endif
+ }
+
+-long
++int
+ atsufontget(int what, ATSUStyle style)
+ {
+- long rval = -1;
++ int rval = -1;
+
+ #ifdef XETEX_MAC
+ ATSUFontID fontID;
+@@ -1966,10 +1964,10 @@ atsufontget(int what, ATSUStyle style)
+ return rval;
+ }
+
+-long
++int
+ atsufontget1(int what, ATSUStyle style, int param)
+ {
+- long rval = -1;
++ int rval = -1;
+
+ #ifdef XETEX_MAC
+ ATSUFontID fontID;
+@@ -2026,10 +2024,10 @@ atsufontget1(int what, ATSUStyle style, int param)
+ return rval;
+ }
+
+-long
++int
+ atsufontget2(int what, ATSUStyle style, int param1, int param2)
+ {
+- long rval = -1;
++ int rval = -1;
+
+ #ifdef XETEX_MAC
+ ATSUFontID fontID;
+@@ -2063,10 +2061,10 @@ atsufontget2(int what, ATSUStyle style, int param1, in
+ return rval;
+ }
+
+-long
++int
+ atsufontgetnamed(int what, ATSUStyle style)
+ {
+- long rval = -1;
++ int rval = -1;
+
+ #ifdef XETEX_MAC
+ ATSUFontID fontID;
+@@ -2090,10 +2088,10 @@ atsufontgetnamed(int what, ATSUStyle style)
+ return rval;
+ }
+
+-long
++int
+ atsufontgetnamed1(int what, ATSUStyle style, int param)
+ {
+- long rval = -1;
++ int rval = -1;
+
+ #ifdef XETEX_MAC
+ ATSUFontID fontID;
+@@ -2220,7 +2218,7 @@ atsuprintfontname(int what, ATSUStyle style, int param
+ }
+
+ void
+-printglyphname(int font, int gid)
++printglyphname(integer font, integer gid)
+ {
+ char* s;
+ int len = 0;
+@@ -2243,8 +2241,8 @@ printglyphname(int font, int gid)
+ printchar(*s++);
+ }
+
+-boolean
+-u_open_in(unicodefile* f, int filefmt, const_string fopen_mode, int mode, int encodingData)
++int
++u_open_in(unicodefile* f, integer filefmt, const_string fopen_mode, integer mode, integer encodingData)
+ {
+ boolean rval;
+ *f = malloc(sizeof(UFILE));
+@@ -2287,7 +2285,7 @@ u_open_in(unicodefile* f, int filefmt, const_string fo
+ return rval;
+ }
+
+-boolean
++int
+ open_dvi_output(FILE** fptr)
+ {
+ if (nopdfoutput) {
+@@ -2391,7 +2389,7 @@ get_uni_c(UFILE* f)
+ return rval;
+ }
+
+-boolean
++int
+ input_line(UFILE* f)
+ {
+ int i;
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_ext_h (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_h)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_ext_h (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_ext_h 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,109 @@
+$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_ext_h,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
+--- texk/web2c/xetexdir/XeTeX_ext.h.orig Fri Dec 29 17:54:26 2006
++++ texk/web2c/xetexdir/XeTeX_ext.h Fri Jun 22 10:51:56 2007
+@@ -141,10 +141,10 @@ typedef struct {
+ #define node_width(node) node[width_offset].cint
+ #define node_depth(node) node[depth_offset].cint
+ #define node_height(node) node[height_offset].cint
+-#define native_length(node) node[native_info_offset].hh.v.RH
+-#define native_font(node) node[native_info_offset].hh.b1
+-#define native_glyph_count(node) node[native_glyph_info_offset].hh.v.LH
+-#define native_glyph_info_ptr(node) node[native_glyph_info_offset].hh.v.RH
++#define native_length(node) node[native_info_offset].qqqq.b2
++#define native_font(node) node[native_info_offset].qqqq.b1
++#define native_glyph_count(node) node[native_info_offset].qqqq.b3
++#define native_glyph_info_ptr(node) node[native_glyph_info_offset].ptr
+ #define native_glyph_info_size 10 /* info for each glyph is location (FixedPoint) + glyph ID (UInt16) */
+
+ #define native_glyph(p) native_length(p) /* glyph ID field in a glyph_node */
+@@ -206,6 +206,8 @@ extern const UInt32 kSurrogateLowEnd;
+ extern const UInt32 byteMask;
+ extern const UInt32 byteMark;
+
++#include <stdio.h> /* for FILE */
++
+ #include "trans.h"
+
+ #ifdef __cplusplus
+@@ -213,51 +215,62 @@ extern "C" {
+ #endif
+ void initversionstring(char **versions);
+
+- void setinputfileencoding(unicodefile f, int mode, int encodingData);
++ void setinputfileencoding(unicodefile f, integer mode, integer encodingData);
+ void uclose(unicodefile f);
+ int input_line_icu(unicodefile f);
+- void linebreakstart(int localeStrNum, const UniChar* text, int textLength);
++ void linebreakstart(integer localeStrNum, const UniChar* text, integer textLength);
+ int linebreaknext();
+- long getencodingmodeandinfo(long* info);
++ int getencodingmodeandinfo(integer* info);
+ void printutf8str(const unsigned char* str, int len);
+ void printchars(const unsigned short* str, int len);
+ void* load_mapping_file(const char* s, const char* e);
+- void* findnativefont(unsigned char* name, long scaled_size);
++ void* findnativefont(unsigned char* name, integer scaled_size);
+ void releasefontengine(void* engine, int type_flag);
+
+- /* 'integer' params here are really TeX 'scaled' values, but that typedef isn't available every place this is included */
++ /* the metrics params here are really TeX 'scaled' values, but that typedef isn't available every place this is included */
+ void otgetfontmetrics(void* engine, integer* ascent, integer* descent, integer* xheight, integer* capheight, integer* slant);
+- void getnativecharheightdepth(int font, int ch, integer* height, integer* depth);
+- void getnativecharsidebearings(int font, int ch, integer* lsb, integer* rsb);
++ void getnativecharheightdepth(integer font, integer ch, integer* height, integer* depth);
++ void getnativecharsidebearings(integer font, integer ch, integer* lsb, integer* rsb);
+
+ /* single-purpose metrics accessors */
+- integer getnativecharwd(int font, int ch);
+- integer getnativecharht(int font, int ch);
+- integer getnativechardp(int font, int ch);
+- integer getnativecharic(int font, int ch);
++ integer getnativecharwd(integer font, integer ch);
++ integer getnativecharht(integer font, integer ch);
++ integer getnativechardp(integer font, integer ch);
++ integer getnativecharic(integer font, integer ch);
+
+- long otfontget(int what, void* engine);
+- long otfontget1(int what, void* engine, long param);
+- long otfontget2(int what, void* engine, long param1, long param2);
+- long otfontget3(int what, void* engine, long param1, long param2, long param3);
++ integer otfontget(integer what, void* engine);
++ integer otfontget1(integer what, void* engine, integer param);
++ integer otfontget2(integer what, void* engine, integer param1, integer param2);
++ integer otfontget3(integer what, void* engine, integer param1, integer param2, integer param3);
+ int makeXDVGlyphArrayData(void* p);
+- long makefontdef(long f);
++ int makefontdef(integer f);
+ int applymapping(void* cnv, const UniChar* txtPtr, int txtLen);
+ void store_justified_native_glyphs(void* node);
+ void measure_native_node(void* node, int use_glyph_metrics);
+ Fixed get_native_ital_corr(void* node);
+ Fixed get_native_glyph_ital_corr(void* node);
+ void measure_native_glyph(void* node, int use_glyph_metrics);
+- int mapchartoglyph(int font, unsigned int ch);
+- int mapglyphtoindex(int font);
++ integer mapchartoglyph(integer font, integer ch);
++ integer mapglyphtoindex(integer font);
++ integer getfontcharrange(integer font, int first);
++ void printglyphname(integer font, integer gid);
+
++ double read_double(const char** s);
++ unsigned int read_rgb_a(const char** cp);
++
+ const char* getGlyphNamePtr(const char* buffer, int tableSize, UInt16 gid, int* len);
+
+ int find_pic_file(char** path, realrect* bounds, int pdfBoxType, int page);
++ int u_open_in(unicodefile* f, integer filefmt, const char* fopen_mode, integer mode, integer encodingData);
++ int open_dvi_output(FILE** fptr);
++ void dviclose(FILE* fptr);
++ int get_uni_c(UFILE* f);
++ int input_line(UFILE* f);
++ void makeutf16name();
+
+ #ifdef XETEX_MAC
+ /* functions in XeTeX_mac.c */
+- void* loadAATfont(ATSFontRef fontRef, long scaled_size, const char* cp1);
++ void* loadAATfont(ATSFontRef fontRef, integer scaled_size, const char* cp1);
+ void DoAtsuiLayout(void* node, int justify);
+ void GetGlyphBBox_AAT(ATSUStyle style, UInt16 gid, GlyphBBox* bbox);
+ float GetGlyphWidth_AAT(ATSUStyle style, UInt16 gid);
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_mac_c (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_mac_c)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_mac_c (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_XeTeX_mac_c 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,12 @@
+$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_mac_c,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
+--- texk/web2c/xetexdir/XeTeX_mac.c.orig Wed Dec 6 17:29:15 2006
++++ texk/web2c/xetexdir/XeTeX_mac.c Fri Jun 22 10:51:56 2007
+@@ -162,7 +162,7 @@ DoAtsuiLayout(void* p, int justify)
+ lsDelta -= lsUnit;
+
+ native_glyph_count(node) = realGlyphCount;
+- native_glyph_info_ptr(node) = (long)glyph_info;
++ native_glyph_info_ptr(node) = glyph_info;
+
+ if (!justify)
+ node_width(node) = FixedPStoTeXPoints(layoutRec[count-1].realPos) + lsDelta;
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_jpegimage_c (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_jpegimage_c)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_jpegimage_c (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_jpegimage_c 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,12 @@
+$OpenBSD: patch-texk_web2c_xetexdir_jpegimage_c,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
+--- texk/web2c/xetexdir/jpegimage.c.orig Wed Jul 26 17:19:45 2006
++++ texk/web2c/xetexdir/jpegimage.c Wed Jun 27 13:17:43 2007
+@@ -81,6 +81,8 @@
+
+ #include <memory.h>
+
++#include "kpathsea/lib.h" /* for xmalloc/xrealloc prototypes */
++
+ #define JPEG_DEBUG_STR "JPEG"
+ #define JPEG_DEBUG 3
+
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex-new_ch (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex-new_ch)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex-new_ch (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex-new_ch 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,267 @@
+$OpenBSD: patch-texk_web2c_xetexdir_xetex-new_ch,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
+--- texk/web2c/xetexdir/xetex-new.ch.orig Wed Jan 3 16:25:04 2007
++++ texk/web2c/xetexdir/xetex-new.ch Fri Jun 22 10:51:56 2007
+@@ -56,7 +56,7 @@
+
+ @d XeTeX_version=0
+ @d XeTeX_revision==".996"
+- at d XeTeX_version_string=='-0.996' {current \XeTeX\ version}
++ at d XeTeX_version_string=='-0.996-patch1' {current \XeTeX\ version}
+ @z
+
+ @x
+@@ -706,29 +706,28 @@ if max_quarterword-min_quarterword<@"FFFF then bad:=19
+
+ To support ``native'' fonts, we build |native_word_nodes|, which are variable size whatsits.
+ These have the same |width|, |depth|, and |height| fields as a |box_node|, at offsets 1-3,
+-and then a word containing a size field for the node, a font number, and a length.
+-Then there is a field containing two halfwords, a glyph count and a C pointer to a glyph info array;
+-these are set by |set_native_metrics|. Copying and freeing of these nodes needs to take account of this!
++and then a word containing a size field for the node, a font number, a length, and a glyph count.
++Then there is a field containing a C pointer to a glyph info array;
++this and the glyph count are set by |set_native_metrics|.
++Copying and freeing of these nodes needs to take account of this!
+ This is followed by |length| bytes, for the actual characters of the string.
+ (Yes, we count in bytes, even though what we store there is UTF-16.)
+
+ So |native_node_size|, which does not include any space for the actual text, is 6.}
+
+- at d deleted_native_node=41 {native words that have been superseded by their successors}
+-
+ @d native_node_size=6 {size of a native_word node (plus the actual chars) -- see also xetex.h}
+- at d native_size(#)==mem[#+4].hh.b0
+- at d native_font(#)==mem[#+4].hh.b1
+- at d native_length(#)==mem[#+4].hh.rh
+- at d native_glyph_count(#)==mem[#+5].hh.lh
+- at d native_glyph_info_ptr(#)==mem[#+5].hh.rh
++ at d native_size(#)==mem[#+4].qqqq.b0
++ at d native_font(#)==mem[#+4].qqqq.b1
++ at d native_length(#)==mem[#+4].qqqq.b2
++ at d native_glyph_count(#)==mem[#+4].qqqq.b3
++ at d native_glyph_info_ptr(#)==mem[#+5].ptr
+ @d native_glyph_info_size=10 { number of bytes of info per glyph: 16-bit glyph ID, 32-bit x and y coords }
+
+ @d free_native_glyph_info(#) ==
+ begin
+- if native_glyph_info_ptr(#) <> 0 then begin
+- libc_free(cast_to_ptr(native_glyph_info_ptr(#)));
+- native_glyph_info_ptr(#) := 0;
++ if native_glyph_info_ptr(#) <> null_ptr then begin
++ libc_free(native_glyph_info_ptr(#));
++ native_glyph_info_ptr(#) := null_ptr;
+ native_glyph_count(#) := 0;
+ end
+ end
+@@ -736,10 +735,10 @@ So |native_node_size|, which does not include any spac
+ @p procedure copy_native_glyph_info(src:pointer; dest:pointer);
+ var glyph_count:integer;
+ begin
+- if native_glyph_info_ptr(src) <> 0 then begin
++ if native_glyph_info_ptr(src) <> null_ptr then begin
+ glyph_count := native_glyph_count(src);
+- native_glyph_info_ptr(dest) := cast_to_integer(xmalloc_array(char, glyph_count * native_glyph_info_size));
+- memcpy(cast_to_ptr(native_glyph_info_ptr(dest)), cast_to_ptr(native_glyph_info_ptr(src)), glyph_count * native_glyph_info_size);
++ native_glyph_info_ptr(dest) := xmalloc_array(char, glyph_count * native_glyph_info_size);
++ memcpy(native_glyph_info_ptr(dest), native_glyph_info_ptr(src), glyph_count * native_glyph_info_size);
+ native_glyph_count(dest) := glyph_count;
+ end
+ end;
+@@ -2936,8 +2935,7 @@ done:
+ end
+
+ @ @<Advance |q| past ignorable nodes@>=
+-while (q <> null) and (not is_char_node(q))
+- and ( (type(q) = disc_node) or ((type(q) = whatsit_node) and (subtype(q) = deleted_native_node)) ) do
++while (q <> null) and (not is_char_node(q)) and (type(q) = disc_node) do
+ q := link(q)
+
+ @ We ought to give special care to the efficiency of one part of |hlist_out|,
+@@ -3293,7 +3291,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
+ or (subtype(v)=pic_node)
+ or (subtype(v)=pdf_node)
+ then break_width[1]:=break_width[1]-width(v)
+- else if subtype(v)=deleted_native_node then do_nothing
+ else confusion("disc1a");
+ othercases confusion("disc1")
+ @z
+@@ -3307,7 +3304,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
+ or (subtype(s)=pic_node)
+ or (subtype(s)=pdf_node)
+ then break_width[1]:=break_width[1]+width(s)
+- else if subtype(s)=deleted_native_node then do_nothing
+ else confusion("disc2a");
+ othercases confusion("disc2")
+ @z
+@@ -3327,7 +3323,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
+ or (subtype(s)=pic_node)
+ or (subtype(s)=pdf_node)
+ then disc_width:=disc_width+width(s)
+- else if subtype(s)=deleted_native_node then do_nothing
+ else confusion("disc3a");
+ othercases confusion("disc3")
+ @z
+@@ -3341,7 +3336,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
+ or (subtype(s)=pic_node)
+ or (subtype(s)=pdf_node)
+ then act_width:=act_width+width(s)
+- else if subtype(s)=deleted_native_node then do_nothing
+ else confusion("disc4a");
+ othercases confusion("disc4")
+ @z
+@@ -3784,7 +3778,7 @@ hmode+char_num: begin scan_usv_num; cur_chr:=cur_val;
+ @!main_p:pointer; {temporary register for list manipulation}
+ @y
+ @!main_p:pointer; {temporary register for list manipulation}
+-@!main_pp:pointer; {another temporary register for list manipulation}
++@!main_pp,@!main_ppp:pointer; {more temporary registers for list manipulation}
+ @!main_h:pointer; {temp for hyphen offset in native-font text}
+ @!is_hyph:boolean; {whether the last char seen is the font's hyphenchar}
+ @z
+@@ -3859,11 +3853,22 @@ collect_native:
+
+ if mode=hmode then begin
+
++ main_ppp := head;
++ if main_ppp<>main_pp then
++ while (link(main_ppp)<>main_pp) do
++ main_ppp:=link(main_ppp); { find node preceding tail }
++
+ temp_ptr := str_start_macro(str_ptr);
+ repeat
+ if main_h = 0 then main_h := main_k;
+
+- if (not is_char_node(main_pp)) and (type(main_pp)=whatsit_node) and (subtype(main_pp)=native_word_node) and (native_font(main_pp)=main_f) then begin
++ if (not is_char_node(main_pp))
++ and (type(main_pp)=whatsit_node)
++ and (subtype(main_pp)=native_word_node)
++ and (native_font(main_pp)=main_f)
++ and (main_ppp<>main_pp)
++ and type(main_ppp)<>disc_node
++ then begin
+
+ { make a new temp string that contains the concatenated text of |tail| + the current word/fragment }
+ main_k := main_h + native_length(main_pp);
+@@ -3888,9 +3893,13 @@ collect_native:
+ do incr(main_h); { look for next hyphen or end of text }
+ if (main_h < main_k) then incr(main_h);
+
+- { flag the previous node as no longer valid }
+- free_native_glyph_info(main_pp);
+- subtype(main_pp) := deleted_native_node;
++ { remove the preceding node from the list }
++ link(main_ppp) := link(main_pp);
++ link(main_pp) := null;
++ flush_node_list(main_pp);
++ main_pp := tail;
++ while (link(main_ppp)<>main_pp) do
++ main_ppp:=link(main_ppp);
+
+ end else begin
+
+@@ -3929,9 +3938,14 @@ collect_native:
+ set_native_char(tail, main_p + native_length(main_pp), str_pool[str_start_macro(str_ptr) + main_p]);
+ set_native_metrics(tail, XeTeX_use_glyph_metrics);
+
+- { flag the previous node as no longer valid }
+- free_native_glyph_info(main_pp);
+- subtype(main_pp) := deleted_native_node;
++ { remove the preceding node from the list }
++ main_p := head;
++ if main_p<>main_pp then
++ while link(main_p)<>main_pp do
++ main_p := link(main_p);
++ link(main_p) := link(main_pp);
++ link(main_pp) := null;
++ flush_node_list(main_pp);
+ end else begin
+ { package the current string into a |native_word| whatsit }
+ link(main_pp) := new_native_word_node(main_f, main_k);
+@@ -3997,7 +4011,6 @@ begin if tail<>head then
+ @y
+ if type(p)<>kern_node then if type(p)<>ligature_node then
+ if (type(p)<>whatsit_node) or ((subtype(p)<>native_word_node)
+- and (subtype(p)<>deleted_native_node)
+ and (subtype(p)<>glyph_node)) then
+ begin print_err("Improper discretionary list");
+ @z
+@@ -4802,8 +4815,10 @@ native_word_node:begin
+ print_char(" ");
+ print_native_word(p);
+ end;
++@{
+ deleted_native_node:
+ print("[DELETED]");
++@}
+ glyph_node:begin
+ print_esc(font_id_text(native_font(p)));
+ print(" glyph#");
+@@ -4837,12 +4852,9 @@ native_word_node: begin words:=native_size(p);
+ r:=get_node(words);
+ while words > 0 do
+ begin decr(words); mem[r+words]:=mem[p+words]; end;
+- native_glyph_info_ptr(r):=0; native_glyph_count(r):=0;
++ native_glyph_info_ptr(r):=null_ptr; native_glyph_count(r):=0;
+ copy_native_glyph_info(p, r);
+ end;
+-deleted_native_node: begin words:=native_size(p);
+- r:=get_node(words);
+- end;
+ glyph_node: begin r:=get_node(glyph_node_size);
+ words:=glyph_node_size;
+ end;
+@@ -4858,7 +4870,6 @@ othercases confusion("ext2")
+ othercases confusion("ext3")
+ @y
+ native_word_node: begin free_native_glyph_info(p); free_node(p,native_size(p)); end;
+-deleted_native_node: free_node(p,native_size(p));
+ glyph_node: free_node(p,glyph_node_size);
+ pic_node,pdf_node: free_node(p,total_pic_node_size(p));
+ pdf_save_pos_node:
+@@ -5106,7 +5117,7 @@ begin
+ dvi_two(native_glyph(p));
+ cur_h := cur_h + width(p);
+ end else begin
+- if native_glyph_info_ptr(p) <> 0 then begin
++ if native_glyph_info_ptr(p) <> null_ptr then begin
+ len := make_xdv_glyph_array_data(p);
+ for k := 0 to len-1 do
+ dvi_out(xdv_buffer_byte(k));
+@@ -5231,7 +5242,7 @@ end;
+ @x
+ language_node:do_nothing;
+ @y
+-language_node,deleted_native_node:do_nothing;
++language_node:do_nothing;
+ @z
+
+ @x
+@@ -6012,6 +6023,11 @@ whatsit_node:
+ goto next_p;
+
+ @ Here we compute the effective width of a glue node as in |hlist_out|.
++
++@<Cases of |reverse|...@>=
++glue_node: begin round_glue;
++ @<Handle a glue node for mixed...@>;
++ end;
+ @z
+
+ @x
+@@ -6106,7 +6122,7 @@ begin
+ native_length(q) := n;
+
+ native_glyph_count(q) := 0;
+- native_glyph_info_ptr(q) := 0;
++ native_glyph_info_ptr(q) := null_ptr;
+
+ new_native_word_node := q;
+ end;
+@@ -6163,7 +6179,7 @@ begin
+
+ native_size(p) := native_node_size + 1;
+ native_glyph_count(p) := 0;
+- native_glyph_info_ptr(p) := 0;
++ native_glyph_info_ptr(p) := null_ptr;
+ native_font(p) := f;
+
+ if c > @"FFFF then begin
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_defines (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_defines)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_defines (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_defines 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,12 @@
+$OpenBSD: patch-texk_web2c_xetexdir_xetex_defines,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
+--- texk/web2c/xetexdir/xetex.defines.orig Wed Dec 6 17:29:15 2006
++++ texk/web2c/xetexdir/xetex.defines Fri Jun 22 10:51:56 2007
+@@ -32,6 +32,8 @@ authorization from SIL International.
+
+ { xetex.defines: additions for xetex }
+
++ at define @field ptr;
++ at define const nullptr;
+ @define type voidpointer;
+ @define function getnativechar();
+ @define procedure setnativechar();
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_h (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_h)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_h (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_h 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,13 @@
+$OpenBSD: patch-texk_web2c_xetexdir_xetex_h,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
+--- texk/web2c/xetexdir/xetex.h.orig Wed Dec 6 17:29:15 2006
++++ texk/web2c/xetexdir/xetex.h Fri Jun 22 10:51:56 2007
+@@ -63,8 +63,7 @@ void* getotassemblyptr(int f, int g); /* function in X
+
+ #define dviopenout(f) open_dvi_output(&(f))
+
+-#define casttoptr(x) (void*)(x)
+-#define casttointeger(x) (long)(x)
++#define nullptr (NULL)
+ #define glyphinfobyte(p,k) ((unsigned char*)p)[k]
+ #define casttoushort(x) (unsigned short)(x)
+
Copied: trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_mk (from rev 30880, trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_mk)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_mk (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_web2c_xetexdir_xetex_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,38 @@
+$OpenBSD: patch-texk_web2c_xetexdir_xetex_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
+--- texk/web2c/xetexdir/xetex.mk.orig Sat Jan 20 12:44:35 2007
++++ texk/web2c/xetexdir/xetex.mk Fri May 4 20:28:40 2007
+@@ -275,7 +275,7 @@ xefmts: $(all_xefmts)
+
+ xefmtdir = $(web2cdir)/xetex
+ $(xefmtdir)::
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(xefmtdir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(xefmtdir)
+
+ xetex.fmt: xetex
+ $(dumpenv) $(MAKE) progname=xetex files="xetex.ini unicode-letters.tex plain.tex cmr10.tfm" prereq-check
+@@ -294,7 +294,7 @@ install-xetex-dumps: install-xetex-fmts
+
+ install-programs: @XETEX@ install-xetex-programs
+ install-xetex-programs: xetex $(bindir)
+- for p in xetex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++ for p in xetex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
+
+ install-links: @XETEX@ install-xetex-links
+ install-xetex-links: install-xetex-programs
+@@ -304,13 +304,13 @@ install-xetex-links: install-xetex-programs
+ install-fmts: @XETEX@ install-xetex-fmts
+ install-xetex-fmts: xefmts $(xefmtdir)
+ xefmts="$(all_xefmts)"; \
+- for f in $$xefmts; do $(INSTALL_DATA) $$f $(xefmtdir)/$$f; done
++ for f in $$xefmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(xefmtdir)/$$f; done
+ xefmts="$(xefmts)"; \
+ for f in $$xefmts; do base=`basename $$f .fmt`; \
+- (cd $(bindir) && (rm -f $$base; $(LN) xetex $$base)); done
++ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) xetex $$base)); done
+
+ install-data:: @XETEX@ install-xetex-data
+ install-xetex-pool: xetex.pool $(texpooldir)
+- $(INSTALL_DATA) xetex.pool $(texpooldir)/xetex.pool
++ $(INSTALL_DATA) xetex.pool ${DESTDIR}$(texpooldir)/xetex.pool
+
+ # end of xetex.mk
Copied: trunk/dports/tex/texlive/files/patch-texk_xdv2pdf_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_xdv2pdf_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_xdv2pdf_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_xdv2pdf_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,24 @@
+$OpenBSD: patch-texk_xdv2pdf_Makefile_in,v 1.1.1.1 2007/07/17 21:53:25 jasper Exp $
+--- texk/xdv2pdf/Makefile.in.orig Sat Apr 21 18:37:26 2007
++++ texk/xdv2pdf/Makefile.in Sat Apr 21 18:38:20 2007
+@@ -57,15 +57,15 @@ distclean::
+ $(RM) config.h
+
+ install-exec:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
+- $(INSTALL) $(t1wrap) $(bindir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
++ $(INSTALL) $(t1wrap) ${DESTDIR}$(bindir)
+
+ uninstall-exec:
+- cd $(bindir); rm -f $(programs)
++ cd ${DESTDIR}$(bindir); rm -f $(programs)
+
+ install-data:
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
+
+ uninstall-data:
+
Copied: trunk/dports/tex/texlive/files/patch-texk_xdvik_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-texk_xdvik_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_xdvik_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_xdvik_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,83 @@
+$OpenBSD: patch-texk_xdvik_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
+--- texk/xdvik/Makefile.in.orig Sat Apr 21 18:39:04 2007
++++ texk/xdvik/Makefile.in Sat Apr 21 18:41:40 2007
+@@ -125,51 +125,51 @@ install: install-exec install-data
+ uninstall: uninstall-exec uninstall-data
+
+ install-exec: @final_exec_name@
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+- $(INSTALL_LIBTOOL_PROG) @final_exec_name@ $(bindir)
+- $(INSTALL_SCRIPT) xdvi-sh $(scriptdir)/@wrapper_script@
+- rm -f $(scriptdir)/o at wrapper_script@
+- ln -s @wrapper_script@ $(scriptdir)/o at wrapper_script@
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
++ $(INSTALL_LIBTOOL_PROG) @final_exec_name@ ${DESTDIR}$(bindir)
++ $(INSTALL_SCRIPT) xdvi-sh ${DESTDIR}$(scriptdir)/@wrapper_script@
++ rm -f ${DESTDIR}$(scriptdir)/o at wrapper_script@
++ ln -s @wrapper_script@ ${DESTDIR}$(scriptdir)/o at wrapper_script@
+ ### fix wrong CVS permissions for shell script
+- $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
+- chmod +x $(scriptdir)/xdvizilla
++ $(INSTALL_SCRIPT) $(srcdir)/xdvizilla ${DESTDIR}$(scriptdir)/xdvizilla
++ chmod +x ${DESTDIR}$(scriptdir)/xdvizilla
+
+ uninstall-exec:
+- for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
+- for p in @wrapper_script@ o at wrapper_script@; do rm -f $(scriptdir)/$$p; done
++ for p in @final_exec_name@; do rm -f ${DESTDIR}$(bindir)/$$p; done
++ for p in @wrapper_script@ o at wrapper_script@; do rm -f ${DESTDIR}$(scriptdir)/$$p; done
+
+ install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
+- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
+- $(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
+- rm -f $(man1dir)/o$(manpage).$(manext)
+- ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
+- $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
+- $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
++ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/xdvi/pixmaps
++ $(INSTALL_DATA) $(manpage).1 ${DESTDIR}$(man1dir)/$(manpage).$(manext)
++ rm -f ${DESTDIR}$(man1dir)/o$(manpage).$(manext)
++ ln -s $(manpage).$(manext) ${DESTDIR}$(man1dir)/o$(manpage).$(manext)
++ $(INSTALL_DATA) $(srcdir)/texmf/XDvi ${DESTDIR}$(texmf)/xdvi/XDvi
++ $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm ${DESTDIR}$(texmf)/xdvi/pixmaps
+ if \
+- grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
+- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
++ grep 'original xdvi.cfg --' ${DESTDIR}$(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
++ || test ! -r ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
+ then \
+- $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \
++ $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
+ else \
+ true; \
+ fi
+- $(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext)
++ $(INSTALL_DATA) $(srcdir)/xdvizilla.1 ${DESTDIR}$(man1dir)/xdvizilla.$(manext)
+
+ uninstall-data:
+- rm -f $(man1dir)/$(manpage).$(manext) $(man1dir)/xdvizilla.$(manext) \
+- $(scriptdir)/xdvizilla \
+- $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
+- $(texmf)/xdvi/XDvi
++ rm -f ${DESTDIR}$(man1dir)/$(manpage).$(manext) ${DESTDIR}$(man1dir)/xdvizilla.$(manext) \
++ ${DESTDIR}$(scriptdir)/xdvizilla \
++ ${DESTDIR}$(texmf)/xdvi/pixmaps/toolbar.xpm ${DESTDIR}$(texmf)/xdvi/pixmaps/toolbar2.xpm \
++ ${DESTDIR}$(texmf)/xdvi/XDvi
+ if \
+- head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
+- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
++ head -n 1 ${DESTDIR}$(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
++ || test ! -r ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
+ then \
+- rm -f $(texmf)/xdvi/xdvi.cfg; \
++ rm -f ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
+ else \
+ true; \
+ fi
+- rmdir $(texmf)/xdvi/pixmaps
++ rmdir ${DESTDIR}$(texmf)/xdvi/pixmaps
+
+ distname = xdvik
+ program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \
Copied: trunk/dports/tex/texlive/files/patch-texk_xdvipdfmx_src_tt_cmap_c (from rev 30880, trunk/dports/tex/texlive/patch-texk_xdvipdfmx_src_tt_cmap_c)
===================================================================
--- trunk/dports/tex/texlive/files/patch-texk_xdvipdfmx_src_tt_cmap_c (rev 0)
+++ trunk/dports/tex/texlive/files/patch-texk_xdvipdfmx_src_tt_cmap_c 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,33 @@
+$OpenBSD: patch-texk_xdvipdfmx_src_tt_cmap_c,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
+--- texk/xdvipdfmx/src/tt_cmap.c.orig Fri Sep 29 16:15:10 2006
++++ texk/xdvipdfmx/src/tt_cmap.c Tue Jun 26 14:53:54 2007
+@@ -303,6 +303,9 @@ lookup_cmap4 (struct cmap4 *map, USHORT cc)
+ if (cc >= map->startCount[i]) {
+ if (map->idRangeOffset[i] == 0) {
+ gid = (cc + map->idDelta[i]) & 0xffff;
++ } else if (cc == 0xffff && map->idRangeOffset[i] == 0xffff) {
++ /* this is for protection against some old broken fonts... */
++ gid = 0;
+ } else {
+ j = map->idRangeOffset[i] - (segCount - i) * 2;
+ j = (cc - map->startCount[i]) + (j / 2);
+@@ -630,6 +633,9 @@ load_cmap4 (struct cmap4 *map,
+ ch = c0 + j;
+ if (map->idRangeOffset[i] == 0) {
+ gid = (ch + map->idDelta[i]) & 0xffff;
++ } else if (c0 == 0xffff && c1 == 0xffff && map->idRangeOffset[i] == 0xffff) {
++ /* this is for protection against some old broken fonts... */
++ gid = 0;
+ } else {
+ gid = (map->glyphIndexArray[j+d] +
+ map->idDelta[i]) & 0xffff;
+@@ -952,6 +958,9 @@ create_ToUnicode_cmap4 (struct cmap4 *map,
+ ch = c0 + j;
+ if (map->idRangeOffset[i] == 0) {
+ gid = (ch + map->idDelta[i]) & 0xffff;
++ } else if (c0 == 0xffff && c1 == 0xffff && map->idRangeOffset[i] == 0xffff) {
++ /* this is for protection against some old broken fonts... */
++ gid = 0;
+ } else {
+ gid = (map->glyphIndexArray[j+d] +
+ map->idDelta[i]) & 0xffff;
Copied: trunk/dports/tex/texlive/files/patch-utils_dialog_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-utils_dialog_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-utils_dialog_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-utils_dialog_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,32 @@
+$OpenBSD: patch-utils_dialog_Makefile_in,v 1.2 2007/10/15 07:31:57 kili Exp $
+--- utils/dialog/Makefile.in.orig Tue Jan 17 22:16:42 2006
++++ utils/dialog/Makefile.in Sun Oct 14 21:54:04 2007
+@@ -104,23 +104,23 @@ SHELL = /bin/sh
+ @SET_MAKE@
+
+ .PHONY: install installdirs install-exec
+-install: install-exec $(man1dir)/tcdialog.$(manext)
++install: install-exec ${DESTDIR}$(man1dir)/tcdialog.$(manext)
+
+ install-exec: installdirs $(bindir)/tcdialog
+
+ installdirs:
+- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(man1dir)
++ $(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(man1dir)
+
+ $(bindir)/tcdialog: dialog
+- $(INSTALL_PROGRAM) dialog $@
++ $(INSTALL_PROGRAM) dialog ${DESTDIR}$@
+
+-$(man1dir)/tcdialog.$(manext): dialog.man
++${DESTDIR}$(man1dir)/tcdialog.$(manext): dialog.man
+ $(INSTALL_DATA) $(srcdir)/dialog.man $@
+
+
+ check:
+ uninstall:
+- -rm -f $(bindir)/tcdialog $(man1dir)/tcdialog.$(manext)
++ -rm -f ${DESTDIR}$(bindir)/tcdialog ${DESTDIR}$(man1dir)/tcdialog.$(manext)
+
+
+ .PHONY: clean realclean distclean mostlyclean
Copied: trunk/dports/tex/texlive/files/patch-utils_ps2eps_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-utils_ps2eps_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-utils_ps2eps_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-utils_ps2eps_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,26 @@
+$OpenBSD: patch-utils_ps2eps_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
+--- utils/ps2eps/Makefile.in.orig Wed Jan 10 01:13:09 2007
++++ utils/ps2eps/Makefile.in Tue Apr 17 17:24:46 2007
+@@ -28,16 +28,16 @@ bbox: bbox.o
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+
+ install: bbox
+- $(INSTALL) -d $(bindir) $(mandir)/man1
+- $(INSTALL_SCRIPT) $(srcdir)/ps2eps $(bindir)/ps2eps
+- $(INSTALL_PROGRAM) bbox $(bindir)/bbox
+- $(INSTALL_DATA) $(srcdir)/ps2eps.1 $(mandir)/man1/ps2eps.1
+- $(INSTALL_DATA) $(srcdir)/bbox.1 $(mandir)/man1/bbox.1
++ $(INSTALL) -d ${DESTDIR}$(bindir) ${DESTDIR}$(mandir)/man1
++ $(INSTALL_SCRIPT) $(srcdir)/ps2eps ${DESTDIR}$(bindir)/ps2eps
++ $(INSTALL_PROGRAM) bbox ${DESTDIR}$(bindir)/bbox
++ $(INSTALL_DATA) $(srcdir)/ps2eps.1 ${DESTDIR}$(mandir)/man1/ps2eps.1
++ $(INSTALL_DATA) $(srcdir)/bbox.1 ${DESTDIR}$(mandir)/man1/bbox.1
+
+ check:
+
+ uninstall:
+- -rm -f $(bindir)/ps2eps $(bindir)/bbox $(mandir)/man1/ps2eps.1 $(mandir)/man1/bbox.1
++ -rm -f ${DESTDIR}$(bindir)/ps2eps ${DESTDIR}$(bindir)/bbox ${DESTDIR}$(mandir)/man1/ps2eps.1 ${DESTDIR}$(mandir)/man1/bbox.1
+
+ clean:
+ -rm -f bbox bbox.o
Copied: trunk/dports/tex/texlive/files/patch-utils_psutils_Makefile_in (from rev 30880, trunk/dports/tex/texlive/patch-utils_psutils_Makefile_in)
===================================================================
--- trunk/dports/tex/texlive/files/patch-utils_psutils_Makefile_in (rev 0)
+++ trunk/dports/tex/texlive/files/patch-utils_psutils_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -0,0 +1,31 @@
+$OpenBSD: patch-utils_psutils_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
+--- utils/psutils/Makefile.in.orig Tue Apr 17 17:27:13 2007
++++ utils/psutils/Makefile.in Tue Apr 17 17:29:04 2007
+@@ -193,14 +193,14 @@ SHELL = /bin/sh
+ install: install-exec install-man
+
+ install-exec: installdirs
+- for p in $(BIN); do $(INSTALL_PROGRAM) $$p $(bindir)/$$p; done
+- for p in $(SHELLSCRIPTS) $(PERLSCRIPTS); do $(INSTALL_PROGRAM) $$p $(scriptdir)/$$p; done
++ for p in $(BIN); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/$$p; done
++ for p in $(SHELLSCRIPTS) $(PERLSCRIPTS); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(scriptdir)/$$p; done
+
+ install-man: installdirs
+- for p in $(MANPAGES); do $(INSTALL_DATA) $$p $(man1dir)/$$p; done
++ for p in $(MANPAGES); do $(INSTALL_DATA) $$p ${DESTDIR}$(man1dir)/$$p; done
+
+ installdirs:
+- $(SHELL) ${srcdir}/../../texk/mkinstalldirs $(bindir) $(scriptdir) $(man1dir)
++ $(SHELL) ${srcdir}/../../texk/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir) ${DESTDIR}$(man1dir)
+
+ clean:
+ rm -f *.o $(BIN) $(SHELLSCRIPTS) $(PERLSCRIPTS) $(MANPAGES)
+@@ -210,6 +210,8 @@ distclean: mostlyclean
+
+ realclean: distclean
+ mostlyclean: clean
++
++# TODO UPSTREAM! - uninstall: !!!
+
+ Makefile: config.status $(srcdir)/Makefile.in
+ $(SHELL) config.status
Deleted: trunk/dports/tex/texlive/patch-Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,103 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- Makefile.in.orig Tue Dec 26 23:37:34 2006
-+++ Makefile.in Thu May 24 15:28:58 2007
-@@ -52,6 +52,20 @@ LIBSDIRS = @LIBSDIRS@
- # install kpathsea and friends by default.
- INSTDIRS = @INSTDIRS@
-
-+# OpenBSD fake env patch
-+MK_TEXMFDIST= ${DESTDIR}$(texmf)-dist
-+MK_TEXMFLOCAL= ${DESTDIR}$(texmf)-local
-+MK_TEXMFSYSVAR= ${DESTDIR}/var
-+MK_TEXMFSYSCONFIG= ${DESTDIR}${SYSCONFDIR}/texmf
-+MK_TEXMFMAIN= ${DESTDIR}$(texmf)
-+
-+TETEXENV= TEXMFDIST=${MK_TEXMFDIST} \
-+ TEXMFLOCAL=${MK_TEXMFLOCAL} \
-+ TEXMFSYSVAR=${MK_TEXMFSYSVAR} \
-+ TEXMFSYSCONFIG=${MK_TEXMFSYSCONFIG} \
-+ TEXMFMAIN=${MK_TEXMFMAIN} \
-+ PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH)
-+
- default: all
- install: all
- for dir in $(INSTDIRS); do \
-@@ -64,35 +78,41 @@ install: all
- fi
- @FMU@
- @FMU at install-extra:
-+
-+# MESS - Will be @exec anyway...
- # temporary fix for missing links
-- - if test -f texk/web2c/omegafonts/omfonts; then \
-- cd texk/web2c/omegafonts && $(MAKE) install-links; \
-- else :; fi
-- $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
-- - if test -f $(scriptdir)/mktexlsr; then \
-- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-- $(scriptdir)/mktexlsr; \
-- else :; fi
-- - if test -f $(scriptdir)/fmtutil-sys; then \
-- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-- $(scriptdir)/fmtutil-sys --all; \
-- else :; fi
-- - if test -f $(scriptdir)/texlinks; then \
-- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-- $(scriptdir)/texlinks; \
-- else :; fi
-- - if test -f $(scriptdir)/updmap-sys \
-- && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-- $(scriptdir)/kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
-- then \
-- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-- $(scriptdir)/updmap-sys; \
-- else :; fi
-+# - if test -f texk/web2c/omegafonts/omfonts; then \
-+# cd texk/web2c/omegafonts && $(MAKE) install-links; \
-+# else :; fi
-+# $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
-+# - if test -f $(scriptdir)/mktexlsr; then \
-+# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+# $(scriptdir)/mktexlsr; \
-+# else :; fi
-+# - if test -f $(scriptdir)/fmtutil-sys; then \
-+# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+# $(scriptdir)/fmtutil-sys --all; \
-+# else :; fi
-+# - if test -f $(scriptdir)/texlinks; then \
-+# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+# $(scriptdir)/texlinks; \
-+# else :; fi
-+# - if test -f $(scriptdir)/updmap-sys \
-+# && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+# $(scriptdir)/kpsewhich --format='web2c files' updmap.cfg >/dev/null; \
-+# then \
-+# TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+# $(scriptdir)/updmap-sys; \
-+# else :; fi
-
-+ # OpenBSD (All non @exec stuff here, see PLIST for the rest)
-+ cd texk/web2c/omegafonts && $(MAKE) install-links
-+ ${TETEXENV} $(srcdir)/selfautofix "${DESTDIR}$(bindir)" "${DESTDIR}$(texmf)/web2c"
-+
- install-exec:
- for dir in $(INSTDIRS); do \
- echo making $@ in $$dir; \
-- (cd $$dir && PATH=$(scriptdir):$(bindir):$(PATH) \
-+ (cd $$dir && PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH) \
- $(MAKE) $@) || exit 1; \
- done
- @FMU@
-@@ -101,9 +121,9 @@ install-exec:
- - if test -f texk/web2c/omegafonts/omfonts; then \
- cd texk/web2c/omegafonts && $(MAKE) install-links; \
- else :; fi
-- - if test -f $(scriptdir)/texlinks; then \
-- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-- $(scriptdir)/texlinks; \
-+ - if test -f ${DESTDIR}$(scriptdir)/texlinks; then \
-+ TEXMFMAIN=${DESTDIR}$(texmf) PATH=${DESTDIR}$(scriptdir):${DESTDIR}$(bindir):$(PATH) \
-+ ${DESTDIR}$(scriptdir)/texlinks; \
- else :; fi
-
- strip: install
Deleted: trunk/dports/tex/texlive/patch-libs_icu-xetex_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-libs_icu-xetex_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-libs_icu-xetex_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,14 +0,0 @@
-$OpenBSD: patch-libs_icu-xetex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
---- libs/icu-xetex/Makefile.in.orig Fri May 11 12:34:40 2007
-+++ libs/icu-xetex/Makefile.in Fri May 11 12:35:58 2007
-@@ -174,7 +174,9 @@ $(top_builddir)/config/Makefile.inc: $(srcdir)/config/
-
- $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
- -$(RMV) $@
-- $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
-+ # OpenBSD - Cant use /usr/bin/install at build stage if in sudo build
-+ # $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
-+ cp $(top_srcdir)/config/icu-config-top $@
- @echo "# Following from @platform_make_fragment@" >> $@
- sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@
- sed -f $(top_srcdir)/config/make2sh.sed < @platform_make_fragment@ | grep -v '#M#' | uniq >> $@
Deleted: trunk/dports/tex/texlive/patch-libs_icu-xetex_layout_KernTable_cpp
===================================================================
--- trunk/dports/tex/texlive/patch-libs_icu-xetex_layout_KernTable_cpp 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-libs_icu-xetex_layout_KernTable_cpp 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,74 +0,0 @@
-$OpenBSD: patch-libs_icu-xetex_layout_KernTable_cpp,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
---- libs/icu-xetex/layout/KernTable.cpp.orig Wed Jun 27 09:59:39 2007
-+++ libs/icu-xetex/layout/KernTable.cpp Wed Jun 27 10:00:16 2007
-@@ -16,8 +16,10 @@
- U_NAMESPACE_BEGIN
-
- struct PairInfo {
-- le_uint32 key; // sigh, MSVC compiler gags on union here
-+ le_uint16 left;
-+ le_uint16 right;
- le_int16 value; // fword, kern value in funits
-+ le_uint32 key() const { return ((le_uint32)SWAPW(left) << 16) | SWAPW(right); }
- };
- #define KERN_PAIRINFO_SIZE 6
-
-@@ -81,9 +83,24 @@ KernTable::KernTable(const LEFontInstance* font, const
- if (coverage & COVERAGE_HORIZONTAL) { // only handle horizontal kerning
- const Subtable_0* table = (const Subtable_0*)((char*)subhead + KERN_SUBTABLE_HEADER_SIZE);
- nPairs = SWAPW(table->nPairs);
-+#if 0 // don't trust these fields as some old TTF fonts have bad data here
- searchRange = SWAPW(table->searchRange);
- entrySelector = SWAPW(table->entrySelector);
- rangeShift = SWAPW(table->rangeShift);
-+#else // recompute the binary search header fields
-+ if (nPairs == 0) { // this probably shouldn't happen
-+ searchRange = entrySelector = 0;
-+ } else {
-+ searchRange = 1;
-+ entrySelector = 0;
-+ while (searchRange * 2 <= nPairs) {
-+ searchRange *= 2;
-+ entrySelector += 1;
-+ }
-+ }
-+ rangeShift = (nPairs - searchRange) * KERN_PAIRINFO_SIZE;
-+ searchRange *= KERN_PAIRINFO_SIZE;
-+#endif
- pairs = (const PairInfo*)((char*)table + KERN_SUBTABLE_0_HEADER_SIZE);
-
- #if DEBUG
-@@ -103,9 +120,8 @@ KernTable::KernTable(const LEFontInstance* font, const
-
- const PairInfo* p = pairs;
- for (i = 0; i < nPairs; ++i, p = (const PairInfo*)((char*)p+KERN_PAIRINFO_SIZE)) {
-- le_uint32 k = SWAPL(p->key);
-- le_uint16 left = (k >> 16) & 0xffff;
-- le_uint16 right = k & 0xffff;
-+ le_uint16 left = SWAPW(p->left);
-+ le_uint16 right = SWAPW(p->right);
- if (left < 256 && right < 256) {
- char c = ids[left];
- if (c > 0x20 && c < 0x7f) {
-@@ -149,10 +165,11 @@ void KernTable::process(LEGlyphStorage& storage)
- // but it is not in sorted order on win32 platforms because of the endianness difference
- // so either I have to swap the element each time I examine it, or I have to swap
- // all the elements ahead of time and store them in the font
-+ // The key() accessor on PairInfo handles the swapping if needed
-
- const PairInfo* p = pairs;
- const PairInfo* tp = (const PairInfo*)((char*)p + rangeShift);
-- if (key > SWAPL(tp->key)) {
-+ if (key > tp->key()) {
- p = tp;
- }
-
-@@ -165,7 +182,7 @@ void KernTable::process(LEGlyphStorage& storage)
- while (probe > KERN_PAIRINFO_SIZE) {
- probe >>= 1;
- tp = (const PairInfo*)((char*)p + probe);
-- le_uint32 tkey = SWAPL(tp->key);
-+ le_uint32 tkey = tp->key();
- #if DEBUG
- fprintf(stdout, " %.3d (%0.8x)\n", ((char*)tp - (char*)pairs)/KERN_PAIRINFO_SIZE, tkey);
- fflush(stdout);
Deleted: trunk/dports/tex/texlive/patch-texk_afm2pl_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_afm2pl_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_afm2pl_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,26 +0,0 @@
-$OpenBSD: patch-texk_afm2pl_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/afm2pl/Makefile.in.orig Wed Apr 18 13:54:33 2007
-+++ texk/afm2pl/Makefile.in Wed Apr 18 13:55:25 2007
-@@ -22,16 +22,16 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: $(program)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
- uninstall-exec:
-- rm -f $(bindir)/$(program)
-+ rm -f ${DESTDIR}$(bindir)/$(program)
-
- install-data: $(program).1
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
- uninstall-data:
-- rm -f $(man1dir)/$(program).$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/$(program).$(manext)
-
- kpse_include ../make/clean.mk
- kpse_include ../make/config.mk
Deleted: trunk/dports/tex/texlive/patch-texk_bibtex8_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_bibtex8_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_bibtex8_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,27 +0,0 @@
-$OpenBSD: patch-texk_bibtex8_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/bibtex8/Makefile.in.orig Wed Apr 18 14:04:09 2007
-+++ texk/bibtex8/Makefile.in Wed Apr 18 14:05:17 2007
-@@ -29,17 +29,17 @@ bibtex8: $(OBJS) $(kpathsea)
- $(kpathsea_link) $(OBJS) $(LOADLIBES)
-
- install: all install-data install-doc
-- -$(top_srcdir)/../mkinstalldirs $(bindir)
-- -$(INSTALL_LIBTOOL_PROG) bibtex8 $(bindir)/bibtex8
-+ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) bibtex8 ${DESTDIR}$(bindir)/bibtex8
-
- install-data:
-- -$(top_srcdir)/../mkinstalldirs $(texmf)/bibtex/csf
-- -$(INSTALL) -m 644 $(srcdir)/csf/*.csf $(texmf)/bibtex/csf
-+ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/bibtex/csf
-+ $(INSTALL) -m 644 $(srcdir)/csf/*.csf ${DESTDIR}$(texmf)/bibtex/csf
-
- install-doc:
-- -$(top_srcdir)/../mkinstalldirs $(texmf)/doc/bibtex8
-+ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/doc/bibtex8
- for i in 00readme.txt HISTORY csfile.txt file_id.diz ; \
-- do $(INSTALL) -m 644 $(srcdir)/$$i $(texmf)/doc/bibtex8; \
-+ do $(INSTALL) -m 644 $(srcdir)/$$i ${DESTDIR}$(texmf)/doc/bibtex8; \
- done
-
- kpse_include ../make/tkpathsea.mk
Deleted: trunk/dports/tex/texlive/patch-texk_cjkutils_conv_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_cjkutils_conv_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_cjkutils_conv_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,17 +0,0 @@
-$OpenBSD: patch-texk_cjkutils_conv_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/cjkutils/conv/Makefile.in.orig Wed Apr 18 18:58:48 2007
-+++ texk/cjkutils/conv/Makefile.in Wed Apr 18 18:59:45 2007
-@@ -23,10 +23,10 @@ sjisconv: sjisconv.o
- install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_PROGRAM) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do $(RM) $(bindir)/$$p; done
-+ for p in $(programs); do $(RM) ${DESTDIR}$(bindir)/$$p; done
-
- install-data:
- uninstall-data:
Deleted: trunk/dports/tex/texlive/patch-texk_cjkutils_hbf2gf_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_cjkutils_hbf2gf_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_cjkutils_hbf2gf_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,26 +0,0 @@
-$OpenBSD: patch-texk_cjkutils_hbf2gf_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/cjkutils/hbf2gf/Makefile.in.orig Wed Apr 18 19:00:52 2007
-+++ texk/cjkutils/hbf2gf/Makefile.in Wed Apr 18 19:01:31 2007
-@@ -43,16 +43,16 @@ $(CWEAVE):
- install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do $(RM) $(bindir)/$$p; done
-+ for p in $(programs); do $(RM) ${DESTDIR}$(bindir)/$$p; done
-
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
- uninstall-data:
-- $(RM) $(man1dir)/$(program).$(manext)
-+ $(RM) ${DESTDIR}$(man1dir)/$(program).$(manext)
-
- kpse_include ../make/dist.mk
- kpse_include ../make/clean.mk
Deleted: trunk/dports/tex/texlive/patch-texk_cjkutils_scripts_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_cjkutils_scripts_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_cjkutils_scripts_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,21 +0,0 @@
-$OpenBSD: patch-texk_cjkutils_scripts_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/cjkutils/scripts/Makefile.in.orig Wed Apr 18 19:44:57 2007
-+++ texk/cjkutils/scripts/Makefile.in Wed Apr 18 19:45:22 2007
-@@ -14,12 +14,12 @@ default all:
- install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
-- ln -sf gbklatex $(scriptdir)/bg5+latex
-- ln -sf gbkpdflatex $(scriptdir)/bg5+pdflatex
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(scriptdir); done
-+ ln -sf gbklatex ${DESTDIR}$(scriptdir)/bg5+latex
-+ ln -sf gbkpdflatex ${DESTDIR}$(scriptdir)/bg5+pdflatex
- uninstall-exec:
-- for p in $(scripts); do $(RM) $(scriptdir)/$$p; done
-+ for p in $(scripts); do $(RM) ${DESTDIR}$(scriptdir)/$$p; done
-
- install-data:
- uninstall-data:
Deleted: trunk/dports/tex/texlive/patch-texk_detex_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_detex_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_detex_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,23 +0,0 @@
-$OpenBSD: patch-texk_detex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/detex/Makefile.in.orig Wed Apr 18 20:37:27 2007
-+++ texk/detex/Makefile.in Wed Apr 18 20:37:56 2007
-@@ -39,13 +39,13 @@ distclean::
- install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
- install-exec: $(program)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
- uninstall-exec:
-- rm -f $(bindir)/$(program)
-+ rm -f ${DESTDIR}$(bindir)/$(program)
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/detex.man $(man1dir)/detex.$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/detex.man ${DESTDIR}$(man1dir)/detex.$(manext)
- uninstall-data:
-- rm -f $(man1dir)/detex.$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/detex.$(manext)
- depend info dvi check:
Deleted: trunk/dports/tex/texlive/patch-texk_dtl_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_dtl_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_dtl_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,31 +0,0 @@
-$OpenBSD: patch-texk_dtl_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/dtl/Makefile.in.orig Sat Apr 21 17:33:16 2007
-+++ texk/dtl/Makefile.in Sat Apr 21 17:38:50 2007
-@@ -29,19 +29,19 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/dv2dt.man $(man1dir)/dv2dt.1
-- $(INSTALL_DATA) $(srcdir)/dt2dv.man $(man1dir)/dt2dv.1
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/dv2dt.man ${DESTDIR}$(man1dir)/dv2dt.1
-+ $(INSTALL_DATA) $(srcdir)/dt2dv.man ${DESTDIR}$(man1dir)/dt2dv.1
-
- uninstall-data:
-- rm -f $(man1dir)/dv2dt.1
-- rm -f $(man1dir)/dt2dv.1
-+ rm -f ${DESTDIR}$(man1dir)/dv2dt.1
-+ rm -f ${DESTDIR}$(man1dir)/dt2dv.1
-
- kpse_include ../make/dist.mk
- kpse_include ../make/config.mk
Deleted: trunk/dports/tex/texlive/patch-texk_dvi2tty_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_dvi2tty_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_dvi2tty_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,27 +0,0 @@
-$OpenBSD: patch-texk_dvi2tty_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/dvi2tty/Makefile.in.orig Sat Apr 21 17:35:32 2007
-+++ texk/dvi2tty/Makefile.in Sat Apr 21 17:38:01 2007
-@@ -20,17 +20,17 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: $(programs)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data: dvi2tty.1
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/dvi2tty.1 $(man1dir)/dvi2tty.$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/dvi2tty.1 ${DESTDIR}$(man1dir)/dvi2tty.$(manext)
-
- uninstall-data:
-- rm -f $(man1dir)/dvi2tty.$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/dvi2tty.$(manext)
- pre-dist-$(distname):
- post-dist-$(distname):
-
Deleted: trunk/dports/tex/texlive/patch-texk_dvidvi_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_dvidvi_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_dvidvi_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,27 +0,0 @@
-$OpenBSD: patch-texk_dvidvi_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
---- texk/dvidvi/Makefile.in.orig Sat Apr 21 17:39:12 2007
-+++ texk/dvidvi/Makefile.in Sat Apr 21 17:42:36 2007
-@@ -25,17 +25,17 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/dvidvi.1 $(man1dir)/dvidvi.1
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/dvidvi.1 ${DESTDIR}$(man1dir)/dvidvi.1
-
- uninstall-data:
-- rm -f $(man1dir)/dvidvi.1
-+ rm -f ${DESTDIR}$(man1dir)/dvidvi.1
-
- kpse_include ../make/dist.mk
- kpse_include ../make/config.mk
Deleted: trunk/dports/tex/texlive/patch-texk_dviljk_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_dviljk_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_dviljk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,54 +0,0 @@
-$OpenBSD: patch-texk_dviljk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/dviljk/Makefile.in.orig Sat Apr 21 17:43:02 2007
-+++ texk/dviljk/Makefile.in Sat Apr 21 17:44:56 2007
-@@ -52,28 +52,28 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
- test ! -f $(program) \
-- || $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
-+ || $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
- test ! -f $(program2p) \
-- || $(INSTALL_LIBTOOL_PROG) $(program2p) $(bindir)
-+ || $(INSTALL_LIBTOOL_PROG) $(program2p) ${DESTDIR}$(bindir)
- test ! -f $(program4) \
-- || $(INSTALL_LIBTOOL_PROG) $(program4) $(bindir)
-+ || $(INSTALL_LIBTOOL_PROG) $(program4) ${DESTDIR}$(bindir)
- test ! -f $(program4l) \
-- || $(INSTALL_LIBTOOL_PROG) $(program4l) $(bindir)
-- $(INSTALL_SCRIPT) $(srcdir)/dvihp $(scriptdir)/dvihp
-- cd $(bindir) && (rm -f $(program6); $(LN) $(program4) $(program6))
-+ || $(INSTALL_LIBTOOL_PROG) $(program4l) ${DESTDIR}$(bindir)
-+ $(INSTALL_SCRIPT) $(srcdir)/dvihp ${DESTDIR}$(scriptdir)/dvihp
-+ cd ${DESTDIR}$(bindir) && (rm -f $(program6); $(LN) $(program4) $(program6))
- uninstall-exec:
-- cd $(bindir); rm -f $(programs)
-+ cd ${DESTDIR}$(bindir); rm -f $(programs)
-
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/dvilj.man $(man1dir)/dvilj.$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/dvilj.man ${DESTDIR}$(man1dir)/dvilj.$(manext)
- for p in dvilj2p dvilj4 dvilj4l dvilj6; do \
-- rm -f $(man1dir)/$$p.$(manext); \
-- ln -s dvilj.$(manext) $(man1dir)/$$p.$(manext); \
-+ rm -f ${DESTDIR}$(man1dir)/$$p.$(manext); \
-+ ln -s dvilj.$(manext) ${DESTDIR}$(man1dir)/$$p.$(manext); \
- done
-- $(INSTALL_DATA) $(srcdir)/dvihp.man $(man1dir)/dvihp.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/dvihp.man ${DESTDIR}$(man1dir)/dvihp.$(manext)
-
- # It seems simplest to keep this separate. Use find and cpio instead of
- # just cp -r in case the source hierarchy is cvs- or rcs-ified.
-@@ -83,7 +83,7 @@ install-fonts:
- find fonts -name \( "*.tfm" -o -name "*.vf" \) -print | cpio -pld $(texmf)
-
- uninstall-data:
-- rm -f $(man1dir)/dvilj.$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/dvilj.$(manext)
-
-
- distname = dviljk
Deleted: trunk/dports/tex/texlive/patch-texk_dvipdfm_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_dvipdfm_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_dvipdfm_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,40 +0,0 @@
-$OpenBSD: patch-texk_dvipdfm_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
---- texk/dvipdfm/Makefile.in.orig Sat Apr 21 17:45:31 2007
-+++ texk/dvipdfm/Makefile.in Sat Apr 21 17:46:16 2007
-@@ -49,24 +49,24 @@ distclean::
- $(RM) config.h
-
- install-exec:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
-- $(INSTALL_LIBTOOL_PROG) ebb $(bindir)
-- $(INSTALL_SCRIPT) $(srcdir)/dvipdft $(bindir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) ebb ${DESTDIR}$(bindir)
-+ $(INSTALL_SCRIPT) $(srcdir)/dvipdft ${DESTDIR}$(bindir)
-
- uninstall-exec:
-- cd $(bindir); rm -f $(programs)
-+ cd ${DESTDIR}$(bindir); rm -f $(programs)
-
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
-- $(INSTALL_DATA) $(srcdir)/dvipdft.1 $(man1dir)/dvipdft.$(manext)
-- $(INSTALL_DATA) $(srcdir)/ebb.1 $(man1dir)/ebb.$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
-+ $(INSTALL_DATA) $(srcdir)/dvipdft.1 ${DESTDIR}$(man1dir)/dvipdft.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/ebb.1 ${DESTDIR}$(man1dir)/ebb.$(manext)
-
- uninstall-data:
-- rm -f $(man1dir)/dvilj.$(manext)
-- rm -f $(man1dir)/dvipdft.$(manext)
-- rm -f $(man1dir)/ebb.$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/dvilj.$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/dvipdft.$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/ebb.$(manext)
-
- kpse_include ../make/config.mk
-
Deleted: trunk/dports/tex/texlive/patch-texk_dvipos_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_dvipos_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_dvipos_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,28 +0,0 @@
-$OpenBSD: patch-texk_dvipos_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/dvipos/Makefile.in.orig Sat Apr 21 17:49:47 2007
-+++ texk/dvipos/Makefile.in Sat Apr 21 17:50:20 2007
-@@ -22,18 +22,18 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/dvipos.1 $(man1dir)/dvipos.1
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/dvipos.1 ${DESTDIR}$(man1dir)/dvipos.1
-
- uninstall-data:
-- rm -f $(man1dir)/dvipos.1
-+ rm -f ${DESTDIR}$(man1dir)/dvipos.1
-
- kpse_include ../make/dist.mk
- kpse_include ../make/config.mk
Deleted: trunk/dports/tex/texlive/patch-texk_dvipsk_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_dvipsk_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_dvipsk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,66 +0,0 @@
-$OpenBSD: patch-texk_dvipsk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/dvipsk/Makefile.in.orig Sat Apr 21 17:50:40 2007
-+++ texk/dvipsk/Makefile.in Sat Apr 21 17:53:12 2007
-@@ -85,18 +85,18 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-- rm -f $(bindir)/o$(program)
-- ln -s $(program) $(bindir)/o$(program)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-+ rm -f ${DESTDIR}$(bindir)/o$(program)
-+ ln -s $(program) ${DESTDIR}$(bindir)/o$(program)
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-- rm -f $(bindir)/o$(program)
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-+ rm -f ${DESTDIR}$(bindir)/o$(program)
-
- install-data: $(program).info
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(infodir) $(psheaderdir)/base
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(infodir) ${DESTDIR}$(psheaderdir)/base
- # PostScript prologues and encodings.
-- for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
-+ for h in $(prologues); do $(INSTALL_DATA) $$h ${DESTDIR}$(psheaderdir)/base/$$h; done
- # cd $(srcdir)/reencode && \
- # for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
- # config.ps. Any one config.ps will be wrong for most people, so don't
-@@ -114,27 +114,27 @@ install-data: $(program).info
- # else true; fi
- # Info files.
- cd $(srcdir) && for i in $(program).i*; do \
-- $(INSTALL_DATA) $$i $(infodir)/$$i; done
-+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
- # Man pages.
-- $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext)
-- rm -f $(man1dir)/o$(program).$(manext)
-- ln -s $(program).$(manext) $(man1dir)/o$(program).$(manext)
-- $(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(man1dir)/afm2tfm.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/$(program).1 ${DESTDIR}$(man1dir)/$(program).$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/o$(program).$(manext)
-+ ln -s $(program).$(manext) ${DESTDIR}$(man1dir)/o$(program).$(manext)
-+ $(INSTALL_DATA) $(srcdir)/afm2tfm.1 ${DESTDIR}$(man1dir)/afm2tfm.$(manext)
- # TeX macros.
- # cd $(srcdir)/tex && for m in *.tex; do \
- # $(INSTALL_DATA) $$m $(dvips_plain_macrodir)/$$m; done
- $(POST_INSTALL)
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-- install-info --info-dir=$(infodir) $(infodir)/$(program).info; \
-+ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/$(program).info; \
- else true; fi
-
- uninstall-data:
- $(PRE_UNINSTALL)
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-- install-info --delete --info-dir=$(infodir) $(infodir)/$(program).info; \
-+ install-info --delete --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/$(program).info; \
- else true; fi
- $(NORMAL_UNINSTALL)
-- rm -f $(infodir)/dvips.i*
-+ rm -f ${DESTDIR}$(infodir)/dvips.i*
- # for h in $(prologues); do rm -f $(psheaderdir)/base/$$h; done
- # cd $(srcdir)/reencode && for e in *.enc; do rm -f $(psheaderdir)/base/$$e; \
- # done
Deleted: trunk/dports/tex/texlive/patch-texk_gsftopk_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_gsftopk_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_gsftopk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,30 +0,0 @@
-$OpenBSD: patch-texk_gsftopk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/gsftopk/Makefile.in.orig Tue Jan 17 21:41:51 2006
-+++ texk/gsftopk/Makefile.in Sat Apr 21 18:20:21 2007
-@@ -34,18 +34,18 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: $(program)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
- uninstall-exec:
-- rm -f $(bindir)/$(program)
-+ rm -f ${DESTDIR}$(bindir)/$(program)
-
- install-data: gsftopk.1
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(gsftopkpsheaderdir)
-- $(INSTALL_DATA) gsftopk.1 $(man1dir)/gsftopk.$(manext)
-- $(INSTALL_DATA) $(srcdir)/render.ps $(gsftopkpsheaderdir)/render.ps
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(gsftopkpsheaderdir)
-+ $(INSTALL_DATA) gsftopk.1 ${DESTDIR}$(man1dir)/gsftopk.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/render.ps ${DESTDIR}$(gsftopkpsheaderdir)/render.ps
- uninstall-data:
-- rm -f $(man1dir)/gsftopk.$(manext)
-- rm -f $(gsftopkpsheaderdir)/render.ps
-+ rm -f ${DESTDIR}$(man1dir)/gsftopk.$(manext)
-+ rm -f ${DESTDIR}$(gsftopkpsheaderdir)/render.ps
-
- kpse_include ../make/clean.mk
-
Deleted: trunk/dports/tex/texlive/patch-texk_kpathsea_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_kpathsea_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_kpathsea_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,119 +0,0 @@
-$OpenBSD: patch-texk_kpathsea_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
---- texk/kpathsea/Makefile.in.orig Sun Jan 7 23:31:48 2007
-+++ texk/kpathsea/Makefile.in Tue Apr 17 19:21:33 2007
-@@ -154,73 +154,73 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: kpsewhich
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir) \
-- $(libdir) $(web2cdir)
-- if grep 'original mktexpk --' $(scriptdir)/mktexpk >/dev/null 2>&1\
-- || test ! -r $(scriptdir)/mktexpk; then \
-- $(INSTALL_SCRIPT) $(srcdir)/mktexpk $(scriptdir)/mktexpk; \
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir) \
-+ ${DESTDIR}$(libdir) ${DESTDIR}$(web2cdir)
-+ if grep 'original mktexpk --' ${DESTDIR}$(scriptdir)/mktexpk >/dev/null 2>&1\
-+ || test ! -r ${DESTDIR}$(scriptdir)/mktexpk; then \
-+ $(INSTALL_SCRIPT) $(srcdir)/mktexpk ${DESTDIR}$(scriptdir)/mktexpk; \
- else true; fi
-- if grep 'original mktexmf --' $(scriptdir)/mktexmf >/dev/null 2>&1\
-- || test ! -r $(scriptdir)/mktexmf; then \
-- $(INSTALL_SCRIPT) $(srcdir)/mktexmf $(scriptdir)/mktexmf; \
-+ if grep 'original mktexmf --' ${DESTDIR}$(scriptdir)/mktexmf >/dev/null 2>&1\
-+ || test ! -r ${DESTDIR}$(scriptdir)/mktexmf; then \
-+ $(INSTALL_SCRIPT) $(srcdir)/mktexmf ${DESTDIR}$(scriptdir)/mktexmf; \
- else true; fi
-- if grep 'original mktextfm --' $(scriptdir)/mktextfm >/dev/null 2>&1\
-- || test ! -r $(scriptdir)/mktextfm; then \
-- $(INSTALL_SCRIPT) $(srcdir)/mktextfm $(scriptdir)/mktextfm; \
-+ if grep 'original mktextfm --' ${DESTDIR}$(scriptdir)/mktextfm >/dev/null 2>&1\
-+ || test ! -r ${DESTDIR}$(scriptdir)/mktextfm; then \
-+ $(INSTALL_SCRIPT) $(srcdir)/mktextfm ${DESTDIR}$(scriptdir)/mktextfm; \
- else true; fi
-- if grep 'original mktexlsr --' $(scriptdir)/mktexlsr >/dev/null 2>&1\
-- || test ! -r $(scriptdir)/mktexlsr; then \
-- $(INSTALL_SCRIPT) $(srcdir)/mktexlsr $(scriptdir)/mktexlsr; \
-+ if grep 'original mktexlsr --' ${DESTDIR}$(scriptdir)/mktexlsr >/dev/null 2>&1\
-+ || test ! -r ${DESTDIR}$(scriptdir)/mktexlsr; then \
-+ $(INSTALL_SCRIPT) $(srcdir)/mktexlsr ${DESTDIR}$(scriptdir)/mktexlsr; \
- else true; fi
- # if grep 'original mktexfmt --' $(scriptdir)/mktexfmt > /dev/null 2>&1\
- # || test ! -r $(scriptdir)/mktexfmt; then \
- # $(INSTALL_SCRIPT) $(srcdir)/mktexfmt $(scriptdir)/mktexfmt; \
- # else true; fi
-- $(INSTALL_DATA) $(srcdir)/mktex.opt $(web2cdir)/mktex.opt
-- $(INSTALL_SCRIPT) $(srcdir)/mktexdir $(web2cdir)/mktexdir
-- $(INSTALL_DATA) $(srcdir)/mktexdir.opt $(web2cdir)/mktexdir.opt
-- $(INSTALL_SCRIPT) $(srcdir)/mktexnam $(web2cdir)/mktexnam
-- $(INSTALL_DATA) $(srcdir)/mktexnam.opt $(web2cdir)/mktexnam.opt
-- $(INSTALL_SCRIPT) $(srcdir)/mktexupd $(web2cdir)/mktexupd
-- $(INSTALL_LIBTOOL_LIBS) lib$(library).la $(libdir)
-- $(INSTALL_LIBTOOL_PROG) kpsewhich $(bindir)
-- $(INSTALL_PROGRAM) kpsestat $(bindir)
-- $(INSTALL_PROGRAM) kpseaccess $(bindir)
-- $(INSTALL_PROGRAM) kpsereadlink $(bindir)
-+ $(INSTALL_DATA) $(srcdir)/mktex.opt ${DESTDIR}$(web2cdir)/mktex.opt
-+ $(INSTALL_SCRIPT) $(srcdir)/mktexdir ${DESTDIR}$(web2cdir)/mktexdir
-+ $(INSTALL_DATA) $(srcdir)/mktexdir.opt ${DESTDIR}$(web2cdir)/mktexdir.opt
-+ $(INSTALL_SCRIPT) $(srcdir)/mktexnam ${DESTDIR}$(web2cdir)/mktexnam
-+ $(INSTALL_DATA) $(srcdir)/mktexnam.opt ${DESTDIR}$(web2cdir)/mktexnam.opt
-+ $(INSTALL_SCRIPT) $(srcdir)/mktexupd ${DESTDIR}$(web2cdir)/mktexupd
-+ $(INSTALL_LIBTOOL_LIBS) lib$(library).la ${DESTDIR}$(libdir)
-+ $(INSTALL_LIBTOOL_PROG) kpsewhich ${DESTDIR}$(bindir)
-+ $(INSTALL_PROGRAM) kpsestat ${DESTDIR}$(bindir)
-+ $(INSTALL_PROGRAM) kpseaccess ${DESTDIR}$(bindir)
-+ $(INSTALL_PROGRAM) kpsereadlink ${DESTDIR}$(bindir)
- uninstall-exec:
-- $(UNINSTALL_LIBTOOL_LIBS) $(libdir)/lib$(library).la
-- $(UNINSTALL_LIBTOOL_PROG) $(bindir)/kpsewhich
-- $(UNINSTALL_PROGRAM) $(bindir)/kpsestat
-- $(UNINSTALL_PROGRAM) $(bindir)/kpseaccess
-- $(UNINSTALL_PROGRAM) $(bindir)/kpsereadlink
-+ $(UNINSTALL_LIBTOOL_LIBS) ${DESTDIR}$(libdir)/lib$(library).la
-+ $(UNINSTALL_LIBTOOL_PROG) ${DESTDIR}$(bindir)/kpsewhich
-+ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpsestat
-+ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpseaccess
-+ $(UNINSTALL_PROGRAM) ${DESTDIR}$(bindir)/kpsereadlink
-
- install-data: texmf.cnf kpathsea.info install-man
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf) $(infodir) $(web2cdir)
-- if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
-- || test ! -r $(web2cdir)/texmf.cnf; then \
-- $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf) ${DESTDIR}$(infodir) ${DESTDIR}$(web2cdir)
-+ if grep 'original texmf.cnf --' ${DESTDIR}$(web2cdir)/texmf.cnf >/dev/null 2>&1 \
-+ || test ! -r ${DESTDIR}$(web2cdir)/texmf.cnf; then \
-+ $(INSTALL_DATA) texmf.cnf ${DESTDIR}$(web2cdir)/texmf.cnf; \
- else true; fi
- test -r ./kpathsea.info || cd $(srcdir) && for i in kpathsea.i*; do \
-- $(INSTALL_DATA) $$i $(infodir)/$$i; done
-+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
- # Should we install the headers? They are not just system-dependent,
- # which is bad enough, but even compiler-dependent.
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(includedir)/kpathsea
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(includedir)/kpathsea
- for f in $(install_headers); do \
-- $(INSTALL_DATA) $$f $(includedir)/kpathsea/; done
-- rm -f $(includedir)/kpathsea/acconfig.h
-+ $(INSTALL_DATA) $$f ${DESTDIR}$(includedir)/kpathsea/; done
-+ rm -f ${DESTDIR}$(includedir)/kpathsea/acconfig.h
- $(POST_INSTALL)
-- test -r $(infodir)/dir || $(INSTALL_DATA) $(top_srcdir)/../dir $(infodir)
-+ test -r ${DESTDIR}$(infodir)/dir || $(INSTALL_DATA) $(top_srcdir)/../dir ${DESTDIR}$(infodir)
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-- install-info --info-dir=$(infodir) $(infodir)/kpathsea.info; \
-+ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/kpathsea.info; \
- else true; fi
-
- uninstall-data:
- $(PRE_UNINSTALL)
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-- install-info --delete --info-dir=$(infodir) $(infodir)/kpathsea.info; \
-+ install-info --delete --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/kpathsea.info; \
- else true; fi
- $(NORMAL_UNINSTALL)
-- rm -f $(infodir)/kpathsea.i*
-+ rm -f ${DESTDIR}$(infodir)/kpathsea.i*
- # for f in $(install_headers); do rm -f $(includedir)/`basename $$f`; done
-
- # distdir is used by other distributions; they define $(distdir).
Deleted: trunk/dports/tex/texlive/patch-texk_lacheck_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_lacheck_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_lacheck_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,27 +0,0 @@
-$OpenBSD: patch-texk_lacheck_Makefile_in,v 1.1.1.1 2007/07/17 21:53:29 jasper Exp $
---- texk/lacheck/Makefile.in.orig Sat Apr 21 17:57:36 2007
-+++ texk/lacheck/Makefile.in Sat Apr 21 17:58:10 2007
-@@ -28,17 +28,17 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data: lacheck.1
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) lacheck.1 $(man1dir)/lacheck.1
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) lacheck.1 ${DESTDIR}$(man1dir)/lacheck.1
-
- uninstall-data:
-- rm -f $(man1dir)/lacheck.1
-+ rm -f ${DESTDIR}$(man1dir)/lacheck.1
-
- lacheck.1: lacheck.man
- -sed -e "s!%%LACHECKREV%%!Release $(REV)!" $(srcdir)/lacheck.man |\
Deleted: trunk/dports/tex/texlive/patch-texk_make_man_mk
===================================================================
--- trunk/dports/tex/texlive/patch-texk_make_man_mk 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_make_man_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,23 +0,0 @@
-$OpenBSD: patch-texk_make_man_mk,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
---- texk/make/man.mk.orig Tue Apr 17 20:28:51 2007
-+++ texk/make/man.mk Tue Apr 17 20:35:25 2007
-@@ -51,16 +51,16 @@ sedscript:
- echo 's%@LOCALMODES@%$(localmodes)%' >>sedscript
-
- install-man: manfiles
-- $(top_srcdir)/../mkinstalldirs $(man1dir)
-+ $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
- for nameone in $(manfiles); do \
- name=`basename $${nameone} .1`; \
-- $(INSTALL_DATA) $${name}.1 $(man1dir)/$${name}.$(manext); \
-+ $(INSTALL_DATA) $${name}.1 ${DESTDIR}$(man1dir)/$${name}.$(manext); \
- done
-
- uninstall-man:
- for nameone in $(manfiles); do \
- name=`basename $${nameone} .1`; \
-- rm -f $(man1dir)/$${name}.$(manext); \
-+ rm -f ${DESTDIR}$(man1dir)/$${name}.$(manext); \
- done
-
- install-data: install-man
Deleted: trunk/dports/tex/texlive/patch-texk_makeindexk_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_makeindexk_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_makeindexk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,29 +0,0 @@
-$OpenBSD: patch-texk_makeindexk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
---- texk/makeindexk/Makefile.in.orig Sat Apr 21 18:21:52 2007
-+++ texk/makeindexk/Makefile.in Sat Apr 21 18:23:14 2007
-@@ -19,17 +19,17 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: $(programs)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
-- $(INSTALL_SCRIPT) $(srcdir)/mkindex $(scriptdir)/mkindex
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
-+ $(INSTALL_SCRIPT) $(srcdir)/mkindex ${DESTDIR}$(scriptdir)/mkindex
- uninstall-exec:
-- cd $(bindir) && rm -f $(program)
-- cd $(scriptdir) && rm -f mkindex
-+ cd ${DESTDIR}$(bindir) && rm -f $(program)
-+ cd ${DESTDIR}$(scriptdir) && rm -f mkindex
-
- install-data: makeindex.1
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/makeindex.1 $(man1dir)/makeindex.$(manext)
-- $(INSTALL_DATA) $(srcdir)/mkindex.1 $(man1dir)/mkindex.$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/makeindex.1 ${DESTDIR}$(man1dir)/makeindex.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/mkindex.1 ${DESTDIR}$(man1dir)/mkindex.$(manext)
-
- uninstall-data:
-
Deleted: trunk/dports/tex/texlive/patch-texk_musixflx_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_musixflx_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_musixflx_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,17 +0,0 @@
-$OpenBSD: patch-texk_musixflx_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
---- texk/musixflx/Makefile.in.orig Sat Apr 21 18:24:29 2007
-+++ texk/musixflx/Makefile.in Sat Apr 21 18:24:52 2007
-@@ -21,10 +21,10 @@ install: install-exec
- uninstall: uninstall-exec
-
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data:
-
Deleted: trunk/dports/tex/texlive/patch-texk_ps2pkm_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_ps2pkm_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_ps2pkm_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,34 +0,0 @@
-$OpenBSD: patch-texk_ps2pkm_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
---- texk/ps2pkm/Makefile.in.orig Sat Apr 21 18:25:02 2007
-+++ texk/ps2pkm/Makefile.in Sat Apr 21 18:26:32 2007
-@@ -35,20 +35,20 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: $(programs)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data: mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/mag.1 $(man1dir)/mag.$(manext)
-- $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 $(man1dir)/pfb2pfa.$(manext)
-- $(INSTALL_DATA) $(srcdir)/pk2bm.1 $(man1dir)/pk2bm.$(manext)
-- $(INSTALL_DATA) $(srcdir)/ps2pk.1 $(man1dir)/ps2pk.$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/mag.1 ${DESTDIR}$(man1dir)/mag.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 ${DESTDIR}$(man1dir)/pfb2pfa.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/pk2bm.1 ${DESTDIR}$(man1dir)/pk2bm.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/ps2pk.1 ${DESTDIR}$(man1dir)/ps2pk.$(manext)
- uninstall-data:
-- rm -f $(man1dir)/ps2pk.$(manext) $(man1dir)/pk2bm.$(manext) \
-- $(man1dir)/pfb2pfa.$(manext) $(man1dir)/mag.$(manext)
-+ rm -f $(man1dir)/ps2pk.$(manext) ${DESTDIR}$(man1dir)/pk2bm.$(manext) \
-+ $(man1dir)/pfb2pfa.$(manext) ${DESTDIR}$(man1dir)/mag.$(manext)
-
- pre-dist-$(distname):
- post-dist-$(distname):
Deleted: trunk/dports/tex/texlive/patch-texk_seetexk_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_seetexk_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_seetexk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,39 +0,0 @@
-$OpenBSD: patch-texk_seetexk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
---- texk/seetexk/Makefile.in.orig Sat Apr 21 18:26:53 2007
-+++ texk/seetexk/Makefile.in Sat Apr 21 18:28:18 2007
-@@ -51,23 +51,23 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/dviselect.man $(man1dir)/dviselect.1
-- $(INSTALL_DATA) $(srcdir)/dviconcat.man $(man1dir)/dviconcat.1
-- $(INSTALL_DATA) $(srcdir)/dvibook.man $(man1dir)/dvibook.1
-- $(INSTALL_DATA) $(srcdir)/dvitodvi.man $(man1dir)/dvitodvi.1
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/dviselect.man ${DESTDIR}$(man1dir)/dviselect.1
-+ $(INSTALL_DATA) $(srcdir)/dviconcat.man ${DESTDIR}$(man1dir)/dviconcat.1
-+ $(INSTALL_DATA) $(srcdir)/dvibook.man ${DESTDIR}$(man1dir)/dvibook.1
-+ $(INSTALL_DATA) $(srcdir)/dvitodvi.man ${DESTDIR}$(man1dir)/dvitodvi.1
-
- uninstall-data:
-- rm -f $(man1dir)/dviselect.1
-- rm -f $(man1dir)/dviconcat.1
-- rm -f $(man1dir)/dvibook.1
-- rm -f $(man1dir)/dvitodvi.1
-+ rm -f ${DESTDIR}$(man1dir)/dviselect.1
-+ rm -f ${DESTDIR}$(man1dir)/dviconcat.1
-+ rm -f ${DESTDIR}$(man1dir)/dvibook.1
-+ rm -f ${DESTDIR}$(man1dir)/dvitodvi.1
-
- distname = seetexk
-
Deleted: trunk/dports/tex/texlive/patch-texk_tetex_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_tetex_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_tetex_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,122 +0,0 @@
-$OpenBSD: patch-texk_tetex_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
---- texk/tetex/Makefile.in.orig Sat Apr 21 18:28:56 2007
-+++ texk/tetex/Makefile.in Sat Apr 21 18:32:15 2007
-@@ -39,76 +39,77 @@ check:
-
- # Auxiliary files.
- install-data:: $(INFOFILES)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir) ${DESTDIR}$(man5dir) ${DESTDIR}$(texpooldir) ${DESTDIR}$(texmf)/doc/tetex
- for p in $(manpgs); do \
-- $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
-+ $(INSTALL_DATA) $(srcdir)/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
- done
- for p in $(contextmanpgs); do \
-- $(INSTALL_DATA) $(srcdir)/context/$$p.man $(man1dir)/$$p.$(manext); \
-+ $(INSTALL_DATA) $(srcdir)/context/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
- done
-- $(INSTALL_DATA) $(srcdir)/fmtutil.man $(man1dir)/fmtutil.1
-- $(INSTALL_DATA) $(srcdir)/texlinks.man $(man1dir)/texlinks.1
-- $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 $(man5dir)/fmtutil.cnf.5
-- $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 $(man5dir)/updmap.cfg.5
-- cd $(man1dir); rm -f allec.$(manext) texhash.$(manext) \
-+ $(INSTALL_DATA) $(srcdir)/fmtutil.man ${DESTDIR}$(man1dir)/fmtutil.1
-+ $(INSTALL_DATA) $(srcdir)/texlinks.man ${DESTDIR}$(man1dir)/texlinks.1
-+ $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 ${DESTDIR}$(man5dir)/fmtutil.cnf.5
-+ $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 ${DESTDIR}$(man5dir)/updmap.cfg.5
-+ cd ${DESTDIR}$(man1dir); rm -f allec.$(manext) texhash.$(manext) \
- lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \
- kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \
- cweave.$(manext) odvicopy.$(manext) \
- odvitype.$(manext) texconfig-sys.$(manext) \
- updmap-sys.$(manext) mktexfmt.$(manext) fmtutil-sys.$(manext)
-- ln -s allcm.$(manext) $(man1dir)/allec.$(manext)
-- ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext)
-- ln -s omega.$(manext) $(man1dir)/lambda.$(manext)
-- ln -s pdftex.$(manext) $(man1dir)/pdflatex.$(manext)
-- ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext)
-- ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext)
-- ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext)
-- ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext)
-- ln -s cweb.$(manext) $(man1dir)/cweave.$(manext)
-- ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext)
-- ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext)
-- ln -s texconfig.$(manext) $(man1dir)/texconfig-sys.$(manext)
-- ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext)
-- ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext)
-- ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext)
-+ ln -s allcm.$(manext) ${DESTDIR}$(man1dir)/allec.$(manext)
-+ ln -s mktexlsr.$(manext) ${DESTDIR}$(man1dir)/texhash.$(manext)
-+ ln -s omega.$(manext) ${DESTDIR}$(man1dir)/lambda.$(manext)
-+ ln -s pdftex.$(manext) ${DESTDIR}$(man1dir)/pdflatex.$(manext)
-+ ln -s kpsetool.$(manext) ${DESTDIR}$(man1dir)/kpsepath.$(manext)
-+ ln -s kpsetool.$(manext) ${DESTDIR}$(man1dir)/kpsexpand.$(manext)
-+ ln -s mf.$(manext) ${DESTDIR}$(man1dir)/mf-nowin.$(manext)
-+ ln -s cweb.$(manext) ${DESTDIR}$(man1dir)/ctangle.$(manext)
-+ ln -s cweb.$(manext) ${DESTDIR}$(man1dir)/cweave.$(manext)
-+ ln -s dvicopy.$(manext) ${DESTDIR}$(man1dir)/odvicopy.$(manext)
-+ ln -s dvitype.$(manext) ${DESTDIR}$(man1dir)/odvitype.$(manext)
-+ ln -s texconfig.$(manext) ${DESTDIR}$(man1dir)/texconfig-sys.$(manext)
-+ ln -s updmap.$(manext) ${DESTDIR}$(man1dir)/updmap-sys.$(manext)
-+ ln -s fmtutil.$(manext) ${DESTDIR}$(man1dir)/mktexfmt.$(manext)
-+ ln -s fmtutil.$(manext) ${DESTDIR}$(man1dir)/fmtutil-sys.$(manext)
- test -r ./latex.info || cd $(srcdir) && for i in latex.info*; do \
-- $(INSTALL_DATA) $$i $(infodir)/$$i; done
-+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-- install-info --info-dir=$(infodir) $(infodir)/latex.info; \
-+ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/latex.info; \
- else true; fi
- for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
-- $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
-+ $(INSTALL_DATA) $(srcdir)/doc/$$p ${DESTDIR}$(texmf)/doc/tetex; \
- done
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
-- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
-- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 $(texmf)/texconfig/v
-- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/x/xterm $(texmf)/texconfig/x
-- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/README $(texmf)/texconfig
-- $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig
-- $(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr
-- $(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/texconfig \
-+ ${DESTDIR}$(texmf)/texconfig/g ${DESTDIR}$(texmf)/texconfig/v ${DESTDIR}$(texmf)/texconfig/x
-+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic ${DESTDIR}$(texmf)/texconfig/g
-+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 ${DESTDIR}$(texmf)/texconfig/v
-+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/x/xterm ${DESTDIR}$(texmf)/texconfig/x
-+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/README ${DESTDIR}$(texmf)/texconfig
-+ $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic ${DESTDIR}$(texmf)/texconfig
-+ $(INSTALL_SCRIPT) $(srcdir)/tcfmgr ${DESTDIR}$(texmf)/texconfig/tcfmgr
-+ $(INSTALL_DATA) $(srcdir)/tcfmgr.map ${DESTDIR}$(texmf)/texconfig/tcfmgr.map
-
- install-exec:
-- -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
-+ -$(SHELL) $(srcdir)/../mkinstalldirs ${DESTDIR}$(scriptdir)
- for s in $(SCRIPTS); do \
-- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
-+ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
- done
- for s in $(CONTEXTSCRIPTS); do \
-- $(INSTALL_SCRIPT) $(srcdir)/context/$$s $(scriptdir)/$$s; \
-+ $(INSTALL_SCRIPT) $(srcdir)/context/$$s ${DESTDIR}$(scriptdir)/$$s; \
- done
-- if test -f $(bindir)/pdftex; then \
-+ if test -f ${DESTDIR}$(bindir)/pdftex; then \
- for s in $(PDFSCRIPTS); do \
-- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
-+ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
- done; \
- else \
- true; \
- fi
-- cd $(scriptdir); rm -f allec kpsepath kpsexpand texhash; \
-+ cd ${DESTDIR}$(scriptdir); rm -f allec kpsepath kpsexpand texhash; \
- ln -s allcm allec; \
- ln -s kpsetool kpsepath; \
- ln -s kpsetool kpsexpand; \
- ln -s mktexlsr texhash
-- cd $(scriptdir); rm -f mktexfmt; ln -s fmtutil mktexfmt
-+ cd ${DESTDIR}$(scriptdir); rm -f mktexfmt; ln -s fmtutil mktexfmt
-
- kpse_include ../make/clean.mk
-
Deleted: trunk/dports/tex/texlive/patch-texk_tetex_texlinks
===================================================================
--- trunk/dports/tex/texlive/patch-texk_tetex_texlinks 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_tetex_texlinks 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,140 +0,0 @@
-$OpenBSD: patch-texk_tetex_texlinks,v 1.1 2007/10/19 22:14:13 steven Exp $
---- texk/tetex/texlinks.orig Wed Jan 17 16:31:31 2007
-+++ texk/tetex/texlinks Mon Oct 15 09:49:15 2007
-@@ -6,6 +6,9 @@
- # the lines given in fmtutil.cnf.
-
- # History:
-+# Tue Oct 9 14:23:01 BST 2007
-+# Added unlink option (-u) to aid OpenBSD package uninstall
-+# Edd Barrett <vext01 at gmail.com>
- # Sun Aug 28 21:41:06 CEST 2005
- # remove special cases for csplain,cslatex,pdfcslatex,pdfcsplain
- # Fr Apr 8 19:15:05 CEST 2005
-@@ -35,34 +38,31 @@ export PATH
- test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
- cnf=fmtutil.cnf # name of the config file
--version=1169050907 # seconds since `00:00:00 1970-01-01 UTC'
-+version=1192147136 # seconds since `00:00:00 1970-01-01 UTC'
- # date '+%s' (with GNU date)
- progname=texlinks
-
--usage='texlinks [options] [directories]
-+usage='Usage: texlinks [OPTION]... [DIRECTORY]...
-
- Create symbolic links format -> engine according to fmtutil setup.
-
--Valid options:
-- --help
-- -h show this help text
-- --version show version string
-- --cnffile file
-- -f file use file as config file (default: fmtutil.cnf)
-- --verbose
-- -v set verbose mode on (default: off)
-- --multiplatform
-- -m operate in all platform specific directories
-+Mandatory arguments to long options are mandatory for short options too.
-+ -h, --help show this help text
-+ --version show version string
-+ -f, --cnffile FILE use FILE as config file (default: fmtutil.cnf)
-+ -v, --verbose enable verbose messages (default: off)
-+ -m, --multiplatform operate in all platform specific directories
- (default: operate only in directory for this platform)
-- --silent
-- -s silently skip over existing scripts / binaries
-- instead of creating a warning
-+ -s, --silent silently skip existing scripts / binaries
-+ (default: issue warning)
-+ -u, --unlink remove symlinks created by texlinks
-
--directories is an optional list of directories in which to operate.
--If no directories are specified the list of directories depends on the
----multiplatform option.
--'
-+The DIRECTORY arguments are an optional list of directories in which to
-+operate. If no directories are specified the list of directories
-+depends on the --multiplatform option.
-
-+Report bugs to tex-k at tug.org.'
-+
- ###############################################################################
- # abort(errmsg)
- # print `errmsg' to stderr and exit with error code 1
-@@ -140,7 +140,7 @@ install_link()
- fi
- if test -f $selfautoloc/mf && test -f $selfautoloc/mf-nowin; then
- # have both mf and mf-nowin binaries. no link.
-- verbose_echo "metafont symlink $src -> $dest skipped (special case)"
-+ verbose_echo "skipped metafont symlink $src -> $dest (special case)"
- return
- fi
- fi
-@@ -149,7 +149,7 @@ install_link()
-
- case $src in
- */cont-??|*/metafun|*/mptopdf)
-- verbose_echo "symlink $src -> $dest skipped (special case)"
-+ verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
- ;;
- *)
- test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
-@@ -205,6 +205,24 @@ upd_symlinkdir()
- }
-
- ###############################################################################
-+# rm_link()
-+# Delete a previously installed link
-+###############################################################################
-+rm_link()
-+{
-+ link=$1;
-+ if test -e $link; then
-+ if test -h $link; then
-+ verbose_do rm -Rf $link
-+ else
-+ verbose_echo "kept $link, since not a symlink"
-+ fi
-+ else
-+ verbose_echo "skipped $link, non-existent"
-+ fi
-+}
-+
-+###############################################################################
- # main()
- # parse commandline arguments, initialize variables,
- # switch into temp. direcrory, execute desired command
-@@ -217,6 +235,7 @@ main()
-
- multiplatform=false
- verbose=false
-+ unlink=false
- silent=false
- thisdir=`pwd`
- : ${KPSE_DOT=$thisdir}; export KPSE_DOT
-@@ -232,6 +251,7 @@ main()
- --v*|-v) verbose=true;;
- --s*|-s) silent=true;;
- --m*|-m) multiplatform=true;;
-+ --u*|-u) unlink=true;;
- -*) errmsg "fmtutil: unknown option \`$1' ignored.";;
- *) break;;
- esac
-@@ -278,9 +298,14 @@ main()
-
- test "x$fmt" = "x$engine" && continue
- if test -f "$d/$engine"; then
-- install_link "$engine" "$d/$fmt"
-+ case $unlink in
-+ true)
-+ rm_link "$d/$fmt";;
-+ *)
-+ install_link "$engine" "$d/$fmt";;
-+ esac
- else
-- verbose_echo "$d/$engine: engine does not exist. Skipping..."
-+ verbose_echo "skipped $d/$engine, engine does not exist"
- fi
-
- # restore positional arguments:
Deleted: trunk/dports/tex/texlive/patch-texk_tex4htk_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_tex4htk_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_tex4htk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,20 +0,0 @@
-$OpenBSD: patch-texk_tex4htk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
---- texk/tex4htk/Makefile.in.orig Sat Apr 21 18:32:35 2007
-+++ texk/tex4htk/Makefile.in Sat Apr 21 18:33:47 2007
-@@ -29,12 +29,12 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: all
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/$$p; done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-+ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(bindir)/$$p; done
-
- uninstall-exec:
-- for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done
-+ for p in $(programs) $(scripts); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data:
-
Deleted: trunk/dports/tex/texlive/patch-texk_texlive_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_texlive_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_texlive_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,27 +0,0 @@
-$OpenBSD: patch-texk_texlive_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
---- texk/texlive/Makefile.in.orig Sat Apr 21 18:34:02 2007
-+++ texk/texlive/Makefile.in Sat Apr 21 18:34:59 2007
-@@ -19,17 +19,17 @@ install: install-data install-exec
- # Auxiliary files.
- install-data::
- for p in $(manpgs); do \
-- $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
-+ $(INSTALL_DATA) $(srcdir)/$$p.man ${DESTDIR}$(man1dir)/$$p.$(manext); \
- done
-
- install-exec:
-- -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
-+ -$(SHELL) $(srcdir)/../mkinstalldirs ${DESTDIR}$(scriptdir)
- for s in $(LIVESCRIPTS); do \
-- rm -f $(scriptdir)/$$s ; \
-- $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \
-+ rm -f ${DESTDIR}$(scriptdir)/$$s ; \
-+ $(INSTALL_SCRIPT) $(srcdir)/$$s ${DESTDIR}$(scriptdir)/$$s; \
- done
-- rm -f $(scriptdir)/getnonfreefonts-sys
-- ln -s getnonfreefonts $(scriptdir)/getnonfreefonts-sys
-+ rm -f ${DESTDIR}$(scriptdir)/getnonfreefonts-sys
-+ ln -s getnonfreefonts ${DESTDIR}$(scriptdir)/getnonfreefonts-sys
-
- kpse_include ../make/clean.mk
-
Deleted: trunk/dports/tex/texlive/patch-texk_ttf2pk_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_ttf2pk_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_ttf2pk_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,28 +0,0 @@
-$OpenBSD: patch-texk_ttf2pk_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
---- texk/ttf2pk/Makefile.in.orig Sat Apr 21 18:35:31 2007
-+++ texk/ttf2pk/Makefile.in Sat Apr 21 18:36:09 2007
-@@ -38,17 +38,17 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: $(programs)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- uninstall-exec:
-- for p in $(programs); do rm -f $(bindir)/$$p; done
-+ for p in $(programs); do rm -f ${DESTDIR}$(bindir)/$$p; done
-
- install-data: ttf2pk.1 ttf2tfm.1
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(INSTALL_DATA) $(srcdir)/ttf2pk.1 $(man1dir)/ttf2pk.$(manext)
-- $(INSTALL_DATA) $(srcdir)/ttf2tfm.1 $(man1dir)/ttf2tfm.$(manext)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(INSTALL_DATA) $(srcdir)/ttf2pk.1 ${DESTDIR}$(man1dir)/ttf2pk.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/ttf2tfm.1 ${DESTDIR}$(man1dir)/ttf2tfm.$(manext)
- uninstall-data:
-- rm -f $(man1dir)/ttf2pk.$(manext) $(man1dir)/ttf2tfm.$(manext)
-+ rm -f $(man1dir)/ttf2pk.$(manext) ${DESTDIR}$(man1dir)/ttf2tfm.$(manext)
-
- pre-dist-$(distname):
- post-dist-$(distname):
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,116 +0,0 @@
-$OpenBSD: patch-texk_web2c_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
---- texk/web2c/Makefile.in.orig Wed Jan 10 17:39:42 2007
-+++ texk/web2c/Makefile.in Fri May 4 20:28:39 2007
-@@ -788,25 +788,25 @@ install-dumps: install-tex-dumps install-mf-dumps inst
-
- # Installation directories.
- $(bindir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
- $(texpooldir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texpooldir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texpooldir)
- $(mfpooldir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(mfpooldir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(mfpooldir)
- $(mppooldir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(mppooldir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(mppooldir)
- $(fmtdir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(fmtdir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(fmtdir)
- $(basedir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(basedir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(basedir)
- $(memdir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(memdir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(memdir)
- $(web2cdir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(web2cdir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(web2cdir)
-
- # Installing the programs.
- install-programs: $(programs) $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
- # Installation of each of the three main engines.
- install-tex: install-tex-exec install-tex-data
-@@ -829,15 +829,15 @@ install-mpost-dumps: install-mpost-mems
- install-programs: install-tex-programs
- install-tex-programs: tex $(bindir)
- tex="tex"; \
-- for p in $$tex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ for p in $$tex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- install-programs: install-mf-programs
- install-mf-programs: mf $(mfn) $(bindir)
- mf="mf $(mfn)"; \
-- for p in $$mf; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ for p in $$mf; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- install-programs: install-mpost-programs
- install-mpost-programs: mpost $(bindir)
- mpost="mpost"; \
-- for p in $$mpost; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ for p in $$mpost; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
- # The links to {mf,mp,tex} for each format and for {ini,vir}{mf,mp,tex},
- # plus the equivalents for e-TeX, Omega, and pdf[ex]TeX.
-@@ -860,34 +860,34 @@ install-mpost-links: install-mpost-programs
- install-fmts: install-tex-fmts
- install-tex-fmts: fmts $(fmtdir)
- fmts="$(all_fmts)"; \
-- for f in $$fmts; do $(INSTALL_DATA) $$f $(fmtdir)/$$f; done
-- cd $(fmtdir) && (rm -f plain.fmt; $(LN) tex.fmt plain.fmt)
-+ for f in $$fmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(fmtdir)/$$f; done
-+ cd ${DESTDIR}$(fmtdir) && (rm -f plain.fmt; $(LN) tex.fmt plain.fmt)
- fmts="$(fmts)"; \
- for f in $$fmts; do base=`basename $$f .fmt`; \
-- (cd $(bindir) && (rm -f $$base; $(LN) tex $$base)); done
-+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) tex $$base)); done
-
- install-bases: install-mf-bases
- install-mf-bases: bases $(basedir)
- bases="$(all_bases)"; \
-- for f in $$bases; do $(INSTALL_DATA) $$f $(basedir)/$$f; done
-- cd $(basedir) && (rm -f plain.base; $(LN) mf.base plain.base)
-+ for f in $$bases; do $(INSTALL_DATA) $$f ${DESTDIR}$(basedir)/$$f; done
-+ cd ${DESTDIR}$(basedir) && (rm -f plain.base; $(LN) mf.base plain.base)
- bases="$(bases)"; \
- for f in $$bases; do base=`basename $$f .base`;\
-- (cd $(bindir) && (rm -f $$base; $(LN) mf $$base)); done
-+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) mf $$base)); done
-
- install-mems: install-mpost-mems
- install-mpost-mems: mems $(memdir)
- mems="$(all_mems)"; \
-- for f in $$mems; do $(INSTALL_DATA) $$f $(memdir)/$$f; done
-- cd $(memdir) && (rm -f plain.mem; $(LN) mpost.mem plain.mem)
-+ for f in $$mems; do $(INSTALL_DATA) $$f ${DESTDIR}$(memdir)/$$f; done
-+ cd ${DESTDIR}$(memdir) && (rm -f plain.mem; $(LN) mpost.mem plain.mem)
- mems="$(mems)"; \
- for f in $$mems; do base=`basename $$f .mem`; \
-- (cd $(bindir) && (rm -f $$base; $(LN) mpost $$base)); done
-+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) mpost $$base)); done
-
- install-tex-pool: tex.pool $(texpooldir)
-- $(INSTALL_DATA) tex.pool $(texpooldir)/tex.pool
-+ $(INSTALL_DATA) tex.pool ${DESTDIR}$(texpooldir)/tex.pool
- install-mf-pool: mf.pool $(mfpooldir)
-- $(INSTALL_DATA) mf.pool $(mfpooldir)/mf.pool
-+ $(INSTALL_DATA) mf.pool ${DESTDIR}$(mfpooldir)/mf.pool
- install-mpost-pool: # no longer used, the strings are in the binary
- # install-mpost-pool: mp.pool $(mppooldir)
- # $(INSTALL_DATA) mp.pool $(mppooldir)/mp.pool
-@@ -896,9 +896,9 @@ install-mpost-pool: # no longer used, the strings are
- install-data:: $(web2cdir)
- cd doc && $(MAKE) $(install_makeargs) install-data
- cd man && $(MAKE) $(install_makeargs) install-data
-- $(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(man1dir)/tie.$(manext)
-- $(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(man1dir)/ctie.$(manext)
-- $(INSTALL_DATA) fmtutil.cnf $(web2cdir)/fmtutil.cnf
-+ $(INSTALL_DATA) $(srcdir)/tiedir/tie.1 ${DESTDIR}$(man1dir)/tie.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 ${DESTDIR}$(man1dir)/ctie.$(manext)
-+ $(INSTALL_DATA) fmtutil.cnf ${DESTDIR}$(web2cdir)/fmtutil.cnf
-
- # Dummy target.
- uninstall uninstall-exec uninstall-data:
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_alephdir_aleph_mk
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_alephdir_aleph_mk 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_alephdir_aleph_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,39 +0,0 @@
-$OpenBSD: patch-texk_web2c_alephdir_aleph_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/web2c/alephdir/aleph.mk.orig Tue Jan 17 21:41:51 2006
-+++ texk/web2c/alephdir/aleph.mk Fri May 4 20:28:39 2007
-@@ -142,7 +142,7 @@ afmts: $(all_afmts)
-
- afmtdir = $(web2cdir)/aleph
- $(afmtdir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(afmtdir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(afmtdir)
-
- aleph.fmt: aleph
- $(dumpenv) $(MAKE) progname=aleph files="omega.ini" prereq-check
-@@ -161,7 +161,7 @@ install-aleph-dumps: install-aleph-fmts
- # The actual binary executables and pool files.
- install-programs: @ALEPH@ install-aleph-programs
- install-aleph-programs: aleph $(bindir)
-- for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
- install-links: @ALEPH@ install-aleph-links
- install-aleph-links: install-aleph-programs
-@@ -171,14 +171,14 @@ install-aleph-links: install-aleph-programs
- install-fmts: @ALEPH@ install-aleph-fmts
- install-aleph-fmts: afmts $(afmtdir)
- afmts="$(all_afmts)"; \
-- for f in $$afmts; do $(INSTALL_DATA) $$f $(afmtdir)/$$f; done
-+ for f in $$afmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(afmtdir)/$$f; done
- afmts="$(afmts)"; \
- for f in $$afmts; do base=`basename $$f .fmt`; \
-- (cd $(bindir) && (rm -f $$base; $(LN) aleph $$base)); done
-+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) aleph $$base)); done
-
- # Auxiliary files.
- install-data:: @ALEPH@ install-aleph-data
- install-aleph-pool: aleph.pool $(texpooldir)
-- $(INSTALL_DATA) aleph.pool $(texpooldir)/aleph.pool
-+ $(INSTALL_DATA) aleph.pool ${DESTDIR}$(texpooldir)/aleph.pool
-
- # end of aleph.mk
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_doc_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_doc_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_doc_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,19 +0,0 @@
-$OpenBSD: patch-texk_web2c_doc_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/web2c/doc/Makefile.in.orig Wed Apr 18 13:50:12 2007
-+++ texk/web2c/doc/Makefile.in Wed Apr 18 13:51:09 2007
-@@ -48,12 +48,12 @@ Makefile: Makefile.in ../config.status
- install: install-exec install-data
- install-exec:
- install-data: web2c.info
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(infodir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(infodir)
- test -r ./web2c.info || cd $(srcdir) && for i in web2c.i*; do \
-- $(INSTALL_DATA) $$i $(infodir)/$$i; done
-+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; done
- $(POST_INSTALL)
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-- install-info --info-dir=$(infodir) $(infodir)/web2c.info; \
-+ install-info --info-dir=${DESTDIR}$(infodir) ${DESTDIR}$(infodir)/web2c.info; \
- else true; fi
-
- check: all
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_mpware_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_mpware_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_mpware_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,20 +0,0 @@
-$OpenBSD: patch-texk_web2c_mpware_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/web2c/mpware/Makefile.in.orig Tue Apr 17 21:27:22 2007
-+++ texk/web2c/mpware/Makefile.in Tue Apr 17 21:28:04 2007
-@@ -45,11 +45,11 @@ Makefile: Makefile.in ../config.status
-
- install: install-exec install-data
- install-exec: $(programs)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir)
-- $(INSTALL_PROGRAM) newer $(bindir)/newer
-- $(INSTALL_LIBTOOL_PROG) dmp $(bindir)
-- $(INSTALL_LIBTOOL_PROG) mpto $(bindir)
-- $(INSTALL_SCRIPT) makempx $(scriptdir)/makempx
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir)
-+ $(INSTALL_PROGRAM) newer ${DESTDIR}$(bindir)/newer
-+ $(INSTALL_LIBTOOL_PROG) dmp ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) mpto ${DESTDIR}$(bindir)
-+ $(INSTALL_SCRIPT) makempx ${DESTDIR}$(scriptdir)/makempx
- install-data:
-
- kpse_include ../make/tkpathsea.mk
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_omegadir_omega_mk
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_omegadir_omega_mk 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_omegadir_omega_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,39 +0,0 @@
-$OpenBSD: patch-texk_web2c_omegadir_omega_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/web2c/omegadir/omega.mk.orig Tue Jan 17 21:41:51 2006
-+++ texk/web2c/omegadir/omega.mk Fri May 4 20:28:40 2007
-@@ -183,7 +183,7 @@ ofmts: $(all_ofmts)
-
- ofmtdir = $(web2cdir)/omega
- $(ofmtdir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(ofmtdir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(ofmtdir)
-
- omega.fmt: omega
- $(dumpenv) $(MAKE) progname=omega files="omega.tex" prereq-check
-@@ -213,7 +213,7 @@ install-omega-dumps: install-omega-fmts
- # The actual binary executables and pool files.
- install-programs: @OMEGA@ install-omega-programs
- install-omega-programs: $(omega_programs) $(bindir)
-- for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
- cd otps && $(MAKE) $(install_makeargs) install-programs
- cd omegafonts && $(MAKE) $(install_makeargs) install-programs
-
-@@ -227,14 +227,14 @@ install-omega-links: install-omega-programs
- install-fmts: @OMEGA@ install-omega-fmts
- install-omega-fmts: ofmts $(ofmtdir)
- ofmts="$(all_ofmts)"; \
-- for f in $$ofmts; do $(INSTALL_DATA) $$f $(ofmtdir)/$$f; done
-+ for f in $$ofmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(ofmtdir)/$$f; done
- ofmts="$(ofmts)"; \
- for f in $$ofmts; do base=`basename $$f .fmt`; \
-- (cd $(bindir) && (rm -f $$base; $(LN) omega $$base)); done
-+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) omega $$base)); done
-
- # Auxiliary files.
- install-data:: @OMEGA@ install-omega-data
- install-omega-pool: omega.pool $(texpooldir)
-- $(INSTALL_DATA) omega.pool $(texpooldir)/omega.pool
-+ $(INSTALL_DATA) omega.pool ${DESTDIR}$(texpooldir)/omega.pool
-
- # end of omega.mk
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_omegafonts_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_omegafonts_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_omegafonts_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,19 +0,0 @@
-$OpenBSD: patch-texk_web2c_omegafonts_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/web2c/omegafonts/Makefile.in.orig Wed Apr 18 13:29:36 2007
-+++ texk/web2c/omegafonts/Makefile.in Wed Apr 18 13:31:07 2007
-@@ -52,12 +52,12 @@ install: install-exec
- install-exec:: install-links
-
- install-programs: $(programs)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
- install-links: install-programs
- for f in ""$(linked_programs); do \
-- cd $(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
-+ cd ${DESTDIR}$(bindir) && (rm -f $$f; $(LN) omfonts $$f); done
-
- Makefile: Makefile.in ../config.status
- cd .. && $(SHELL) config.status
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_otps_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_otps_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_otps_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,16 +0,0 @@
-$OpenBSD: patch-texk_web2c_otps_Makefile_in,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/web2c/otps/Makefile.in.orig Wed Apr 18 03:05:43 2007
-+++ texk/web2c/otps/Makefile.in Wed Apr 18 03:06:28 2007
-@@ -35,9 +35,9 @@ outocp: outocp.o
- $(programs): $(proglib) $(kpathsea)
-
- install-programs: $(programs)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-- for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p $(scriptdir); done
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-+ for p in $(scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p ${DESTDIR}$(scriptdir); done
-
- Makefile: Makefile.in ../config.status
- cd .. && $(SHELL) config.status
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_pdftexdir_pdftex_mk
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_pdftexdir_pdftex_mk 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_pdftexdir_pdftex_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,40 +0,0 @@
-$OpenBSD: patch-texk_web2c_pdftexdir_pdftex_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/web2c/pdftexdir/pdftex.mk.orig Tue Dec 26 23:37:34 2006
-+++ texk/web2c/pdftexdir/pdftex.mk Fri May 4 20:28:40 2007
-@@ -92,7 +92,7 @@ pdfefmts: $(all_pdfefmts)
-
- pdfefmtdir = $(web2cdir)/pdfetex
- $(pdfefmtdir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(pdfefmtdir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(pdfefmtdir)
-
- pdfetex.fmt: pdfetex
- $(dumpenv) $(MAKE) progname=pdfetex files="etex.src plain.tex cmr10.tfm" prereq-check
-@@ -112,7 +112,7 @@ install-pdftex-dumps: install-pdftex-fmts
- # The actual binary executables and pool files.
- install-programs: @PETEX@ install-pdftex-programs
- install-pdftex-programs: $(pdftex) $(bindir)
-- for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
- install-links: @PETEX@ install-pdftex-links
- install-pdftex-links: install-pdftex-programs
-@@ -122,15 +122,15 @@ install-pdftex-links: install-pdftex-programs
- install-fmts: @PETEX@ install-pdftex-fmts
- install-pdftex-fmts: pdfefmts $(pdfefmtdir)
- pdfefmts="$(all_pdfefmts)"; \
-- for f in $$pdfefmts; do $(INSTALL_DATA) $$f $(pdfefmtdir)/$$f; done
-+ for f in $$pdfefmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(pdfefmtdir)/$$f; done
- pdfefmts="$(pdfefmts)"; \
- for f in $$pdfefmts; do base=`basename $$f .fmt`; \
-- (cd $(bindir) && (rm -f $$base; $(LN) pdftex $$base)); done
-+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) pdftex $$base)); done
-
- # Auxiliary files.
- install-data:: @PETEX@ install-pdftex-data
- install-pdftex-pool: pdftex.pool $(texpooldir)
-- $(INSTALL_DATA) pdftex.pool $(texpooldir)/pdftex.pool
-+ $(INSTALL_DATA) pdftex.pool ${DESTDIR}$(texpooldir)/pdftex.pool
-
- #
- # ttf2afm
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_texmfmem_h
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_texmfmem_h 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_texmfmem_h 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,84 +0,0 @@
-$OpenBSD: patch-texk_web2c_texmfmem_h,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
---- texk/web2c/texmfmem.h.orig Tue Jun 20 13:03:18 2006
-+++ texk/web2c/texmfmem.h Fri Jun 22 10:51:56 2007
-@@ -112,33 +112,20 @@ typedef union
- #else
- twohalves hhfield;
- #endif
--#ifdef WORDS_BIGENDIAN
- #ifdef XeTeX
-- struct
-- {
-- integer CINT;
-- integer CINT1;
-- } x;
--#else
-- integer cint;
-+ voidpointer ptr;
- #endif
-+#ifdef WORDS_BIGENDIAN
-+ integer cint;
- fourquarters qqqq;
- #else /* not WORDS_BIGENDIAN */
--#ifdef XeTeX
- struct
- {
-- integer CINT1;
-- integer CINT;
-- } x;
--#else
-- struct
-- {
- #if defined (TeX) && !defined (SMALLTeX) || defined (MF) && !defined (SMALLMF) || defined (MP) && !defined (SMALLMP)
- halfword junk;
- #endif /* big {TeX,MF,MP} */
- integer CINT;
- } u;
--#endif
-
- struct
- {
-@@ -159,28 +146,13 @@ typedef union
- typedef union
- {
- #ifdef WORDS_BIGENDIAN
--#ifdef XeTeX
-- struct
-- {
-- integer CINT;
-- } x;
--#else
- integer cint;
--#endif
- fourquarters qqqq;
- #else /* not WORDS_BIGENDIAN */
--#ifdef XeTeX
- struct
- {
-- halfword junk;
- integer CINT;
-- } x;
--#else
-- struct
-- {
-- integer CINT;
- } u;
--#endif
-
- struct
- {
-@@ -199,14 +171,9 @@ typedef union
- #define rh v.RH
- #define lhfield v.LH
-
--#ifdef XeTeX
--#define cint x.CINT
--#define cint1 x.CINT1
--#else
- #ifndef WORDS_BIGENDIAN
- #define cint u.CINT
- #endif
--#endif /* XeTeX */
-
- #ifndef WORDS_BIGENDIAN
- #define qqqq v.QQQQ
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_c
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_c 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_c 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,348 +0,0 @@
-$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_ext_c,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
---- texk/web2c/xetexdir/XeTeX_ext.c.orig Mon Jan 15 13:04:36 2007
-+++ texk/web2c/xetexdir/XeTeX_ext.c Fri Jun 22 10:51:56 2007
-@@ -236,9 +236,9 @@ void initversionstring(char **versions)
- }
-
-
--extern char* gettexstring(int strNumber);
-+extern char* gettexstring(integer strNumber);
- void
--setinputfileencoding(UFILE* f, int mode, int encodingData)
-+setinputfileencoding(UFILE* f, integer mode, integer encodingData)
- {
- if ((f->encodingMode == ICUMAPPING) && (f->conversionData != NULL))
- ucnv_close((UConverter*)(f->conversionData));
-@@ -288,9 +288,9 @@ input_line_icu(UFILE* f)
- static char* byteBuffer = NULL;
-
- UInt32 bytesRead = 0;
-- int i;
-+ int i;
- UConverter* cnv;
-- long outLen;
-+ int outLen;
- UErrorCode errorCode = 0;
-
- if (byteBuffer == NULL)
-@@ -355,10 +355,9 @@ static UBreakIterator* brkIter = NULL;
- static int brkLocaleStrNum = 0;
-
- void
--linebreakstart(int localeStrNum, const UniChar* text, int textLength)
-+linebreakstart(integer localeStrNum, const UniChar* text, integer textLength)
- {
- UErrorCode status = 0;
-- int i;
-
- if ((localeStrNum != brkLocaleStrNum) && (brkIter != NULL)) {
- ubrk_close(brkIter);
-@@ -392,8 +391,8 @@ linebreaknext()
- return ubrk_next((UBreakIterator*)brkIter);
- }
-
--long
--getencodingmodeandinfo(long* info)
-+int
-+getencodingmodeandinfo(integer* info)
- {
- /* \XeTeXinputencoding "enc-name"
- * -> name is packed in |nameoffile| as a C string, starting at [1]
-@@ -811,7 +810,7 @@ splitFontName(char* name, char** var, char** feat, cha
- }
-
- void*
--findnativefont(unsigned char* uname, long scaled_size)
-+findnativefont(unsigned char* uname, integer scaled_size)
- /* scaled_size here is in TeX points */
- {
- void* rval = 0;
-@@ -950,7 +949,6 @@ void
- otgetfontmetrics(void* pEngine, scaled* ascent, scaled* descent, scaled* xheight, scaled* capheight, scaled* slant)
- {
- XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
-- long rval = 0;
- float a, d;
- int glyphID;
-
-@@ -977,8 +975,8 @@ otgetfontmetrics(void* pEngine, scaled* ascent, scaled
- *capheight = *ascent; /* arbitrary figure if there's no 'X' in the font */
- }
-
--long
--otfontget(int what, void* pEngine)
-+integer
-+otfontget(integer what, void* pEngine)
- {
- XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
- XeTeXFont fontInst = getFont(engine);
-@@ -995,8 +993,8 @@ otfontget(int what, void* pEngine)
- }
-
-
--long
--otfontget1(int what, void* pEngine, long param)
-+integer
-+otfontget1(integer what, void* pEngine, integer param)
- {
- XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
- XeTeXFont fontInst = getFont(engine);
-@@ -1013,8 +1011,8 @@ otfontget1(int what, void* pEngine, long param)
- }
-
-
--long
--otfontget2(int what, void* pEngine, long param1, long param2)
-+integer
-+otfontget2(integer what, void* pEngine, integer param1, integer param2)
- {
- XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
- XeTeXFont fontInst = getFont(engine);
-@@ -1032,8 +1030,8 @@ otfontget2(int what, void* pEngine, long param1, long
- }
-
-
--long
--otfontget3(int what, void* pEngine, long param1, long param2, long param3)
-+integer
-+otfontget3(integer what, void* pEngine, integer param1, integer param2, integer param3)
- {
- XeTeXLayoutEngine engine = (XeTeXLayoutEngine)pEngine;
- XeTeXFont fontInst = getFont(engine);
-@@ -1091,7 +1089,7 @@ makeXDVGlyphArrayData(void* pNode)
- xdvbuffer = (char*)xmalloc(xdvBufSize);
- }
-
-- glyph_info = (void*)native_glyph_info_ptr(p);
-+ glyph_info = native_glyph_info_ptr(p);
- locations = (FixedPoint*)glyph_info;
- glyphIDs = (UInt16*)(locations + glyphCount);
-
-@@ -1138,8 +1136,8 @@ makeXDVGlyphArrayData(void* pNode)
- return ((char*)cp - xdvbuffer);
- }
-
--long
--makefontdef(long f)
-+int
-+makefontdef(integer f)
- {
- UInt16 flags = 0;
- UInt32 variationCount = 0;
-@@ -1349,7 +1347,7 @@ snap_zone(scaled* value, scaled snap_value, scaled fuz
- }
-
- void
--getnativecharheightdepth(int font, int ch, scaled* height, scaled* depth)
-+getnativecharheightdepth(integer font, integer ch, scaled* height, scaled* depth)
- {
- #define QUAD(f) fontinfo[6+parambase[f]].cint
- #define X_HEIGHT(f) fontinfo[5+parambase[f]].cint
-@@ -1389,7 +1387,7 @@ getnativecharheightdepth(int font, int ch, scaled* hei
- }
-
- scaled
--getnativecharht(int f, int c)
-+getnativecharht(integer f, integer c)
- {
- scaled h, d;
- getnativecharheightdepth(f, c, &h, &d);
-@@ -1397,7 +1395,7 @@ getnativecharht(int f, int c)
- }
-
- scaled
--getnativechardp(int f, int c)
-+getnativechardp(integer f, integer c)
- {
- scaled h, d;
- getnativecharheightdepth(f, c, &h, &d);
-@@ -1405,7 +1403,7 @@ getnativechardp(int f, int c)
- }
-
- void
--getnativecharsidebearings(int font, int ch, scaled* lsb, scaled* rsb)
-+getnativecharsidebearings(integer font, integer ch, scaled* lsb, scaled* rsb)
- {
- float l, r;
-
-@@ -1432,7 +1430,7 @@ getnativecharsidebearings(int font, int ch, scaled* ls
- }
-
- scaled
--getnativecharic(int f, int c)
-+getnativecharic(integer f, integer c)
- {
- scaled lsb, rsb;
- getnativecharsidebearings(f, c, &lsb, &rsb);
-@@ -1443,7 +1441,7 @@ getnativecharic(int f, int c)
- }
-
- scaled
--getnativecharwd(int f, int c)
-+getnativecharwd(integer f, integer c)
- {
- scaled wd = 0;
- #ifdef XETEX_MAC
-@@ -1515,7 +1513,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
- void* glyph_info = 0;
- static float* positions = 0;
- static UInt32* glyphs = 0;
-- static long maxGlyphs = 0;
-+ static int maxGlyphs = 0;
-
- FixedPoint* locations;
- UInt16* glyphIDs;
-@@ -1591,7 +1589,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
-
- node_width(node) = X2Fix(wid);
- native_glyph_count(node) = realGlyphCount;
-- native_glyph_info_ptr(node) = (long)glyph_info;
-+ native_glyph_info_ptr(node) = glyph_info;
- }
- else {
- int i;
-@@ -1632,7 +1630,7 @@ measure_native_node(void* pNode, int use_glyph_metrics
- }
-
- native_glyph_count(node) = realGlyphCount;
-- native_glyph_info_ptr(node) = (long)glyph_info;
-+ native_glyph_info_ptr(node) = glyph_info;
- }
-
- ubidi_close(pBiDi);
-@@ -1787,8 +1785,8 @@ measure_native_glyph(void* pNode, int use_glyph_metric
- }
- }
-
--int
--mapchartoglyph(int font, unsigned int ch)
-+integer
-+mapchartoglyph(integer font, integer ch)
- {
- if (ch > 0x10ffff || ((ch >= 0xd800) && (ch <= 0xdfff)))
- return 0;
-@@ -1805,8 +1803,8 @@ mapchartoglyph(int font, unsigned int ch)
- }
- }
-
--int
--mapglyphtoindex(int font)
-+integer
-+mapglyphtoindex(integer font)
- /* glyph name is at nameoffile+1 */
- {
- #ifdef XETEX_MAC
-@@ -1822,8 +1820,8 @@ mapglyphtoindex(int font)
- }
- }
-
--int
--getfontcharrange(int font, int first)
-+integer
-+getfontcharrange(integer font, int first)
- {
- #ifdef XETEX_MAC
- if (fontarea[font] == AAT_FONT_FLAG)
-@@ -1928,10 +1926,10 @@ atsugetfontmetrics(ATSUStyle style, Fixed* ascent, Fix
- #endif
- }
-
--long
-+int
- atsufontget(int what, ATSUStyle style)
- {
-- long rval = -1;
-+ int rval = -1;
-
- #ifdef XETEX_MAC
- ATSUFontID fontID;
-@@ -1966,10 +1964,10 @@ atsufontget(int what, ATSUStyle style)
- return rval;
- }
-
--long
-+int
- atsufontget1(int what, ATSUStyle style, int param)
- {
-- long rval = -1;
-+ int rval = -1;
-
- #ifdef XETEX_MAC
- ATSUFontID fontID;
-@@ -2026,10 +2024,10 @@ atsufontget1(int what, ATSUStyle style, int param)
- return rval;
- }
-
--long
-+int
- atsufontget2(int what, ATSUStyle style, int param1, int param2)
- {
-- long rval = -1;
-+ int rval = -1;
-
- #ifdef XETEX_MAC
- ATSUFontID fontID;
-@@ -2063,10 +2061,10 @@ atsufontget2(int what, ATSUStyle style, int param1, in
- return rval;
- }
-
--long
-+int
- atsufontgetnamed(int what, ATSUStyle style)
- {
-- long rval = -1;
-+ int rval = -1;
-
- #ifdef XETEX_MAC
- ATSUFontID fontID;
-@@ -2090,10 +2088,10 @@ atsufontgetnamed(int what, ATSUStyle style)
- return rval;
- }
-
--long
-+int
- atsufontgetnamed1(int what, ATSUStyle style, int param)
- {
-- long rval = -1;
-+ int rval = -1;
-
- #ifdef XETEX_MAC
- ATSUFontID fontID;
-@@ -2220,7 +2218,7 @@ atsuprintfontname(int what, ATSUStyle style, int param
- }
-
- void
--printglyphname(int font, int gid)
-+printglyphname(integer font, integer gid)
- {
- char* s;
- int len = 0;
-@@ -2243,8 +2241,8 @@ printglyphname(int font, int gid)
- printchar(*s++);
- }
-
--boolean
--u_open_in(unicodefile* f, int filefmt, const_string fopen_mode, int mode, int encodingData)
-+int
-+u_open_in(unicodefile* f, integer filefmt, const_string fopen_mode, integer mode, integer encodingData)
- {
- boolean rval;
- *f = malloc(sizeof(UFILE));
-@@ -2287,7 +2285,7 @@ u_open_in(unicodefile* f, int filefmt, const_string fo
- return rval;
- }
-
--boolean
-+int
- open_dvi_output(FILE** fptr)
- {
- if (nopdfoutput) {
-@@ -2391,7 +2389,7 @@ get_uni_c(UFILE* f)
- return rval;
- }
-
--boolean
-+int
- input_line(UFILE* f)
- {
- int i;
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_h
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_h 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_ext_h 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,109 +0,0 @@
-$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_ext_h,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
---- texk/web2c/xetexdir/XeTeX_ext.h.orig Fri Dec 29 17:54:26 2006
-+++ texk/web2c/xetexdir/XeTeX_ext.h Fri Jun 22 10:51:56 2007
-@@ -141,10 +141,10 @@ typedef struct {
- #define node_width(node) node[width_offset].cint
- #define node_depth(node) node[depth_offset].cint
- #define node_height(node) node[height_offset].cint
--#define native_length(node) node[native_info_offset].hh.v.RH
--#define native_font(node) node[native_info_offset].hh.b1
--#define native_glyph_count(node) node[native_glyph_info_offset].hh.v.LH
--#define native_glyph_info_ptr(node) node[native_glyph_info_offset].hh.v.RH
-+#define native_length(node) node[native_info_offset].qqqq.b2
-+#define native_font(node) node[native_info_offset].qqqq.b1
-+#define native_glyph_count(node) node[native_info_offset].qqqq.b3
-+#define native_glyph_info_ptr(node) node[native_glyph_info_offset].ptr
- #define native_glyph_info_size 10 /* info for each glyph is location (FixedPoint) + glyph ID (UInt16) */
-
- #define native_glyph(p) native_length(p) /* glyph ID field in a glyph_node */
-@@ -206,6 +206,8 @@ extern const UInt32 kSurrogateLowEnd;
- extern const UInt32 byteMask;
- extern const UInt32 byteMark;
-
-+#include <stdio.h> /* for FILE */
-+
- #include "trans.h"
-
- #ifdef __cplusplus
-@@ -213,51 +215,62 @@ extern "C" {
- #endif
- void initversionstring(char **versions);
-
-- void setinputfileencoding(unicodefile f, int mode, int encodingData);
-+ void setinputfileencoding(unicodefile f, integer mode, integer encodingData);
- void uclose(unicodefile f);
- int input_line_icu(unicodefile f);
-- void linebreakstart(int localeStrNum, const UniChar* text, int textLength);
-+ void linebreakstart(integer localeStrNum, const UniChar* text, integer textLength);
- int linebreaknext();
-- long getencodingmodeandinfo(long* info);
-+ int getencodingmodeandinfo(integer* info);
- void printutf8str(const unsigned char* str, int len);
- void printchars(const unsigned short* str, int len);
- void* load_mapping_file(const char* s, const char* e);
-- void* findnativefont(unsigned char* name, long scaled_size);
-+ void* findnativefont(unsigned char* name, integer scaled_size);
- void releasefontengine(void* engine, int type_flag);
-
-- /* 'integer' params here are really TeX 'scaled' values, but that typedef isn't available every place this is included */
-+ /* the metrics params here are really TeX 'scaled' values, but that typedef isn't available every place this is included */
- void otgetfontmetrics(void* engine, integer* ascent, integer* descent, integer* xheight, integer* capheight, integer* slant);
-- void getnativecharheightdepth(int font, int ch, integer* height, integer* depth);
-- void getnativecharsidebearings(int font, int ch, integer* lsb, integer* rsb);
-+ void getnativecharheightdepth(integer font, integer ch, integer* height, integer* depth);
-+ void getnativecharsidebearings(integer font, integer ch, integer* lsb, integer* rsb);
-
- /* single-purpose metrics accessors */
-- integer getnativecharwd(int font, int ch);
-- integer getnativecharht(int font, int ch);
-- integer getnativechardp(int font, int ch);
-- integer getnativecharic(int font, int ch);
-+ integer getnativecharwd(integer font, integer ch);
-+ integer getnativecharht(integer font, integer ch);
-+ integer getnativechardp(integer font, integer ch);
-+ integer getnativecharic(integer font, integer ch);
-
-- long otfontget(int what, void* engine);
-- long otfontget1(int what, void* engine, long param);
-- long otfontget2(int what, void* engine, long param1, long param2);
-- long otfontget3(int what, void* engine, long param1, long param2, long param3);
-+ integer otfontget(integer what, void* engine);
-+ integer otfontget1(integer what, void* engine, integer param);
-+ integer otfontget2(integer what, void* engine, integer param1, integer param2);
-+ integer otfontget3(integer what, void* engine, integer param1, integer param2, integer param3);
- int makeXDVGlyphArrayData(void* p);
-- long makefontdef(long f);
-+ int makefontdef(integer f);
- int applymapping(void* cnv, const UniChar* txtPtr, int txtLen);
- void store_justified_native_glyphs(void* node);
- void measure_native_node(void* node, int use_glyph_metrics);
- Fixed get_native_ital_corr(void* node);
- Fixed get_native_glyph_ital_corr(void* node);
- void measure_native_glyph(void* node, int use_glyph_metrics);
-- int mapchartoglyph(int font, unsigned int ch);
-- int mapglyphtoindex(int font);
-+ integer mapchartoglyph(integer font, integer ch);
-+ integer mapglyphtoindex(integer font);
-+ integer getfontcharrange(integer font, int first);
-+ void printglyphname(integer font, integer gid);
-
-+ double read_double(const char** s);
-+ unsigned int read_rgb_a(const char** cp);
-+
- const char* getGlyphNamePtr(const char* buffer, int tableSize, UInt16 gid, int* len);
-
- int find_pic_file(char** path, realrect* bounds, int pdfBoxType, int page);
-+ int u_open_in(unicodefile* f, integer filefmt, const char* fopen_mode, integer mode, integer encodingData);
-+ int open_dvi_output(FILE** fptr);
-+ void dviclose(FILE* fptr);
-+ int get_uni_c(UFILE* f);
-+ int input_line(UFILE* f);
-+ void makeutf16name();
-
- #ifdef XETEX_MAC
- /* functions in XeTeX_mac.c */
-- void* loadAATfont(ATSFontRef fontRef, long scaled_size, const char* cp1);
-+ void* loadAATfont(ATSFontRef fontRef, integer scaled_size, const char* cp1);
- void DoAtsuiLayout(void* node, int justify);
- void GetGlyphBBox_AAT(ATSUStyle style, UInt16 gid, GlyphBBox* bbox);
- float GetGlyphWidth_AAT(ATSUStyle style, UInt16 gid);
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_mac_c
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_mac_c 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_XeTeX_mac_c 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,12 +0,0 @@
-$OpenBSD: patch-texk_web2c_xetexdir_XeTeX_mac_c,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
---- texk/web2c/xetexdir/XeTeX_mac.c.orig Wed Dec 6 17:29:15 2006
-+++ texk/web2c/xetexdir/XeTeX_mac.c Fri Jun 22 10:51:56 2007
-@@ -162,7 +162,7 @@ DoAtsuiLayout(void* p, int justify)
- lsDelta -= lsUnit;
-
- native_glyph_count(node) = realGlyphCount;
-- native_glyph_info_ptr(node) = (long)glyph_info;
-+ native_glyph_info_ptr(node) = glyph_info;
-
- if (!justify)
- node_width(node) = FixedPStoTeXPoints(layoutRec[count-1].realPos) + lsDelta;
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_jpegimage_c
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_jpegimage_c 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_jpegimage_c 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,12 +0,0 @@
-$OpenBSD: patch-texk_web2c_xetexdir_jpegimage_c,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
---- texk/web2c/xetexdir/jpegimage.c.orig Wed Jul 26 17:19:45 2006
-+++ texk/web2c/xetexdir/jpegimage.c Wed Jun 27 13:17:43 2007
-@@ -81,6 +81,8 @@
-
- #include <memory.h>
-
-+#include "kpathsea/lib.h" /* for xmalloc/xrealloc prototypes */
-+
- #define JPEG_DEBUG_STR "JPEG"
- #define JPEG_DEBUG 3
-
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex-new_ch
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex-new_ch 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex-new_ch 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,267 +0,0 @@
-$OpenBSD: patch-texk_web2c_xetexdir_xetex-new_ch,v 1.1.1.1 2007/07/17 21:53:33 jasper Exp $
---- texk/web2c/xetexdir/xetex-new.ch.orig Wed Jan 3 16:25:04 2007
-+++ texk/web2c/xetexdir/xetex-new.ch Fri Jun 22 10:51:56 2007
-@@ -56,7 +56,7 @@
-
- @d XeTeX_version=0
- @d XeTeX_revision==".996"
-- at d XeTeX_version_string=='-0.996' {current \XeTeX\ version}
-+ at d XeTeX_version_string=='-0.996-patch1' {current \XeTeX\ version}
- @z
-
- @x
-@@ -706,29 +706,28 @@ if max_quarterword-min_quarterword<@"FFFF then bad:=19
-
- To support ``native'' fonts, we build |native_word_nodes|, which are variable size whatsits.
- These have the same |width|, |depth|, and |height| fields as a |box_node|, at offsets 1-3,
--and then a word containing a size field for the node, a font number, and a length.
--Then there is a field containing two halfwords, a glyph count and a C pointer to a glyph info array;
--these are set by |set_native_metrics|. Copying and freeing of these nodes needs to take account of this!
-+and then a word containing a size field for the node, a font number, a length, and a glyph count.
-+Then there is a field containing a C pointer to a glyph info array;
-+this and the glyph count are set by |set_native_metrics|.
-+Copying and freeing of these nodes needs to take account of this!
- This is followed by |length| bytes, for the actual characters of the string.
- (Yes, we count in bytes, even though what we store there is UTF-16.)
-
- So |native_node_size|, which does not include any space for the actual text, is 6.}
-
-- at d deleted_native_node=41 {native words that have been superseded by their successors}
--
- @d native_node_size=6 {size of a native_word node (plus the actual chars) -- see also xetex.h}
-- at d native_size(#)==mem[#+4].hh.b0
-- at d native_font(#)==mem[#+4].hh.b1
-- at d native_length(#)==mem[#+4].hh.rh
-- at d native_glyph_count(#)==mem[#+5].hh.lh
-- at d native_glyph_info_ptr(#)==mem[#+5].hh.rh
-+ at d native_size(#)==mem[#+4].qqqq.b0
-+ at d native_font(#)==mem[#+4].qqqq.b1
-+ at d native_length(#)==mem[#+4].qqqq.b2
-+ at d native_glyph_count(#)==mem[#+4].qqqq.b3
-+ at d native_glyph_info_ptr(#)==mem[#+5].ptr
- @d native_glyph_info_size=10 { number of bytes of info per glyph: 16-bit glyph ID, 32-bit x and y coords }
-
- @d free_native_glyph_info(#) ==
- begin
-- if native_glyph_info_ptr(#) <> 0 then begin
-- libc_free(cast_to_ptr(native_glyph_info_ptr(#)));
-- native_glyph_info_ptr(#) := 0;
-+ if native_glyph_info_ptr(#) <> null_ptr then begin
-+ libc_free(native_glyph_info_ptr(#));
-+ native_glyph_info_ptr(#) := null_ptr;
- native_glyph_count(#) := 0;
- end
- end
-@@ -736,10 +735,10 @@ So |native_node_size|, which does not include any spac
- @p procedure copy_native_glyph_info(src:pointer; dest:pointer);
- var glyph_count:integer;
- begin
-- if native_glyph_info_ptr(src) <> 0 then begin
-+ if native_glyph_info_ptr(src) <> null_ptr then begin
- glyph_count := native_glyph_count(src);
-- native_glyph_info_ptr(dest) := cast_to_integer(xmalloc_array(char, glyph_count * native_glyph_info_size));
-- memcpy(cast_to_ptr(native_glyph_info_ptr(dest)), cast_to_ptr(native_glyph_info_ptr(src)), glyph_count * native_glyph_info_size);
-+ native_glyph_info_ptr(dest) := xmalloc_array(char, glyph_count * native_glyph_info_size);
-+ memcpy(native_glyph_info_ptr(dest), native_glyph_info_ptr(src), glyph_count * native_glyph_info_size);
- native_glyph_count(dest) := glyph_count;
- end
- end;
-@@ -2936,8 +2935,7 @@ done:
- end
-
- @ @<Advance |q| past ignorable nodes@>=
--while (q <> null) and (not is_char_node(q))
-- and ( (type(q) = disc_node) or ((type(q) = whatsit_node) and (subtype(q) = deleted_native_node)) ) do
-+while (q <> null) and (not is_char_node(q)) and (type(q) = disc_node) do
- q := link(q)
-
- @ We ought to give special care to the efficiency of one part of |hlist_out|,
-@@ -3293,7 +3291,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
- or (subtype(v)=pic_node)
- or (subtype(v)=pdf_node)
- then break_width[1]:=break_width[1]-width(v)
-- else if subtype(v)=deleted_native_node then do_nothing
- else confusion("disc1a");
- othercases confusion("disc1")
- @z
-@@ -3307,7 +3304,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
- or (subtype(s)=pic_node)
- or (subtype(s)=pdf_node)
- then break_width[1]:=break_width[1]+width(s)
-- else if subtype(s)=deleted_native_node then do_nothing
- else confusion("disc2a");
- othercases confusion("disc2")
- @z
-@@ -3327,7 +3323,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
- or (subtype(s)=pic_node)
- or (subtype(s)=pdf_node)
- then disc_width:=disc_width+width(s)
-- else if subtype(s)=deleted_native_node then do_nothing
- else confusion("disc3a");
- othercases confusion("disc3")
- @z
-@@ -3341,7 +3336,6 @@ label done,done1,done2,done3,done4,done5,done6,continu
- or (subtype(s)=pic_node)
- or (subtype(s)=pdf_node)
- then act_width:=act_width+width(s)
-- else if subtype(s)=deleted_native_node then do_nothing
- else confusion("disc4a");
- othercases confusion("disc4")
- @z
-@@ -3784,7 +3778,7 @@ hmode+char_num: begin scan_usv_num; cur_chr:=cur_val;
- @!main_p:pointer; {temporary register for list manipulation}
- @y
- @!main_p:pointer; {temporary register for list manipulation}
--@!main_pp:pointer; {another temporary register for list manipulation}
-+@!main_pp,@!main_ppp:pointer; {more temporary registers for list manipulation}
- @!main_h:pointer; {temp for hyphen offset in native-font text}
- @!is_hyph:boolean; {whether the last char seen is the font's hyphenchar}
- @z
-@@ -3859,11 +3853,22 @@ collect_native:
-
- if mode=hmode then begin
-
-+ main_ppp := head;
-+ if main_ppp<>main_pp then
-+ while (link(main_ppp)<>main_pp) do
-+ main_ppp:=link(main_ppp); { find node preceding tail }
-+
- temp_ptr := str_start_macro(str_ptr);
- repeat
- if main_h = 0 then main_h := main_k;
-
-- if (not is_char_node(main_pp)) and (type(main_pp)=whatsit_node) and (subtype(main_pp)=native_word_node) and (native_font(main_pp)=main_f) then begin
-+ if (not is_char_node(main_pp))
-+ and (type(main_pp)=whatsit_node)
-+ and (subtype(main_pp)=native_word_node)
-+ and (native_font(main_pp)=main_f)
-+ and (main_ppp<>main_pp)
-+ and type(main_ppp)<>disc_node
-+ then begin
-
- { make a new temp string that contains the concatenated text of |tail| + the current word/fragment }
- main_k := main_h + native_length(main_pp);
-@@ -3888,9 +3893,13 @@ collect_native:
- do incr(main_h); { look for next hyphen or end of text }
- if (main_h < main_k) then incr(main_h);
-
-- { flag the previous node as no longer valid }
-- free_native_glyph_info(main_pp);
-- subtype(main_pp) := deleted_native_node;
-+ { remove the preceding node from the list }
-+ link(main_ppp) := link(main_pp);
-+ link(main_pp) := null;
-+ flush_node_list(main_pp);
-+ main_pp := tail;
-+ while (link(main_ppp)<>main_pp) do
-+ main_ppp:=link(main_ppp);
-
- end else begin
-
-@@ -3929,9 +3938,14 @@ collect_native:
- set_native_char(tail, main_p + native_length(main_pp), str_pool[str_start_macro(str_ptr) + main_p]);
- set_native_metrics(tail, XeTeX_use_glyph_metrics);
-
-- { flag the previous node as no longer valid }
-- free_native_glyph_info(main_pp);
-- subtype(main_pp) := deleted_native_node;
-+ { remove the preceding node from the list }
-+ main_p := head;
-+ if main_p<>main_pp then
-+ while link(main_p)<>main_pp do
-+ main_p := link(main_p);
-+ link(main_p) := link(main_pp);
-+ link(main_pp) := null;
-+ flush_node_list(main_pp);
- end else begin
- { package the current string into a |native_word| whatsit }
- link(main_pp) := new_native_word_node(main_f, main_k);
-@@ -3997,7 +4011,6 @@ begin if tail<>head then
- @y
- if type(p)<>kern_node then if type(p)<>ligature_node then
- if (type(p)<>whatsit_node) or ((subtype(p)<>native_word_node)
-- and (subtype(p)<>deleted_native_node)
- and (subtype(p)<>glyph_node)) then
- begin print_err("Improper discretionary list");
- @z
-@@ -4802,8 +4815,10 @@ native_word_node:begin
- print_char(" ");
- print_native_word(p);
- end;
-+@{
- deleted_native_node:
- print("[DELETED]");
-+@}
- glyph_node:begin
- print_esc(font_id_text(native_font(p)));
- print(" glyph#");
-@@ -4837,12 +4852,9 @@ native_word_node: begin words:=native_size(p);
- r:=get_node(words);
- while words > 0 do
- begin decr(words); mem[r+words]:=mem[p+words]; end;
-- native_glyph_info_ptr(r):=0; native_glyph_count(r):=0;
-+ native_glyph_info_ptr(r):=null_ptr; native_glyph_count(r):=0;
- copy_native_glyph_info(p, r);
- end;
--deleted_native_node: begin words:=native_size(p);
-- r:=get_node(words);
-- end;
- glyph_node: begin r:=get_node(glyph_node_size);
- words:=glyph_node_size;
- end;
-@@ -4858,7 +4870,6 @@ othercases confusion("ext2")
- othercases confusion("ext3")
- @y
- native_word_node: begin free_native_glyph_info(p); free_node(p,native_size(p)); end;
--deleted_native_node: free_node(p,native_size(p));
- glyph_node: free_node(p,glyph_node_size);
- pic_node,pdf_node: free_node(p,total_pic_node_size(p));
- pdf_save_pos_node:
-@@ -5106,7 +5117,7 @@ begin
- dvi_two(native_glyph(p));
- cur_h := cur_h + width(p);
- end else begin
-- if native_glyph_info_ptr(p) <> 0 then begin
-+ if native_glyph_info_ptr(p) <> null_ptr then begin
- len := make_xdv_glyph_array_data(p);
- for k := 0 to len-1 do
- dvi_out(xdv_buffer_byte(k));
-@@ -5231,7 +5242,7 @@ end;
- @x
- language_node:do_nothing;
- @y
--language_node,deleted_native_node:do_nothing;
-+language_node:do_nothing;
- @z
-
- @x
-@@ -6012,6 +6023,11 @@ whatsit_node:
- goto next_p;
-
- @ Here we compute the effective width of a glue node as in |hlist_out|.
-+
-+@<Cases of |reverse|...@>=
-+glue_node: begin round_glue;
-+ @<Handle a glue node for mixed...@>;
-+ end;
- @z
-
- @x
-@@ -6106,7 +6122,7 @@ begin
- native_length(q) := n;
-
- native_glyph_count(q) := 0;
-- native_glyph_info_ptr(q) := 0;
-+ native_glyph_info_ptr(q) := null_ptr;
-
- new_native_word_node := q;
- end;
-@@ -6163,7 +6179,7 @@ begin
-
- native_size(p) := native_node_size + 1;
- native_glyph_count(p) := 0;
-- native_glyph_info_ptr(p) := 0;
-+ native_glyph_info_ptr(p) := null_ptr;
- native_font(p) := f;
-
- if c > @"FFFF then begin
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_defines
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_defines 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_defines 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,12 +0,0 @@
-$OpenBSD: patch-texk_web2c_xetexdir_xetex_defines,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
---- texk/web2c/xetexdir/xetex.defines.orig Wed Dec 6 17:29:15 2006
-+++ texk/web2c/xetexdir/xetex.defines Fri Jun 22 10:51:56 2007
-@@ -32,6 +32,8 @@ authorization from SIL International.
-
- { xetex.defines: additions for xetex }
-
-+ at define @field ptr;
-+ at define const nullptr;
- @define type voidpointer;
- @define function getnativechar();
- @define procedure setnativechar();
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_h
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_h 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_h 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,13 +0,0 @@
-$OpenBSD: patch-texk_web2c_xetexdir_xetex_h,v 1.1.1.1 2007/07/17 21:53:31 jasper Exp $
---- texk/web2c/xetexdir/xetex.h.orig Wed Dec 6 17:29:15 2006
-+++ texk/web2c/xetexdir/xetex.h Fri Jun 22 10:51:56 2007
-@@ -63,8 +63,7 @@ void* getotassemblyptr(int f, int g); /* function in X
-
- #define dviopenout(f) open_dvi_output(&(f))
-
--#define casttoptr(x) (void*)(x)
--#define casttointeger(x) (long)(x)
-+#define nullptr (NULL)
- #define glyphinfobyte(p,k) ((unsigned char*)p)[k]
- #define casttoushort(x) (unsigned short)(x)
-
Deleted: trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_mk
===================================================================
--- trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_mk 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_web2c_xetexdir_xetex_mk 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,38 +0,0 @@
-$OpenBSD: patch-texk_web2c_xetexdir_xetex_mk,v 1.1.1.1 2007/07/17 21:53:28 jasper Exp $
---- texk/web2c/xetexdir/xetex.mk.orig Sat Jan 20 12:44:35 2007
-+++ texk/web2c/xetexdir/xetex.mk Fri May 4 20:28:40 2007
-@@ -275,7 +275,7 @@ xefmts: $(all_xefmts)
-
- xefmtdir = $(web2cdir)/xetex
- $(xefmtdir)::
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(xefmtdir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(xefmtdir)
-
- xetex.fmt: xetex
- $(dumpenv) $(MAKE) progname=xetex files="xetex.ini unicode-letters.tex plain.tex cmr10.tfm" prereq-check
-@@ -294,7 +294,7 @@ install-xetex-dumps: install-xetex-fmts
-
- install-programs: @XETEX@ install-xetex-programs
- install-xetex-programs: xetex $(bindir)
-- for p in xetex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
-+ for p in xetex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
- install-links: @XETEX@ install-xetex-links
- install-xetex-links: install-xetex-programs
-@@ -304,13 +304,13 @@ install-xetex-links: install-xetex-programs
- install-fmts: @XETEX@ install-xetex-fmts
- install-xetex-fmts: xefmts $(xefmtdir)
- xefmts="$(all_xefmts)"; \
-- for f in $$xefmts; do $(INSTALL_DATA) $$f $(xefmtdir)/$$f; done
-+ for f in $$xefmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(xefmtdir)/$$f; done
- xefmts="$(xefmts)"; \
- for f in $$xefmts; do base=`basename $$f .fmt`; \
-- (cd $(bindir) && (rm -f $$base; $(LN) xetex $$base)); done
-+ (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) xetex $$base)); done
-
- install-data:: @XETEX@ install-xetex-data
- install-xetex-pool: xetex.pool $(texpooldir)
-- $(INSTALL_DATA) xetex.pool $(texpooldir)/xetex.pool
-+ $(INSTALL_DATA) xetex.pool ${DESTDIR}$(texpooldir)/xetex.pool
-
- # end of xetex.mk
Deleted: trunk/dports/tex/texlive/patch-texk_xdv2pdf_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_xdv2pdf_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_xdv2pdf_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,24 +0,0 @@
-$OpenBSD: patch-texk_xdv2pdf_Makefile_in,v 1.1.1.1 2007/07/17 21:53:25 jasper Exp $
---- texk/xdv2pdf/Makefile.in.orig Sat Apr 21 18:37:26 2007
-+++ texk/xdv2pdf/Makefile.in Sat Apr 21 18:38:20 2007
-@@ -57,15 +57,15 @@ distclean::
- $(RM) config.h
-
- install-exec:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- $(INSTALL_LIBTOOL_PROG) $(program) $(bindir)
-- $(INSTALL) $(t1wrap) $(bindir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) $(program) ${DESTDIR}$(bindir)
-+ $(INSTALL) $(t1wrap) ${DESTDIR}$(bindir)
-
- uninstall-exec:
-- cd $(bindir); rm -f $(programs)
-+ cd ${DESTDIR}$(bindir); rm -f $(programs)
-
- install-data:
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-
- uninstall-data:
-
Deleted: trunk/dports/tex/texlive/patch-texk_xdvik_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-texk_xdvik_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_xdvik_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,83 +0,0 @@
-$OpenBSD: patch-texk_xdvik_Makefile_in,v 1.1.1.1 2007/07/17 21:53:30 jasper Exp $
---- texk/xdvik/Makefile.in.orig Sat Apr 21 18:39:04 2007
-+++ texk/xdvik/Makefile.in Sat Apr 21 18:41:40 2007
-@@ -125,51 +125,51 @@ install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
- install-exec: @final_exec_name@
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
-- $(INSTALL_LIBTOOL_PROG) @final_exec_name@ $(bindir)
-- $(INSTALL_SCRIPT) xdvi-sh $(scriptdir)/@wrapper_script@
-- rm -f $(scriptdir)/o at wrapper_script@
-- ln -s @wrapper_script@ $(scriptdir)/o at wrapper_script@
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(bindir)
-+ $(INSTALL_LIBTOOL_PROG) @final_exec_name@ ${DESTDIR}$(bindir)
-+ $(INSTALL_SCRIPT) xdvi-sh ${DESTDIR}$(scriptdir)/@wrapper_script@
-+ rm -f ${DESTDIR}$(scriptdir)/o at wrapper_script@
-+ ln -s @wrapper_script@ ${DESTDIR}$(scriptdir)/o at wrapper_script@
- ### fix wrong CVS permissions for shell script
-- $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
-- chmod +x $(scriptdir)/xdvizilla
-+ $(INSTALL_SCRIPT) $(srcdir)/xdvizilla ${DESTDIR}$(scriptdir)/xdvizilla
-+ chmod +x ${DESTDIR}$(scriptdir)/xdvizilla
-
- uninstall-exec:
-- for p in @final_exec_name@; do rm -f $(bindir)/$$p; done
-- for p in @wrapper_script@ o at wrapper_script@; do rm -f $(scriptdir)/$$p; done
-+ for p in @final_exec_name@; do rm -f ${DESTDIR}$(bindir)/$$p; done
-+ for p in @wrapper_script@ o at wrapper_script@; do rm -f ${DESTDIR}$(scriptdir)/$$p; done
-
- install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
-- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
-- $(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
-- rm -f $(man1dir)/o$(manpage).$(manext)
-- ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
-- $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
-- $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(man1dir)
-+ $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(texmf)/xdvi/pixmaps
-+ $(INSTALL_DATA) $(manpage).1 ${DESTDIR}$(man1dir)/$(manpage).$(manext)
-+ rm -f ${DESTDIR}$(man1dir)/o$(manpage).$(manext)
-+ ln -s $(manpage).$(manext) ${DESTDIR}$(man1dir)/o$(manpage).$(manext)
-+ $(INSTALL_DATA) $(srcdir)/texmf/XDvi ${DESTDIR}$(texmf)/xdvi/XDvi
-+ $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm ${DESTDIR}$(texmf)/xdvi/pixmaps
- if \
-- grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
-- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
-+ grep 'original xdvi.cfg --' ${DESTDIR}$(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
-+ || test ! -r ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
- then \
-- $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \
-+ $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
- else \
- true; \
- fi
-- $(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/xdvizilla.1 ${DESTDIR}$(man1dir)/xdvizilla.$(manext)
-
- uninstall-data:
-- rm -f $(man1dir)/$(manpage).$(manext) $(man1dir)/xdvizilla.$(manext) \
-- $(scriptdir)/xdvizilla \
-- $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
-- $(texmf)/xdvi/XDvi
-+ rm -f ${DESTDIR}$(man1dir)/$(manpage).$(manext) ${DESTDIR}$(man1dir)/xdvizilla.$(manext) \
-+ ${DESTDIR}$(scriptdir)/xdvizilla \
-+ ${DESTDIR}$(texmf)/xdvi/pixmaps/toolbar.xpm ${DESTDIR}$(texmf)/xdvi/pixmaps/toolbar2.xpm \
-+ ${DESTDIR}$(texmf)/xdvi/XDvi
- if \
-- head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
-- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
-+ head -n 1 ${DESTDIR}$(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
-+ || test ! -r ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
- then \
-- rm -f $(texmf)/xdvi/xdvi.cfg; \
-+ rm -f ${DESTDIR}$(texmf)/xdvi/xdvi.cfg; \
- else \
- true; \
- fi
-- rmdir $(texmf)/xdvi/pixmaps
-+ rmdir ${DESTDIR}$(texmf)/xdvi/pixmaps
-
- distname = xdvik
- program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \
Deleted: trunk/dports/tex/texlive/patch-texk_xdvipdfmx_src_tt_cmap_c
===================================================================
--- trunk/dports/tex/texlive/patch-texk_xdvipdfmx_src_tt_cmap_c 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-texk_xdvipdfmx_src_tt_cmap_c 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,33 +0,0 @@
-$OpenBSD: patch-texk_xdvipdfmx_src_tt_cmap_c,v 1.1.1.1 2007/07/17 21:53:34 jasper Exp $
---- texk/xdvipdfmx/src/tt_cmap.c.orig Fri Sep 29 16:15:10 2006
-+++ texk/xdvipdfmx/src/tt_cmap.c Tue Jun 26 14:53:54 2007
-@@ -303,6 +303,9 @@ lookup_cmap4 (struct cmap4 *map, USHORT cc)
- if (cc >= map->startCount[i]) {
- if (map->idRangeOffset[i] == 0) {
- gid = (cc + map->idDelta[i]) & 0xffff;
-+ } else if (cc == 0xffff && map->idRangeOffset[i] == 0xffff) {
-+ /* this is for protection against some old broken fonts... */
-+ gid = 0;
- } else {
- j = map->idRangeOffset[i] - (segCount - i) * 2;
- j = (cc - map->startCount[i]) + (j / 2);
-@@ -630,6 +633,9 @@ load_cmap4 (struct cmap4 *map,
- ch = c0 + j;
- if (map->idRangeOffset[i] == 0) {
- gid = (ch + map->idDelta[i]) & 0xffff;
-+ } else if (c0 == 0xffff && c1 == 0xffff && map->idRangeOffset[i] == 0xffff) {
-+ /* this is for protection against some old broken fonts... */
-+ gid = 0;
- } else {
- gid = (map->glyphIndexArray[j+d] +
- map->idDelta[i]) & 0xffff;
-@@ -952,6 +958,9 @@ create_ToUnicode_cmap4 (struct cmap4 *map,
- ch = c0 + j;
- if (map->idRangeOffset[i] == 0) {
- gid = (ch + map->idDelta[i]) & 0xffff;
-+ } else if (c0 == 0xffff && c1 == 0xffff && map->idRangeOffset[i] == 0xffff) {
-+ /* this is for protection against some old broken fonts... */
-+ gid = 0;
- } else {
- gid = (map->glyphIndexArray[j+d] +
- map->idDelta[i]) & 0xffff;
Deleted: trunk/dports/tex/texlive/patch-utils_dialog_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-utils_dialog_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-utils_dialog_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,32 +0,0 @@
-$OpenBSD: patch-utils_dialog_Makefile_in,v 1.2 2007/10/15 07:31:57 kili Exp $
---- utils/dialog/Makefile.in.orig Tue Jan 17 22:16:42 2006
-+++ utils/dialog/Makefile.in Sun Oct 14 21:54:04 2007
-@@ -104,23 +104,23 @@ SHELL = /bin/sh
- @SET_MAKE@
-
- .PHONY: install installdirs install-exec
--install: install-exec $(man1dir)/tcdialog.$(manext)
-+install: install-exec ${DESTDIR}$(man1dir)/tcdialog.$(manext)
-
- install-exec: installdirs $(bindir)/tcdialog
-
- installdirs:
-- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(man1dir)
-+ $(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(man1dir)
-
- $(bindir)/tcdialog: dialog
-- $(INSTALL_PROGRAM) dialog $@
-+ $(INSTALL_PROGRAM) dialog ${DESTDIR}$@
-
--$(man1dir)/tcdialog.$(manext): dialog.man
-+${DESTDIR}$(man1dir)/tcdialog.$(manext): dialog.man
- $(INSTALL_DATA) $(srcdir)/dialog.man $@
-
-
- check:
- uninstall:
-- -rm -f $(bindir)/tcdialog $(man1dir)/tcdialog.$(manext)
-+ -rm -f ${DESTDIR}$(bindir)/tcdialog ${DESTDIR}$(man1dir)/tcdialog.$(manext)
-
-
- .PHONY: clean realclean distclean mostlyclean
Deleted: trunk/dports/tex/texlive/patch-utils_ps2eps_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-utils_ps2eps_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-utils_ps2eps_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,26 +0,0 @@
-$OpenBSD: patch-utils_ps2eps_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
---- utils/ps2eps/Makefile.in.orig Wed Jan 10 01:13:09 2007
-+++ utils/ps2eps/Makefile.in Tue Apr 17 17:24:46 2007
-@@ -28,16 +28,16 @@ bbox: bbox.o
- $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-
- install: bbox
-- $(INSTALL) -d $(bindir) $(mandir)/man1
-- $(INSTALL_SCRIPT) $(srcdir)/ps2eps $(bindir)/ps2eps
-- $(INSTALL_PROGRAM) bbox $(bindir)/bbox
-- $(INSTALL_DATA) $(srcdir)/ps2eps.1 $(mandir)/man1/ps2eps.1
-- $(INSTALL_DATA) $(srcdir)/bbox.1 $(mandir)/man1/bbox.1
-+ $(INSTALL) -d ${DESTDIR}$(bindir) ${DESTDIR}$(mandir)/man1
-+ $(INSTALL_SCRIPT) $(srcdir)/ps2eps ${DESTDIR}$(bindir)/ps2eps
-+ $(INSTALL_PROGRAM) bbox ${DESTDIR}$(bindir)/bbox
-+ $(INSTALL_DATA) $(srcdir)/ps2eps.1 ${DESTDIR}$(mandir)/man1/ps2eps.1
-+ $(INSTALL_DATA) $(srcdir)/bbox.1 ${DESTDIR}$(mandir)/man1/bbox.1
-
- check:
-
- uninstall:
-- -rm -f $(bindir)/ps2eps $(bindir)/bbox $(mandir)/man1/ps2eps.1 $(mandir)/man1/bbox.1
-+ -rm -f ${DESTDIR}$(bindir)/ps2eps ${DESTDIR}$(bindir)/bbox ${DESTDIR}$(mandir)/man1/ps2eps.1 ${DESTDIR}$(mandir)/man1/bbox.1
-
- clean:
- -rm -f bbox bbox.o
Deleted: trunk/dports/tex/texlive/patch-utils_psutils_Makefile_in
===================================================================
--- trunk/dports/tex/texlive/patch-utils_psutils_Makefile_in 2007-11-10 07:08:04 UTC (rev 30884)
+++ trunk/dports/tex/texlive/patch-utils_psutils_Makefile_in 2007-11-10 07:13:16 UTC (rev 30885)
@@ -1,31 +0,0 @@
-$OpenBSD: patch-utils_psutils_Makefile_in,v 1.1.1.1 2007/07/17 21:53:27 jasper Exp $
---- utils/psutils/Makefile.in.orig Tue Apr 17 17:27:13 2007
-+++ utils/psutils/Makefile.in Tue Apr 17 17:29:04 2007
-@@ -193,14 +193,14 @@ SHELL = /bin/sh
- install: install-exec install-man
-
- install-exec: installdirs
-- for p in $(BIN); do $(INSTALL_PROGRAM) $$p $(bindir)/$$p; done
-- for p in $(SHELLSCRIPTS) $(PERLSCRIPTS); do $(INSTALL_PROGRAM) $$p $(scriptdir)/$$p; done
-+ for p in $(BIN); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/$$p; done
-+ for p in $(SHELLSCRIPTS) $(PERLSCRIPTS); do $(INSTALL_PROGRAM) $$p ${DESTDIR}$(scriptdir)/$$p; done
-
- install-man: installdirs
-- for p in $(MANPAGES); do $(INSTALL_DATA) $$p $(man1dir)/$$p; done
-+ for p in $(MANPAGES); do $(INSTALL_DATA) $$p ${DESTDIR}$(man1dir)/$$p; done
-
- installdirs:
-- $(SHELL) ${srcdir}/../../texk/mkinstalldirs $(bindir) $(scriptdir) $(man1dir)
-+ $(SHELL) ${srcdir}/../../texk/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(scriptdir) ${DESTDIR}$(man1dir)
-
- clean:
- rm -f *.o $(BIN) $(SHELLSCRIPTS) $(PERLSCRIPTS) $(MANPAGES)
-@@ -210,6 +210,8 @@ distclean: mostlyclean
-
- realclean: distclean
- mostlyclean: clean
-+
-+# TODO UPSTREAM! - uninstall: !!!
-
- Makefile: config.status $(srcdir)/Makefile.in
- $(SHELL) config.status
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071109/6eb43797/attachment-0001.html
More information about the macports-changes
mailing list