[pkgsrc/trunk]: pkgsrc As discussed in tech-pkg, remove X11/Xpm support in gr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/168a69c9d689
branches:  trunk
changeset: 476809:168a69c9d689
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sun Jun 20 21:46:36 2004 +0000

description:
As discussed in tech-pkg, remove X11/Xpm support in graphics/gd.
While I'm here, s/-lpthread/${PTHREAD_LDFLAGS}/.

Bump PKGREVISION.

diffstat:

 doc/CHANGES               |  3 ++-
 graphics/gd/Makefile      |  7 +++----
 graphics/gd/buildlink3.mk |  7 ++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r dfeb2f5df6e0 -r 168a69c9d689 doc/CHANGES
--- a/doc/CHANGES       Sun Jun 20 21:40:49 2004 +0000
+++ b/doc/CHANGES       Sun Jun 20 21:46:36 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6251 2004/06/20 21:40:49 martin Exp $
+$NetBSD: CHANGES,v 1.6252 2004/06/20 21:46:36 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2984,3 +2984,4 @@
        Updated msmtp to 1.0.0 [xtraeme 2004-06-20]
        Updated gdm to 2.6.0.3 [jmmv 2004-06-20]
        Updated cdrecord to 2.00.3nb1 [martin 2004-06-20]
+       Updated gd to 2.0.25nb1 [xtraeme 2004-06-20]
diff -r dfeb2f5df6e0 -r 168a69c9d689 graphics/gd/Makefile
--- a/graphics/gd/Makefile      Sun Jun 20 21:40:49 2004 +0000
+++ b/graphics/gd/Makefile      Sun Jun 20 21:46:36 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2004/05/25 14:55:34 adam Exp $
+# $NetBSD: Makefile,v 1.54 2004/06/20 21:46:36 xtraeme Exp $
 
 DISTNAME=      gd-2.0.25
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.boutell.com/gd/http/
 
@@ -12,10 +13,9 @@
 
 USE_BUILDLINK3=                YES
 USE_LIBTOOL=           YES
-USE_X11=               YES
 GNU_CONFIGURE=         YES
 REPLACE_PERL=          bdftogd
-LIBS+=                 -lpthread
+LIBS+=                 ${PTHREAD_LDFLAGS}
 
 BUILDLINK_DEPENDS.freetype2=   freetype2>=2.1.4
 
@@ -23,7 +23,6 @@
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r dfeb2f5df6e0 -r 168a69c9d689 graphics/gd/buildlink3.mk
--- a/graphics/gd/buildlink3.mk Sun Jun 20 21:40:49 2004 +0000
+++ b/graphics/gd/buildlink3.mk Sun Jun 20 21:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/06/20 21:46:36 xtraeme Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GD_BUILDLINK3_MK:=     ${GD_BUILDLINK3_MK}+
@@ -11,17 +11,14 @@
 BUILDLINK_PACKAGES+=   gd
 
 .if !empty(GD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gd+=         gd>=2.0.15
+BUILDLINK_DEPENDS.gd+=         gd>=2.0.15nb1
 BUILDLINK_PKGSRCDIR.gd?=       ../../graphics/gd
 .endif # GD_BUILDLINK3_MK
 
-USE_X11=       yes
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"