[80513] users/dports/ports/tex/texlive-bin
dports at macports.org
dports at macports.org
Wed Jul 13 22:56:39 PDT 2011
Revision: 80513
http://trac.macports.org/changeset/80513
Author: dports at macports.org
Date: 2011-07-13 22:56:38 -0700 (Wed, 13 Jul 2011)
Log Message:
-----------
texlive-bin: update patches required to build & destroot 2011 source.
Modified Paths:
--------------
users/dports/ports/tex/texlive-bin/Portfile
users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
Added Paths:
-----------
users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.6_configure.diff
users/dports/ports/tex/texlive-bin/files/patch-src_texk_ptexenc_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_ptexenc_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_Makefile.in.diff
users/dports/ports/tex/texlive-bin/files/patch-utils_chktex_Makefile.in.diff
Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile 2011-07-14 04:55:56 UTC (rev 80512)
+++ users/dports/ports/tex/texlive-bin/Portfile 2011-07-14 05:56:38 UTC (rev 80513)
@@ -5,8 +5,7 @@
PortGroup texlive 1.0
name texlive-bin
-version 2010
-revision 4
+version 2011
categories tex
maintainers dports
@@ -20,14 +19,13 @@
homepage http://www.tug.org/texlive/
platforms darwin
-master_sites tex_ctan:systems/texlive/Source/
-set distversion 20100720
+master_sites http://flute.csail.mit.edu/texlive/test
+set distversion 20110628
distname texlive-${distversion}-source
worksrcdir ${distname}
use_xz yes
-checksums md5 2a2201b84fdbf210032e1df70bc59157 \
- sha1 713b861123e3d9e073e2c93d7ed3e13262d82c34 \
- rmd160 b1120f3377ca45b4d86911b99a95c2e6e45927b5
+checksums sha1 05d701ff5e50760471207147f326c647d77f8ca0 \
+ rmd160 ad90c0179ab913019a6ddefb834c463ace7b5c5b
universal_variant no
@@ -49,19 +47,24 @@
path:bin/pkg-config:pkgconfig
patchfiles patch-configure.diff \
+ patch-libs-freetype-Makefile.in.diff \
patch-libs_icu_Makefile.in.diff \
- patch-libs_icu_icu-4.4_configure.diff \
- patch-libs_icu_icu-4.4_tools_icuinfo_Makefile.in.diff \
- patch-libs-freetype-Makefile.in.diff \
+ patch-libs_icu_icu-4.6_configure.diff \
+ patch-texk_ptexenc_Makefile.in.diff \
+ patch-texk_tetex_Makefile.in.diff \
+ patch-texk_tex4htk_Makefile.in.diff \
patch-texk_texlive_linked_scripts_Makefile.in.diff \
- patch-texk_tex4htk_Makefile.in.diff \
- patch-texk_xdvik_xdvi-sh.in.diff
+ patch-texk_xdvik_xdvi-sh.in.diff \
+ patch-utils_chktex_Makefile.in.diff
+
post-patch {
+ reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|" ${worksrcpath}/texk/tetex/Makefile.in
reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/tex4htk/Makefile.in
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
delete ${worksrcpath}/texk/kpathsea/texmf.cnf
@@ -92,11 +95,11 @@
configure.args --bindir=${texlive_bindir} \
--mandir=${texlive_bindir} \
--infodir=${prefix}/share/info \
+ --enable-shared \
--disable-multiplatform \
--disable-native-texlive-build \
--without-old-mac-fonts \
--with-banner-add="/MacPorts ${version}_${revision}" \
- --enable-shared \
--with-system-freetype2 \
--without-system-freetype \
--without-system-icu \
@@ -109,6 +112,7 @@
--with-t1lib-includes=${prefix}/include \
--with-t1lib-libdir=${prefix}/lib \
--with-system-xpdf \
+ --with-system-poppler \
--with-system-zlib \
--with-system-zziplib \
--disable-etex \
@@ -126,6 +130,9 @@
configure.env-append CPLUS_INCLUDE_PATH=${prefix}/include
configure.env-append LIBRARY_PATH=${prefix}/lib
+# XXX
+configure.ccache no
+
# work around bug in texlive makefiles where $OBJC is not recorded
# during configure phase
pre-build {
Added: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.6_configure.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.6_configure.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.6_configure.diff 2011-07-14 05:56:38 UTC (rev 80513)
@@ -0,0 +1,55 @@
+--- libs/icu/icu-4.6/configure.orig 2010-10-07 12:34:53.000000000 +0900
++++ libs/icu/icu-4.6/configure 2010-12-03 09:47:00.000000000 +0900
+@@ -6419,40 +6419,6 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_c_bigendian=unknown
+- # See if we're dealing with a universal compiler.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifndef __APPLE_CC__
+- not a universal capable compiler
+- #endif
+- typedef int dummy;
+-
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+- # Check for potential -arch flags. It is not universal unless
+- # there are at least two -arch flags with different values.
+- ac_arch=
+- ac_prev=
+- for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+- if test -n "$ac_prev"; then
+- case $ac_word in
+- i?86 | x86_64 | ppc | ppc64)
+- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+- ac_arch=$ac_word
+- else
+- ac_cv_c_bigendian=universal
+- break
+- fi
+- ;;
+- esac
+- ac_prev=
+- elif test "x$ac_word" = "x-arch"; then
+- ac_prev=arch
+- fi
+- done
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6627,11 +6593,6 @@
+ ;; #(
+ no)
+ ;; #(
+- universal)
+-
+-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+-
+- ;; #(
+ *)
+ as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
Added: users/dports/ports/tex/texlive-bin/files/patch-src_texk_ptexenc_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-src_texk_ptexenc_Makefile.in.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-src_texk_ptexenc_Makefile.in.diff 2011-07-14 05:56:38 UTC (rev 80513)
@@ -0,0 +1,4 @@
+256c256
+< libptexenc_la_LDFLAGS = -no-undefined -version-info $(PTEXENC_LT_VERSINFO)
+---
+> libptexenc_la_LDFLAGS = -version-info $(PTEXENC_LT_VERSINFO)
Added: users/dports/ports/tex/texlive-bin/files/patch-texk_ptexenc_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_ptexenc_Makefile.in.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_ptexenc_Makefile.in.diff 2011-07-14 05:56:38 UTC (rev 80513)
@@ -0,0 +1,11 @@
+--- texk/ptexenc/Makefile.in.orig 2011-07-11 18:49:12.000000000 -0400
++++ texk/ptexenc/Makefile.in 2011-07-11 18:49:02.000000000 -0400
+@@ -253,7 +253,7 @@
+ AM_CFLAGS = $(WARNING_CFLAGS)
+ lib_LTLIBRARIES = libptexenc.la
+ libptexenc_la_CPPFLAGS = -DMAKE_PTENC_DLL
+-libptexenc_la_LDFLAGS = -no-undefined -version-info $(PTEXENC_LT_VERSINFO)
++libptexenc_la_LDFLAGS = -version-info $(PTEXENC_LT_VERSINFO)
+
+ # Note: jisx0208.h is a copy of ../../libs/gd/gd-2.0.35/jisx0208.h.
+ #
Added: 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 (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_Makefile.in.diff 2011-07-14 05:56:38 UTC (rev 80513)
@@ -0,0 +1,78 @@
+--- 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 @@
+ texconfig-sys \
+ texlinks
+
+-scriptsdir = texmf/scripts/tetex
++scriptsdir = scripts/tetex
+ nodist_bin_SCRIPTS = $(am__append_1)
+ 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 = /opt/local/share/texmf-texlive/$(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 @@
+ fmtutil.cnf.5 \
+ updmap.cfg.5
+
+-texconfdir = ${prefix}
++texconfdir = /opt/local/share/texmf-texlive
+ 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 = /opt/local/share/texmf-texlive/texconfig
+ dist_texconfig_SCRIPTS = tcfmgr
+ dist_texconfig_DATA = tcfmgr.map
+-web2cdir = ${prefix}/texmf/web2c
++web2cdir = /opt/local/share/texmf-texlive/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
+
+ uninstall-nobase_dist_texconfDATA:
+@@ -910,19 +911,14 @@
+
+ # We support both multiplatform and non-multiplatform 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) && \
+ 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)'"; \
++ $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
+ 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 2011-07-14 04:55:56 UTC (rev 80512)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff 2011-07-14 05:56:38 UTC (rev 80513)
@@ -1,44 +1,40 @@
---- texk/tex4htk/Makefile.in.orig 2010-11-01 20:10:42.000000000 -0400
-+++ texk/tex4htk/Makefile.in 2010-11-01 22:31:56.000000000 -0400
-@@ -274,8 +274,8 @@
- wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \
- xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \
- xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
--tex4ht_subdir = texmf-dist/scripts/tex4ht
--tex4htdir = ${prefix}/$(tex4ht_subdir)
-+tex4ht_subdir = scripts/tex4ht
-+tex4htdir = @@TEXMFDIST@@/$(tex4ht_subdir)
- tex4ht_SCRIPTS =
- bin_SCRIPTS =
- all: c-auto.h
-@@ -837,25 +837,20 @@
- echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.sh'"; \
- $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \
- done
+--- 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 @@
+ LDADD = $(KPATHSEA_LIBS)
+ perl_scripts = mk4ht
+ shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex
+-scriptsdir = texmf-dist/scripts/tex4ht
++scriptsdir = scripts/tex4ht
+ nodist_bin_SCRIPTS = $(am__append_1)
+ 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 = @@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 @@
+
+ # We support both multiplatform and non-multiplatform builds.
+ install-links:
- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-- *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+- */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) install-links
++ $(MAKE) $(AM_MAKEFLAGS) TYPE=$(TYPE) EXT=$(EXT) make-links
- .PHONY: install-links
- install-links:
+ make-links:
@cd $(DESTDIR)$(bindir) && \
- for p in $(perl_scripts); do \
- rm -f $$p; \
-- echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \
-- $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
-+ echo "creating link '$$p' -> '$(tex4htdir)/$$p.pl'"; \
-+ $(LN_S) $(tex4htdir)/$$p.pl $$p; \
- done && \
- for p in $(shell_scripts); do \
- rm -f $$p; \
-- echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \
-- $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p; \
-+ echo "creating link '$$p' -> '$(tex4htdir)/$$p.sh'"; \
-+ $(LN_S) $(tex4htdir)/$$p.sh $$p; \
- done
+ 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)'"; \
++ $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
+ done
- uninstall-hook:
+ uninstall-links:
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 2011-07-14 04:55:56 UTC (rev 80512)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff 2011-07-14 05:56:38 UTC (rev 80513)
@@ -1,47 +1,52 @@
---- texk/texlive/linked_scripts/Makefile.in.orig 2010-11-01 20:10:29.000000000 -0400
-+++ texk/texlive/linked_scripts/Makefile.in 2010-11-01 22:27:35.000000000 -0400
-@@ -575,13 +575,10 @@
+--- 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 @@
#
# We support both multiplatform and non-multiplatform builds.
#
-+
+# MacPorts: hard-code link destinations instead of using relative ones
- install-data-hook:
-- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-- *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-- exit 1;; \
-- esac
-+ $(MAKE) $(AM_MAKEFLAGS) install-links
+ runscript = $(top_srcdir)/w32_wrapper/runscript.exe
+ @WIN32_TRUE at WINEXT = $(EXEEXT)
+ all: all-am
+@@ -619,12 +620,7 @@
+ @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
.PHONY: install-links
install-links:
-@@ -589,16 +586,16 @@
- for s in $(nobase_dist_scriptx_SCRIPTS); do \
+@@ -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; \
+- $(LN_S) $(REL)/texmf/scripts/$$s $$target || exit 1; \
+ echo "creating link '$$target' -> '@@TEXMFMAIN@@/scripts/$$s'"; \
-+ $(LN_S) @@TEXMFMAIN@@/scripts/$$s $$target; \
++ $(LN_S) @@TEXMFMAIN@@/scripts/$$s $$target || exit 1; \
done && \
- for s in $(nobase_dist_script_SCRIPTS); do \
+ 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; \
+- $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target || exit 1; \
+ echo "creating link '$$target' -> '@@TEXMFDIST@@/scripts/$$s'"; \
-+ $(LN_S) @@TEXMFDIST@@/scripts/$$s $$target; \
++ $(LN_S) @@TEXMFDIST@@/scripts/$$s $$target || exit 1; \
done && \
for s in $(bin_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
-@@ -606,12 +603,7 @@
+@@ -649,12 +645,7 @@
rm -f $$link; \
echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link; \
+ $(LN_S) $$file $$link || exit 1; \
- done && \
- rm -f man && \
- if test -d $(REL)/texmf/doc/man; then \
@@ -51,4 +56,4 @@
+ done
uninstall-hook:
- @for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \
+ @for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
Added: 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 (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-utils_chktex_Makefile.in.diff 2011-07-14 05:56:38 UTC (rev 80513)
@@ -0,0 +1,39 @@
+--- 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 @@
+ $(CHKTEX_TREE)/deweb.1
+
+ perl_scripts = deweb
+-scriptsdir = texmf/scripts/chktex
++scriptsdir = scripts/chktex
+ nodist_bin_SCRIPTS = $(am__append_1)
+ 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 = @@TEXMFMAIN@@/$(scriptsdir)
+ nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+ @WIN32_FALSE at bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
+
+@@ -1121,19 +1121,14 @@
+
+ # We support both multiplatform and non-multiplatform 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) && \
+ 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; \
++ $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
+ done
+
+ uninstall-links:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110713/033e8bee/attachment-0001.html>
More information about the macports-changes
mailing list