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

dports at macports.org dports at macports.org
Fri Jun 29 21:42:36 PDT 2012


Revision: 94806
          https://trac.macports.org/changeset/94806
Author:   dports at macports.org
Date:     2012-06-29 21:42:34 -0700 (Fri, 29 Jun 2012)
Log Message:
-----------
texlive-bin: update and reenable some patchfiles; remove some unneeded
patchfiles; disable building lcdf-typetools

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

Added Paths:
-----------
    users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_configure.diff

Removed Paths:
-------------
    users/dports/ports/tex/texlive-bin/files/patch-configure.diff
    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_tools_icuinfo_Makefile.in.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_ps2pkm_type1.c.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_ptexenc_Makefile.in.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_XeTeX_ext.h.diff

Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile	2012-06-30 01:22:46 UTC (rev 94805)
+++ users/dports/ports/tex/texlive-bin/Portfile	2012-06-30 04:42:34 UTC (rev 94806)
@@ -60,16 +60,13 @@
 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
+# fix xdvipdfmx/freetype dfont issue (#30745)
+patchfiles-append   patch-texk_xdvipdfmx_src_cidtype2.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
 
-# # 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 \
@@ -81,12 +78,9 @@
                     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
+patchfiles-append   patch-libs-freetype-Makefile.in.diff \
+                    patch-libs_icu_icu-49.1_configure.diff \
+                    patch-libs_icu_Makefile.in.diff
 
 post-patch {
     reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|" ${worksrcpath}/texk/tetex/Makefile.in
@@ -171,6 +165,7 @@
                 --disable-detex \
                 --disable-dvi2tty \
                 --disable-dvipng \
+                --disable-lcdf-typetools \
                 --disable-ps2eps \
                 --disable-psutils \
                 --disable-t1utils \
@@ -271,7 +266,6 @@
     # can't build xdv2pdf, and need to use a hack to make xetex build
     if {${os.platform} == "darwin" && ${os.major} >= 11} {
         configure.args-append --disable-xdv2pdf
-        patchfiles-append patch-texk_web2c_xetexdir_XeTeX_ext.h.diff
     }
 
     # ...and it doesn't build with clang, either (#33602)

Deleted: users/dports/ports/tex/texlive-bin/files/patch-configure.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-configure.diff	2012-06-30 01:22:46 UTC (rev 94805)
+++ users/dports/ports/tex/texlive-bin/files/patch-configure.diff	2012-06-30 04:42:34 UTC (rev 94806)
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2009/12/12 17:48:34 edd Exp $
---- configure.orig	Sat Jul  4 17:27:52 2009
-+++ configure	Sat Jul  4 17:42:02 2009
-@@ -20683,7 +20683,7 @@ else
- fi
- 
- if $PKG_CONFIG poppler --atleast-version=0.10; then
--  POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-+  POPPLER_VERSION='-DPOPPLER_VERSION="'`$PKG_CONFIG poppler --modversion`'"'
-   XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
-   XPDF_LIBS=`$PKG_CONFIG poppler --libs`
- elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then

Deleted: 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	2012-06-30 01:22:46 UTC (rev 94805)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.6_configure.diff	2012-06-30 04:42:34 UTC (rev 94806)
@@ -1,55 +0,0 @@
---- 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 ;;

Deleted: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.6_tools_icuinfo_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.6_tools_icuinfo_Makefile.in.diff	2012-06-30 01:22:46 UTC (rev 94805)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.6_tools_icuinfo_Makefile.in.diff	2012-06-30 04:42:34 UTC (rev 94806)
@@ -1,11 +0,0 @@
---- libs/icu/icu-4.6/tools/icuinfo/Makefile.in.orig	2011-07-14 02:07:18.000000000 -0400
-+++ libs/icu/icu-4.6/tools/icuinfo/Makefile.in	2011-07-14 02:07:51.000000000 -0400
-@@ -36,7 +36,7 @@
- 
- ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME)
- 
--CPPFLAGS+=  -DU_PLATFORM=\"@platform@\"  -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\"@CC@\" -DU_CXX=\"@CXX@\"
-+CPPFLAGS+=  -DU_PLATFORM=\"@platform@\"  -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" '-DU_CC="@CC@"' '-DU_CXX="@CXX@"'
- # -DENABLE_RELEASE=@ENABLE_RELEASE@ -DENABLE_DEBUG=@ENABLE_DEBUG@ "
- 
- 

Copied: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_configure.diff (from rev 94801, 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-49.1_configure.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-49.1_configure.diff	2012-06-30 04:42:34 UTC (rev 94806)
@@ -0,0 +1,55 @@
+--- 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 ;;

Deleted: users/dports/ports/tex/texlive-bin/files/patch-texk_ps2pkm_type1.c.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_ps2pkm_type1.c.diff	2012-06-30 01:22:46 UTC (rev 94805)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_ps2pkm_type1.c.diff	2012-06-30 04:42:34 UTC (rev 94806)
@@ -1,19 +0,0 @@
---- texk/ps2pkm/type1.c.orig	Mon Jun 22 23:33:58 2009
-+++ texk/ps2pkm/type1.c	Sun Jul 17 22:33:35 2011
-@@ -127,6 +127,8 @@
- #define Error {errflag = TRUE; return;}
-  
- #define Error0(errmsg) { CC; IfTrace0(TRUE, errmsg); Error;}
-+
-+#define Error01(errmsg) { CC; IfTrace0(TRUE, errmsg); errflag = TRUE; return -1.0;}
-  
- #define Error1(errmsg,arg) { CC; IfTrace1(TRUE, errmsg, arg); Error;}
-  
-@@ -780,7 +782,7 @@
- static DOUBLE PSFakePop ()
- {
-   if (PSFakeTop >= 0) return(PSFakeStack[PSFakeTop--]);
--  else Error0("PSFakePop : Stack empty\n");
-+  else Error01("PSFakePop : Stack empty\n");
-   /*NOTREACHED*/
- }

Deleted: 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	2012-06-30 01:22:46 UTC (rev 94805)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_ptexenc_Makefile.in.diff	2012-06-30 04:42:34 UTC (rev 94806)
@@ -1,11 +0,0 @@
---- 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.
- #

Deleted: users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_XeTeX_ext.h.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_XeTeX_ext.h.diff	2012-06-30 01:22:46 UTC (rev 94805)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_XeTeX_ext.h.diff	2012-06-30 04:42:34 UTC (rev 94806)
@@ -1,16 +0,0 @@
---- texk/web2c/xetexdir/XeTeX_ext.h.orig	2011-08-08 00:14:45.000000000 -0400
-+++ texk/web2c/xetexdir/XeTeX_ext.h	2011-08-08 00:17:19.000000000 -0400
-@@ -313,6 +314,13 @@
- 	void atsugetfontmetrics(ATSUStyle style, integer* ascent, integer* descent, integer* xheight, integer* capheight, integer* slant);
- 
- #ifdef XETEX_MAC
-+
-+#include <ApplicationServices/ApplicationServices.h>
-+/* These functions have been removed on 10.7; as a workaround, just do
-+ * a cast as the ATSFontRef and ATSUFontID should have the same value... */
-+#define FMGetFontFromATSFontRef(x) ((ATSUFontID) x)
-+#define FMGetATSFontRefFromFont(x) ((ATSFontRef) x)
-+
- /* functions in XeTeX_mac.c */
- 	void* loadAATfont(ATSFontRef fontRef, integer scaled_size, const char* cp1);
- 	void DoAtsuiLayout(void* node, int justify);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120629/250428ee/attachment-0001.html>


More information about the macports-changes mailing list