[52043] trunk/dports/tex/texlive_base

[jeremyhu at macports.org]

Revision: 52043
          http://trac.macports.org/changeset/52043
Author:   jeremyhu at macports.org
Date:     2009-06-08 14:29:15 -0700 (Mon, 08 Jun 2009)
Log Message:
-----------
texlive_base: Use freetype instead of ATSU.  Added missing dependency on motif

Modified Paths:
--------------
    trunk/dports/tex/texlive_base/Portfile

Added Paths:
-----------
    trunk/dports/tex/texlive_base/files/XeTeX_mac-loadAATfont.patch

Modified: trunk/dports/tex/texlive_base/Portfile
===================================================================
--- trunk/dports/tex/texlive_base/Portfile	2009-06-08 20:16:55 UTC (rev 52042)
+++ trunk/dports/tex/texlive_base/Portfile	2009-06-08 21:29:15 UTC (rev 52043)
@@ -4,7 +4,7 @@
 
 name            texlive_base
 version         2007
-revision        6
+revision        7
 categories      tex
 maintainers     nomaintainer
 description     TeX Live Binaries.
@@ -34,7 +34,7 @@
 depends_lib     port:freetype port:fontconfig port:ncurses port:zlib \
                 port:libpng port:texinfo port:texi2html port:ghostscript \
                 port:texlive_texmf-minimal port:texlive_texmf-full \
-                port:xorg-libXaw port:xorg-libXp
+                port:xorg-libXaw lib:libXm:openmotif
 
 depends_build   path:bin/perl:perl5
 
@@ -47,14 +47,10 @@
                 --with-system-gd --with-fontconfig=${prefix} \
                 --disable-multiplatform --without-texinfo \
                 --without-xdvipdfmx --without-texi2html \
-                --without-psutils --without-system-icu
+                --without-psutils --without-system-icu \
+                --x-includes=${prefix}/include \
+                --x-libraries=${prefix}/lib
 
-if { ! [variant_isset no_x11] } {
-    configure.args-append \
-       --x-includes=${prefix}/include \
-       --x-libraries=${prefix}/lib
-}
-
 configure.cppflags-delete   -I${prefix}/include
 configure.cppflags-append   -isystem${prefix}/include
 
@@ -80,8 +76,10 @@
 }
 
 variant no_x11 {
-    depends_lib-delete port:xorg-libXaw port:xorg-libXp
+    depends_lib-delete port:xorg-libXaw lib:libXm:openmotif
     configure.args-append --without-x --without-pdfopen
+    configure.args-delete  --x-includes=${prefix}/include \
+                           --x-libraries=${prefix}/lib
 }
 
 livecheck.check     regex
@@ -98,6 +96,10 @@
         ${worksrcpath}/texk/xdv2pdf/Makefile.in
     reinplace "s|OBJC = cc|OBJC = \$(CC)|" \
         ${worksrcpath}/texk/xdv2pdf/Makefile.in
+
+    # The check for Carbon is actually used for ATSU which is deprecated, force freetype
+    reinplace "s|has_carbon=yes|has_carbon=no|" ${worksrcpath}/texk/web2c/configure
+    reinplace "s|has_carbon=yes|has_carbon=no|" ${worksrcpath}/texk/xdv2pdf/configure
 }
 
 post-configure {
@@ -165,3 +167,7 @@
     patch-utils_ps2eps_Makefile_in\
     patch-utils_psutils_Makefile_in\
     patch-texk_web2c_omegafonts_pl_l.diff
+
+# MP patches... kept separate from OpenBSD patches for maintainability
+patchfiles-append \
+    XeTeX_mac-loadAATfont.patch

Added: trunk/dports/tex/texlive_base/files/XeTeX_mac-loadAATfont.patch
===================================================================
--- trunk/dports/tex/texlive_base/files/XeTeX_mac-loadAATfont.patch	                        (rev 0)
+++ trunk/dports/tex/texlive_base/files/XeTeX_mac-loadAATfont.patch	2009-06-08 21:29:15 UTC (rev 52043)
@@ -0,0 +1,11 @@
+--- texk/web2c/xetexdir/XeTeX_mac.c.orig	2009-06-08 09:41:38.000000000 -0700
++++ texk/web2c/xetexdir/XeTeX_mac.c	2009-06-08 09:42:31.000000000 -0700
+@@ -628,7 +628,7 @@ find_selector_by_name(ATSUFontID fontID,
+ }
+ 
+ void*
+-loadAATfont(ATSFontRef fontRef, long scaled_size, const char* cp1)
++loadAATfont(ATSFontRef fontRef, integer scaled_size, const char* cp1)
+ {
+ 	ATSUFontID	fontID = FMGetFontFromATSFontRef(fontRef);
+ 	ATSUStyle	style = 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090608/20c742da/attachment.html>