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

have been converted to USE_BUILDLINK2.

6 files changed, 16 insertions, 16 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index a11d5764851..7dc7d59ece4 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/04/23 02:08:54 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 21:51:42 jlam Exp $
 
 DISTNAME=	amaya-src-5.1
 PKGNAME=	amaya-5.1
@@ -15,7 +15,7 @@ HOMEPAGE=	http://www.w3.org/Amaya/
 COMMENT=	Web Browser/Editor from the World Wide Web Consortium
 
 EXTRACT_ELEMENTS=	Amaya
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
 
@@ -30,8 +30,8 @@ CFLAGS+=		-Dunix
 # files in the right place.
 #
 ac_cv_path_motif=	no_motif=
-ac_cv_path_motif+=	ac_motif_includes=${BUILDLINK_DIR}/include
-ac_cv_path_motif+=	ac_motif_libraries=${BUILDLINK_DIR}/lib
+ac_cv_path_motif+=	ac_motif_includes=${MOTIFBASE}/include
+ac_cv_path_motif+=	ac_motif_libraries=${MOTIFBASE}/lib
 
 post-extract:
 	${MKDIR} ${WRKSRC}
@@ -49,9 +49,9 @@ post-patch:
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/Amaya
 
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../www/libwww/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../www/libwww/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index b0ce9e11c47..0eb11a035bd 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2002/07/01 02:23:16 kristerw Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:51:42 jlam Exp $
 
 SHA1 (amaya-src-5.1.tgz) = fe032cce47ed3979606d43bd21e10c2d41d6e05b
 Size (amaya-src-5.1.tgz) = 4925073 bytes
 SHA1 (patch-aa) = 22dd34ab9dcd70220effb2fff690f70a5f1bbeb7
 SHA1 (patch-ab) = 6f5940d24e285dcdcaf4420cf25b6bc8f750ab28
 SHA1 (patch-ac) = e8740b482a7422fadadff451fb148beacd081838
-SHA1 (patch-ad) = 18a23b68f0f81d8767d17905cd762956b37e33b4
+SHA1 (patch-ad) = de880e28c117fdb64fc48e2b2d03be16c634bd8b
 SHA1 (patch-ae) = 5e1e356471bb26ca463e3f09f0447044d2aaac39
 SHA1 (patch-af) = 9f29ef449cd5112b771e4c248a881ec4b41d7a0f
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 @@