Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. Also

use REPLACE_PERL instead of patching to replace /usr/bin/perl.

4 files changed, 21 insertions, 41 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 7337d64c69a..f783f3b4138 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/06/14 06:36:50 kei Exp $
+# $NetBSD: Makefile,v 1.30 2001/06/28 20:02:56 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
@@ -10,24 +10,21 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.boutell.com/gd/
 COMMENT=	graphics library for fast PNG creation
 
-DEPENDS+=	freetype-lib>=1.3.1:../../graphics/freetype-lib
-DEPENDS+=	png>=1.0.11:../../graphics/png
-DEPENDS+=	jpeg-*:../../graphics/jpeg
-
-USE_X11=	YES
-USE_XPM=	YES
-USE_LIBTOOL=	YES
-
-NO_CONFIGURE=	YES
+USE_BUILDLINK_ONLY=	YES
+USE_X11=		YES
+USE_LIBTOOL=		YES
+REPLACE_PERL=		bdftogd
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-DEPENDS+=	zlib-*:../../devel/zlib
-CPPFLAGS+=	-I${LOCALBASE}/include				# zlib.h
-MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl ${LOCALBASE}/lib/libz.a"
+MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl"
 .endif
 
+CPPFLAGS+=	-I${BUILDLINK_DIR}/include/freetype	# freetype.h
+CPPFLAGS+=	-I${BUILDLINK_DIR}/include/X11		# xpm.h
+CPPFLAGS+=	-I${X11BASE}/include
+
 # When the API changes and breaks binary-compatibility with the previous
 # version, increment the MAJOR by 1 and reset the MINOR to 0.  Otherwise,
 # bump the MINOR when a new version comes out.
@@ -36,15 +33,9 @@ GD_MAJOR=	1
 GD_MINOR=	9
 MAKE_ENV+=	GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}"
 
-EVAL_PREFIX+=	XPMDIR=xpm
-CPPFLAGS+=	-I${LOCALBASE}/include/freetype			# freetype.h
-CPPFLAGS+=	-I${LOCALBASE}/include				# png.h
-CPPFLAGS+=	-I${XPMDIR}/include -I${XPMDIR}/include/X11	# xpm.h
-CPPFLAGS+=	-I${X11BASE}/include
-
-post-patch:
-	cd ${WRKSRC}; \
-	${MV} bdftogd bdftogd.orig; \
-	${SED} -e 's_@PREFIX@_${PREFIX}_' bdftogd.orig > bdftogd
-
+.include "../../devel/zlib/buildlink.mk"
+.include "../../graphics/freetype-lib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index 7b7b5f295ac..bcd3f3383b3 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/14 06:36:50 kei Exp $
+$NetBSD: distinfo,v 1.4 2001/06/28 20:02:56 jlam Exp $
 
 SHA1 (gd-1.8.3.tar.gz) = a0a40813a2a516be35f464a76f7e15af238b45e1
 Size (gd-1.8.3.tar.gz) = 274318 bytes
-SHA1 (patch-aa) = f80e7519bbc30125a63598ee98443664f685ac6c
+SHA1 (patch-aa) = 18391771c9b58172d58b25e841c2793a74c43282
 SHA1 (patch-ab) = a00035b1d8a2c9f2f705778c7d3d3ccd5f8e9a5e
-SHA1 (patch-ac) = 004fda3229d752287b177220bf0704251bea2357
diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa
index f051f7ffc16..27630847b3c 100644
--- a/graphics/gd/patches/patch-aa
+++ b/graphics/gd/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.12 2001/03/04 09:32:43 tron Exp $
+$NetBSD: patch-aa,v 1.13 2001/06/28 20:02:57 jlam Exp $
 
---- Makefile.orig	Sat Jun  3 21:26:12 2000
-+++ Makefile	Sun Mar  4 10:30:05 2001
+--- Makefile.orig	Sat Jun  3 15:26:12 2000
++++ Makefile
 @@ -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
@@ -193,7 +193,7 @@ $NetBSD: patch-aa,v 1.12 2001/03/04 09:32:43 tron Exp $
 +$(LIBGD): $(GD_OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
 +	rm -f $(LIBGD)
 +	$(CC) -o $(LIBGD) $(GD_OBJS:.o=.lo) -rpath ${PREFIX}/lib \
-+		-version-info $(GD_MAJOR):$(GD_MINOR) -L${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib ${LIBS:C/${LIBGD}//g}
++		-version-info $(GD_MAJOR):$(GD_MINOR) $(LIBDIRS) ${LIBS:C/${LIBGD}//g}
  
  clean:
 -	rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
diff --git a/graphics/gd/patches/patch-ac b/graphics/gd/patches/patch-ac
deleted file mode 100644
index 940727f9f26..00000000000
--- a/graphics/gd/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/06/14 06:36:50 kei Exp $
-
---- bdftogd.orig	Thu Jun 14 14:46:54 2001
-+++ bdftogd	Thu Jun 14 14:49:18 2001
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@PREFIX@/bin/perl -w
- 
- #
- # Simple convertor from bdf to gd font format.