5 files changed, 73 insertions, 131 deletions

diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 95363adc80f9..292cbe9cea81 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	epplets
-PORTVERSION=	0.11
-PORTREVISION=	2
+PORTVERSION=	0.12
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
diff --git a/x11-wm/epplets/distinfo b/x11-wm/epplets/distinfo
index fc5b5122e400..0ea191b88e24 100644
--- a/x11-wm/epplets/distinfo
+++ b/x11-wm/epplets/distinfo
@@ -1,3 +1,3 @@
-MD5 (epplets-0.11.tar.gz) = 9a2277543eb24a1173bd3e7a145b8afd
-SHA256 (epplets-0.11.tar.gz) = 74e0dfc5d162ef8c2264ed979ce1b914c22746416288584e2a38204db77933b7
-SIZE (epplets-0.11.tar.gz) = 1053739
+MD5 (epplets-0.12.tar.gz) = 7f5119eeac9b938e6d64b972e4b9d984
+SHA256 (epplets-0.12.tar.gz) = 676522217e91955cda67ba1f7dcd11f9242685af5652ea408cd6128a8b332ce2
+SIZE (epplets-0.12.tar.gz) = 894232
diff --git a/x11-wm/epplets/files/patch-epplets_E-Wireless.c b/x11-wm/epplets/files/patch-epplets_E-Wireless.c
index 472f0fb9c365..aee8faaccb21 100644
--- a/x11-wm/epplets/files/patch-epplets_E-Wireless.c
+++ b/x11-wm/epplets/files/patch-epplets_E-Wireless.c
@@ -153,15 +153,6 @@
     s[0] = '0' + color;
     Epplet_modify_config("color", s);
     Epplet_save_config();
