2 files changed, 23 insertions, 14 deletions

diff --git a/x11-wm/epplets/files/patch-epplets::Makefile.in b/x11-wm/epplets/files/patch-epplets::Makefile.in
index f4658bdb3efa..2c5b31075ba4 100644
--- a/x11-wm/epplets/files/patch-epplets::Makefile.in
+++ b/x11-wm/epplets/files/patch-epplets::Makefile.in
@@ -9,7 +9,7 @@
 -@GL_PROGS@ E-MemWatch.epplet E-Disk.epplet E-Areas.epplet E-Magic.epplet \
 -E-Toolbox.epplet E-NetFlame.epplet E-Sys.epplet E-ScreenShoot.epplet \
 +bin_PROGRAMS = E-Clock.epplet E-Time.epplet \
-+E-Biff.epplet E-Power.epplet @TEST_PROGS@ @MIXER_PROGS@ \
++E-Biff.epplet @APM_PROGS@ @TEST_PROGS@ @MIXER_PROGS@ \
 +@GL_PROGS@ E-Disk.epplet E-Areas.epplet E-Magic.epplet \
 +E-Toolbox.epplet E-NetFlame.epplet E-ScreenShoot.epplet \
  E-Slides.epplet E-Xss.epplet E-Mountbox.epplet E-Exec.epplet @ESD_PROGS@ \
@@ -201,3 +201,12 @@
  
  # You can use the following command to generate this line:
  # ABOUT_DOCS = `(cd epplets && ls -1d *.ABOUT/* 2>/dev/null | grep -v CVS)`
+@@ -407,7 +371,7 @@
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+ bin_PROGRAMS =  E-Load.epplet E-Clock.epplet E-Time.epplet E-Net.epplet \
+-E-Cpu.epplet E-Biff.epplet E-Power.epplet @TEST_PROGS@ @MIXER_PROGS@ \
++E-Cpu.epplet E-Biff.epplet @APM_PROGS@ @TEST_PROGS@ @MIXER_PROGS@ \
+ @GL_PROGS@ E-MemWatch.epplet E-Disk.epplet E-Areas.epplet \
+ E-Magic.epplet E-Toolbox.epplet E-NetFlame.epplet E-Sys.epplet \
+ E-ScreenShoot.epplet E-Slides.epplet E-Xss.epplet E-Mountbox.epplet \
diff --git a/x11-wm/epplets/pkg-plist b/x11-wm/epplets/pkg-plist
index 33de5e575a05..3aa6242ca643 100644
--- a/x11-wm/epplets/pkg-plist
+++ b/x11-wm/epplets/pkg-plist
@@ -146,18 +146,18 @@ share/enlightenment/epplet_data/E-PlayCD/E-PlayCD.ABOUT/EPlayCD.jpg
 share/enlightenment/epplet_data/E-PlayCD/E-PlayCD.ABOUT/MAIN
 share/enlightenment/epplet_data/E-PlayCD/E-PlayCD.ABOUT/aircut3.ttf
 share/enlightenment/epplet_data/E-PlayCD/E-PlayCD.ABOUT/bg.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-0.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-10.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-100.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-20.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-30.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-40.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-50.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-60.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-70.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-80.png
-share/enlightenment/epplet_data/E-Power/E-Power-Bat-90.png
-share/enlightenment/epplet_data/E-Power/E-Power.ABOUT/MAIN
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-0.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-10.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-100.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-20.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-30.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-40.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-50.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-60.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-70.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-80.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power-Bat-90.png
+%%APM_PROGS%%share/enlightenment/epplet_data/E-Power/E-Power.ABOUT/MAIN
 share/enlightenment/epplet_data/E-Power/E-Power.ABOUT/aircut3.ttf
 share/enlightenment/epplet_data/E-Power/E-Power.ABOUT/bg.png
 share/enlightenment/epplet_data/E-SD/E-SD.ABOUT/MAIN
@@ -224,7 +224,7 @@ share/enlightenment/epplet_icons/E-OpenGL-Demo.icon
 share/enlightenment/epplet_icons/E-Pants.icon
 share/enlightenment/epplet_icons/E-Pinger.icon
 share/enlightenment/epplet_icons/E-PlayCD.icon
-share/enlightenment/epplet_icons/E-Power.icon
+%%APM_PROGS%%share/enlightenment/epplet_icons/E-Power.icon
 share/enlightenment/epplet_icons/E-SD.icon
 share/enlightenment/epplet_icons/E-ScreenSave.icon
 share/enlightenment/epplet_icons/E-ScreenShoot.icon