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

dports at macports.org dports at macports.org
Tue Jul 2 14:48:24 PDT 2013


Revision: 107549
          https://trac.macports.org/changeset/107549
Author:   dports at macports.org
Date:     2013-07-02 14:48:24 -0700 (Tue, 02 Jul 2013)
Log Message:
-----------
texlive-bin: use MacPorts icu/harfbuzz libraries

Modified Paths:
--------------
    users/dports/ports/tex/texlive-bin/Portfile

Removed Paths:
-------------
    users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff
    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

Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile	2013-07-02 21:24:45 UTC (rev 107548)
+++ users/dports/ports/tex/texlive-bin/Portfile	2013-07-02 21:48:24 UTC (rev 107549)
@@ -56,6 +56,8 @@
                 path:lib/pkgconfig/cairo.pc:cairo \
                 path:lib/pkgconfig/pixman-1.pc:libpixman \
                 port:graphite2 \
+                port:icu \
+                port:harfbuzz \
                 port:texlive-common
 
 depends_run     port:ghostscript
@@ -77,9 +79,7 @@
                     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-51.1_source_configure.diff \
-                    patch-libs_icu_Makefile.in.diff
+patchfiles-append   patch-libs-freetype-Makefile.in.diff
 
 post-patch {
     reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
@@ -116,8 +116,7 @@
 # texlive whenever possible, to avoid redundancy and to better keep
 # current with respect to security updates and the like.
 #
-# Exceptions are freetype1 (not in MacPorts anymore) and icu/harfbuzz
-# (the texlive version of icu is non-standard)
+# Exceptions are freetype1 (not in MacPorts anymore)
 #
 # Many of the --with-system-* and --disable-* flags are actually
 # redundant because we've removed those components from the distfile,
@@ -136,6 +135,8 @@
                 --with-system-cairo \
                 --with-system-gd \
                 --with-system-graphite2 \
+                --with-system-harfbuzz \
+                --with-system-icu \
                 --with-system-libpng \
                 --with-libpng-includes=${prefix}/include \
                 --with-libpng-libdir=${prefix}/lib \
@@ -275,10 +276,6 @@
     default_variants    +x11
 }
 
-platform darwin 8 {
-    patchfiles-append patch-libs_icu_icu-51.1_source_common_putil.cpp.diff
-}
-
 livecheck.type      regex
 livecheck.url       ${homepage}acquire.html
 livecheck.regex     "TeX Live (\[0-9\]+) "

Deleted: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff	2013-07-02 21:24:45 UTC (rev 107548)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff	2013-07-02 21:48:24 UTC (rev 107549)
@@ -1,15 +0,0 @@
---- libs/icu/Makefile.in.orig	2010-11-02 20:11:12.000000000 -0400
-+++ libs/icu/Makefile.in	2010-11-02 20:20:35.000000000 -0400
-@@ -198,6 +198,12 @@
- SUBDIRS = . $(am__append_1)
- EXTRA_DIST = $(ICU_TREE) license.html $(ICU_TREE)-PATCHES
- @cross_TRUE at ICU_NATIVE = icu-native/config/icucross.mk
-+
-+# MacPorts: remove $prefix/lib from LIBRARY_PATH to prevent gcc from
-+# trying to link against libraries from the icu port
-+export LIBRARY_PATH=
-+
-+
- all: all-recursive
- 
- .SUFFIXES:

Deleted: 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	2013-07-02 21:24:45 UTC (rev 107548)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_common_putil.cpp.diff	2013-07-02 21:48:24 UTC (rev 107549)
@@ -1,17 +0,0 @@
-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.
-  *

Deleted: 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	2013-07-02 21:24:45 UTC (rev 107548)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-51.1_source_configure.diff	2013-07-02 21:48:24 UTC (rev 107549)
@@ -1,55 +0,0 @@
---- 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 ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130702/7d6be75e/attachment.html>


More information about the macports-changes mailing list