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

have been converted to USE_BUILDLINK2.

8 files changed, 9 insertions, 9 deletions

diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE
index 0f0df12dbcb..651789a1c76 100644
--- a/sysutils/ups-nut/MESSAGE
+++ b/sysutils/ups-nut/MESSAGE
@@ -1,5 +1,5 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.2 2002/07/03 11:57:11 lukem Exp $
+$NetBSD: MESSAGE,v 1.3 2002/08/25 21:51:04 jlam Exp $
 
  ${NUT_CONFDIR}/upsd.users has a new format from version 0.45.5.
  You will need to update this before restarting upsd(8).
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index a40c14f32d8..6b092b46284 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/07/03 11:57:12 lukem Exp $
+# $NetBSD: Makefile,v 1.22 2002/08/25 21:51:04 jlam Exp $
 #
 
 DISTNAME=		nut-0.50.0
@@ -12,7 +12,7 @@ COMMENT=		Network UPS Tools
 
 BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
 			--with-user=${NUT_USER}				\
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index a2144ec3f2e..9139398a2f8 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2002/07/03 11:57:12 lukem Exp $
+@comment $NetBSD: PLIST,v 1.10 2002/08/25 21:51:04 jlam Exp $
 bin/upsc
 bin/upscmd
 bin/upsct
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 3768fccf2ec..f16b4bd40d1 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/07/03 11:57:12 lukem Exp $
+$NetBSD: distinfo,v 1.14 2002/08/25 21:51:05 jlam Exp $
 
 SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3
 Size (nut-0.50.0.tar.gz) = 382755 bytes
diff --git a/sysutils/ups-nut/files/ups.sh b/sysutils/ups-nut/files/ups.sh
index 66f4ea4bdb7..99371f31e32 100644
--- a/sysutils/ups-nut/files/ups.sh
+++ b/sysutils/ups-nut/files/ups.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ups.sh,v 1.8 2002/05/24 22:28:27 hubertf Exp $
+# $NetBSD: ups.sh,v 1.9 2002/08/25 21:51:05 jlam Exp $
 #
 # KEYWORD: nostart
 
diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa
index b06f339e18c..75598290e63 100644
--- a/sysutils/ups-nut/patches/patch-aa
+++ b/sysutils/ups-nut/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/07/03 11:57:13 lukem Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/25 21:51:06 jlam Exp $
 
 --- models/upscommon.c.orig	Fri May 17 15:27:55 2002
 +++ models/upscommon.c
diff --git a/sysutils/ups-nut/patches/patch-ac b/sysutils/ups-nut/patches/patch-ac
index 16286d5f35a..567735ca3b3 100644
--- a/sysutils/ups-nut/patches/patch-ac
+++ b/sysutils/ups-nut/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2002/07/03 11:57:13 lukem Exp $
+$NetBSD: patch-ac,v 1.5 2002/08/25 21:51:06 jlam Exp $
 
 --- clients/upslog.c.orig	Fri May 17 08:26:22 2002
 +++ clients/upslog.c
diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag
index ea9e99f5ac1..ff0f31b73fa 100644
--- a/sysutils/ups-nut/patches/patch-ag
+++ b/sysutils/ups-nut/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2002/05/13 14:40:51 lukem Exp $
+$NetBSD: patch-ag,v 1.5 2002/08/25 21:51:06 jlam Exp $
 
 --- models/Makefile.in.orig	Tue Mar 26 10:30:31 2002
 +++ models/Makefile.in