From 1fb7b792d028fbb79560a2ea3d4195aae16fb20f Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 21 Sep 2002 12:13:44 +0000
Subject: buildlink1 -> buildlink2, and note conflict with compfaces.

---
 mail/faces/Makefile         | 9 +++++----
 mail/faces/distinfo         | 4 ++--
 mail/faces/patches/patch-ab | 6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'mail/faces')

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 6651b37f7a2..4541638379c 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/09/10 08:18:32 manu Exp $
+# $NetBSD: Makefile,v 1.30 2002/09/21 12:13:44 jlam Exp $
 
 DISTNAME=	faces-1.6.1
 PKGREVISION=	2
@@ -7,6 +7,8 @@ CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/faces-1.6.1/
 EXTRACT_SUFX=	.tar.Z
 
+CONFLICTS=	compface-[0-9]*
+
 MAINTAINER=	packages@netbsd.org
 COMMENT=	visual mail, user and print face server
 
@@ -15,7 +17,7 @@ DEPENDS+=	netpbm>=9.2:../../graphics/netpbm
 LICENSE=	limited-redistribution
 RESTRICTED=	"Distribution not allowed if money exchanged"
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 
@@ -55,6 +57,5 @@ do-configure: replace-perl
 		${MV} -f $${FILE}.fixed $${FILE};			\
 	done
 
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 2cf62ea21eb..044248bf745 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 19:23:05 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/09/21 12:13:44 jlam Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 Size (faces-1.6.1.tar.Z) = 249469 bytes
 SHA1 (patch-aa) = 99012a91d3ac39bdd0ad8b5ab454812ace346dbb
-SHA1 (patch-ab) = d134a61c7f6f470780c0ed27a20db0ca11cb85d5
+SHA1 (patch-ab) = e4a30df1518dd16014330f119a1590865fee47fb
 SHA1 (patch-ac) = adb2718262027b4ba68425ffd4bef37192ff6d0c
 SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68
 SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088
diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab
index b8a0de88ed6..e21326bcecf 100644
--- a/mail/faces/patches/patch-ab
+++ b/mail/faces/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.10 2001/11/30 16:29:28 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2002/09/21 12:13:44 jlam Exp $
 
 --- Makefile.dist.orig	Sun Nov 24 18:55:28 1991
 +++ Makefile.dist
@@ -91,8 +91,8 @@ $NetBSD: patch-ab,v 1.10 2001/11/30 16:29:28 jlam Exp $
  #
 -#X11INCDIR         = -I$(OPENWINHOME)/include
 -#X11LIBDIR         = -L$(OPENWINHOME)/lib
-+X11INCDIR         = -I${BUILDLINK_X11_DIR}/include
-+X11LIBDIR         = -L${BUILDLINK_X11_DIR}/lib
++X11INCDIR         = -I${X11BASE}/include
++X11LIBDIR         = -L${X11BASE}/lib
  #------------------------------------------------------------------------
  #  If you are compiling the XView version, then the following two lines
  #  should be uncommented, and set appropriately.
-- 
cgit v1.2.3