Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

4 files changed, 5 insertions, 5 deletions

diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
index 5911b4c8c7f..270e007a1ad 100644
--- a/www/amaya/patches/patch-aa
+++ b/www/amaya/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2002/07/01 02:23:17 kristerw Exp $
+$NetBSD: patch-aa,v 1.9 2002/08/25 21:51:43 jlam Exp $
 --- ../configure.orig	Tue Jul  3 13:23:50 2001
 +++ ../configure	Mon Jul  1 02:48:37 2002
 @@ -3049,7 +3049,7 @@
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
index 7f400064792..0381b191b19 100644
--- a/www/amaya/patches/patch-ad
+++ b/www/amaya/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2001/08/09 19:03:19 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2002/08/25 21:51:43 jlam Exp $
 
 --- ../annotlib/Makefile.in.orig	Thu Apr  5 06:49:33 2001
 +++ ../annotlib/Makefile.in
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2001/08/09 19:03:19 jlam Exp $
 -	  -I@top_srcdir@/../libwww/modules/expat/xmlparse \
 -	  -I@top_srcdir@/../libwww/modules/expat/xmltok \
 +	  -I@top_srcdir@/amaya/f \
-+	  -I${BUILDLINK_DIR}/include/w3c-libwww \
++	  -I${LOCALBASE}/include/w3c-libwww \
  	   @THOTINCLUDES@ $(X_FLAGS)
  
  
diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae
index f433c8f3dc5..2588356d406 100644
--- a/www/amaya/patches/patch-ae
+++ b/www/amaya/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2002/07/01 02:23:17 kristerw Exp $
+$NetBSD: patch-ae,v 1.6 2002/08/25 21:51:44 jlam Exp $
 --- ../thotlib/include/ustring.h.orig	Mon Jul  1 02:49:43 2002
 +++ ../thotlib/include/ustring.h	Mon Jul  1 02:55:09 2002
 @@ -5,7 +5,11 @@
diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af
index b0159b8d36e..83595a3e7a0 100644
--- a/www/amaya/patches/patch-af
+++ b/www/amaya/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2002/07/01 02:23:17 kristerw Exp $
+$NetBSD: patch-af,v 1.5 2002/08/25 21:51:44 jlam Exp $
 --- ../config.h.in.orig	Mon Jul  1 02:52:16 2002
 +++ ../config.h.in	Mon Jul  1 02:52:51 2002
 @@ -321,6 +321,9 @@