From e67a5d8a790b0bbe3129f96cd2afd9aebee9c1cc Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 8 Oct 2002 12:33:23 +0000
Subject: buildlink1 -> buildlink2

---
 graphics/pixmap/Makefile         | 8 +++++---
 graphics/pixmap/distinfo         | 4 ++--
 graphics/pixmap/patches/patch-ac | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'graphics/pixmap')

diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 70b0825cf6b..cef9ac32364 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/04/17 02:52:48 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/10/08 12:38:25 jlam Exp $
 # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp
 #
 
@@ -17,6 +17,7 @@ PATCHFILES=		pixmap_2.6.patch1.gz \
 MAINTAINER=		packages@netbsd.org
 COMMENT=		Pixmap editor based on XPM library
 
+USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
 
 WRKSRC=			${WRKDIR}/pixmap
@@ -24,6 +25,7 @@ WRKSRC=			${WRKDIR}/pixmap
 MAKE_ENV+=		LOCAL_LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=		MOTIFBASE="${MOTIFBASE}"
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pixmap/distinfo b/graphics/pixmap/distinfo
index db20f5062a9..47cee8cefd2 100644
--- a/graphics/pixmap/distinfo
+++ b/graphics/pixmap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/28 08:55:16 agc Exp $
+$NetBSD: distinfo,v 1.5 2002/10/08 12:38:25 jlam Exp $
 
 SHA1 (pixmap2.6.tar.gz) = f9b0c610ed73254fbde9a25346ed78d493d97752
 Size (pixmap2.6.tar.gz) = 120340 bytes
@@ -12,4 +12,4 @@ SHA1 (pixmap_2.6.patch4.gz) = 1a994cdbe837ac36d0cb4d5c2109f18b5732d7b6
 Size (pixmap_2.6.patch4.gz) = 1269 bytes
 SHA1 (patch-aa) = 83e783b4308374e638a5b129f219a2b45d93126e
 SHA1 (patch-ab) = 67f64b30aa72d8a1fefe24d264c27d028cb8056b
-SHA1 (patch-ac) = 99c0fd51d041397cac7ee7bccbf573b536741133
+SHA1 (patch-ac) = 501d8c73092abae755bdd33dba15dcec39784eb7
diff --git a/graphics/pixmap/patches/patch-ac b/graphics/pixmap/patches/patch-ac
index 17c9c3308a9..d4fda76fa66 100644
--- a/graphics/pixmap/patches/patch-ac
+++ b/graphics/pixmap/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2002/06/28 08:55:18 agc Exp $
+$NetBSD: patch-ac,v 1.5 2002/10/08 12:38:26 jlam Exp $
 
 --- Imakefile.orig	Fri May 13 06:04:38 1994
 +++ Imakefile
@@ -27,7 +27,7 @@ $NetBSD: patch-ac,v 1.4 2002/06/28 08:55:18 agc Exp $
 -        XPM_INCLUDEDIR = /net/koala/include
 -        XPM_LIBDIR = /net/koala/lib/sun4
 -        EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER)
-+        XPM_INCLUDEDIR = $(BUILDLINK_DIR)/include
++        XPM_INCLUDEDIR = $(LOCALBASE)/include
 +        XPM_LIBDIR = $(USRLIBDIR)
 +        EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I$(MOTIFBASE)/include
  
-- 
cgit v1.2.3