Changeset 81856

Timestamp:

08/05/11 22:33:57 (4 years ago)

Author:

dports@…

Message:

texlive-bin: simplify X toolkit variants: remove +nextaw/+xaw3d
variants; rename +xaw variant to +x11 and make it the default instead
of +motif; leave +no_x11 as a compatibility variant for -x11. See
#30614.

File:

• users/dports/ports/tex/texlive-bin/Portfile (modified) (3 diffs)

users/dports/ports/tex/texlive-bin/Portfile

@@ -44 +44 @@
                 port:t1lib \
                 port:poppler \
-                port:xorg-libXp \
                 port:texlive-common
 
@@ -150 +149 @@
                 --disable-t1utils \
                 --disable-texinfo \
-                --disable-xindy
+                --disable-xindy \
+                --without-x \
+                --without-pdfopen
 
 configure.cppflags-delete   -I${prefix}/include
@@ -220 +221 @@
 }
 
-
-if {![variant_isset no_x11] && ![variant_isset motif] && ![variant_isset xaw] && ![variant_isset xaw3d] && ![variant_isset nextaw]} {
-    default_variants    +motif
-}
-
-variant no_x11 conflicts xaw motif xaw3d nextaw {
-    depends_lib-delete port:xorg-libXp
-    configure.args-append --without-x --without-pdfopen
-    configure.args-delete  --x-includes=${prefix}/include \
-                           --x-libraries=${prefix}/lib
-}
-variant motif conflicts no_x11 xaw xaw3d nextaw description {Use Motif to build xdvi} {
-     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} {
+variant x11 conflicts no_x11 description {Build with x11 support, using Xaw widgets for xdvi} {
+    depends_lib-append port:xorg-libXp
+    configure.args-delete --without-x --without-pdfopen    
     depends_lib-append port:xorg-libXaw
     configure.args-append --with-xdvi-x-toolkit=xaw
 }
-variant xaw3d conflicts no_x11 motif xaw nextaw description {Use Xaw3d to build xdvi} {
-    depends_lib-append port:Xaw3d
-    configure.args-append --with-xdvi-x-toolkit=xaw3d
-}
-variant nextaw conflicts no_x11 motif xaw xaw3d description {Use neXtaw to build xdvi} {
-    depends_lib-append port:neXtaw
-    configure.args-append --with-xdvi-x-toolkit=neXtaw
+
+variant motif conflicts no_x11 xaw xaw3d nextaw description {Use Motif to build xdvi} {
+    depends_lib-delete port:xorg-libXaw
+    configure.args-delete --with-xdvi-x-toolkit=xaw
+    depends_lib-append lib:libXm:openmotif
+    configure.args-append --with-xdvi-x-toolkit=motif
+}
+
+variant no_x11 conflicts x11 motif description {Legacy compatibility variant} {}
+
+if {![variant_isset no_x11]} {
+    default_variants    +x11
 }