[131363] trunk/dports/graphics/netpbm

[ryandesign at macports.org]

Revision: 131363
          https://trac.macports.org/changeset/131363
Author:   ryandesign at macports.org
Date:     2015-01-10 07:19:32 -0800 (Sat, 10 Jan 2015)
Log Message:
-----------
netpbm: add x11 variant, to allow x11 features to be disabled (#43566)

Modified Paths:
--------------
    trunk/dports/graphics/netpbm/Portfile

Added Paths:
-----------
    trunk/dports/graphics/netpbm/files/patch-other-pamx-Makefile.diff

Modified: trunk/dports/graphics/netpbm/Portfile
===================================================================
--- trunk/dports/graphics/netpbm/Portfile	2015-01-10 14:43:02 UTC (rev 131362)
+++ trunk/dports/graphics/netpbm/Portfile	2015-01-10 15:19:32 UTC (rev 131363)
@@ -7,6 +7,7 @@
 name                netpbm
 version             10.69.02
 svn.revision        2372
+revision            1
 categories          graphics
 platforms           darwin freebsd linux
 maintainers         ryandesign openmaintainer
@@ -30,7 +31,6 @@
                     port:libpng \
                     port:libxml2 \
                     port:tiff \
-                    port:xorg-libX11 \
                     port:zlib
 
 fetch.type          svn
@@ -38,7 +38,8 @@
 worksrcdir          advanced
 
 patchfiles          patch-lib-Makefile.diff \
-                    patch-converter-other-giftopnm.c-strcaseeq.diff
+                    patch-converter-other-giftopnm.c-strcaseeq.diff \
+                    patch-other-pamx-Makefile.diff
 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/pm_config.in.h
@@ -57,6 +58,7 @@
 set netpbmlibtype unixshared
 set netpbmlibsuffix so
 set want_sse N
+set want_x11 N
 
 configure {
     # The netpbm configure script is interactive, and appends its results to
@@ -82,6 +84,7 @@
 RGB_DB_PATH = ${prefix}/share/netpbm/rgb.txt
 TIFFLIB = -ltiff
 WANT_SSE = ${want_sse}
+WANT_X11 = ${want_x11}
 ZLIB = -lz
 "
     close ${configmk}
@@ -144,6 +147,14 @@
     }
 }
 
+variant x11 description {Build the pamx image viewer} {
+    global want_x11
+    set want_x11        Y
+    depends_lib-append  port:xorg-libX11
+}
+
+default_variants    +x11
+
 livecheck.type      regex
 livecheck.url       https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced/version.mk&limit=1
 livecheck.regex     {(\d+(\.\d+)+)}

Added: trunk/dports/graphics/netpbm/files/patch-other-pamx-Makefile.diff
===================================================================
--- trunk/dports/graphics/netpbm/files/patch-other-pamx-Makefile.diff	                        (rev 0)
+++ trunk/dports/graphics/netpbm/files/patch-other-pamx-Makefile.diff	2015-01-10 15:19:32 UTC (rev 131363)
@@ -0,0 +1,12 @@
+--- other/pamx/Makefile.orig	2014-05-04 14:43:22.000000000 -0400
++++ other/pamx/Makefile	2014-05-04 14:39:09.000000000 -0400
+@@ -9,7 +9,8 @@
+ 
+ EXTERN_INCLUDE =
+ 
+-ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
++ifeq ($(WANT_X11),N)
++else ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
+   # Pkg-config has never heard of X11, or doesn't even exist
+ 
+   ifneq ($(X11LIB),NONE)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150110/e5218ee1/attachment-0001.html>