aboutsummaryrefslogtreecommitdiff
path: root/x11-wm/ede
diff options
context:
space:
mode:
authorSergey Matveychuk <sem@FreeBSD.org>2006-12-17 10:03:22 +0000
committerSergey Matveychuk <sem@FreeBSD.org>2006-12-17 10:03:22 +0000
commit02fe2026c381f605193bf2f16f2d1bfbc14a23b6 (patch)
tree6a72bdae6d48154ef9dfb770654d0641e571f192 /x11-wm/ede
parent01f6a2d8d3211b4b7eaf97b0ea9cd02c331a97cb (diff)
downloadports-02fe2026c381f605193bf2f16f2d1bfbc14a23b6.tar.gz
ports-02fe2026c381f605193bf2f16f2d1bfbc14a23b6.zip
Notes
Diffstat (limited to 'x11-wm/ede')
-rw-r--r--x11-wm/ede/Makefile4
-rw-r--r--x11-wm/ede/distinfo6
-rw-r--r--x11-wm/ede/files/patch-datas::startede.in20
-rw-r--r--x11-wm/ede/files/patch-eworkpanel-batterymonitor.cpp30
4 files changed, 45 insertions, 15 deletions
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 0af5950c8dac..2fec5cc28460 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ede
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ede
@@ -19,7 +19,7 @@ LIB_DEPENDS= efltk.2:${PORTSDIR}/x11-toolkits/efltk
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BZIP2= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
diff --git a/x11-wm/ede/distinfo b/x11-wm/ede/distinfo
index fedd67f8d0c4..4673517e2f20 100644
--- a/x11-wm/ede/distinfo
+++ b/x11-wm/ede/distinfo
@@ -1,3 +1,3 @@
-MD5 (ede-1.0.4.tar.bz2) = 07865c6087bd3e4a088145cbea84fe3f
-SHA256 (ede-1.0.4.tar.bz2) = a8ebfb6b13383cad427e3ef403211cf00f6a3b15551871fa01a6bb59a9cfc123
-SIZE (ede-1.0.4.tar.bz2) = 1372589
+MD5 (ede-1.1.tar.bz2) = acb1a82ac79ee2000bf50b204d81ab89
+SHA256 (ede-1.1.tar.bz2) = de59d4e7a2a6bcb9b788a72c541b405c0fa205223630579d4f4cbe976964b38c
+SIZE (ede-1.1.tar.bz2) = 1396930
diff --git a/x11-wm/ede/files/patch-datas::startede.in b/x11-wm/ede/files/patch-datas::startede.in
index dbaed023fbd8..854fae1b5396 100644
--- a/x11-wm/ede/files/patch-datas::startede.in
+++ b/x11-wm/ede/files/patch-datas::startede.in
@@ -1,22 +1,22 @@
---- datas/startede.in.orig Fri Mar 4 18:44:41 2005
-+++ datas/startede.in Wed Jul 20 13:03:33 2005
-@@ -32,16 +32,16 @@
+--- datas/startede.in.orig Sun Sep 3 00:52:45 2006
++++ datas/startede.in Sat Dec 16 20:00:01 2006
+@@ -27,16 +27,16 @@
fi
# If we have xsetroot than script shoult run it
-if [ "$XSETROOT" ]; then
-+if [ -z "$XSETROOT" ]; then
++if [ ! -z "$XSETROOT" ]; then
$XSETROOT -solid black
fi
# Test if XScreenSaver is somewhere in PATH, if not - don't start it
-if [ "$XSSAVER" ]; then
-+if [ -z "$XSSAVER" ]; then
++if [ ! -z "$XSSAVER" ]; then
xscreensaver -nosplash &
fi
- exec edewm &
- exec eiconman &
- etip &
-- exec eworkpanel
-+ eworkpanel
+ exec edewm &
+ exec eiconman &
+ etip &
+-exec eworkpanel
++eworkpanel
diff --git a/x11-wm/ede/files/patch-eworkpanel-batterymonitor.cpp b/x11-wm/ede/files/patch-eworkpanel-batterymonitor.cpp
new file mode 100644
index 000000000000..6bd64d1ab7c0
--- /dev/null
+++ b/x11-wm/ede/files/patch-eworkpanel-batterymonitor.cpp
@@ -0,0 +1,30 @@
+--- eworkpanel/batterymonitor.cpp.orig Sun Dec 17 12:05:20 2006
++++ eworkpanel/batterymonitor.cpp Sun Dec 17 12:04:43 2006
+@@ -10,6 +10,9 @@
+ // GNU General Public Licence version 2 or newer.
+ // See COPYING for details.
+
++#include <unistd.h>
++#include <fcntl.h>
++
+ #include "batterymonitor.h"
+
+ #include "icons/poweron.xpm"
+@@ -151,7 +154,7 @@
+ #include <machine/apmioctl.h>
+
+ int first = 1;
+-void battery_check(void)
++void BatteryMonitor::battery_check(void)
+ {
+ int fd;
+ struct apmreq ar ;
+@@ -213,7 +216,7 @@
+ #define APM_STAT_BATT_CHARGING 3
+
+ int first = 1;
+-void battery_check(void)
++void BatteryMonitor::battery_check(void)
+ {
+ int fd, r;
+ bool p;