Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/mail/faces/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mail/faces/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- pkgsrc/mail/faces/Makefile	2002/09/10 08:18:32	1.29
+++ pkgsrc/mail/faces/Makefile	2002/09/21 12:13:44	1.30
@@ -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/net
 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"