Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

28 files changed, 47 insertions, 27 deletions

diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 51bf4f9dbfd..2c53e6fa1d9 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/12 10:25:47 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:23:19 jlam Exp $
 #
 
 DISTNAME=		fam-2.6.7
diff --git a/sysutils/fam/PLIST b/sysutils/fam/PLIST
index 5758147f293..bac0efcad7a 100644
--- a/sysutils/fam/PLIST
+++ b/sysutils/fam/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/12 10:25:47 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:23:19 jlam Exp $
 bin/fam
 etc/fam.conf.sample
 include/fam.h
diff --git a/sysutils/fam/buildlink.mk b/sysutils/fam/buildlink.mk
index 737ad8a2991..0fb34d63a67 100644
--- a/sysutils/fam/buildlink.mk
+++ b/sysutils/fam/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/12 10:43:10 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:19 jlam Exp $
 #
 # This Makefile fragment is included by packages that use fam.
 #
diff --git a/sysutils/fam/buildlink2.mk b/sysutils/fam/buildlink2.mk
new file mode 100644
index 00000000000..9382dbc6d0d
--- /dev/null
+++ b/sysutils/fam/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:20 jlam Exp $
+
+.if !defined(FAM_BUILDLINK2_MK)
+FAM_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		fam
+BUILDLINK_DEPENDS.fam?=		fam>=2.6.7
+BUILDLINK_PKGSRCDIR.fam?=	../../sysutils/fam
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.fam=fam
+BUILDLINK_PREFIX.fam_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.fam+=	include/fam.h
+BUILDLINK_FILES.fam+=	lib/fam/editconf.perl
+BUILDLINK_FILES.fam+=	lib/libfam.*
+
+BUILDLINK_TARGETS+=	fam-buildlink
+
+fam-buildlink: _BUILDLINK_USE
+
+.endif	# FAM_BUILDLINK2_MK
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index 36a71c9407d..6b9781a2fab 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 13:02:28 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:23:20 jlam Exp $
 
 SHA1 (fam-2.6.7.tar.gz) = ca03cb4120e3cc7f6bb08c8183b358e240bd5d36
 Size (fam-2.6.7.tar.gz) = 241203 bytes
diff --git a/sysutils/fam/patches/patch-aa b/sysutils/fam/patches/patch-aa
index 98b5ffa1121..894a9271d86 100644
--- a/sysutils/fam/patches/patch-aa
+++ b/sysutils/fam/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 10:25:47 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:20 jlam Exp $
 
 --- acconfig.h.orig	Tue Dec 18 11:03:36 2001
 +++ acconfig.h
diff --git a/sysutils/fam/patches/patch-ab b/sysutils/fam/patches/patch-ab
index 9cbdd501358..8c3c15b6137 100644
--- a/sysutils/fam/patches/patch-ab
+++ b/sysutils/fam/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:20 jlam Exp $
 
 --- config.h.in.orig	Fri Dec 21 10:00:06 2001
 +++ config.h.in
diff --git a/sysutils/fam/patches/patch-ac b/sysutils/fam/patches/patch-ac
index 6c81b67b825..cada84d7a08 100644
--- a/sysutils/fam/patches/patch-ac
+++ b/sysutils/fam/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:20 jlam Exp $
 
 --- configure.in.orig	Fri Dec 21 08:18:48 2001
 +++ configure.in
diff --git a/sysutils/fam/patches/patch-ad b/sysutils/fam/patches/patch-ad
index 4b79be34485..e2090688034 100644
--- a/sysutils/fam/patches/patch-ad
+++ b/sysutils/fam/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:23:20 jlam Exp $
 
 --- fam/Client.h.orig	Tue Dec 18 11:03:36 2001
 +++ fam/Client.h
diff --git a/sysutils/fam/patches/patch-ae b/sysutils/fam/patches/patch-ae
index 1f6d56e7fe5..7114ccbb021 100644
--- a/sysutils/fam/patches/patch-ae
+++ b/sysutils/fam/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/FileSystem.c++.orig	Tue Dec 18 11:03:37 2001
 +++ fam/FileSystem.c++
diff --git a/sysutils/fam/patches/patch-af b/sysutils/fam/patches/patch-af
index 0697d150ec8..31f15d1fd40 100644
--- a/sysutils/fam/patches/patch-af
+++ b/sysutils/fam/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/FileSystemTable.c++.orig	Tue Dec 18 11:03:37 2001
 +++ fam/FileSystemTable.c++
diff --git a/sysutils/fam/patches/patch-ag b/sysutils/fam/patches/patch-ag
index fcce18cb060..6bacc0e0e8e 100644
--- a/sysutils/fam/patches/patch-ag
+++ b/sysutils/fam/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/IMon.c++.orig	Tue Dec 18 11:03:37 2001
 +++ fam/IMon.c++
diff --git a/sysutils/fam/patches/patch-ah b/sysutils/fam/patches/patch-ah
index 297d98d8368..4c874090dbe 100644
--- a/sysutils/fam/patches/patch-ah
+++ b/sysutils/fam/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/Interest.c++.orig	Thu Dec 20 08:59:20 2001
 +++ fam/Interest.c++
diff --git a/sysutils/fam/patches/patch-ai b/sysutils/fam/patches/patch-ai
index e5e528aab1e..17c73de7666 100644
--- a/sysutils/fam/patches/patch-ai
+++ b/sysutils/fam/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ai,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/InternalClient.c++.orig	Tue Dec 18 11:03:37 2001
 +++ fam/InternalClient.c++
