Update to 1.4.1, to sync with ups-nut 1.4.1.

5 files changed, 22 insertions, 33 deletions

diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 8ca2f1b4c5c..27debd6b8db 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2003/07/17 22:53:56 grant Exp $
+# $NetBSD: Makefile,v 1.27 2004/02/15 13:15:43 lukem Exp $
 
-DISTNAME=		nut-1.2.1
-PKGREVISION=		2
-PKGNAME=		ups-nut-cgi-1.2.1
+DISTNAME=		nut-1.4.1
+PKGNAME=		ups-nut-cgi-1.4.1
 CATEGORIES=		sysutils
-MASTER_SITES=		http://www.exploits.org/nut/release/1.2/
+MASTER_SITES=		http://random.networkupstools.org/source/1.4/
 
 MAINTAINER=		lukem@NetBSD.org
-HOMEPAGE=		http://www.exploits.org/nut/
+HOMEPAGE=		http://www.networkupstools.org/
 COMMENT=		Network UPS Tools CGI scripts
 
 DEPENDS+=		ups-nut-1.*:../../sysutils/ups-nut
@@ -20,12 +19,15 @@ USE_PKGINSTALL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
+			--datadir=${NUT_DATADIR}			\
+			--localstatedir=${NUT_STATEDIR}			\
 			--with-statepath=${NUT_STATEDIR}		\
 			--with-cgi					\
 			--with-cgipath=${NUT_CGIDIR}
 
 PKG_SYSCONFSUBDIR?=	nut
 NUT_CONFDIR=		${PKG_SYSCONFDIR}
+NUT_DATADIR=		${PREFIX}/share/nut
 NUT_EGDIR=		${PREFIX}/share/examples/nut
 NUT_STATEDIR=		/var/db/nut
 NUT_CGIDIR=		${PREFIX}/libexec/cgi-bin
diff --git a/sysutils/ups-nut-cgi/PLIST b/sysutils/ups-nut-cgi/PLIST
index bda38d0e6ad..85247e1a132 100644
--- a/sysutils/ups-nut-cgi/PLIST
+++ b/sysutils/ups-nut-cgi/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/17 05:53:42 lukem Exp $
-share/examples/nut/hosts.conf.sample
-share/examples/nut/upsset.conf.sample
-share/examples/nut/upsstats-single.html.sample
-share/examples/nut/upsstats.html.sample
+@comment $NetBSD: PLIST,v 1.6 2004/02/15 13:15:43 lukem Exp $
+libexec/cgi-bin/upsimage.cgi
+libexec/cgi-bin/upsset.cgi
+libexec/cgi-bin/upsstats.cgi
 man/man5/hosts.conf.5
 man/man5/upsset.conf.5
 man/man5/upsstats.html.5
 man/man8/upsimage.cgi.8
 man/man8/upsset.cgi.8
 man/man8/upsstats.cgi.8
-libexec/cgi-bin/upsimage.cgi
-libexec/cgi-bin/upsset.cgi
-libexec/cgi-bin/upsstats.cgi
+share/examples/nut/hosts.conf.sample
+share/examples/nut/upsset.conf.sample
+share/examples/nut/upsstats-single.html.sample
+share/examples/nut/upsstats.html.sample
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
index b4dd38ceaf9..4c2358ebef6 100644
--- a/sysutils/ups-nut-cgi/distinfo
+++ b/sysutils/ups-nut-cgi/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2002/12/13 04:23:21 lukem Exp $
+$NetBSD: distinfo,v 1.13 2004/02/15 13:15:43 lukem Exp $
 
-SHA1 (nut-1.2.1.tar.gz) = db55b0165ef594ad1cf73bf5d3d9336a0ac0fb93
-Size (nut-1.2.1.tar.gz) = 444256 bytes
+SHA1 (nut-1.4.1.tar.gz) = b23920207d3bd6563172194546f26dbe7cfb7ec6
+Size (nut-1.4.1.tar.gz) = 550238 bytes
 SHA1 (patch-aa) = 62f0a514e6dde1f5438be676c269711d1bc5d42c
-SHA1 (patch-ab) = 5099c3efb84be2447f80bfeb7f02acc4038ed58f
-SHA1 (patch-ac) = 6f9ca3c1faa4cb20598116f602596f43d1e07199
+SHA1 (patch-ac) = b8f2f582168834b3957b1a877f3cd55cdeb2a92e
diff --git a/sysutils/ups-nut-cgi/patches/patch-ab b/sysutils/ups-nut-cgi/patches/patch-ab
deleted file mode 100644
index 46a19e0a3bd..00000000000
--- a/sysutils/ups-nut-cgi/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/12/13 04:23:21 lukem Exp $
-
---- clients/Makefile.in.orig	Mon Dec  2 23:09:20 2002
-+++ clients/Makefile.in
-@@ -15,6 +15,7 @@
- # other definitions
- CC	 = @CC@
- CFLAGS	 = -I../include @CFLAGS@
-+LDFLAGS  = @LDFLAGS@
- PROGS	 = upsc upslog upsrw upscmd
- SPROGS	 = upsmon upssched
- CGIPROGS = upsstats.cgi upsimage.cgi upsset.cgi
diff --git a/sysutils/ups-nut-cgi/patches/patch-ac b/sysutils/ups-nut-cgi/patches/patch-ac
index cf04b8406e4..f813f1f5135 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ac
+++ b/sysutils/ups-nut-cgi/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/12/13 04:23:21 lukem Exp $
+$NetBSD: patch-ac,v 1.4 2004/02/15 13:15:43 lukem Exp $
 
 --- conf/Makefile.in.orig	Tue Sep  3 17:23:02 2002
 +++ conf/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.3 2002/12/13 04:23:21 lukem Exp $
  exec_prefix	= @exec_prefix@
  
 -CONFPATH	= $(DESTDIR)@sysconfdir@
-+CONFPATH	= $(DESTDIR)@datadir@/examples/nut
++CONFPATH	= $(DESTDIR)@prefix@/share/examples/nut
  
  INSTALLCMD  = @INSTALL@