>Number: 81728
>Category: ports
>Synopsis: Update port: sysutils/asapm to 3.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 31 16:10:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 3.0
New file:
files/patch-apm_read.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/sysutils/asapm/Makefile sysutils/asapm/Makefile
--- /usr/ports/sysutils/asapm/Makefile Fri Feb 6 10:16:37 2004
+++ sysutils/asapm/Makefile Sun May 29 20:41:07 2005
@@ -6,11 +6,9 @@
#
PORTNAME= asapm
-PORTVERSION= 2.13
+PORTVERSION= 3.0
CATEGORIES= sysutils
-MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/ \
- ${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR= apps/asapm
+MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/
MAINTAINER= ports at FreeBSD.org
COMMENT= Laptop battery status display for X11
diff -urN /usr/ports/sysutils/asapm/distinfo sysutils/asapm/distinfo
--- /usr/ports/sysutils/asapm/distinfo Fri Jan 30 14:54:17 2004
+++ sysutils/asapm/distinfo Sun May 29 20:32:16 2005
@@ -1,2 +1,2 @@
-MD5 (asapm-2.13.tar.gz) = 858d4072ef767dee76bc73dc1ef47a0c
-SIZE (asapm-2.13.tar.gz) = 59364
+MD5 (asapm-3.0.tar.gz) = 417b2432d1989ed503d1117e4464bd22
+SIZE (asapm-3.0.tar.gz) = 61354
diff -urN /usr/ports/sysutils/asapm/files/patch-apm_read.c sysutils/asapm/files/patch-apm_read.c
--- /usr/ports/sysutils/asapm/files/patch-apm_read.c Thu Jan 1 09:00:00 1970
+++ sysutils/asapm/files/patch-apm_read.c Sun May 29 20:38:44 2005
@@ -0,0 +1,29 @@
+--- apm_read.c.orig Tue May 17 06:49:13 2005
++++ apm_read.c Sun May 29 20:38:24 2005
+@@ -301,6 +301,9 @@
+ unsigned int remaining_capacity = 0;
+ unsigned int present_rate = 0;
+
++ unsigned int percent;
++ unsigned int time_left;
++
+ /* First check if there is an ACPI system */
+ if ((fd = open("/proc/acpi/info", O_RDONLY)) == -1) {
+ error_handle(1, "open_acpi_info_file");
+@@ -503,7 +506,7 @@
+ * Calculate the percentage and time to full charge
+ * or discharge based on the reported rate.
+ */
+- unsigned int percent =
++ percent =
+ last_full_capacity ?
+ (float)remaining_capacity / (float)last_full_capacity * 100
+ : 0;
+@@ -512,7 +515,6 @@
+ ++state.update;
+ }
+
+- unsigned int time_left;
+ if ( state.battery_status == BATTERY_CHARGING ) {
+ time_left =
+ present_rate ?
diff -urN /usr/ports/sysutils/asapm/pkg-descr sysutils/asapm/pkg-descr
--- /usr/ports/sysutils/asapm/pkg-descr Wed Dec 9 03:49:04 1998
+++ sysutils/asapm/pkg-descr Sun May 29 20:31:52 2005
@@ -6,3 +6,5 @@
NOTE: You need APM driver in your kernel. And enable it to edit
file /etc/rc.conf at `apm_enable=NO' to `YES'.
+
+WWW: http://www.tigr.net/afterstep/view.php?applet=asapm/data
>Release-Note:
>Audit-Trail:
>Unformatted: