ports/57536: Update port: x11-wm/icewm to 1.2.13

[KATO Tsuguru]

>Number:         57536
>Category:       ports
>Synopsis:       Update port: x11-wm/icewm to 1.2.13
>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:   Fri Oct 03 07:10:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.13

New file:
files/patch-src_aapm.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
--- /usr/ports/x11-wm/icewm/Makefile	Thu Aug 28 08:38:53 2003
+++ x11-wm/icewm/Makefile	Fri Oct  3 12:00:39 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.12
+PORTVERSION=	1.2.13
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -urN /usr/ports/x11-wm/icewm/distinfo x11-wm/icewm/distinfo
--- /usr/ports/x11-wm/icewm/distinfo	Thu Aug 28 08:38:53 2003
+++ x11-wm/icewm/distinfo	Fri Oct  3 12:05:59 2003
@@ -1 +1 @@
-MD5 (icewm-1.2.12.tar.gz) = 5d7f9d93bee1f17761f4f281c7f087bc
+MD5 (icewm-1.2.13.tar.gz) = d189afcf15f2386a0a0397c376e297c6
diff -urN /usr/ports/x11-wm/icewm/files/patch-ak x11-wm/icewm/files/patch-ak
--- /usr/ports/x11-wm/icewm/files/patch-ak	Mon Apr 21 12:28:18 2003
+++ x11-wm/icewm/files/patch-ak	Wed Sep 17 03:12:07 2003
@@ -1,5 +1,5 @@
---- src/aapm.cc.orig	Sat Jan  4 01:25:45 2003
-+++ src/aapm.cc	Mon Jan  6 19:00:50 2003
+--- src/aapm.cc.orig	Sun Aug 24 23:59:24 2003
++++ src/aapm.cc	Wed Sep 17 03:11:49 2003
 @@ -26,6 +26,13 @@
  #include <string.h>
  #include <stdio.h>
@@ -28,7 +28,7 @@
      char driver[16];
      char apmver[16];
      int apmflags;
-@@ -60,9 +71,27 @@
+@@ -60,9 +71,31 @@
      char units[16];
  
      if (fd == -1) {
@@ -38,7 +38,6 @@
 +        error = 1;
          return ;
      }
--
 +#ifdef __FreeBSD__
 +    if (ioctl(fd,APMIO_GETINFO, &ai) == -1)
 +    {
@@ -50,14 +49,18 @@
 +        return;
 +    }
 +    close(fd);
-+    BATlife = ai.ai_batt_life;
-+    ACstatus = ai.ai_acline ;
+ 
++    sprintf(apmver, "%u.%u", ai.ai_major, ai.ai_minor);
++    ACstatus = ai.ai_acline;
 +    BATflag = ai.ai_batt_stat == 3 ? 8 : 0;
++    BATlife = ai.ai_batt_life;
++    BATtime = ai.ai_batt_time == 0 ? -1 : ai.ai_batt_time;
++    strcpy(units, "sec");
 +#else
      len = read(fd, buf, sizeof(buf) - 1);
      close(fd);
  
-@@ -76,10 +105,11 @@
+@@ -76,10 +109,11 @@
          static int error = 1;
          if (error) {
              error = 0;
diff -urN /usr/ports/x11-wm/icewm/files/patch-src_aapm.h x11-wm/icewm/files/patch-src_aapm.h
--- /usr/ports/x11-wm/icewm/files/patch-src_aapm.h	Thu Jan  1 09:00:00 1970
+++ x11-wm/icewm/files/patch-src_aapm.h	Thu Sep 18 18:04:13 2003
@@ -0,0 +1,9 @@
+--- src/aapm.h.orig	Sun Aug 24 23:59:25 2003
++++ src/aapm.h	Wed Sep 10 04:57:40 2003
+@@ -1,5 +1,5 @@
+ 
+-#ifndef linux
++#if !defined(linux) && !defined(__FreeBSD__) && !defined(i386)
+ #undef CONFIG_APPLET_APM
+ #elif CONFIG_APPLET_APM
+ 
diff -urN /usr/ports/x11-wm/icewm/pkg-plist x11-wm/icewm/pkg-plist
--- /usr/ports/x11-wm/icewm/pkg-plist	Thu Aug 28 08:38:54 2003
+++ x11-wm/icewm/pkg-plist	Fri Oct  3 12:53:34 2003
@@ -4,6 +4,7 @@
 bin/icesound
 bin/icewm
 %%GNOMEDESKTOP%%bin/icewm-menu-gnome2
+bin/icewm-session
 bin/icewmbg
 bin/icewmhint
 bin/icewmtray
>Release-Note:
>Audit-Trail:
>Unformatted: