From 8cefe37694db718e3b3b52f4d9db15417925022c Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Sun, 20 Jun 2004 21:46:36 +0000
Subject: As discussed in tech-pkg, remove X11/Xpm support in graphics/gd.
 While I'm here, s/-lpthread/${PTHREAD_LDFLAGS}/.

Bump PKGREVISION.
---
 graphics/gd/Makefile      | 7 +++----
 graphics/gd/buildlink3.mk | 7 ++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'graphics/gd')

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 4c0321b7787..90b20ad42e0 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -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 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 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 @@ BUILDLINK_DEPENDS.freetype2=	freetype2>=2.1.4
 .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 --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index f0aad25d152..406fc2ad960 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -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:=	${BUILDLINK_PACKAGES:Ngd}
 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"
 
-- 
cgit v1.2.3