[105854] users/dports/ports/tex/texlive-bin

dports at macports.org dports at macports.org
Tue May 7 22:42:50 PDT 2013


Revision: 105854
          https://trac.macports.org/changeset/105854
Author:   dports at macports.org
Date:     2013-05-07 22:42:50 -0700 (Tue, 07 May 2013)
Log Message:
-----------
texlive-bin: intial update of patchfiles for 2013 (prerelease) version

Modified Paths:
--------------
    users/dports/ports/tex/texlive-bin/Portfile
    users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_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_linked_scripts_Makefile.in.diff

Added Paths:
-----------
    users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_common_putil.cpp.diff
    users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_configure.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_chktex_Makefile.in.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_context_stubs_unix_mtxrun.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_Makefile.in.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_updmap-sys.sh.diff

Removed Paths:
-------------
    users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_common_putil.cpp.diff
    users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_configure.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_Makefile.in.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_updmap-sys.sh.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_context_mtxrun.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	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/Portfile	2013-05-08 05:42:50 UTC (rev 105854)
@@ -5,8 +5,7 @@
 PortGroup       texlive 1.0
 
 name            texlive-bin
-version         2012
-revision        9
+version         2013
 
 categories      tex
 maintainers     dports
@@ -30,21 +29,21 @@
 # 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 20120708.26940
+master_sites    http://flute.csail.mit.edu/texlive/test
+set distversion 20130428.30134
 use_xz          yes
-distname        texlive-${distversion}-source-stripped
+distname        texlive-${distversion}-source
 worksrcdir      ${distname}
 
 set tlpkgdistname   tlpkg-TeXLive-${distversion}
 distfiles-append    ${tlpkgdistname}${extract.suffix}
 
-checksums       texlive-20120708.26940-source-stripped.tar.xz \
-                rmd160  a1253c3b2852926337e724bdb30f07b376597089 \
-                sha256  765b2f7488fe06a59a7560e59132444e26de985961f06a41162e4de367269e4d \
-                tlpkg-TeXLive-20120708.26940.tar.xz \
-                rmd160  f550437e2591f770d449a01fabd44a4eb43d79fb \
-                sha256  259ed8697d8f42de51da4c0345c15d25c2925ec3f3422420c9144d9a54c55fb9
+checksums       texlive-20130428.30134-source.tar.xz \
+                rmd160  8007d8ce9a6d8968a4ef62ec5088aca7602b5446 \
+                sha256  d597d70dad8d1e0e041769ff7a808fb345179ca9fdddaa579b41fb52634a9e78 \
+                tlpkg-TeXLive-20130428.30134.tar.xz \
+                rmd160  c71d2e9789867ece56ffd5d1362c31c077efff6c \
+                sha256  d1304655b3e1d8f61ce9235d4931a7ec9164563dd7809848217227bb8cd81738
 
 depends_lib     port:fontconfig \
                 port:freetype \
@@ -61,35 +60,31 @@
 depends_build   path:bin/perl:perl5 \
                 path:bin/pkg-config:pkgconfig
 
-# 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
 
 # patches related to changes in install paths
 patchfiles-append   patch-texk_kpathsea_Makefile.in.diff \
-                    patch-texk_tetex_Makefile.in.diff \
-                    patch-texk_tetex_updmap-sys.sh.diff \
+                    patch-texk_texlive_tl_scripts_updmap-sys.sh.diff \
                     patch-texk_tex4htk_Makefile.in.diff \
-                    patch-texk_texlive_context_mtxrun.diff \
+                    patch-texk_texlive_linked_scripts_context_stubs_unix_mtxrun.diff \
                     patch-texk_texlive_linked_scripts_Makefile.in.diff \
+                    patch-texk_texlive_tl_scripts_Makefile.in.diff \
                     patch-texk_xdvik_xdvi-sh.in.diff \
-                    patch-utils_chktex_Makefile.in.diff
+                    patch-texk_chktex_Makefile.in.diff
 
 # # fixes for makefile brokenness not otherwise specified
 patchfiles-append   patch-libs-freetype-Makefile.in.diff \
-                    patch-libs_icu_icu-49.1_configure.diff \
+                    patch-libs_icu_icu-51.1_source_configure.diff \
                     patch-libs_icu_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/texlive/tl_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
+    reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/chktex/Makefile.in
 
     # Defaults for the texmf search paths need to be compiled into
     # libkpathsea -- really, just the location of texmf.cnf, which
