From 7d755a2870ae9b368090390820217c2fcc21cd61 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sun, 4 Mar 2001 09:32:43 +0000
Subject: Use default compiler to avoid problem with new "libtool".

---
 graphics/gd/Makefile         |  4 ++--
 graphics/gd/files/patch-sum  |  4 ++--
 graphics/gd/patches/patch-aa | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'graphics/gd')

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index c1a4813a86a..4a8192faae7 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/03/04 09:06:11 tron Exp $
+# $NetBSD: Makefile,v 1.26 2001/03/04 09:32:43 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
@@ -34,7 +34,7 @@ MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl ${LOCALBASE}/lib/libz.a"
 #
 GD_MAJOR=	1
 GD_MINOR=	9
-MAKE_ENV+=	GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}"
+MAKE_ENV+=	GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}"
 
 EVAL_PREFIX+=	XPMDIR=xpm
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
diff --git a/graphics/gd/files/patch-sum b/graphics/gd/files/patch-sum
index 598abf5e316..f5fdb1b0ab8 100644
--- a/graphics/gd/files/patch-sum
+++ b/graphics/gd/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.10 2001/01/09 17:55:21 wiz Exp $
+$NetBSD: patch-sum,v 1.11 2001/03/04 09:32:43 tron Exp $
 
-MD5 (patch-aa) = d1cb66e539898ff7b6b2a0eff403d1af
+MD5 (patch-aa) = c3c570aaac9995af0a107ade27fa8be7
 MD5 (patch-ab) = 029abede0aa46de40b4485257131511e
diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa
index 45953317454..f051f7ffc16 100644
--- a/graphics/gd/patches/patch-aa
+++ b/graphics/gd/patches/patch-aa
@@ -1,16 +1,19 @@
-$NetBSD: patch-aa,v 1.11 2001/01/09 17:55:21 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2001/03/04 09:32:43 tron Exp $
 
---- Makefile.orig	Sat Jun  3 15:26:12 2000
-+++ Makefile
-@@ -5,16 +5,18 @@
+--- Makefile.orig	Sat Jun  3 21:26:12 2000
++++ Makefile	Sun Mar  4 10:30:05 2001
+@@ -3,7 +3,9 @@
+ #If you do not have gcc, change the setting for COMPILER, but you must
+ #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
  #compiler; get gcc if you are still using it). 
- COMPILER=gcc
- 
-+INSTALL=$(LIBTOOL) install -c -m
+-COMPILER=gcc
++#COMPILER=gcc
 +
++INSTALL=$(LIBTOOL) install -c -m
+ 
  #If the ar command fails on your system, consult the ar manpage
  #for your system. 
- AR=ar
+@@ -11,10 +13,10 @@
  
  #If you don't have FreeType, libjpeg and/or Xpm installed, including the
  #header files, uncomment this (default).
-- 
cgit v1.2.3