[52083] trunk/dports/tex/pTeX/Portfile

[jeremyhu at macports.org]

Revision: 52083
          http://trac.macports.org/changeset/52083
Author:   jeremyhu at macports.org
Date:     2009-06-09 13:10:33 -0700 (Tue, 09 Jun 2009)
Log Message:
-----------
pTex: Cleanup variants.  Still use system gd2 even if no_x11 since gd2 has a no_x11 variant as well.

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

Modified: trunk/dports/tex/pTeX/Portfile
===================================================================
--- trunk/dports/tex/pTeX/Portfile	2009-06-09 20:05:35 UTC (rev 52082)
+++ trunk/dports/tex/pTeX/Portfile	2009-06-09 20:10:33 UTC (rev 52083)
@@ -63,7 +63,6 @@
                 cmap-gs863.tar.gz               rmd160 2aa8ccc8e1d83a56026b476b4129238264c2e22c
 
 depends_lib     bin:perl:perl5 \
-                lib:libXm:openmotif \
                 port:gd2 \
                 port:ghostscript-fonts-hiragino \
                 port:jpeg \
@@ -113,8 +112,7 @@
                 --with-system-ncurses \
                 --with-system-pnglib \
                 --with-system-t1lib \
-                --with-system-zlib \
-                --with-xdvi-x-toolkit=motif
+                --with-system-zlib
 #               --enable-shared
 configure {
     set fd [open [file join ${worksrcpath} my_option] w 0644]
@@ -235,28 +233,23 @@
 variant utf8 conflicts euc sjis description {Set the default character encoding to UTF-8} {}
 
 variant no_x11 conflicts motif xaw xaw3d nextaw description {Do not use X11} {
-    depends_lib-delete lib:libXm:openmotif port:fontconfig port:freetype port:gd2 port:jpeg port:libiconv
-    # gd2 requires X11
-    configure.args-delete --with-system-gd --with-xdvi-x-toolkit=motif
-    configure.args-append --without-system-gd --without-x --without-xdvik
+    depends_lib-delete port:fontconfig port:freetype port:jpeg port:libiconv
+    configure.args-append --without-x --without-xdvik
 }
-variant motif conflicts no_x11 xaw xaw3d nextaw description {Use Motif to build xdvi (default)} {}
+variant motif conflicts no_x11 xaw xaw3d nextaw description {Use Motif to build xdvi (default)} {
+     depends_lib-append lib:libXm:openmotif
+     configure.args-append --with-xdvi-x-toolkit=motif
+}
 variant xaw conflicts no_x11 motif xaw3d nextaw description {Use Xaw to build xdvi} {
-    depends_lib-delete lib:libXm:openmotif
     depends_lib-append port:xorg-libXaw
-    configure.args-delete --with-xdvi-x-toolkit=motif
     configure.args-append --with-xdvi-x-toolkit=xaw
 }
 variant xaw3d conflicts no_x11 motif xaw nextaw description {Use Xaw3d to build xdvi} {
-    depends_lib-delete lib:libXm:openmotif
     depends_lib-append port:Xaw3d
-    configure.args-delete --with-xdvi-x-toolkit=motif
     configure.args-append --with-xdvi-x-toolkit=xaw3d
 }
 variant nextaw conflicts no_x11 motif xaw xaw3d description {Use neXtaw to build xdvi} {
-    depends_lib-delete lib:libXm:openmotif
     depends_lib-append port:neXtaw
-    configure.args-delete --with-xdvi-x-toolkit=motif
     configure.args-append --with-xdvi-x-toolkit=neXtaw
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090609/d0e086ee/attachment.html>