Update xbattbar to 1.4.1. No list of changes from version 1.4. Improve

description somewhat to explain why xbattbar is cooler than the other
X11 battery status indicators.

6 files changed, 29 insertions, 33 deletions

diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index a38cd5f7292..68d0feb9c96 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -1,22 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2000/12/29 16:30:05 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2001/01/26 01:28:26 jlam Exp $
 
-DISTNAME=	xbattbar_1.4
-PKGNAME=	xbattbar-1.4
+DISTNAME=	${PKGNAME:S/-/_/}
+PKGNAME=	xbattbar-1.4.1
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://infonet.aist-nara.ac.jp/member/suguru/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://infonet.aist-nara.ac.jp/member/suguru/xbattbar.html
 
-USE_X11BASE=	YES
-USE_IMAKE=	YES
-WRKSRC=		${WRKDIR}/xbattbar
+USE_X11BASE=	# defined
+USE_IMAKE=	# defined
 
 .if !exists(/usr/include/machine/apmvar.h)
 IGNORE+=	"APM is not available for ${MACHINE_PLATFORM}"
 .endif
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/xbattbar.man ${PREFIX}/man/man1/xbattbar.1
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xbattbar/files/md5 b/sysutils/xbattbar/files/md5
index e4abd234bcb..42ea272510a 100644
--- a/sysutils/xbattbar/files/md5
+++ b/sysutils/xbattbar/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/12/14 22:20:25 itojun Exp $
+$NetBSD: md5,v 1.2 2001/01/26 01:28:26 jlam Exp $
 
-MD5 (xbattbar_1.4.tar.gz) = 3bc8637a9c6bb77f6f8d59771364c09f
+MD5 (xbattbar_1.4.1.tar.gz) = e79b36b3000e42438cd9adf53feba393
diff --git a/sysutils/xbattbar/files/patch-sum b/sysutils/xbattbar/files/patch-sum
index 6410e78a0f1..ba09b941f54 100644
--- a/sysutils/xbattbar/files/patch-sum
+++ b/sysutils/xbattbar/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/12/14 22:20:25 itojun Exp $
+$NetBSD: patch-sum,v 1.2 2001/01/26 01:28:26 jlam Exp $
 
-MD5 (patch-aa) = 8fc1ac08550df150e7e5dfe18d147c2a
+MD5 (patch-aa) = 87a38155cfbdf18bf0a0fa64b38490e3
diff --git a/sysutils/xbattbar/patches/patch-aa b/sysutils/xbattbar/patches/patch-aa
index f5bc8ceb1ef..beb84362321 100644
--- a/sysutils/xbattbar/patches/patch-aa
+++ b/sysutils/xbattbar/patches/patch-aa
@@ -1,11 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/14 22:20:25 itojun Exp $
+$NetBSD: patch-aa,v 1.2 2001/01/26 01:28:26 jlam Exp $
 
---- Imakefile-	Fri Dec 15 06:21:16 2000
-+++ Imakefile	Fri Dec 15 06:21:29 2000
-@@ -19,4 +19,4 @@
+--- Imakefile.orig	Sat Dec  5 01:59:29 1998
++++ Imakefile
+@@ -17,8 +17,8 @@
+ XCOMM Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ XCOMM 
  
 -BINDIR = /usr/local/bin
 -MANDIR = /usr/local/man/cat1
 +BINDIR = ${PREFIX}/bin
 +MANDIR = ${PREFIX}/man/cat1
  
+ LOCAL_LIBRARIES = $(XLIB)
+ 
diff --git a/sysutils/xbattbar/pkg/DESCR b/sysutils/xbattbar/pkg/DESCR
index c584b8a28fa..7edf15fca19 100644
--- a/sysutils/xbattbar/pkg/DESCR
+++ b/sysutils/xbattbar/pkg/DESCR
@@ -1,14 +1,9 @@
-This package is a source code package of xbattbar (version 1.4) on X11
-environment.  Xbattbar is designed as a (laptop) battery status
-indicator based on APM kernel API.
-
-* Developers
-
-xbattbar developers are:
-
-Suguru Yamaguchi	base development and releasing
-Akira Kato		function enhancements
-Noriyuki Shigechika	function enhancements
-Susumu Sano		FreeBSD porting
-Hiroshi Ura		NetBSD porting
-Yuji Sekiya		Linux porting
+Xbattbar shows the current (laptop) battery status in the X window
+environment. Battery status is obtained through the APM kernel module.
+The battery indicator of this program is very simple: a simple bar in
+the top/bottom of your display. With its color, it indicates the
+AC-line status (plugged in or off-line), and battery charging/remaining
+level. Also, in the case the mouse cursor enters to the indicator window,
+the popup diagnosis window comes up in the center of your display, and
+then, it shows the current AC line status and battery level in the popup
+window. This program is very small but fancy.
diff --git a/sysutils/xbattbar/pkg/PLIST b/sysutils/xbattbar/pkg/PLIST
index f74b1c517ae..7009c43176c 100644
--- a/sysutils/xbattbar/pkg/PLIST
+++ b/sysutils/xbattbar/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/14 22:20:25 itojun Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/26 01:28:27 jlam Exp $
 bin/xbattbar
-man/man1/xbattbar.1
+man/cat1/xbattbar.0