@@ -105,7 +100,7 @@
     file copy ${filespath}/texk_kpathsea_paths.h ${worksrcpath}/texk/kpathsea/paths.h
     reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/texk/kpathsea/paths.h
     reinplace "s|@@TEXMFSYSCONFIG@@|${texlive_texmfsysconfig}|" ${worksrcpath}/texk/kpathsea/paths.h
-    reinplace "s|@@TEXMFSYSCONFIG@@|${texlive_texmfsysconfig}|" ${worksrcpath}/texk/texlive/context/mtxrun
+    reinplace "s|@@TEXMFSYSCONFIG@@|${texlive_texmfsysconfig}|" ${worksrcpath}/texk/texlive/linked_scripts/context/stubs/unix/mtxrun
 
     if {![variant_isset atsui]} {
         # Force configure to believe that Carbon API is
@@ -201,22 +196,27 @@
 }
 
 post-destroot   {
+    #
+    # XXX
+    #
+    
     # texmf and texmf-dist will be installed by other texlive ports
-    delete ${destroot}${prefix}/share/texmf
-    delete ${destroot}${prefix}/share/texmf-dist
-    delete ${destroot}${texlive_texmfdist}
+#    delete ${destroot}${prefix}/share/texmf
+#    delete ${destroot}${prefix}/share/texmf-dist
+#    delete ${destroot}${texlive_texmfdist}
 
     # Do not install scripts we do not want, or symlinks to scripts that
     # we don't install
-    delete ${destroot}${texlive_texmfmain}/scripts/texlive/tlmgr.pl
-    delete ${destroot}${texlive_bindir}/latexmk
-    delete ${destroot}${texlive_bindir}/tlmgr    
+#    delete ${destroot}${texlive_texmfmain}/scripts/texlive/tlmgr.pl
+#    delete ${destroot}${texlive_bindir}/latexmk
+#    delete ${destroot}${texlive_bindir}/tlmgr    
 
     # Do not install the pre-generated fmtutil.cnf; we generate our own
-    delete ${destroot}${texlive_texmfmain}/web2c/fmtutil.cnf
+#    delete ${destroot}${texlive_texmfmain}/web2c/fmtutil.cnf
 
     # install the tlpkg/TeXLive perl module
-    copy ${workpath}/${tlpkgdistname} ${destroot}${prefix}/share/tlpkg
+    xinstall -d ${destroot}${prefix}/share/tlpkg
+    copy ${workpath}/${tlpkgdistname} ${destroot}${prefix}/share/tlpkg/TeXLive
 
     # gzip manpages that are installed into texlive_bindir
     foreach manpage [glob -directory ${destroot}${texlive_bindir} man*/*] {
@@ -314,7 +314,7 @@
 }
 
 platform darwin 8 {
-    patchfiles-append patch-libs_icu_icu-49.1_common_putil.cpp.diff
+    patchfiles-append patch-libs_icu_icu-51.1_source_common_putil.cpp.diff
 }
 
 livecheck.type      regex

Deleted: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_common_putil.cpp.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_common_putil.cpp.diff	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_common_putil.cpp.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,17 +0,0 @@
-http://bugs.icu-project.org/trac/ticket/9367
---- libs/icu/icu-49.1/common/putil.cpp.orig	2012-06-01 10:52:46.000000000 -0400
-+++ libs/icu/icu-49.1/common/putil.cpp	2012-10-05 19:53:14.000000000 -0400
-@@ -123,6 +123,13 @@
- #endif
- 
- /*
-+ * Mac OS X 10.4 doesn't use its localtime_r() declaration in <time.h> if either _ANSI_SOURCE or _POSIX_C_SOURCE is #defined.
-+ */
-+#if defined(U_TZNAME) && U_PLATFORM_IS_DARWIN_BASED && (defined(_ANSI_SOURCE) || defined(_POSIX_C_SOURCE))
-+U_CFUNC struct tm *localtime_r(const time_t *, struct tm *);
-+#endif
-+
-+/*
-  * Only include langinfo.h if we have a way to get the codeset. If we later
-  * depend on more feature, we can test on U_HAVE_NL_LANGINFO.
-  *

Deleted: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_configure.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_configure.diff	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_configure.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,55 +0,0 @@
---- libs/icu/icu-49.1/configure.orig	2010-10-07 12:34:53.000000000 +0900
-+++ libs/icu/icu-49.1/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-libs_icu_icu-51.1_source_common_putil.cpp.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_common_putil.cpp.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_common_putil.cpp.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -0,0 +1,17 @@
+http://bugs.icu-project.org/trac/ticket/9367
+--- libs/icu/icu-51.1/source/common/putil.cpp.orig	2012-06-01 10:52:46.000000000 -0400
++++ libs/icu/icu-51.1/source/common/putil.cpp	2012-10-05 19:53:14.000000000 -0400
+@@ -123,6 +123,13 @@
+ #endif
+ 
+ /*
++ * Mac OS X 10.4 doesn't use its localtime_r() declaration in <time.h> if either _ANSI_SOURCE or _POSIX_C_SOURCE is #defined.
++ */
++#if defined(U_TZNAME) && U_PLATFORM_IS_DARWIN_BASED && (defined(_ANSI_SOURCE) || defined(_POSIX_C_SOURCE))
++U_CFUNC struct tm *localtime_r(const time_t *, struct tm *);
++#endif
++
++/*
+  * Only include langinfo.h if we have a way to get the codeset. If we later
+  * depend on more feature, we can test on U_HAVE_NL_LANGINFO.
+  *

Added: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_configure.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_configure.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_configure.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -0,0 +1,55 @@
+--- libs/icu/icu-51.1/source/configure.orig	2013-05-07 15:56:23.000000000 -0700
++++ libs/icu/icu-51.1/source/configure	2013-05-07 15:57:35.000000000 -0700
+@@ -6006,40 +6006,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
+@@ -6214,11 +6180,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-texk_chktex_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_chktex_Makefile.in.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_chktex_Makefile.in.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -0,0 +1,37 @@
+--- texk/chktex/Makefile.in.orig	2013-05-07 15:47:23.000000000 -0700
++++ texk/chktex/Makefile.in	2013-05-07 15:49:05.000000000 -0700
+@@ -562,12 +562,12 @@
+ # scripts
+ perl_scripts = deweb
+ sh_scripts = chkweb
+-scriptsdir = texmf-dist/scripts/chktex
++scriptsdir = scripts/chktex
+ nodist_bin_SCRIPTS = $(am__append_2)
+ 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 = $(datarootdir)/$(scriptsdir)
++texmfdir = @@TEXMFDIST@@/$(scriptsdir)
+ nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+ texmf_SCRIPTS = $(CHKTEX_TREE)/chkweb.sh
+ 
+@@ -1521,17 +1521,12 @@
+ 	  echo 'script_links.am:install-links: could not find relpath script'; \
+ 	  exit 1; \
+ 	}; \
+-	REL=`$(SHELL) $$relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
+-	if test -z "$$REL"; then \
+-	  echo 'script_links.am:install_links: 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; \
+-	    if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
++	    if $(AM_V_P); then echo "creating link '$$f' -> '$(texmfdir)/$$f.$(EXT)'"; \
+ 	      else echo "  LINK     $$f"; fi; \
+-	    $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
++	    $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
+ 	  done  
+ 
+ uninstall-links:

Modified: 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	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_kpathsea_Makefile.in.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,14 +1,14 @@
---- 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
+--- texk/kpathsea/Makefile.in.orig	2013-05-06 01:30:37.000000000 -0700
++++ texk/kpathsea/Makefile.in	2013-05-06 01:31:40.000000000 -0700
+@@ -653,7 +653,6 @@
+ libkpathsea_la_CPPFLAGS = $(AM_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 @@
+@@ -730,7 +729,7 @@
  	xopendir.h \
  	xstat.h
  
@@ -17,16 +17,16 @@
  kpseaccess_SOURCES = access.c
  kpsereadlink_SOURCES = readlink.c
  kpsewhich_LDADD = libkpathsea.la
-@@ -442,7 +441,6 @@
+@@ -742,7 +741,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
+ bin_links = mktexlsr:texhash
+ TESTS = kpseaccess.test kpsereadlink.test kpsestat.test kpsewhich.test
+ TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
+@@ -2144,26 +2142,6 @@
  
- # 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
@@ -50,5 +50,5 @@
 -	date >$@
 -
  kpathsea.h: Makefile paths.h
- 	rm -f $@
- 	echo '/* This is a generated file */' >$@
+ 	$(AM_V_GEN)rm -f $@; \
+ 	( echo '/* This is a generated file */'; \

Deleted: 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	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_Makefile.in.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,49 +0,0 @@
---- 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
- 
--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 = $(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)
-@@ -292,10 +292,10 @@
- 	fmtutil.cnf.5 \
- 	updmap.cfg.5
- 
--texconfigdir = $(datarootdir)/texmf/texconfig
-+texconfigdir = @@TEXMFMAIN@@/texconfig
- dist_texconfig_SCRIPTS = tcfmgr
- dist_texconfig_DATA = tcfmgr.map
--web2cdir = $(datarootdir)/texmf/web2c
-+web2cdir = @@TEXMFMAIN@@/web2c
- dist_web2c_DATA = fmtutil.cnf
- bin_links = \
- 	allcm:allec \
-@@ -1044,16 +1044,11 @@
- 
- # We support native builds, multiplatform or not, as well as distro builds.
- install-links:
--	@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; \
-+	    $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
-+	    echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
- 	  done  
- 
- uninstall-links:

Deleted: users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_updmap-sys.sh.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_updmap-sys.sh.diff	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tetex_updmap-sys.sh.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,15 +0,0 @@
---- texk/tetex/updmap-sys.sh.orig	2011-08-02 20:00:10.000000000 -0400
-+++ texk/tetex/updmap-sys.sh	2011-08-02 20:05:12.000000000 -0400
-@@ -23,8 +23,11 @@
- v=`kpsewhich -var-value TEXMFSYSVAR`
- c=`kpsewhich -var-value TEXMFSYSCONFIG`
- 
-+# MacPorts: our updmap.cfg is a generated file that lives in TEXMFSYSVAR,
-+# so we don't want to create a new one in TEXMFSYSCONFIG. As a hack to
-+# deal with this, set TEXMFCONFIG to TEXMFSYSVAR.
- TEXMFVAR="$v"
--TEXMFCONFIG="$c"
-+TEXMFCONFIG="$v"
- export TEXMFVAR TEXMFCONFIG
- 
- exec updmap ${1+"$@"}

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	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,6 +1,6 @@
---- 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 @@
+--- texk/tex4htk/Makefile.in.orig	2013-05-07 15:38:38.000000000 -0700
++++ texk/tex4htk/Makefile.in	2013-05-07 15:39:41.000000000 -0700
+@@ -359,12 +359,12 @@
  LDADD = $(KPATHSEA_LIBS)
  perl_scripts = mk4ht
  shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex
@@ -15,21 +15,22 @@
  dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
  @WIN32_TRUE at dist_bin_SCRIPTS = $(shell_scripts:=.bat)
  CLEANFILES = $(nodist_bin_SCRIPTS)
-@@ -974,16 +974,11 @@
- 
- # We support native builds, multiplatform or not, as well as distro builds.
- install-links:
--	@REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
+@@ -1015,17 +1015,12 @@
+ 	  echo 'script_links.am:install-links: could not find relpath script'; \
+ 	  exit 1; \
+ 	}; \
+-	REL=`$(SHELL) $$relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
 -	if test -z "$$REL"; then \
--	  echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
+-	  echo 'script_links.am:install_links: 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)'"; \
+-	    if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
++	    if $(AM_V_P); then echo "creating link '$$f' -> '$(texmfdir)/$$f.$(EXT)'"; \
+ 	      else echo "  LINK     $$f"; fi; \
 -	    $(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  
  

Deleted: 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	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_context_mtxrun.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,11 +0,0 @@
---- 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 = '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	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,24 +1,15 @@
---- 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 @@
+--- texk/texlive/linked_scripts//Makefile.in.orig	2013-05-06 01:36:13.000000000 -0700
++++ texk/texlive/linked_scripts//Makefile.in	2013-05-07 15:22:36.000000000 -0700
+@@ -223,7 +223,7 @@
  # dangling symlinks produced by `make install'.
  # The instances in texmf* are the masters (except when it is CTAN).
  #
--texmf_scriptsdir = $(datarootdir)/texmf/scripts
-+texmf_scriptsdir = @@TEXMFMAIN@@/scripts
+-texmf_scriptsdir = $(datarootdir)/texmf-dist/scripts
++texmf_scriptsdir = @@TEXMFDIST@@/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 = \
+ 	adhocfilelist/adhocfilelist.sh \
  	bibexport/bibexport.sh \
- 	installfont/installfont-tl \
-@@ -672,25 +672,20 @@
+@@ -620,19 +620,14 @@
  @WIN32_TRUE@	  echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$link.exe'"; \
  @WIN32_TRUE@	  $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$link.exe || exit 1; \
  @WIN32_TRUE@	done
@@ -29,14 +20,6 @@
 - 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,\.[^/]*$$,,'`; \
@@ -48,20 +31,3 @@
  @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:
- 

Added: users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_context_stubs_unix_mtxrun.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_context_stubs_unix_mtxrun.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_context_stubs_unix_mtxrun.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -0,0 +1,17 @@
+--- texk/texlive/linked_scripts/context/stubs/unix/mtxrun.orig	2013-05-07 15:42:58.000000000 -0700
++++ texk/texlive/linked_scripts/context/stubs/unix/mtxrun	2013-05-07 15:43:01.000000000 -0700
+@@ -12845,13 +12845,7 @@
+ if environment.default_texmfcnf then
+   resolvers.luacnfspec="home:texmf/web2c;"..environment.default_texmfcnf 
+ else
+-  resolvers.luacnfspec=concat ({
+-    "home:texmf/web2c",
+-    "selfautoparent:/texmf-local/web2c",
+-    "selfautoparent:/texmf-context/web2c",
+-    "selfautoparent:/texmf-dist/web2c",
+-    "selfautoparent:/texmf/web2c",
+-  },";")
++  resolvers.luacnfspec='@@TEXMFSYSCONFIG@@'
+ end
+ local unset_variable="unset"
+ local formats=resolvers.formats

Added: users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_Makefile.in.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_Makefile.in.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -0,0 +1,51 @@
+--- texk/texlive/tl_scripts//Makefile.in.orig	2013-05-07 15:23:07.000000000 -0700
++++ texk/texlive/tl_scripts//Makefile.in	2013-05-07 15:36:10.000000000 -0700
+@@ -236,13 +236,13 @@
+ 	texlinks
+ 
+ nodist_bin_SCRIPTS = $(am__append_1)
+-scriptsdir = texmf-dist/scripts/texlive
++scriptsdir = scripts/texlive
+ 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 = $(datarootdir)/$(scriptsdir)
++texmfdir = @@TEXMFDIST@@/$(scriptsdir)
+ dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(sh_scripts:=.sh)
+ dist_man_MANS = \
+   	allcm.1 \
+@@ -279,10 +279,10 @@
+ 	texconfig:texconfig-sys \
+ 	updmap:updmap-sys
+ 
+-texconfigdir = $(datarootdir)/texmf-dist/texconfig
++texconfigdir = @@TEXMFDIST@@/texconfig
+ dist_texconfig_SCRIPTS = tcfmgr
+ dist_texconfig_DATA = tcfmgr.map
+-web2cdir = $(datarootdir)/texmf-dist/web2c
++web2cdir = @@TEXMFDIST@@/web2c
+ dist_web2c_DATA = fmtutil.cnf
+ run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
+ 	-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
+@@ -760,17 +760,12 @@
+ 	  echo 'script_links.am:install-links: could not find relpath script'; \
+ 	  exit 1; \
+ 	}; \
+-	REL=`$(SHELL) $$relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
+-	if test -z "$$REL"; then \
+-	  echo 'script_links.am:install_links: 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; \
+-	    if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
++	    if $(AM_V_P); then echo "creating link '$$f' -> '$(texmfdir)/$$f.$(EXT)'"; \
+ 	      else echo "  LINK     $$f"; fi; \
+-	    $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
++	    $(LN_S) $(texmfdir)/$$f.$(EXT) $$f || exit 1; \
+ 	  done  
+ 
+ uninstall-links:

Added: users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_updmap-sys.sh.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_updmap-sys.sh.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_tl_scripts_updmap-sys.sh.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -0,0 +1,15 @@
+--- texk/texlive/tl_scripts/updmap-sys.sh.orig	2011-08-02 20:00:10.000000000 -0400
++++ texk/texlive/tl_scripts/updmap-sys.sh	2011-08-02 20:05:12.000000000 -0400
+@@ -23,8 +23,11 @@
+ v=`kpsewhich -var-value TEXMFSYSVAR`
+ c=`kpsewhich -var-value TEXMFSYSCONFIG`
+ 
++# MacPorts: our updmap.cfg is a generated file that lives in TEXMFSYSVAR,
++# so we don't want to create a new one in TEXMFSYSCONFIG. As a hack to
++# deal with this, set TEXMFCONFIG to TEXMFSYSVAR.
+ TEXMFVAR="$v"
+-TEXMFCONFIG="$c"
++TEXMFCONFIG="$v"
+ export TEXMFVAR TEXMFCONFIG
+ 
+ exec updmap ${1+"$@"}

Deleted: 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	2013-05-08 05:32:26 UTC (rev 105853)
+++ users/dports/ports/tex/texlive-bin/files/patch-utils_chktex_Makefile.in.diff	2013-05-08 05:42:50 UTC (rev 105854)
@@ -1,36 +0,0 @@
---- 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
--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 = $(datarootdir)/$(scriptsdir)
-+texmfdir = @@TEXMFMAIN@@/$(scriptsdir)
- nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
- @WIN32_FALSE at bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
- 
-@@ -1205,16 +1205,11 @@
- 
- # We support native builds, multiplatform or not, as well as distro builds.
- install-links:
--	@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)'"; \
-+	    $(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/20130507/b05233f3/attachment-0001.html>


More information about the macports-changes mailing list