[pkgsrc/trunk]: pkgsrc/graphics/gd PkgSrc changes:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20f31bd5ca44
branches:  trunk
changeset: 557140:20f31bd5ca44
user:      sno <sno%pkgsrc.org@localhost>
date:      Sun Apr 12 00:29:26 2009 +0000

description:
PkgSrc changes:
  - allow optionally build a gd which supports xpm

diffstat:

 graphics/gd/Makefile         |   4 +++-
 graphics/gd/buildlink3.mk    |  13 +++++++++++--
 graphics/gd/distinfo         |   4 ++--
 graphics/gd/options.mk       |  15 +++++++++++++++
 graphics/gd/patches/patch-ac |  11 +----------
 5 files changed, 32 insertions(+), 15 deletions(-)

diffs (102 lines):

diff -r b3819a7999c6 -r 20f31bd5ca44 graphics/gd/Makefile
--- a/graphics/gd/Makefile      Sun Apr 12 00:27:02 2009 +0000
+++ b/graphics/gd/Makefile      Sun Apr 12 00:29:26 2009 +0000
@@ -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 @@
 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 -r b3819a7999c6 -r 20f31bd5ca44 graphics/gd/buildlink3.mk
--- a/graphics/gd/buildlink3.mk Sun Apr 12 00:27:02 2009 +0000
+++ b/graphics/gd/buildlink3.mk Sun Apr 12 00:29:26 2009 +0000
@@ -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 -r b3819a7999c6 -r 20f31bd5ca44 graphics/gd/distinfo
--- a/graphics/gd/distinfo      Sun Apr 12 00:27:02 2009 +0000
+++ b/graphics/gd/distinfo      Sun Apr 12 00:29:26 2009 +0000
@@ -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 -r b3819a7999c6 -r 20f31bd5ca44 graphics/gd/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gd/options.mk    Sun Apr 12 00:29:26 2009 +0000
@@ -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 -r b3819a7999c6 -r 20f31bd5ca44 graphics/gd/patches/patch-ac
--- a/graphics/gd/patches/patch-ac      Sun Apr 12 00:27:02 2009 +0000
+++ b/graphics/gd/patches/patch-ac      Sun Apr 12 00:29:26 2009 +0000
@@ -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 @@
  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 ;;