aboutsummaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2003-10-03 15:18:35 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2003-10-03 15:18:35 +0000
commit95890583fc2a48285c3641680cf86192dfcd9894 (patch)
treee5504aede722f0a7d2bcb0070600e5e483328518 /x11-wm
parenta200783d427ebc495799d84902717480150511ab (diff)
downloadports-95890583fc2a48285c3641680cf86192dfcd9894.tar.gz
ports-95890583fc2a48285c3641680cf86192dfcd9894.zip
Notes
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11-wm/icewm/distinfo2
-rw-r--r--x11-wm/icewm/files/patch-ak17
-rw-r--r--x11-wm/icewm/files/patch-src_aapm.h9
-rw-r--r--x11-wm/icewm/pkg-plist1
5 files changed, 22 insertions, 9 deletions
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 8e080a0e12c2..40f4f9d2c1a8 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -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 --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 7f10c13b9246..29330d6a9869 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-1.2.12.tar.gz) = 5d7f9d93bee1f17761f4f281c7f087bc
+MD5 (icewm-1.2.13.tar.gz) = d189afcf15f2386a0a0397c376e297c6
diff --git a/x11-wm/icewm/files/patch-ak b/x11-wm/icewm/files/patch-ak
index 016a4048d9d7..c06a68797b72 100644
--- a/x11-wm/icewm/files/patch-ak
+++ b/x11-wm/icewm/files/patch-ak
@@ -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 --git a/x11-wm/icewm/files/patch-src_aapm.h b/x11-wm/icewm/files/patch-src_aapm.h
new file mode 100644
index 000000000000..60c89713d7f9
--- /dev/null
+++ b/x11-wm/icewm/files/patch-src_aapm.h
@@ -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 --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 2ff61e9b0b5b..a3dbcc691471 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -4,6 +4,7 @@ bin/icesh
bin/icesound
bin/icewm
%%GNOMEDESKTOP%%bin/icewm-menu-gnome2
+bin/icewm-session
bin/icewmbg
bin/icewmhint
bin/icewmtray