- Upgrade to version 1.2.1
- Clean up the Makefile - Add @comment to PLIST
This commit is contained in:
kevlo
parent
2db89a5cc9
commit
28f03c5de2
@ -3,13 +3,14 @@
|
||||
# Date created: 22 July 1998
|
||||
# Whom: Niklas Hallqvist <niklas@openbsd.org>
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.4 2000/06/09 22:20:23 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2000/06/21 03:11:12 kevlo Exp $
|
||||
# $FreeBSD: Makefile,v 1.4 1997/03/10 12:07:35 asami Exp $
|
||||
#
|
||||
|
||||
DISTNAME= xbatt-1.2
|
||||
DISTNAME= xbatt-1.2.1
|
||||
CATEGORIES= sysutils x11
|
||||
MASTER_SITES= http://www.coara.or.jp/~eto/xbatt/
|
||||
NEED_VERSION= 1.307
|
||||
MASTER_SITES= http://www.clave.gr.jp/~eto/xbatt/
|
||||
|
||||
MAINTAINER= niklas@openbsd.org
|
||||
|
||||
@ -18,8 +19,7 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
USE_IMAKE= Yes
|
||||
NO_INSTALL_MANPAGES= Yes
|
||||
CONFIGURE_STYLE= imake noman
|
||||
ONLY_FOR_ARCHS= i386
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (xbatt-1.2.tar.gz) = 63b26b136795696cbdef0f5d12c61cc0
|
||||
RMD160 (xbatt-1.2.tar.gz) = 763f26d97b3bfda528b3c8eb66589d636b029025
|
||||
SHA1 (xbatt-1.2.tar.gz) = 64ec868f40c1727f3c63cacdc9ec605a28d6fb7e
|
||||
MD5 (xbatt-1.2.1.tar.gz) = 4ad4d31cd70182ffdad31e0cc885c433
|
||||
RMD160 (xbatt-1.2.1.tar.gz) = 3f33ecb224a0a452d113285288ee50e498c39206
|
||||
SHA1 (xbatt-1.2.1.tar.gz) = 6af1136f9e33f03f10821a7c0dd99e057838fbf9
|
||||
|
||||
@ -1,31 +1,31 @@
|
||||
--- xbatt.c.orig Tue Jan 21 15:21:27 1997
|
||||
+++ xbatt.c Tue Jul 21 15:24:07 1998
|
||||
@@ -64,6 +64,11 @@
|
||||
--- xbatt.c.orig Wed Jun 21 18:58:25 2000
|
||||
+++ xbatt.c Wed Jun 21 19:02:20 2000
|
||||
@@ -65,6 +65,11 @@
|
||||
# define APMDEV22 "/dev/apm"
|
||||
#endif
|
||||
|
||||
+#ifdef __OpenBSD__
|
||||
+# include <machine/apmvar.h>
|
||||
+# define APMDEV "/dev/apm"
|
||||
+# define APMDEV "/dev/apm"
|
||||
+#endif /* __OpenBSD__ */
|
||||
+
|
||||
#include "pixmaps/battery.xpm"
|
||||
#include "pixmaps/unknown.xpm"
|
||||
#include "bitmaps/full.xbm"
|
||||
@@ -193,6 +198,12 @@
|
||||
@@ -195,6 +200,12 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifdef __OpenBSD__
|
||||
+ /* initialize APM Interface */
|
||||
+ if ((apmfd = open(APMDEV, O_RDONLY)) == -1)
|
||||
+ /* initialize APM Interface */
|
||||
+ if ((apmfd = open(APMDEV, O_RDONLY)) == -1)
|
||||
+ err(1, "cannot open apm device");
|
||||
+#endif /* __OpenBSD__ */
|
||||
+
|
||||
/* start X-Window session */
|
||||
XtSetLanguageProc( NULL, NULL, NULL );
|
||||
toplevel = XtOpenApplication(&appContext, "XBatt",
|
||||
@@ -369,6 +380,50 @@
|
||||
@@ -371,6 +382,50 @@
|
||||
/* chrging or not. */
|
||||
}
|
||||
#endif /* FreeBSD */
|
||||
@ -38,39 +38,39 @@
|
||||
+
|
||||
+ /* get current status */
|
||||
+ if (info.battery_life == APM_BATT_LIFE_UNKNOWN) {
|
||||
+ switch (info.battery_state) {
|
||||
+ case APM_BATT_HIGH:
|
||||
+ ret.remain = 100;
|
||||
+ break;
|
||||
+ case APM_BATT_LOW:
|
||||
+ ret.remain = 40;
|
||||
+ break;
|
||||
+ case APM_BATT_CRITICAL:
|
||||
+ ret.remain = 10;
|
||||
+ break;
|
||||
+ default: /* expected to be APM_STAT_UNKNOWN */
|
||||
+ ret.remain = APM_STAT_UNKNOWN;
|
||||
+ }
|
||||
+ switch (info.battery_state) {
|
||||
+ case APM_BATT_HIGH:
|
||||
+ ret.remain = 100;
|
||||
+ break;
|
||||
+ case APM_BATT_LOW:
|
||||
+ ret.remain = 40;
|
||||
+ break;
|
||||
+ case APM_BATT_CRITICAL:
|
||||
+ ret.remain = 10;
|
||||
+ break;
|
||||
+ default: /* expected to be APM_STAT_UNKNOWN */
|
||||
+ ret.remain = APM_STAT_UNKNOWN;
|
||||
+ }
|
||||
+ } else if (info.battery_life > 100) {
|
||||
+ /* some APM BIOSes return values slightly > 100 */
|
||||
+ ret.remain = 100;
|
||||
+ /* some APM BIOSes return values slightly > 100 */
|
||||
+ ret.remain = 100;
|
||||
+ } else {
|
||||
+ ret.remain = info.battery_life;
|
||||
+ ret.remain = info.battery_life;
|
||||
+ }
|
||||
+
|
||||
+ /* get AC-line status */
|
||||
+ if (info.ac_state == APM_AC_ON) {
|
||||
+ ret.acline = APM_STAT_LINE_ON;
|
||||
+ ret.acline = APM_STAT_LINE_ON;
|
||||
+ } else {
|
||||
+ ret.acline = APM_STAT_LINE_OFF;
|
||||
+ ret.acline = APM_STAT_LINE_OFF;
|
||||
+ }
|
||||
+
|
||||
+ /* get charging status */
|
||||
+ if (info.battery_state == APM_BATT_CHARGING) {
|
||||
+ ret.charge = APM_STAT_BATT_CHARGING;
|
||||
+ ret.charge = APM_STAT_BATT_CHARGING;
|
||||
+ } else {
|
||||
+ ret.charge = APM_STAT_BATT_HIGH; /* I only want to know, */
|
||||
+ /* chrging or not. */
|
||||
+ ret.charge = APM_STAT_BATT_HIGH; /* I only want to know, */
|
||||
+ /* chrging or not. */
|
||||
+ }
|
||||
+#endif /* __OpenBSD__ */
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- Imakefile.orig Fri Mar 7 07:54:29 1997
|
||||
+++ Imakefile Tue Jul 21 15:45:06 1998
|
||||
--- Imakefile.orig Wed Jun 21 19:02:53 2000
|
||||
+++ Imakefile Wed Jun 21 19:03:14 2000
|
||||
@@ -13,4 +13,4 @@
|
||||
INSTALLFLAGS=-c -m 2755
|
||||
#endif
|
||||
|
||||
@ -1 +1,2 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2000/06/21 03:11:21 kevlo Exp $
|
||||
bin/xbatt
|
||||
|
||||
Loading…
Reference in New Issue
Block a user