[80534] users/dports/ports/tex/texlive-bin
dports at macports.org
dports at macports.org
Thu Jul 14 03:12:28 PDT 2011
Revision: 80534
http://trac.macports.org/changeset/80534
Author: dports at macports.org
Date: 2011-07-14 03:12:28 -0700 (Thu, 14 Jul 2011)
Log Message:
-----------
texlive-bin: fix the default search paths for kpathsea so that it's
able to find texmf.cnf.
Specifically, patch the kpathsea makefile to not try to derive the
default paths from texmf.cnf, and just provide our own paths.h with
the right path substituted in.
Modified Paths:
--------------
users/dports/ports/tex/texlive-bin/Portfile
Added Paths:
-----------
users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/texk_kpathsea_paths.h
Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile 2011-07-14 10:08:21 UTC (rev 80533)
+++ users/dports/ports/tex/texlive-bin/Portfile 2011-07-14 10:12:28 UTC (rev 80534)
@@ -51,6 +51,7 @@
patch-libs_icu_Makefile.in.diff \
patch-libs_icu_icu-4.6_configure.diff \
patch-libs_icu_icu-4.6_tools_icuinfo_Makefile.in.diff \
+ patch-texk_kpathsea_Makefile.in.diff \
patch-texk_ptexenc_Makefile.in.diff \
patch-texk_tetex_Makefile.in.diff \
patch-texk_tex4htk_Makefile.in.diff \
@@ -67,9 +68,19 @@
reinplace "s|@@TEXLIVE_BINDIR@@|${texlive_bindir}|" ${worksrcpath}/texk/xdvik/xdvi-sh.in
reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|" ${worksrcpath}/utils/chktex/Makefile.in
- # Link our texmf.cnf in so that the proper paths are compiled into kpathsea
+ # Defaults for the texmf search paths need to be compiled into
+ # libkpathsea -- really, just the location of texmf.cnf, which
+ # defines all the other paths. texlive normally finds this file
+ # using a bindir-relative path extracted from texmf.cnf, but this
+ # is both incorrect (it fails to find our texmf.cnf) and overkill
+ # (we know the absolute path of texmf.cnf).
+ #
+ # Accordingly, we patch the kpathsea makefile to not try to derive
+ # the default paths from texmf.cnf, and just provide our own
+ # paths.h with the right path substituted in.
delete ${worksrcpath}/texk/kpathsea/texmf.cnf
- ln -s ${texlive_texmfsysconfig}/texmf.cnf ${worksrcpath}/texk/kpathsea/texmf.cnf
+ file copy ${filespath}/texk_kpathsea_paths.h ${worksrcpath}/texk/kpathsea/paths.h
+ reinplace "s|@@TEXMFSYSCONFIG@@|${texlive_texmfsysconfig}|" ${worksrcpath}/texk/kpathsea/paths.h
if {![variant_isset atsui]} {
# Force configure to believe that Carbon API is
Added: users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff 2011-07-14 10:12:28 UTC (rev 80534)
@@ -0,0 +1,54 @@
+--- texk/kpathsea/Makefile.in.orig 2011-07-14 05:27:01.000000000 -0400
++++ texk/kpathsea/Makefile.in 2011-07-14 05:27:50.000000000 -0400
+@@ -364,7 +364,6 @@
+ libkpathsea_la_CPPFLAGS = -DMAKE_KPSE_DLL
+ libkpathsea_la_LDFLAGS = -no-undefined -version-info $(KPSE_LT_VERSINFO)
+ libkpathsea_la_LIBADD = $(LTLIBOBJS)
+-BUILT_SOURCES = paths.h
+ libkpathsea_la_SOURCES = tex-file.c absolute.c atou.c cnf.c concat.c \
+ concat3.c concatn.c db.c debug.c dir.c elt-dirs.c expand.c \
+ extend-fname.c file-p.c find-suffix.c fn.c fontmap.c getopt.c \
+@@ -434,7 +433,7 @@
+ xopendir.h \
+ xstat.h
+
+-DISTCLEANFILES = paths.h stamp-paths kpathsea.h
++DISTCLEANFILES = paths.h kpathsea.h
+ kpseaccess_SOURCES = access.c
+ kpsereadlink_SOURCES = readlink.c
+ kpsewhich_LDADD = libkpathsea.la
+@@ -442,7 +441,6 @@
+ dist_web2c_SCRIPTS = mktexdir mktexnam mktexupd
+ dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt
+ dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
+-dist_noinst_DATA = texmf.cnf
+
+ # Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+ bin_links = \
+@@ -1749,26 +1747,6 @@
+
+ $(libkpathsea_la_OBJECTS): paths.h kpathsea.h
+
+-paths.h: stamp-paths
+-stamp-paths: texmf.cnf bsnl.awk cnf-to-paths.awk
+-# ensure grep is not completely broken, e.g., from GREP_OPTIONS.
+- echo a | grep -v b >/dev/null || { echo "*** grep broken, goodbye."; exit 1; }
+-#
+-# generate paths.h without build machine directories.
+- echo "/* paths.h: Generated from texmf.cnf. */" >paths.tmp
+- $(AWK) -f $(srcdir)/bsnl.awk $(srcdir)/texmf.cnf \
+- | sed -e 's/%.*//' -e 's/^[ ]*//' -e 's/[ ]*$$//' \
+- | $(AWK) -f $(srcdir)/cnf-to-paths.awk \
+- >>paths.tmp
+- @if cmp -s paths.h paths.tmp 2>/dev/null; then \
+- echo "paths.h is unchanged"; \
+- else \
+- echo "cp paths.tmp paths.h"; \
+- cp paths.tmp paths.h; \
+- fi
+- rm -f paths.tmp
+- date >$@
+-
+ kpathsea.h: Makefile paths.h
+ rm -f $@
+ echo '/* This is a generated file */' >$@
Added: users/dports/ports/tex/texlive-bin/files/texk_kpathsea_paths.h
===================================================================
--- users/dports/ports/tex/texlive-bin/files/texk_kpathsea_paths.h (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/texk_kpathsea_paths.h 2011-07-14 10:12:28 UTC (rev 80534)
@@ -0,0 +1,358 @@
+/*
+ * paths.h. Normally generated from texmf.cnf, but here installed
+ * manually via MacPorts.
+ *
+ * The main thing we want to set here is DEFAULT_TEXMFCNF which is the
+ * location of texmf.cnf. The real values of everything else will be
+ * loaded from that file.
+ */
+#ifndef DEFAULT_TEXMFROOT
+#define DEFAULT_TEXMFROOT "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFMAIN
+#define DEFAULT_TEXMFMAIN "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFDIST
+#define DEFAULT_TEXMFDIST "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFLOCAL
+#define DEFAULT_TEXMFLOCAL "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFSYSVAR
+#define DEFAULT_TEXMFSYSVAR "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFSYSCONFIG
+#define DEFAULT_TEXMFSYSCONFIG "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFHOME
+#define DEFAULT_TEXMFHOME "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFVAR
+#define DEFAULT_TEXMFVAR "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFCONFIG
+#define DEFAULT_TEXMFCONFIG "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMF
+#define DEFAULT_TEXMF "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXMFDBS
+#define DEFAULT_TEXMFDBS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_SYSTEXMF
+#define DEFAULT_SYSTEXMF "/nonesuch"
+#endif
+
+#ifndef DEFAULT_VARTEXFONTS
+#define DEFAULT_VARTEXFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_WEB2C
+#define DEFAULT_WEB2C "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXINPUTS
+#define DEFAULT_TEXINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TTF2TFMINPUTS
+#define DEFAULT_TTF2TFMINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MFINPUTS
+#define DEFAULT_MFINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MPINPUTS
+#define DEFAULT_MPINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXFORMATS
+#define DEFAULT_TEXFORMATS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MFBASES
+#define DEFAULT_MFBASES "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MPMEMS
+#define DEFAULT_MPMEMS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXPOOL
+#define DEFAULT_TEXPOOL "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MFPOOL
+#define DEFAULT_MFPOOL "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MPPOOL
+#define DEFAULT_MPPOOL "/nonesuch"
+#endif
+
+#ifndef DEFAULT_VFFONTS
+#define DEFAULT_VFFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TFMFONTS
+#define DEFAULT_TFMFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_PKFONTS
+#define DEFAULT_PKFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_GFFONTS
+#define DEFAULT_GFFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_GLYPHFONTS
+#define DEFAULT_GLYPHFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MISCFONTS
+#define DEFAULT_MISCFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXFONTMAPS
+#define DEFAULT_TEXFONTMAPS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_BIBINPUTS
+#define DEFAULT_BIBINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_BSTINPUTS
+#define DEFAULT_BSTINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MLBIBINPUTS
+#define DEFAULT_MLBIBINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MLBSTINPUTS
+#define DEFAULT_MLBSTINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MFTINPUTS
+#define DEFAULT_MFTINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXPSHEADERS
+#define DEFAULT_TEXPSHEADERS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_OSFONTDIR
+#define DEFAULT_OSFONTDIR "/nonesuch"
+#endif
+
+#ifndef DEFAULT_T1FONTS
+#define DEFAULT_T1FONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_AFMFONTS
+#define DEFAULT_AFMFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TTFONTS
+#define DEFAULT_TTFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_OPENTYPEFONTS
+#define DEFAULT_OPENTYPEFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_T42FONTS
+#define DEFAULT_T42FONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_LIGFONTS
+#define DEFAULT_LIGFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXCONFIG
+#define DEFAULT_TEXCONFIG "/nonesuch"
+#endif
+
+#ifndef DEFAULT_INDEXSTYLE
+#define DEFAULT_INDEXSTYLE "/nonesuch"
+#endif
+
+#ifndef DEFAULT_ENCFONTS
+#define DEFAULT_ENCFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_CMAPFONTS
+#define DEFAULT_CMAPFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_SFDFONTS
+#define DEFAULT_SFDFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_FONTFEATURES
+#define DEFAULT_FONTFEATURES "/nonesuch"
+#endif
+
+#ifndef DEFAULT_FONTCIDMAPS
+#define DEFAULT_FONTCIDMAPS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_PDFTEXCONFIG
+#define DEFAULT_PDFTEXCONFIG "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TRFONTS
+#define DEFAULT_TRFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MPSUPPORT
+#define DEFAULT_MPSUPPORT "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MIMELIBDIR
+#define DEFAULT_MIMELIBDIR "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MAILCAPLIBDIR
+#define DEFAULT_MAILCAPLIBDIR "/nonesuch"
+#endif
+
+#ifndef DEFAULT_FONTCONFIG_FILE
+#define DEFAULT_FONTCONFIG_FILE "/nonesuch"
+#endif
+
+#ifndef DEFAULT_FONTCONFIG_PATH
+#define DEFAULT_FONTCONFIG_PATH "/nonesuch"
+#endif
+
+#ifndef DEFAULT_FC_CACHEDIR
+#define DEFAULT_FC_CACHEDIR "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXDOCS
+#define DEFAULT_TEXDOCS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEXSOURCES
+#define DEFAULT_TEXSOURCES "/nonesuch"
+#endif
+
+#ifndef DEFAULT_WEBINPUTS
+#define DEFAULT_WEBINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_CWEBINPUTS
+#define DEFAULT_CWEBINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_OFMFONTS
+#define DEFAULT_OFMFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_OPLFONTS
+#define DEFAULT_OPLFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_OVFFONTS
+#define DEFAULT_OVFFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_OVPFONTS
+#define DEFAULT_OVPFONTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_OTPINPUTS
+#define DEFAULT_OTPINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_OCPINPUTS
+#define DEFAULT_OCPINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_T4HTINPUTS
+#define DEFAULT_T4HTINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEX4HTFONTSET
+#define DEFAULT_TEX4HTFONTSET "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEX4HTINPUTS
+#define DEFAULT_TEX4HTINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TW_LIBPATH
+#define DEFAULT_TW_LIBPATH "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TW_INIPATH
+#define DEFAULT_TW_INIPATH "/nonesuch"
+#endif
+
+#ifndef DEFAULT_DVIPDFMXINPUTS
+#define DEFAULT_DVIPDFMXINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_LUAINPUTS
+#define DEFAULT_LUAINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_CLUAINPUTS
+#define DEFAULT_CLUAINPUTS ".:$SELFAUTOLOC/lib/{$progname,$engine,}/lua//"
+#endif
+
+#ifndef DEFAULT_TEXMFSCRIPTS
+#define DEFAULT_TEXMFSCRIPTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_JAVAINPUTS
+#define DEFAULT_JAVAINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_PERLINPUTS
+#define DEFAULT_PERLINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_PYTHONINPUTS
+#define DEFAULT_PYTHONINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_RUBYINPUTS
+#define DEFAULT_RUBYINPUTS "/nonesuch"
+#endif
+
+#define DEFAULT_TEXMFCNF "@@TEXMFSYSCONFIG@@"
+
+#ifndef DEFAULT_TEXMF_RESTRICTED_SCRIPTS
+#define DEFAULT_TEXMF_RESTRICTED_SCRIPTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_MISSFONT_LOG
+#define DEFAULT_MISSFONT_LOG "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEX_HUSH
+#define DEFAULT_TEX_HUSH "/nonesuch"
+#endif
+
+#ifndef DEFAULT_TEX
+#define DEFAULT_TEX "/nonesuch"
+#endif
+
+#ifndef DEFAULT_BIBTEX_CSFILE
+#define DEFAULT_BIBTEX_CSFILE "/nonesuch"
+#endif
+
Property changes on: users/dports/ports/tex/texlive-bin/files/texk_kpathsea_paths.h
___________________________________________________________________
Added: svn:eol-style
+ native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110714/03f1c7d0/attachment.html>
More information about the macports-changes
mailing list