[pkgsrc/trunk]: pkgsrc/graphics/ImageMagick Fix PNG support when building wit...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb81f03c6e5e
branches:  trunk
changeset: 536847:bb81f03c6e5e
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Dec 26 19:00:02 2007 +0000

description:
Fix PNG support when building without x11 (PR#37594)

diffstat:

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

diffs (54 lines):

diff -r cb1774afb6bf -r bb81f03c6e5e graphics/ImageMagick/Makefile
--- a/graphics/ImageMagick/Makefile     Wed Dec 26 15:23:21 2007 +0000
+++ b/graphics/ImageMagick/Makefile     Wed Dec 26 19:00:02 2007 +0000
@@ -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 @@
 .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 -r cb1774afb6bf -r bb81f03c6e5e graphics/ImageMagick/buildlink3.mk
--- a/graphics/ImageMagick/buildlink3.mk        Wed Dec 26 15:23:21 2007 +0000
+++ b/graphics/ImageMagick/buildlink3.mk        Wed Dec 26 19:00:02 2007 +0000
@@ -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_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
 
+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/jasper/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/+$//}