buildlink1 -> buildlink2

3 files changed, 12 insertions, 28 deletions

diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 3de71b0381a..d8ec22b856c 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/09/10 16:06:36 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2002/09/21 07:12:32 jlam Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
@@ -9,22 +9,23 @@ COMMENT=		Tools to talk to the 3Com Pilot PDA
 
 BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 USE_GNU_READLINE=	# defined
 
 CONFIGURE_ARGS+=	--with-perl5=${PERL5}
 CONFIGURE_ARGS+=	--with-readline21
-CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
+CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
 
 LIBS+=			-lpisock -liconv
 
 INSTALL_TARGET=		install-execs install-man
 
-.include "../../comms/pilot-link-libs/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../lang/tcl/buildlink.mk"
-.include "../../x11/tk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../comms/pilot-link-libs/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/tcl/buildlink2.mk"
+.include "../../x11/tk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilot-link/distinfo b/comms/pilot-link/distinfo
index 41e3ab57bd4..9b69b90961b 100644
--- a/comms/pilot-link/distinfo
+++ b/comms/pilot-link/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2002/03/15 02:43:56 markd Exp $
+$NetBSD: distinfo,v 1.10 2002/09/21 07:12:33 jlam Exp $
 
 SHA1 (pilot-link.0.9.5.tar.bz2) = cb026637bebad22a273b38edfd8633853d13e065
 Size (pilot-link.0.9.5.tar.bz2) = 424794 bytes
-SHA1 (patch-aa) = 17e0beeb35335b8ed0d2fe06e67327be82ad5148
 SHA1 (patch-ab) = 098d934009c87949a4d6f3dbaed78c9803df1029
 SHA1 (patch-ac) = 5d37048f9524e8d96b387c4ee22b4f91d4d4b6d7
 SHA1 (patch-ad) = 4b2673db8f1ed28ab8e29a5d43dcecd44f0ec7d6
diff --git a/comms/pilot-link/patches/patch-aa b/comms/pilot-link/patches/patch-aa
deleted file mode 100644
index f40b119a298..00000000000
--- a/comms/pilot-link/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/10/23 20:46:47 jlam Exp $
-
---- configure.orig	Mon Mar 12 23:06:17 2001
-+++ configure
-@@ -2964,9 +2964,9 @@
- 				WITHTK='WITHTK'
- 				if test "x$TK_INC" = "x$TCL_INC"; then
- 					TK_INC=" #same as TCL_INC"
--					TCLTKFLAGS="-DTCL -DTK $TCL_INC $DEBIANTCL"
-+					TCLTKFLAGS="-DTCL -DTK -I${BUILDLINK_X11_DIR}/include"
- 				else
--					TCLTKFLAGS="-DTCL -DTK $TCL_INC $DEBIANTCL $TK_INC"
-+					TCLTKFLAGS="-DTCL -DTK -I${BUILDLINK_X11_DIR}/include"
- 				fi
- 			fi
- 		fi