From 77d291ac8a797c7db2c92e9aec9a35079842ac03 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 13 Oct 2002 12:09:13 +0000
Subject: buildlink1 -> buildlink2.

---
 emulators/snes9x/Makefile            |  5 +++--
 net/ettercap/Makefile                | 10 +++++-----
 sysutils/rox-system/Makefile         |  9 +++++----
 sysutils/rox-system/distinfo         |  4 ++--
 sysutils/rox-system/patches/patch-ab | 11 +----------
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index a180ba01615..eadeea23f74 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/01 05:48:11 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/13 12:09:13 wiz Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
@@ -14,6 +14,7 @@ COMMENT=		Super Nintendo Entertainment System (SNES) emulator
 
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
+USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
 PTHREAD_OPTS=		require
@@ -61,5 +62,5 @@ MAKE_ENV+=	USBHID_H=1
 .endif
 .endif
 
-.include "../../mk/pthread.buildlink.mk"
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index f0cff4ba400..23d5f324b92 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/08/01 05:48:18 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/13 12:15:05 wiz Exp $
 
 DISTNAME=		ettercap-0.6.6.6
 CATEGORIES=		security net
@@ -12,15 +12,15 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-plugins \
 			--enable-https
 
+USE_BUILDLINK2=		yes
+
 # missing newpad()
 USE_NCURSES=		yes
 PTHREAD_OPTS+=		require
 
-CPPFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
-
 post-install:
 			cd ${WRKSRC}/plugins ; ${MAKE_ENV} ${MAKE} install
 
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-system/Makefile b/sysutils/rox-system/Makefile
index da93c4da008..0b13b4b7c6d 100644
--- a/sysutils/rox-system/Makefile
+++ b/sysutils/rox-system/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/04 17:47:58 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/13 12:14:08 wiz Exp $
 #
 
 DISTNAME=	System-0.1.2
@@ -12,11 +12,10 @@ HOMEPAGE=	http://rox.sourceforge.net/
 COMMENT=	simple system monitor
 
 DEPENDS+=	rox>=1.2.0nb2:../../sysutils/rox
-DEPENDS+=	libgtop>=1.0.12nb2:../../devel/libgtop
 
 DIST_SUBDIR=	rox
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 
 WRKSRC=		${WRKDIR}/System/src
@@ -35,5 +34,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/src/System ${PREFIX}/libexec/rox
 	${CP} -Rf ${WRKDIR}/System ${APPDIR}
 
-.include "../../x11/gtk/buildlink.mk"
+.include "../../devel/libgtop/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-system/distinfo b/sysutils/rox-system/distinfo
index b1759130092..853f226aa46 100644
--- a/sysutils/rox-system/distinfo
+++ b/sysutils/rox-system/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/04 17:47:58 cjep Exp $
+$NetBSD: distinfo,v 1.2 2002/10/13 12:14:08 wiz Exp $
 
 SHA1 (rox/System-0.1.2.tgz) = aafe4e16e5f689c009785f3dee47339ca34c369d
 Size (rox/System-0.1.2.tgz) = 44875 bytes
 SHA1 (patch-aa) = 2bcca73b001805a2114138ce8dff1e7568bcefa4
-SHA1 (patch-ab) = dbc24fe667212e54ef24dbe07fdaa630b6538b95
+SHA1 (patch-ab) = dd03ab528d6334e576071754fd0bd356231747a2
diff --git a/sysutils/rox-system/patches/patch-ab b/sysutils/rox-system/patches/patch-ab
index ac93f592b06..3c1a2311918 100644
--- a/sysutils/rox-system/patches/patch-ab
+++ b/sysutils/rox-system/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/04 17:47:58 cjep Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/13 12:14:09 wiz Exp $
 
 --- configure.orig	Tue May 28 10:54:40 2002
 +++ configure
@@ -12,12 +12,3 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/06/04 17:47:58 cjep Exp $
  
  
  echo $ac_n "checking for Gtk+-2.0""... $ac_c" 1>&6
-@@ -811,7 +808,7 @@
-     
- echo $ac_n "checking for $GTK_CONFIG""... $ac_c" 1>&6
- echo "configure:814: checking for $GTK_CONFIG" >&5
--if [ -x "`which \"$GTK_CONFIG\" 2> /dev/null`" ]; then
-+if [ -x "$GTK_CONFIG" ]; then
-   echo "$ac_t""yes" 1>&6
- else
-   echo "$ac_t""no" 1>&6
-- 
cgit v1.2.3