[94515] users/dports/ports/tex/texlive-bin
dports at macports.org
dports at macports.org
Wed Jun 20 21:11:15 PDT 2012
Revision: 94515
https://trac.macports.org/changeset/94515
Author: dports at macports.org
Date: 2012-06-20 21:11:14 -0700 (Wed, 20 Jun 2012)
Log Message:
-----------
texlive-bin: first steps toward an update for TL2012; update some patchfiles
Modified Paths:
--------------
users/dports/ports/tex/texlive-bin/Portfile
users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_context_mtxrun.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-utils_chktex_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 2012-06-21 04:11:06 UTC (rev 94514)
+++ users/dports/ports/tex/texlive-bin/Portfile 2012-06-21 04:11:14 UTC (rev 94515)
@@ -5,8 +5,7 @@
PortGroup texlive 1.0
name texlive-bin
-version 2011
-revision 5
+version 2012
categories tex
maintainers dports
@@ -30,14 +29,15 @@
# download time, it omits a number of libraries and utilities that we
# don't build. However, the port should still work with an unmodified
# texlive distfile.
-master_sites http://flute.csail.mit.edu/texlive/
-set distversion 20110705
-distname texlive-${distversion}-source-stripped
+master_sites http://flute.csail.mit.edu/texlive/test
+set distversion 20120530.26733
+distname texlive-${distversion}-source
worksrcdir ${distname}
use_xz yes
-checksums rmd160 00949298eff3b301025c5a587fe5d93becbfe227 \
- sha256 996079f1def51553933cf40ef156cbc6bdc0a68aed738ebc23acfb0024ffaeb8
+checksums rmd160 f5c73c3db1ac433f809c9747843fed68ee95b3ca \
+ sha256 b6d23d62bf21e8a5236bbbd31138826d0371926b29b24a77f54aaf71dcc1f7f8
+
depends_lib port:fontconfig \
port:freetype \
port:libpng \
@@ -53,30 +53,19 @@
depends_build path:bin/perl:perl5 \
path:bin/pkg-config:pkgconfig
-# fixes backported from the 2011 branch
-patchfiles-append patch-r23716-synctex-fix.diff \
- patch-r23740-enctex-xetex-segfault.diff \
- patch-r24159-file-line-error.diff
+# # eliminate updmap.pl's dependency on TLUtils.pm
+# patchfiles-append patch-texk_tetex_updmap.pl.diff
-# poppler 1.8 compatibility fix backported from trunk
-patchfiles-append patch-r24218-luatex-poppler-1.8-compat.diff
+# # fix xdvipdfmx/freetype dfont issue (#30745)
+# patchfiles-append patch-texk_xdvipdfmx_src_cidtype2.c.diff
-# eliminate updmap.pl's dependency on TLUtils.pm
-patchfiles-append patch-texk_tetex_updmap.pl.diff
+# # fix for clang compatibility
+# patchfiles-append patch-texk_ps2pkm_type1.c.diff
-# fix xdvipdfmx/freetype dfont issue (#30745)
-patchfiles-append patch-texk_xdvipdfmx_src_cidtype2.c.diff
+# # make luatex less sensitive to zlib version changes
+# # (cf. http://bugs.debian.org/581818)
+# patchfiles-append patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
-# fix for clang compatibility
-patchfiles-append patch-texk_ps2pkm_type1.c.diff
-
-# make luatex less sensitive to zlib version changes
-# (cf. http://bugs.debian.org/581818)
-patchfiles-append patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
-
-# fix xetex format loading error w/ zlib 1.2.6 (#33164; fixed upstream)
-patchfiles-append patch-texk_web2c_xetexdir_xetex.ch.diff
-
# patches related to changes in install paths
patchfiles-append patch-texk_kpathsea_Makefile.in.diff \
patch-texk_tetex_Makefile.in.diff \
@@ -87,13 +76,13 @@
patch-texk_xdvik_xdvi-sh.in.diff \
patch-utils_chktex_Makefile.in.diff
-# fixes for makefile brokenness not otherwise specified
-patchfiles-append patch-configure.diff \
- patch-libs-freetype-Makefile.in.diff \
- 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_ptexenc_Makefile.in.diff
+# # fixes for makefile brokenness not otherwise specified
+# patchfiles-append patch-configure.diff \
+# patch-libs-freetype-Makefile.in.diff \
+# 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_ptexenc_Makefile.in.diff
post-patch {
reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|" ${worksrcpath}/texk/tetex/Makefile.in
@@ -184,8 +173,10 @@
--disable-texinfo \
--disable-xindy \
--without-x \
- --without-pdfopen
+ --without-pdfopen \
+ --enable-build-in-source-tree
+
configure.cppflags-delete -I${prefix}/include
configure.ldflags-delete -L${prefix}/lib
configure.cppflags-append -isystem${prefix}/include
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_Makefile.in.diff 2012-06-21 04:11:06 UTC (rev 94514)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_Makefile.in.diff 2012-06-21 04:11:14 UTC (rev 94515)
@@ -1,6 +1,6 @@
---- texk/tetex/Makefile.in.orig 2011-06-16 10:01:09.000000000 -0400
-+++ texk/tetex/Makefile.in 2011-07-14 01:15:34.000000000 -0400
-@@ -220,12 +220,12 @@
+--- texk/tetex/Makefile.in.orig 2012-06-14 16:42:47.000000000 -0400
++++ texk/tetex/Makefile.in 2012-06-14 16:52:12.000000000 -0400
+@@ -258,12 +258,12 @@
texconfig-sys \
texlinks
@@ -10,69 +10,40 @@
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@WIN32_TRUE@@WIN32_WRAP_TRUE at wrappers = $(all_scripts:=.exe)
@WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = ${prefix}/$(scriptsdir)
+-texmfdir = $(datarootdir)/$(scriptsdir)
+texmfdir = @@TEXMFMAIN@@/$(scriptsdir)
dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
@WIN32_FALSE at dist_bin_SCRIPTS = $(sh_scripts)
CLEANFILES = $(nodist_bin_SCRIPTS)
-@@ -254,7 +254,7 @@
+@@ -292,10 +292,10 @@
fmtutil.cnf.5 \
updmap.cfg.5
--texconfdir = ${prefix}
-+texconfdir = @@TEXMFMAIN@@
- nobase_dist_texconf_DATA = \
- texmf/texconfig/README \
- texmf/texconfig/g/generic \
-@@ -262,10 +262,10 @@
- texmf/texconfig/v/vt100 \
- texmf/texconfig/x/xterm
-
--texconfigdir = ${prefix}/texmf/texconfig
+-texconfigdir = $(datarootdir)/texmf/texconfig
+texconfigdir = @@TEXMFMAIN@@/texconfig
dist_texconfig_SCRIPTS = tcfmgr
dist_texconfig_DATA = tcfmgr.map
--web2cdir = ${prefix}/texmf/web2c
+-web2cdir = $(datarootdir)/texmf/web2c
+web2cdir = @@TEXMFMAIN@@/web2c
dist_web2c_DATA = fmtutil.cnf
bin_links = \
allcm:allec \
-@@ -574,10 +574,11 @@
- else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
- test -z "$$xfiles" || { \
- test "x$$dir" = x. || { \
-- echo "$(MKDIR_P) '$(DESTDIR)$(texconfdir)/$$dir'"; \
-- $(MKDIR_P) "$(DESTDIR)$(texconfdir)/$$dir"; }; \
-- echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(texconfdir)/$$dir'"; \
-- $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(texconfdir)/$$dir" || exit $$?; }; \
-+ sdir=`echo $$dir | sed -e 's,^[^/]*/,,'`; \
-+ echo "$(MKDIR_P) '$(DESTDIR)$(texconfdir)/$$sdir'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(texconfdir)/$$sdir"; }; \
-+ echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(texconfdir)/$$sdir'"; \
-+ $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(texconfdir)/$$sdir" || exit $$?; }; \
- done
+@@ -1044,16 +1044,11 @@
- uninstall-nobase_dist_texconfDATA:
-@@ -910,19 +911,14 @@
-
- # We support both multiplatform and non-multiplatform builds.
+ # We support native builds, multiplatform or not, as well as distro builds.
install-links:
-- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
-- exit 1;; \
-- esac
-+ $(MAKE) $(AM_MAKEFLAGS) TYPE=$(TYPE) EXT=$(EXT) make-links
-
- make-links:
- @cd $(DESTDIR)$(bindir) && \
+- @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
+- if test -z "$$REL"; then \
+- echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
+- exit 1; \
+- fi; \
+ cd $(DESTDIR)$(bindir) && \
for f in $($(TYPE)_scripts); do \
rm -f $$f; \
-- echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
-- $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
-+ echo "creating link '$$f' -> '$(texmfdir)/$$f.$(EXT)'"; \
+- echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
+- $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+ $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
++ echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
done
uninstall-links:
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff 2012-06-21 04:11:06 UTC (rev 94514)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff 2012-06-21 04:11:14 UTC (rev 94515)
@@ -1,6 +1,6 @@
---- texk/tex4htk/Makefile.in.orig 2011-05-02 09:04:59.000000000 -0400
-+++ texk/tex4htk/Makefile.in 2011-07-13 22:12:21.000000000 -0400
-@@ -264,12 +264,12 @@
+--- texk/tex4htk/Makefile.in.orig 2012-06-14 18:12:45.000000000 -0400
++++ texk/tex4htk/Makefile.in 2012-06-14 18:13:55.000000000 -0400
+@@ -316,12 +316,12 @@
LDADD = $(KPATHSEA_LIBS)
perl_scripts = mk4ht
shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex
@@ -10,29 +10,25 @@
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@WIN32_TRUE@@WIN32_WRAP_TRUE at wrappers = $(all_scripts:=.exe)
@WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = ${prefix}/$(scriptsdir)
+-texmfdir = $(datarootdir)/$(scriptsdir)
+texmfdir = @@TEXMFDIST@@/$(scriptsdir)
dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
@WIN32_TRUE at dist_bin_SCRIPTS = $(shell_scripts:=.bat)
CLEANFILES = $(nodist_bin_SCRIPTS)
-@@ -991,19 +991,14 @@
+@@ -974,16 +974,11 @@
- # We support both multiplatform and non-multiplatform builds.
+ # We support native builds, multiplatform or not, as well as distro builds.
install-links:
-- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
-- exit 1;; \
-- esac
-+ $(MAKE) $(AM_MAKEFLAGS) TYPE=$(TYPE) EXT=$(EXT) make-links
-
- make-links:
- @cd $(DESTDIR)$(bindir) && \
+- @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
+- if test -z "$$REL"; then \
+- echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
+- exit 1; \
+- fi; \
+ cd $(DESTDIR)$(bindir) && \
for f in $($(TYPE)_scripts); do \
rm -f $$f; \
-- echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
-- $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+- echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
+- $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+ echo "creating link '$$f' -> '$(texmfdir)/$$f.$(EXT)'"; \
+ $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
done
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_context_mtxrun.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_context_mtxrun.diff 2012-06-21 04:11:06 UTC (rev 94514)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_context_mtxrun.diff 2012-06-21 04:11:14 UTC (rev 94515)
@@ -1,11 +1,11 @@
---- texk/texlive/context/mtxrun.orig 2011-07-19 19:14:28.000000000 -0400
-+++ texk/texlive/context/mtxrun 2011-07-19 19:16:00.000000000 -0400
-@@ -11155,7 +11155,7 @@
- resolvers.luacnfname = 'texmfcnf.lua'
- resolvers.luacnfstate = "unknown"
+--- texk/texlive/context/mtxrun.orig 2012-06-14 18:34:57.000000000 -0400
++++ texk/texlive/context/mtxrun 2012-06-14 18:35:30.000000000 -0400
+@@ -12340,7 +12340,7 @@
+ resolvers.luacnfspec = environment.default_texmfcnf
+ else
+ -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c"
+- resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}"
++ resolvers.luacnfspec = '@@TEXMFSYSCONFIG'
+ end
--resolvers.luacnfspec = '{selfautodir:,selfautoparent:};{selfautodir:,selfautoparent:}{/share,}/texmf{-local,};{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c'
-+resolvers.luacnfspec = '@@TEXMFSYSCONFIG@@'
-
- local unset_variable = "unset"
-
+ resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff 2012-06-21 04:11:06 UTC (rev 94514)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff 2012-06-21 04:11:14 UTC (rev 94515)
@@ -1,59 +1,67 @@
---- texk/texlive/linked_scripts/Makefile.in.orig 2011-06-20 17:00:53.000000000 -0400
-+++ texk/texlive/linked_scripts/Makefile.in 2011-06-20 20:31:41.000000000 -0400
-@@ -291,6 +291,7 @@
+--- texk/texlive/linked_scripts/Makefile.in.orig 2012-06-14 18:15:41.000000000 -0400
++++ texk/texlive/linked_scripts/Makefile.in 2012-06-14 18:18:22.000000000 -0400
+@@ -215,7 +215,7 @@
+ # dangling symlinks produced by `make install'.
+ # The instances in texmf* are the masters (except when it is CTAN).
#
- # We support both multiplatform and non-multiplatform builds.
- #
-+# MacPorts: hard-code link destinations instead of using relative ones
- runscript = $(top_srcdir)/w32_wrapper/runscript.exe
- @WIN32_TRUE at WINEXT = $(EXEEXT)
- all: all-am
-@@ -619,12 +620,7 @@
+-texmf_scriptsdir = $(datarootdir)/texmf/scripts
++texmf_scriptsdir = @@TEXMFMAIN@@/scripts
+ texmf_shell_scripts = \
+ simpdftex/simpdftex
+
+@@ -231,7 +231,7 @@
+ $(texmf_shell_scripts) \
+ $(texmf_other_scripts)
+
+-texmf_dist_scriptsdir = $(datarootdir)/texmf-dist/scripts
++texmf_dist_scriptsdir = @@TEXMFDIST@@/scripts
+ texmf_dist_shell_scripts = \
+ bibexport/bibexport.sh \
+ installfont/installfont-tl \
+@@ -672,25 +672,20 @@
@WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$link.exe'"; \
@WIN32_TRUE@ $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$link.exe || exit 1; \
@WIN32_TRUE@ done
-- at WIN32_FALSE@ case "$(bindir)" in \
-- at WIN32_FALSE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-- at WIN32_FALSE@ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-- at WIN32_FALSE@ *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-- at WIN32_FALSE@ exit 1;; \
-- at WIN32_FALSE@ esac
-+ at WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) install-links
-
+- at WIN32_FALSE@ @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
+- at WIN32_FALSE@ if test -z "$$REL"; then \
+- at WIN32_FALSE@ echo 'unable to compute relative path for linked scripts' >&2; \
+- at WIN32_FALSE@ exit 1; \
+- at WIN32_FALSE@ fi; \
+ @WIN32_FALSE@ cd $(DESTDIR)$(bindir) && \
+ @WIN32_FALSE@ for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \
+ @WIN32_FALSE@ target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
+ @WIN32_FALSE@ rm -f $$target; \
+- at WIN32_FALSE@ echo "creating link '$$target' -> '$$REL/texmf/scripts/$$s'"; \
+- at WIN32_FALSE@ $(LN_S) $$REL/texmf/scripts/$$s $$target || exit 1; \
++ at WIN32_FALSE@ echo "creating link '$$target' -> '@@TEXMFMAIN@@/scripts/$$s'"; \
++ at WIN32_FALSE@ $(LN_S) @@TEXMFMAIN@@/scripts/$$s $$target || exit 1; \
+ @WIN32_FALSE@ done && \
+ @WIN32_FALSE@ for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
+ @WIN32_FALSE@ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
+ @WIN32_FALSE@ echo "$$s" | grep listings-ext.sh >/dev/null \
+ @WIN32_FALSE@ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
+ @WIN32_FALSE@ rm -f $$target; \
+- at WIN32_FALSE@ echo "creating link '$$target' -> '$$REL/texmf-dist/scripts/$$s'"; \
+- at WIN32_FALSE@ $(LN_S) $$REL/texmf-dist/scripts/$$s $$target || exit 1; \
++ at WIN32_FALSE@ echo "creating link '$$target' -> '@@TEXMFDIST@@/scripts/$$s'"; \
++ at WIN32_FALSE@ $(LN_S) @@TEXMFDIST@@/scripts/$$s $$target || exit 1; \
+ @WIN32_FALSE@ done && \
+ @WIN32_FALSE@ for s in $(bin_links); do \
+ @WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
+@@ -698,15 +693,7 @@
+ @WIN32_FALSE@ rm -f $$link; \
+ @WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
+ @WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \
+- at WIN32_FALSE@ done && \
+- at WIN32_FALSE@ if test -d "$$REL/texmf/doc/man" \
+- at WIN32_FALSE@ && test -z "$(TL_INSTALL_OMIT_MAN_LINK)" \
+- at WIN32_FALSE@ && (test -h man || test ! -e man); then \
+- at WIN32_FALSE@ echo "creating link 'man' -> '$$REL/texmf/doc/man'"; \
+- at WIN32_FALSE@ rm -f man; \
+- at WIN32_FALSE@ (ln -s "$$REL/texmf/doc/man" man || :); \
+- at WIN32_FALSE@ else :; fi
+-
++ at WIN32_FALSE@ done
.PHONY: install-links
install-links:
-@@ -632,16 +628,16 @@
- for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \
- target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
- rm -f $$target; \
-- echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \
-- $(LN_S) $(REL)/texmf/scripts/$$s $$target || exit 1; \
-+ echo "creating link '$$target' -> '@@TEXMFMAIN@@/scripts/$$s'"; \
-+ $(LN_S) @@TEXMFMAIN@@/scripts/$$s $$target || exit 1; \
- done && \
- for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
- target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
- echo "$$s" | grep listings-ext.sh >/dev/null \
- || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
- rm -f $$target; \
-- echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \
-- $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target || exit 1; \
-+ echo "creating link '$$target' -> '@@TEXMFDIST@@/scripts/$$s'"; \
-+ $(LN_S) @@TEXMFDIST@@/scripts/$$s $$target || exit 1; \
- done && \
- for s in $(bin_links); do \
- link=`echo $$s | sed 's,.*:,,'`; \
-@@ -649,12 +645,7 @@
- rm -f $$link; \
- echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link || exit 1; \
-- done && \
-- rm -f man && \
-- if test -d $(REL)/texmf/doc/man; then \
-- echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
-- (ln -s $(REL)/texmf/doc/man man || :); \
-- else :; fi
-+ done
- uninstall-hook:
- @for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
Modified: users/dports/ports/tex/texlive-bin/files/patch-utils_chktex_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-utils_chktex_Makefile.in.diff 2012-06-21 04:11:06 UTC (rev 94514)
+++ users/dports/ports/tex/texlive-bin/files/patch-utils_chktex_Makefile.in.diff 2012-06-21 04:11:14 UTC (rev 94515)
@@ -1,6 +1,6 @@
---- utils/chktex/Makefile.in.orig 2011-07-13 21:28:48.000000000 -0400
-+++ utils/chktex/Makefile.in 2011-07-13 21:32:23.000000000 -0400
-@@ -249,12 +249,12 @@
+--- utils/chktex/Makefile.in.orig 2012-06-14 18:19:36.000000000 -0400
++++ utils/chktex/Makefile.in 2012-06-14 18:20:52.000000000 -0400
+@@ -287,12 +287,12 @@
$(CHKTEX_TREE)/deweb.1
perl_scripts = deweb
@@ -10,29 +10,26 @@
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@WIN32_TRUE@@WIN32_WRAP_TRUE at wrappers = $(all_scripts:=.exe)
@WIN32_TRUE@@WIN32_WRAP_TRUE at runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = ${prefix}/$(scriptsdir)
+-texmfdir = $(datarootdir)/$(scriptsdir)
+texmfdir = @@TEXMFMAIN@@/$(scriptsdir)
nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
@WIN32_FALSE at bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
-@@ -1121,19 +1121,14 @@
+@@ -1205,16 +1205,11 @@
- # We support both multiplatform and non-multiplatform builds.
+ # We support native builds, multiplatform or not, as well as distro builds.
install-links:
-- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
-- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
-- exit 1;; \
-- esac
-+ $(MAKE) $(AM_MAKEFLAGS) TYPE=$(TYPE) EXT=$(EXT) make-links
-
- make-links:
- @cd $(DESTDIR)$(bindir) && \
+- @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
+- if test -z "$$REL"; then \
+- echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
+- exit 1; \
+- fi; \
+ cd $(DESTDIR)$(bindir) && \
for f in $($(TYPE)_scripts); do \
rm -f $$f; \
- echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
-- $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+- echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
+- $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
++ echo "creating link '$$f' -> '$(texmfdir)/$$f.$(EXT)'"; \
+ $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
done
Modified: users/dports/ports/tex/texlive-bin/files/texk_kpathsea_paths.h
===================================================================
--- users/dports/ports/tex/texlive-bin/files/texk_kpathsea_paths.h 2012-06-21 04:11:06 UTC (rev 94514)
+++ users/dports/ports/tex/texlive-bin/files/texk_kpathsea_paths.h 2012-06-21 04:11:14 UTC (rev 94515)
@@ -146,6 +146,14 @@
#define DEFAULT_MLBSTINPUTS "/nonesuch"
#endif
+#ifndef DEFAULT_RISINPUTS
+#define DEFAULT_RISINPUTS "/nonesuch"
+#endif
+
+#ifndef DEFAULT_BLTXMLINPUTS
+#define DEFAULT_BLTXMLINPUTS "/nonesuch"
+#endif
+
#ifndef DEFAULT_MFTINPUTS
#define DEFAULT_MFTINPUTS "/nonesuch"
#endif
@@ -215,7 +223,7 @@
#endif
#ifndef DEFAULT_TRFONTS
-#define DEFAULT_TRFONTS "/nonesuch"
+#define DEFAULT_TRFONTS "/usr{/local,}/share/groff/{current/font,site-font}/devps"
#endif
#ifndef DEFAULT_MPSUPPORT
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120620/3af88f40/attachment-0001.html>
More information about the macports-changes
mailing list