-@@ -257,7 +336,7 @@
-    memset(cpu_hist, 0x00, sizeof(int) * cpu_hist_size);
-    hist_pos = 0;
- 
--   Epplet_Init("E-WIRELESS", "0.1", "E 802.11 signal monitoring epplet",
-+   Epplet_Init("E-Wireless", "0.1", "E 802.11 signal monitoring epplet",
- 	       3, 3, argc, argv, 0);
- 
-    Epplet_load_config();
 @@ -283,10 +362,10 @@
  
     p = Epplet_create_popup();
diff --git a/x11-wm/epplets/files/patch-epplets_Makefile.in b/x11-wm/epplets/files/patch-epplets_Makefile.in
index 460562f69157..8e72259103fd 100644
--- a/x11-wm/epplets/files/patch-epplets_Makefile.in
+++ b/x11-wm/epplets/files/patch-epplets_Makefile.in
@@ -43,17 +43,3 @@
  E-Power-data/E-Power-Bat-0.png E-Power-data/E-Power-Bat-10.png \
  E-Power-data/E-Power-Bat-100.png E-Power-data/E-Power-Bat-20.png \
  E-Power-data/E-Power-Bat-30.png E-Power-data/E-Power-Bat-40.png \
-@@ -690,11 +682,11 @@
- E-Toolbox-data/sample.cfg E-Toolbox-data/popup-sample.cfg \
- E-Toolbox-data/default.cfg
- 
--NEED_FONT = E-Clock E-Mixer E-MoonClock E-Mountbox E-NetFlame E-Power E-SD \
-+NEED_FONT = E-Clock E-Mixer E-MoonClock E-NetFlame E-Power E-SD \
- E-ScreenSave E-ScreenShoot Emix E-UrlWatch E-PlayCD E-OpenGL-Demo \
- E-Pinger E-Pants E-Cpu E-Wireless
- 
--NEED_BG = E-Clock E-Mixer E-MoonClock E-Mountbox E-NetFlame E-Power E-SD \
-+NEED_BG = E-Clock E-Mixer E-MoonClock E-NetFlame E-Power E-SD \
- E-ScreenSave E-ScreenShoot Emix E-UrlWatch E-PlayCD E-OpenGL-Demo \
- E-Pinger E-Pants E-Cpu E-Wireless
- 
diff --git a/x11-wm/epplets/pkg-plist b/x11-wm/epplets/pkg-plist
index acdf97851d19..06e608d0bf7b 100644
--- a/x11-wm/epplets/pkg-plist
+++ b/x11-wm/epplets/pkg-plist
@@ -38,24 +38,45 @@ lib/libepplet.a
 lib/libepplet.la
 lib/libepplet.so
 lib/libepplet.so.3
+share/e16/epplet_icons/E-Biff.icon
+share/e16/epplet_icons/E-Clock.icon
+share/e16/epplet_icons/E-Cpu.icon
+share/e16/epplet_icons/E-Disk.icon
+share/e16/epplet_icons/E-Exec.icon
+share/e16/epplet_icons/E-Load.icon
+share/e16/epplet_icons/E-Magic.icon
+share/e16/epplet_icons/E-MemWatch.icon
+share/e16/epplet_icons/E-Mixer.icon
+share/e16/epplet_icons/E-MoonClock.icon
+share/e16/epplet_icons/E-Net.icon
+share/e16/epplet_icons/E-NetFlame.icon
+share/e16/epplet_icons/E-OpenGL-Demo.icon
+share/e16/epplet_icons/E-Pants.icon
+share/e16/epplet_icons/E-Pinger.icon
+share/e16/epplet_icons/E-PlayCD.icon
+share/e16/epplet_icons/E-Power.icon
+share/e16/epplet_icons/E-SD.icon
+share/e16/epplet_icons/E-ScreenSave.icon
+share/e16/epplet_icons/E-ScreenShoot.icon
+share/e16/epplet_icons/E-Slides.icon
+share/e16/epplet_icons/E-Sys.icon
+share/e16/epplet_icons/E-Time.icon
+share/e16/epplet_icons/E-UrlWatch.icon
+share/e16/epplet_icons/E-Wireless.icon
+share/e16/epplet_icons/Emix.icon
 share/e16/epplet_data/E-Biff/7of9.png
 share/e16/epplet_data/E-Biff/newmail.png
 share/e16/epplet_data/E-Biff/nomail.png
+share/e16/epplet_data/E-Clock/ABOUT/MAIN
 share/e16/epplet_data/E-Clock/E-Clock-Image.png
-share/e16/epplet_data/E-Clock/E-Clock.ABOUT/MAIN
-share/e16/epplet_data/E-Clock/E-Clock.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-Clock/E-Clock.ABOUT/bg.png
-share/e16/epplet_data/E-Cpu/E-Cpu.ABOUT/MAIN
-share/e16/epplet_data/E-Cpu/E-Cpu.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-Cpu/E-Cpu.ABOUT/bg.png
+share/e16/epplet_data/E-Cpu/ABOUT/MAIN
 share/e16/epplet_data/E-Magic/8ball.png
 share/e16/epplet_data/E-Magic/answers.txt
-share/e16/epplet_data/E-Mixer/E-Mixer.ABOUT/E-Mixer-standard.png
-share/e16/epplet_data/E-Mixer/E-Mixer.ABOUT/E-Mixer-tall.png
-share/e16/epplet_data/E-Mixer/E-Mixer.ABOUT/E-Mixer-wide.png
-share/e16/epplet_data/E-Mixer/E-Mixer.ABOUT/MAIN
-share/e16/epplet_data/E-Mixer/E-Mixer.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-Mixer/E-Mixer.ABOUT/bg.png
+share/e16/epplet_data/E-Mixer/ABOUT/E-Mixer-standard.png
+share/e16/epplet_data/E-Mixer/ABOUT/E-Mixer-tall.png
+share/e16/epplet_data/E-Mixer/ABOUT/E-Mixer-wide.png
+share/e16/epplet_data/E-Mixer/ABOUT/MAIN
+share/e16/epplet_data/E-MoonClock/ABOUT/MAIN
 share/e16/epplet_data/E-MoonClock/E-MoonClock-01.png
 share/e16/epplet_data/E-MoonClock/E-MoonClock-02.png
 share/e16/epplet_data/E-MoonClock/E-MoonClock-03.png
@@ -116,32 +137,18 @@ share/e16/epplet_data/E-MoonClock/E-MoonClock-57.png
 share/e16/epplet_data/E-MoonClock/E-MoonClock-58.png
 share/e16/epplet_data/E-MoonClock/E-MoonClock-59.png
 share/e16/epplet_data/E-MoonClock/E-MoonClock-60.png
-share/e16/epplet_data/E-MoonClock/E-MoonClock.ABOUT/MAIN
-share/e16/epplet_data/E-MoonClock/E-MoonClock.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-MoonClock/E-MoonClock.ABOUT/bg.png
-share/e16/epplet_data/E-NetFlame/E-NetFlame.ABOUT/MAIN
-share/e16/epplet_data/E-NetFlame/E-NetFlame.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-NetFlame/E-NetFlame.ABOUT/bg.png
-share/e16/epplet_data/E-OpenGL-Demo/E-OpenGL-Demo.ABOUT/MAIN
-share/e16/epplet_data/E-OpenGL-Demo/E-OpenGL-Demo.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-OpenGL-Demo/E-OpenGL-Demo.ABOUT/bg.png
+share/e16/epplet_data/E-NetFlame/ABOUT/MAIN
+share/e16/epplet_data/E-OpenGL-Demo/ABOUT/MAIN
 share/e16/epplet_data/E-OpenGL-Demo/cube_texture.RGB
-share/e16/epplet_data/E-Pants/E-Pants.ABOUT/MAIN
-share/e16/epplet_data/E-Pants/E-Pants.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-Pants/E-Pants.ABOUT/bg.png
-share/e16/epplet_data/E-Pinger/E-Pinger.ABOUT/MAIN
-share/e16/epplet_data/E-Pinger/E-Pinger.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-Pinger/E-Pinger.ABOUT/bg.png
-share/e16/epplet_data/E-PlayCD/E-PlayCD.ABOUT/E-PlayCD_Controls.png
-share/e16/epplet_data/E-PlayCD/E-PlayCD.ABOUT/EPlayCD.jpg
-share/e16/epplet_data/E-PlayCD/E-PlayCD.ABOUT/MAIN
-share/e16/epplet_data/E-PlayCD/E-PlayCD.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-PlayCD/E-PlayCD.ABOUT/bg.png
-share/e16/epplet_data/E-Power/E-Power.ABOUT/MAIN
-share/e16/epplet_data/E-Power/E-Power.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-Power/E-Power.ABOUT/bg.png
+share/e16/epplet_data/E-Pants/ABOUT/MAIN
+share/e16/epplet_data/E-Pinger/ABOUT/MAIN
+share/e16/epplet_data/E-PlayCD/ABOUT/E-PlayCD_Controls.png
+share/e16/epplet_data/E-PlayCD/ABOUT/EPlayCD.jpg
+share/e16/epplet_data/E-PlayCD/ABOUT/MAIN
+share/e16/epplet_data/E-Power/ABOUT/MAIN
 share/e16/epplet_data/E-Power/E-Power-Bat-0.png
 share/e16/epplet_data/E-Power/E-Power-Bat-10.png
+share/e16/epplet_data/E-Power/E-Power-Bat-100.png
 share/e16/epplet_data/E-Power/E-Power-Bat-20.png
 share/e16/epplet_data/E-Power/E-Power-Bat-30.png
 share/e16/epplet_data/E-Power/E-Power-Bat-40.png
@@ -150,20 +157,13 @@ share/e16/epplet_data/E-Power/E-Power-Bat-60.png
 share/e16/epplet_data/E-Power/E-Power-Bat-70.png
 share/e16/epplet_data/E-Power/E-Power-Bat-80.png
 share/e16/epplet_data/E-Power/E-Power-Bat-90.png
-share/e16/epplet_data/E-Power/E-Power-Bat-100.png
-share/e16/epplet_data/E-SD/E-SD.ABOUT/MAIN
-share/e16/epplet_data/E-SD/E-SD.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-SD/E-SD.ABOUT/bg.png
+share/e16/epplet_data/E-SD/ABOUT/MAIN
 share/e16/epplet_data/E-SD/E-SD_minitime.png
 share/e16/epplet_data/E-SD/E-SD_standby.png
-share/e16/epplet_data/E-ScreenSave/E-ScreenSave.ABOUT/MAIN
-share/e16/epplet_data/E-ScreenSave/E-ScreenSave.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-ScreenSave/E-ScreenSave.ABOUT/bg.png
-share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/E_ScreenShoot_buttons.png
-share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/E_ScreenShoot_cloak.png
-share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/MAIN
-share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/bg.png
+share/e16/epplet_data/E-ScreenSave/ABOUT/MAIN
+share/e16/epplet_data/E-ScreenShoot/ABOUT/E_ScreenShoot_buttons.png
+share/e16/epplet_data/E-ScreenShoot/ABOUT/E_ScreenShoot_cloak.png
+share/e16/epplet_data/E-ScreenShoot/ABOUT/MAIN
 share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot_col.png
 share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot_minitime.png
 share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot_minitime2.png
@@ -180,84 +180,50 @@ share/e16/epplet_data/E-Toolbox/mail.png
 share/e16/epplet_data/E-Toolbox/netscape.png
 share/e16/epplet_data/E-Toolbox/popup-sample.cfg
 share/e16/epplet_data/E-Toolbox/sample.cfg
-share/e16/epplet_data/E-UrlWatch/E-UrlWatch.ABOUT/MAIN
-share/e16/epplet_data/E-UrlWatch/E-UrlWatch.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-UrlWatch/E-UrlWatch.ABOUT/bg.png
+share/e16/epplet_data/E-UrlWatch/ABOUT/MAIN
 share/e16/epplet_data/E-UrlWatch/wooeep.wav
-share/e16/epplet_data/E-Wireless/E-Wireless.ABOUT/MAIN
-share/e16/epplet_data/E-Wireless/E-Wireless.ABOUT/aircut3.ttf
-share/e16/epplet_data/E-Wireless/E-Wireless.ABOUT/bg.png
-share/e16/epplet_data/E-Wireless/E-Wireless.ABOUT/delia.jpg
-share/e16/epplet_data/E-Wireless/E-Wireless.ABOUT/delia.png
-share/e16/epplet_data/Emix/Emix.ABOUT/MAIN
-share/e16/epplet_data/Emix/Emix.ABOUT/aircut3.ttf
-share/e16/epplet_data/Emix/Emix.ABOUT/bg.png
+share/e16/epplet_data/E-Wireless/ABOUT/MAIN
+share/e16/epplet_data/E-Wireless/ABOUT/delia.jpg
+share/e16/epplet_data/E-Wireless/ABOUT/delia.png
+share/e16/epplet_data/Emix/ABOUT/MAIN
 share/e16/epplet_data/Emix/Emix.AUTHORS
 share/e16/epplet_data/Emix/Emix.COPYING
 share/e16/epplet_data/Emix/Emix.README
 share/e16/epplet_data/Emix/Emix.TODO
-share/e16/epplet_data/aircut3.ttf
-share/e16/epplet_data/bg.png
-share/e16/epplet_icons/E-Biff.icon
-share/e16/epplet_icons/E-Clock.icon
-share/e16/epplet_icons/E-Cpu.icon
-share/e16/epplet_icons/E-Disk.icon
-share/e16/epplet_icons/E-Exec.icon
-share/e16/epplet_icons/E-Load.icon
-share/e16/epplet_icons/E-Magic.icon
-share/e16/epplet_icons/E-MemWatch.icon
-share/e16/epplet_icons/E-Mixer.icon
-share/e16/epplet_icons/E-MoonClock.icon
-share/e16/epplet_icons/E-Net.icon
-share/e16/epplet_icons/E-NetFlame.icon
-share/e16/epplet_icons/E-OpenGL-Demo.icon
-share/e16/epplet_icons/E-Pants.icon
-share/e16/epplet_icons/E-Pinger.icon
-share/e16/epplet_icons/E-PlayCD.icon
-share/e16/epplet_icons/E-Power.icon
-share/e16/epplet_icons/E-SD.icon
-share/e16/epplet_icons/E-ScreenSave.icon
-share/e16/epplet_icons/E-ScreenShoot.icon
-share/e16/epplet_icons/E-Slides.icon
-share/e16/epplet_icons/E-Sys.icon
-share/e16/epplet_icons/E-Time.icon
-share/e16/epplet_icons/E-UrlWatch.icon
-share/e16/epplet_icons/E-Wireless.icon
-share/e16/epplet_icons/Emix.icon
-@dirrmtry rmdir %D/share/e16/epplet_icons
-@dirrm share/e16/epplet_data/Emix/Emix.ABOUT
+@dirrmtry share/e16/epplet_icons
+@dirrm share/e16/epplet_data/Emix/ABOUT
 @dirrm share/e16/epplet_data/Emix
-@dirrm share/e16/epplet_data/E-Wireless/E-Wireless.ABOUT
+@dirrm share/e16/epplet_data/E-Wireless/ABOUT
 @dirrm share/e16/epplet_data/E-Wireless
-@dirrm share/e16/epplet_data/E-UrlWatch/E-UrlWatch.ABOUT
+@dirrm share/e16/epplet_data/E-UrlWatch/ABOUT
 @dirrm share/e16/epplet_data/E-UrlWatch
 @dirrm share/e16/epplet_data/E-Toolbox
-@dirrm share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT
+@dirrm share/e16/epplet_data/E-ScreenShoot/ABOUT
 @dirrm share/e16/epplet_data/E-ScreenShoot
-@dirrm share/e16/epplet_data/E-ScreenSave/E-ScreenSave.ABOUT
+@dirrm share/e16/epplet_data/E-ScreenSave/ABOUT
 @dirrm share/e16/epplet_data/E-ScreenSave
-@dirrm share/e16/epplet_data/E-SD/E-SD.ABOUT
+@dirrm share/e16/epplet_data/E-SD/ABOUT
 @dirrm share/e16/epplet_data/E-SD
-@dirrm share/e16/epplet_data/E-Power/E-Power.ABOUT
+@dirrm share/e16/epplet_data/E-Power/ABOUT
 @dirrm share/e16/epplet_data/E-Power
-@dirrm share/e16/epplet_data/E-PlayCD/E-PlayCD.ABOUT
+@dirrm share/e16/epplet_data/E-PlayCD/ABOUT
 @dirrm share/e16/epplet_data/E-PlayCD
-@dirrm share/e16/epplet_data/E-Pinger/E-Pinger.ABOUT
+@dirrm share/e16/epplet_data/E-Pinger/ABOUT
 @dirrm share/e16/epplet_data/E-Pinger
-@dirrm share/e16/epplet_data/E-Pants/E-Pants.ABOUT
+@dirrm share/e16/epplet_data/E-Pants/ABOUT
 @dirrm share/e16/epplet_data/E-Pants
-@dirrm share/e16/epplet_data/E-OpenGL-Demo/E-OpenGL-Demo.ABOUT
+@dirrm share/e16/epplet_data/E-OpenGL-Demo/ABOUT
 @dirrm share/e16/epplet_data/E-OpenGL-Demo
-@dirrm share/e16/epplet_data/E-NetFlame/E-NetFlame.ABOUT
+@dirrm share/e16/epplet_data/E-NetFlame/ABOUT
 @dirrm share/e16/epplet_data/E-NetFlame
-@dirrm share/e16/epplet_data/E-MoonClock/E-MoonClock.ABOUT
+@dirrm share/e16/epplet_data/E-MoonClock/ABOUT
 @dirrm share/e16/epplet_data/E-MoonClock
-@dirrm share/e16/epplet_data/E-Mixer/E-Mixer.ABOUT
+@dirrm share/e16/epplet_data/E-Mixer/ABOUT
 @dirrm share/e16/epplet_data/E-Mixer
 @dirrm share/e16/epplet_data/E-Magic
-@dirrm share/e16/epplet_data/E-Cpu/E-Cpu.ABOUT
+@dirrm share/e16/epplet_data/E-Cpu/ABOUT
 @dirrm share/e16/epplet_data/E-Cpu
-@dirrm share/e16/epplet_data/E-Clock/E-Clock.ABOUT
+@dirrm share/e16/epplet_data/E-Clock/ABOUT
 @dirrm share/e16/epplet_data/E-Clock
 @dirrm share/e16/epplet_data/E-Biff
 @dirrm share/e16/epplet_data