[83018] trunk/dports/tex/texlive-bin

[dports at macports.org]

Revision: 83018
          http://trac.macports.org/changeset/83018
Author:   dports at macports.org
Date:     2011-08-23 13:40:57 -0700 (Tue, 23 Aug 2011)
Log Message:
-----------
texlive-bin: fix and re-enable clang build (#30869)
 * use -isystem instead of C_INCLUDE_PATH/CPLUS_INCLUDE_PATH
 * patch ps2pkm to fix a clang compile error

Modified Paths:
--------------
    trunk/dports/tex/texlive-bin/Portfile

Added Paths:
-----------
    trunk/dports/tex/texlive-bin/files/patch-texk_ps2pkm_type1.c.diff

Modified: trunk/dports/tex/texlive-bin/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin/Portfile	2011-08-23 16:13:01 UTC (rev 83017)
+++ trunk/dports/tex/texlive-bin/Portfile	2011-08-23 20:40:57 UTC (rev 83018)
@@ -57,6 +57,7 @@
                 patch-libs_icu_icu-4.6_configure.diff \
                 patch-libs_icu_icu-4.6_tools_icuinfo_Makefile.in.diff \
                 patch-texk_kpathsea_Makefile.in.diff \
+                patch-texk_ps2pkm_type1.c.diff \
                 patch-texk_ptexenc_Makefile.in.diff \
                 patch-texk_tetex_Makefile.in.diff \
                 patch-texk_tetex_updmap-sys.sh.diff \
@@ -107,11 +108,6 @@
     reinplace "s|kpse_cv_have_ApplicationServices=yes|kpse_cv_have_ApplicationServices=no|" ${worksrcpath}/texk/xdvipdfmx/configure
 }
 
-# clang build currently fails (#30869)
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
-
 # llvm-gcc apparently fails on Xcode 4.0.x (#30758)
 if {${configure.compiler} == "llvm-gcc-4.2" &&
     [rpm-vercomp $xcodeversion 4.1] < 0} {
@@ -167,8 +163,7 @@
 
 configure.cppflags-delete   -I${prefix}/include
 configure.ldflags-delete    -L${prefix}/lib
-configure.env-append        C_INCLUDE_PATH=${prefix}/include
-configure.env-append        CPLUS_INCLUDE_PATH=${prefix}/include
+configure.cppflags-append   -isystem${prefix}/include
 configure.env-append        LIBRARY_PATH=${prefix}/lib
 
 # work around bug in texlive makefiles where $OBJC is not recorded

Added: trunk/dports/tex/texlive-bin/files/patch-texk_ps2pkm_type1.c.diff
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-texk_ps2pkm_type1.c.diff	                        (rev 0)
+++ trunk/dports/tex/texlive-bin/files/patch-texk_ps2pkm_type1.c.diff	2011-08-23 20:40:57 UTC (rev 83018)
@@ -0,0 +1,19 @@
+--- 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*/
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110823/a05de51c/attachment.html>