From af7ca56910dc7e7cc5d2a706682daba2d72af042 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Wed, 26 Dec 2007 19:00:02 +0000
Subject: Fix PNG support when building without x11 (PR#37594)

---
 graphics/ImageMagick/Makefile      |  4 ++--
 graphics/ImageMagick/buildlink3.mk | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'graphics/ImageMagick')

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d37eaccd715..94c0b79ef65 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2007/06/16 21:58:08 heinz Exp $
+# $NetBSD: Makefile,v 1.152 2007/12/26 19:00:02 adam Exp $
 
 .include "Makefile.common"
 
@@ -47,6 +47,6 @@ CONFIGURE_ARGS+=	--without-wmf
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index 134c0c77382..dfa362d083e 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/12/26 19:00:02 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 IMAGEMAGICK_BUILDLINK3_MK:=	${IMAGEMAGICK_BUILDLINK3_MK}+
@@ -12,16 +12,24 @@ BUILDLINK_PACKAGES+=	ImageMagick
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ImageMagick
 
 .if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ImageMagick+=		ImageMagick>=5.5.7.11nb1
+BUILDLINK_API_DEPENDS.ImageMagick+=	ImageMagick>=5.5.7.11nb1
 BUILDLINK_ABI_DEPENDS.ImageMagick+=	ImageMagick>=6.3.1.6nb1
 BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
 .endif	# IMAGEMAGICK_BUILDLINK3_MK
 
-.include "../../archivers/bzip2/buildlink3.mk"
+pkgbase := ImageMagick
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mx11)
 .include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/libwmf/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.endif
+
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/libwmf/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
-- 
cgit v1.2.3