From e2149c872f9d936fe8cfe228b7f9abbbc0ead37a Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 21 Sep 2002 07:00:33 +0000
Subject: buildlink1 -> buildlink2

---
 chat/gtkyahoo/Makefile       | 15 ++++++++-------
 comms/estic/Makefile         |  6 +++---
 comms/estic/distinfo         |  4 ++--
 comms/estic/patches/patch-ag |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile
index 15e2dae6374..ef04e9bbc76 100644
--- a/chat/gtkyahoo/Makefile
+++ b/chat/gtkyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/28 05:20:41 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/21 07:00:33 jlam Exp $
 
 DISTNAME=	gtkyahoo-0.18.2
 CATEGORIES=	chat
@@ -11,15 +11,16 @@ COMMENT=	GTK+ client for Yahoo! Messenger
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-libyahoo="${BUILDLINK_DIR}"
+CONFIGURE_ARGS+=	--with-libyahoo="${BUILDLINK_PREFIX.libyahoo}"
 
 pre-configure:
 	${RM} -rf ${WRKSRC}/libyahoo
 
-.include "../../chat/libyahoo/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../chat/libyahoo/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index 3216d1519a4..3fa066a4f00 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:06 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/21 07:06:41 jlam Exp $
 
 DISTNAME=	estic-1.61
 CATEGORIES=	comms
@@ -16,7 +16,8 @@ RESTRICTED=	"Only free distribution permitted"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=	# defined
+USE_X11=	# defined
 
 ALL_TARGET=	depend all
 ESTICPATCH=	${DISTNAME}-patch-from-1.60${EXTRACT_SUFX}
@@ -43,5 +44,4 @@ do-install:
 	cd ${WRKSRC}/samples && \
 	${INSTALL_DATA} * ${PREFIX}/share/examples/estic
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/estic/distinfo b/comms/estic/distinfo
index 3b4d98ddf7a..24c1b704d72 100644
--- a/comms/estic/distinfo
+++ b/comms/estic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/10/14 17:19:58 tron Exp $
+$NetBSD: distinfo,v 1.5 2002/09/21 07:06:41 jlam Exp $
 
 SHA1 (estic-1.60-sources.zip) = ce66a6d52faaf6adba492bb3f74e49eab608d0c3
 Size (estic-1.60-sources.zip) = 892311 bytes
@@ -10,7 +10,7 @@ SHA1 (patch-ac) = 2dd445fc1b14bc58d361fed4d6e2366a060b5203
 SHA1 (patch-ad) = b7287df75abc237859ee25ce04c5b3df4d338c37
 SHA1 (patch-ae) = 29ce3dafba535a26aef00e53da05d51eb09617be
 SHA1 (patch-af) = 39a39789e8875d901bce07581b544ef8590af4fa
-SHA1 (patch-ag) = 6a2703a6839e4e75c0d3a40e9ffd8c6362b29ffc
+SHA1 (patch-ag) = f12d7fe2bf40a420b8b045e52215cb844cae33e5
 SHA1 (patch-ah) = 4a5ce78d5d7173132c91ec5dbcf20b0484afe882
 SHA1 (patch-ai) = d7fdcc29f357a9a8b0790e2491f577160d05db34
 SHA1 (patch-aj) = afaa7e22e01fc698418fb6543fe8e7f81feab106
diff --git a/comms/estic/patches/patch-ag b/comms/estic/patches/patch-ag
index ef7582f99c6..773ad9daed8 100644
--- a/comms/estic/patches/patch-ag
+++ b/comms/estic/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2001/08/29 22:41:06 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2002/09/21 07:06:42 jlam Exp $
 
 --- ../spunk/make/freebsd-x.mak.orig	Sun Nov 24 22:33:26 1996
 +++ ../spunk/make/freebsd-x.mak	Sat Feb 10 19:06:51 2001
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.2 2001/08/29 22:41:06 jlam Exp $
  
  # Flags for the gnu compiler
 -CFLAGS	= -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-+CFLAGS	+= -DFREEBSD -Wall -x c++ -I$(BUILDLINK_X11_DIR)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
++CFLAGS	+= -DFREEBSD -Wall -x c++ -I$(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
  
  LIB	= spunk.a
  ZIPFILE = spunk.zip
-- 
cgit v1.2.3