PkgSrc changes:

  - allow optionally build a gd which supports xpm

5 files changed, 32 insertions, 15 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 044d6e8e01f..2f91f65f8ec 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2008/11/16 08:58:08 dholland Exp $
+# $NetBSD: Makefile,v 1.78 2009/04/12 00:29:26 sno Exp $
 
 DISTNAME=	gd-2.0.35
 PKGREVISION=	1
@@ -10,6 +10,8 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.libgd.org/
 COMMENT=	Graphics library for the dynamic creation of images
 
+.include "options.mk"
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 # fails in test not finding libgd.a
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 24382910cc6..be575648292 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,14 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/04/12 00:29:26 sno Exp $
 
 BUILDLINK_TREE+=	gd
 
 .if !defined(GD_BUILDLINK3_MK)
 GD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gd+=		gd>=2.0.15nb1
+BUILDLINK_API_DEPENDS.gd+=	gd>=2.0.15nb1
 BUILDLINK_ABI_DEPENDS.gd+=	gd>=2.0.33nb3
 BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
 
+pkgbase := gd
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.gd:Mx11)
+.include "../../x11/libXpm/buildlink3.mk"
+#.include "../../x11/libXp/buildlink3.mk"
+#.include "../../mk/xaw.buildlink3.mk"
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index 1f8edc88a4b..5e897f0bc77 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2008/09/22 17:44:49 adam Exp $
+$NetBSD: distinfo,v 1.29 2009/04/12 00:29:26 sno Exp $
 
 SHA1 (gd-2.0.35.tar.bz2) = ccf34a610abff2dbf133a20c4d2a4aa94939018a
 RMD160 (gd-2.0.35.tar.bz2) = f452a2c333b2ba9b7b4c143983ec2af18a335516
 Size (gd-2.0.35.tar.bz2) = 1212730 bytes
 SHA1 (patch-aa) = 726107579811ce1f33b00bd4dbf13040c48120bb
 SHA1 (patch-ab) = 082f5baa2c147fb62381c21ecb3ce11a1891a2aa
-SHA1 (patch-ac) = df9a1e9cd5c336fb888f59593ab1b83a02c5a1aa
+SHA1 (patch-ac) = d166ed4d0a3510c610e8aa233d312e15d96f4667
diff --git a/graphics/gd/options.mk b/graphics/gd/options.mk
new file mode 100644
index 00000000000..b1c1a2c04bc
--- /dev/null
+++ b/graphics/gd/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2009/04/12 00:29:26 sno Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gd
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	# empty
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libXpm/buildlink3.mk"
+CONFIGURE_ENV+= 	X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
+CONFIGURE_ARGS+=        --with-xpm
+.else
+CONFIGURE_ARGS+=        --without-xpm
+.endif
diff --git a/graphics/gd/patches/patch-ac b/graphics/gd/patches/patch-ac
index 5be945de4d9..b301435fa23 100644
--- a/graphics/gd/patches/patch-ac
+++ b/graphics/gd/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2008/09/22 17:44:49 adam Exp $
+$NetBSD: patch-ac,v 1.8 2009/04/12 00:29:26 sno Exp $
 
 --- configure.orig	2008-09-22 17:26:32.000000000 +0200
 +++ configure
@@ -11,12 +11,3 @@ $NetBSD: patch-ac,v 1.7 2008/09/22 17:44:49 adam Exp $
  fi
  
  
-@@ -24163,6 +24163,8 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     echo "$ac_cs_version"; exit ;;