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

have been converted to USE_BUILDLINK2.

6 files changed, 9 insertions, 9 deletions

diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 76045f6aee5..b1bd1254dc9 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/07/03 11:57:14 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 21:51:07 jlam Exp $
 
 DISTNAME=		nut-0.50.0
 PKGNAME=		ups-nut-cgi-0.50.0
@@ -20,7 +20,8 @@ NUT_CONFDIR=		${PKG_SYSCONFDIR}
 NUT_STATEDIR=		/var/db/nut
 NUT_CGIDIR=		${PREFIX}/share/nut/cgi
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
+USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
 			--with-statepath=${NUT_STATEDIR}		\
@@ -30,6 +31,5 @@ CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
 pre-configure:
 	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force
 
-.include "../../graphics/gd/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/gd/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut-cgi/PLIST b/sysutils/ups-nut-cgi/PLIST
index 65afed21c39..d586f7a473b 100644
--- a/sysutils/ups-nut-cgi/PLIST
+++ b/sysutils/ups-nut-cgi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/13 15:15:24 lukem Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:51:07 jlam Exp $
 man/man5/hosts.conf.5
 man/man5/multimon.conf.5
 man/man5/upsset.conf.5
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
index 4767e05580a..6e8ba20ce46 100644
--- a/sysutils/ups-nut-cgi/distinfo
+++ b/sysutils/ups-nut-cgi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/07/03 11:57:14 lukem Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 21:51:07 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-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
index d2e8e5fa0fd..4a9cef4a296 100644
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ b/sysutils/ups-nut-cgi/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2002/07/03 11:57:14 lukem Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:07 jlam Exp $
 
 --- Makefile.in.orig	Wed Apr 17 00:00:49 2002
 +++ Makefile.in
diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad
index a23d45a27b8..bdc5984ad81 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ad
+++ b/sysutils/ups-nut-cgi/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2002/07/03 11:57:14 lukem Exp $
+$NetBSD: patch-ad,v 1.7 2002/08/25 21:51:08 jlam Exp $
 
 --- configure.in.orig	Tue Apr 16 23:34:38 2002
 +++ configure.in
diff --git a/sysutils/ups-nut-cgi/patches/patch-ae b/sysutils/ups-nut-cgi/patches/patch-ae
index 52f204c5515..9f364aeb950 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ae
+++ b/sysutils/ups-nut-cgi/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/07/03 11:57:14 lukem Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 21:51:08 jlam Exp $
 
 --- clients/upsstats.c.orig	Thu Mar 21 17:01:16 2002
 +++ clients/upsstats.c