[119755] trunk/dports/math/surf

[devans at macports.org]

Revision: 119755
          https://trac.macports.org/changeset/119755
Author:   devans at macports.org
Date:     2014-05-05 10:52:45 -0700 (Mon, 05 May 2014)
Log Message:
-----------
surf: add default variant +gui and drop +no_x11 which is a misnomer and broken to boot, patch configure to fix --enable-cups (#39383 #43582).

Modified Paths:
--------------
    trunk/dports/math/surf/Portfile

Added Paths:
-----------
    trunk/dports/math/surf/files/
    trunk/dports/math/surf/files/patch-configure.diff

Modified: trunk/dports/math/surf/Portfile
===================================================================
--- trunk/dports/math/surf/Portfile	2014-05-05 17:33:48 UTC (rev 119754)
+++ trunk/dports/math/surf/Portfile	2014-05-05 17:52:45 UTC (rev 119755)
@@ -22,18 +22,30 @@
 checksums           rmd160  27e21733ecacff85ca8d0b982c6378fd58722c97 \
                     sha256  8a5326bd50ed8c4e4c49f13dac3b4cf419944d2279d71b897faafcbdc3f99cd8
 
+# libX11 is needed not only for the GUI option but also to support X11 image file formats
+
 depends_lib         port:gmp \
                     port:flex \
-                    port:xorg-libXmu \
                     port:jpeg \
                     port:tiff \
-                    port:gtk1
+                    port:xorg-libX11
 
-variant no_x11 {
-    depends_lib-delete port:gtk1
-    configure.args-append --disable-gui
+patchfiles          patch-configure.diff
+
+configure.args      --x-includes=${prefix}/include \
+                    --x-libraries=${prefix}/lib \
+                    --enable-cups=no \
+                    --enable-gui=no
+                    
+variant gui description {Enable gtk1 based GUI} {
+    depends_lib-append      port:gtk1 \
+                            port:xorg-libXmu
+    configure.args-delete   --enable-gui=no \
+                            --enable-cups=no
 }
 
+default_variants +gui
+
 post-destroot {
     copy ${worksrcpath}/examples ${destroot}${prefix}/share/${name}/
     system "chmod -R 755 ${destroot}${prefix}/share/${name}/examples/* && \

Added: trunk/dports/math/surf/files/patch-configure.diff
===================================================================
--- trunk/dports/math/surf/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/math/surf/files/patch-configure.diff	2014-05-05 17:52:45 UTC (rev 119755)
@@ -0,0 +1,18 @@
+--- configure.orig	2014-05-05 10:19:54.000000000 -0700
++++ configure	2014-05-05 10:21:12.000000000 -0700
+@@ -5606,6 +5606,7 @@
+ 	LIBS="`$CUPSCONFIG --libs` $LIBS"
+ 
+ 
++fi
+ if test "x$cups" = "xyes"; then
+   CUPS_TRUE=
+   CUPS_FALSE='#'
+@@ -5613,7 +5614,6 @@
+   CUPS_TRUE='#'
+   CUPS_FALSE=
+ fi
+-fi
+ 
+ 
+ if test "$gui" = "yes"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140505/1e0d00fc/attachment.html>