diff --git a/sysutils/fam/patches/patch-aj b/sysutils/fam/patches/patch-aj
index 5d8d02c029e..9f925926436 100644
--- a/sysutils/fam/patches/patch-aj
+++ b/sysutils/fam/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/Listener.c++.orig	Tue Dec 18 11:03:37 2001
 +++ fam/Listener.c++
diff --git a/sysutils/fam/patches/patch-ak b/sysutils/fam/patches/patch-ak
index 3e4e92ca708..dd778965f01 100644
--- a/sysutils/fam/patches/patch-ak
+++ b/sysutils/fam/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/Log.c++.orig	Tue Dec 18 11:03:37 2001
 +++ fam/Log.c++
diff --git a/sysutils/fam/patches/patch-al b/sysutils/fam/patches/patch-al
index c7b5ed3e98c..d1c30c51abb 100644
--- a/sysutils/fam/patches/patch-al
+++ b/sysutils/fam/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-al,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/Makefile.am.orig	Tue Dec 18 11:03:37 2001
 +++ fam/Makefile.am
diff --git a/sysutils/fam/patches/patch-am b/sysutils/fam/patches/patch-am
index dad15743a6b..154c9d2e315 100644
--- a/sysutils/fam/patches/patch-am
+++ b/sysutils/fam/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-am,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/Scheduler.h.orig	Tue Dec 18 11:03:37 2001
 +++ fam/Scheduler.h
diff --git a/sysutils/fam/patches/patch-an b/sysutils/fam/patches/patch-an
index da9632a5abb..3333283de63 100644
--- a/sysutils/fam/patches/patch-an
+++ b/sysutils/fam/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-an,v 1.2 2002/08/25 19:23:21 jlam Exp $
 
 --- fam/StringTable.h.orig	Tue Dec 18 11:03:37 2001
 +++ fam/StringTable.h
diff --git a/sysutils/fam/patches/patch-ao b/sysutils/fam/patches/patch-ao
index be547485627..57b32eed875 100644
--- a/sysutils/fam/patches/patch-ao
+++ b/sysutils/fam/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:22 jlam Exp $
 
 --- fam/mntent.h.orig	Sun May 12 19:15:01 2002
 +++ fam/mntent.h
diff --git a/sysutils/fam/patches/patch-ap b/sysutils/fam/patches/patch-ap
index ba929575674..f38ba19a80f 100644
--- a/sysutils/fam/patches/patch-ap
+++ b/sysutils/fam/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:22 jlam Exp $
 
 --- fam/mntent_compat.c++.orig	Sun May 12 19:37:49 2002
 +++ fam/mntent_compat.c++
diff --git a/sysutils/fam/patches/patch-aq b/sysutils/fam/patches/patch-aq
index 50ef8b1d543..6a828ecd474 100644
--- a/sysutils/fam/patches/patch-aq
+++ b/sysutils/fam/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-aq,v 1.2 2002/08/25 19:23:22 jlam Exp $
 
 --- libfam/Client.c++.orig	Tue Dec 18 11:03:38 2001
 +++ libfam/Client.c++
diff --git a/sysutils/fam/patches/patch-ar b/sysutils/fam/patches/patch-ar
index e418270de31..e0131471cc3 100644
--- a/sysutils/fam/patches/patch-ar
+++ b/sysutils/fam/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ar,v 1.2 2002/08/25 19:23:22 jlam Exp $
 
 --- libfam/fam.c++.orig	Tue Dec 18 11:03:38 2001
 +++ libfam/fam.c++
diff --git a/sysutils/fam/patches/patch-as b/sysutils/fam/patches/patch-as
index ccff09833e4..9fdb7904894 100644
--- a/sysutils/fam/patches/patch-as
+++ b/sysutils/fam/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-as,v 1.2 2002/08/25 19:23:22 jlam Exp $
 
 --- test/test.c++.orig	Wed Dec 19 19:08:48 2001
 +++ test/test.c++
diff --git a/sysutils/fam/patches/patch-at b/sysutils/fam/patches/patch-at
index b84eb52f205..c57d78bdd67 100644
--- a/sysutils/fam/patches/patch-at
+++ b/sysutils/fam/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-at,v 1.2 2002/08/25 19:23:22 jlam Exp $
 
 --- Makefile.am.orig	Tue Dec 18 11:03:36 2001
 +++ Makefile.am
diff --git a/sysutils/fam/patches/patch-au b/sysutils/fam/patches/patch-au
index b512fa47678..3233423fe3d 100644
--- a/sysutils/fam/patches/patch-au
+++ b/sysutils/fam/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-au,v 1.2 2002/08/25 19:23:23 jlam Exp $
 
 --- fam/Makefile.in.orig	Fri Dec 21 10:00:16 2001
 +++ fam/Makefile.in
diff --git a/sysutils/fam/patches/patch-av b/sysutils/fam/patches/patch-av
index 6acade39b54..0e35593d322 100644
--- a/sysutils/fam/patches/patch-av
+++ b/sysutils/fam/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-av,v 1.2 2002/08/25 19:23:23 jlam Exp $
 
 --- Makefile.in.orig	Sun May 12 19:27:47 2002
 +++ Makefile.in
diff --git a/sysutils/fam/patches/patch-aw b/sysutils/fam/patches/patch-aw
index 33b84686939..1e1749c0617 100644
--- a/sysutils/fam/patches/patch-aw
+++ b/sysutils/fam/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-aw,v 1.2 2002/08/25 19:23:23 jlam Exp $
 
 --- man/Makefile.in.orig	Sun May 12 20:01:26 2002
 +++ man/Makefile.in