8 files changed, 277 insertions, 602 deletions

diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index c4b1e49ab96b..f21d2ba76daa 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	epplets
-PORTVERSION=	0.7
-PORTREVISION=	5
+PORTVERSION=	0.9
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
@@ -16,8 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A collection of Enlightenment dock applications
 
 BUILD_DEPENDS=	e16:${PORTSDIR}/x11-wm/enlightenment
-LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio \
-		epplet.1:${PORTSDIR}/x11-wm/libepplet
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+		cdaudio.1:${PORTSDIR}/audio/libcdaudio
 RUN_DEPENDS=	import:${PORTSDIR}/graphics/ImageMagick \
 		e16:${PORTSDIR}/x11-wm/enlightenment
 
@@ -25,31 +24,11 @@ USE_X_PREFIX=	yes
 USE_GNOME=	esound lthack
 USE_GL=		yes
 USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	EROOT="${X11BASE}/share/enlightenment" \
-		EBIN="${X11BASE}/bin" \
-		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-fsstd
-MAKE_ARGS=	SUBDIRS="epplets debian"
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-APM_PROGS=	E-Power.epplet
-PLIST_SUB+=	APM_PROGS=""
-.else
-APM_PROGS=	# none
-PLIST_SUB+=	APM_PROGS="@comment "
-.endif
-
-post-extract:
-	@${RM} -f ${WRKSRC}/api/epplet.h*
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's| ../api/epplet.h||g ; \
-		 s|@APM_PROGS@|${APM_PROGS}|g'
-	@${REINPLACE_CMD} -e 's| api/epplet.h||g' ${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/epplets/distinfo b/x11-wm/epplets/distinfo
index 043f7a9ddab7..6692181af8f3 100644
--- a/x11-wm/epplets/distinfo
+++ b/x11-wm/epplets/distinfo
@@ -1,3 +1,3 @@
-MD5 (epplets-0.7.tar.gz) = b28331134d22ba5305c48dc0948f9e95
-SHA256 (epplets-0.7.tar.gz) = 0fa080659084d6695f76397e266702f829ed9c9772b4182140b44c66bc123da2
-SIZE (epplets-0.7.tar.gz) = 1001282
+MD5 (epplets-0.9.tar.gz) = a38653f731b7c8a0ee6ec8293e33edfd
+SHA256 (epplets-0.9.tar.gz) = 279260ff417a100665d3f1e7bb8250e79d175d059948accbbe4d66980275fc8b
+SIZE (epplets-0.9.tar.gz) = 1129444
diff --git a/x11-wm/epplets/files/patch-api::epplet.h.in b/x11-wm/epplets/files/patch-api::epplet.h.in
new file mode 100644
index 000000000000..7b87c97c61ff
--- /dev/null
+++ b/x11-wm/epplets/files/patch-api::epplet.h.in
@@ -0,0 +1,10 @@
+--- api/epplet.h.in.orig	Fri Jun 30 08:54:24 2000
++++ api/epplet.h.in	Mon Dec  8 23:43:09 2003
+@@ -28,7 +28,6 @@
+ 
+ /* preliminary OpenGL Checking */
+ #ifdef HAVE_LIBGL
+-#include <GL/glut.h>
+ #include <GL/glx.h>
+ #endif
+ 
diff --git a/x11-wm/epplets/files/patch-configure b/x11-wm/epplets/files/patch-configure
new file mode 100644
index 000000000000..d4ea3890e55d
--- /dev/null
+++ b/x11-wm/epplets/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Apr 24 01:33:18 2006
++++ configure	Mon Apr 24 01:36:16 2006
+@@ -22464,7 +22464,7 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Imlib2_imlib_create_image=no
++ac_cv_lib_Imlib2_imlib_create_image=yes
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
diff --git a/x11-wm/epplets/files/patch-epplets::E-Power.c b/x11-wm/epplets/files/patch-epplets::E-Power.c
deleted file mode 100644
index 412a263e0e69..000000000000
--- a/x11-wm/epplets/files/patch-epplets::E-Power.c
+++ /dev/null
@@ -1,106 +0,0 @@
---- epplets/E-Power.c.orig	Sun Oct 14 03:32:19 2001
-+++ epplets/E-Power.c	Mon Dec  8 03:32:37 2003
-@@ -1,5 +1,12 @@
- #include "epplet.h"
- 
-+#ifdef __FreeBSD__
-+#include <stdio.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <machine/apm_bios.h>
-+#endif
-+
- int                prev_bat_val = 110;
- int                bat_val = 0;
- int                time_val = 0;
-@@ -18,16 +25,34 @@
- static void
- cb_timer(void *data)
- {
-+#ifdef __FreeBSD__
-+   int fd;
-+
-+   fd = open("/dev/apm", O_RDONLY);
-+   if (fd != -1)
-+#else
-    static FILE *f;
- 
-    f = fopen("/proc/apm", "r");
-    if (f)
-+#endif
-      {
- 	char s[256], s1[32], s2[32], s3[32];
- 	int apm_flags, ac_stat, bat_stat, bat_flags;
- 	int  i, hours, minutes, up, up2;
- 	char *s_ptr;
- 	
-+#ifdef __FreeBSD__
-+	struct apm_info info;
-+       
-+	ioctl(fd,APMIO_GETINFO,&info);
-+	ac_stat=info.ai_acline;
-+	bat_stat=info.ai_batt_stat;
-+	time_val=info.ai_batt_time;
-+	bat_val=info.ai_batt_life;
-+
-+	close(fd);
-+#else
- 	fgets(s, 255, f);
- 	sscanf(s, "%*s %*s %x %x %x %x %s %s %s", &apm_flags, &ac_stat, &bat_stat, &bat_flags, s1, s2, s3);
- 	s1[strlen(s1) - 1] = 0;
-@@ -37,6 +62,7 @@
- 	else if (!strcmp(s3, "min"))
- 	   time_val = atoi(s2) * 60;
- 	fclose(f);
-+#endif
- 	
- 	up = bat_val - prev_bat_val;
- 	up2 = up;
-@@ -52,6 +78,7 @@
- 	
-         s_ptr = s;
- 
-+#ifndef __FreeBSD__
-         if( bat_flags != 0xff
- 	    && bat_flags & 0x80 )
- 	  {
-@@ -59,6 +86,7 @@
- 	  }
- 	else
- 	  {
-+#endif
- 	    if( bat_val > 0 )
- 	      s_ptr += sprintf( s_ptr, "%i%%", bat_val );
- 
-@@ -77,7 +105,9 @@
- 	          s_ptr += sprintf( s_ptr, ", charge" );
- 		  break;
- 	      }
-+#ifndef __FreeBSD__
- 	  }
-+#endif
- 	s_ptr += sprintf( s_ptr, "\n" );
- 
- 
-@@ -87,6 +117,9 @@
-           }
-         else
-           {
-+#ifdef __FreeBSD__
-+	    if( time_val >= 0){
-+#endif
- 	    hours = time_val / 3600;
-             minutes = (time_val / 60) % 60;
- 	    if (up2 > 0)
-@@ -96,6 +129,11 @@
- 		       		hours, minutes);
- 	    else
- 	       s_ptr += sprintf(s_ptr, "%i:%02i", hours, minutes);
-+#ifdef __FreeBSD__
-+	    }
-+	    else
-+	       s_ptr += sprintf(s_ptr, "unknown");
-+#endif
-           }
- 	Epplet_change_label(label, s);
- 
diff --git a/x11-wm/epplets/files/patch-epplets::Emix.c b/x11-wm/epplets/files/patch-epplets::Emix.c
index bb18cc9c3b3b..96a5c95cd00a 100644
--- a/x11-wm/epplets/files/patch-epplets::Emix.c
+++ b/x11-wm/epplets/files/patch-epplets::Emix.c
@@ -1,12 +1,11 @@
---- epplets/Emix.c.orig	Wed Sep 13 08:24:16 2000
-+++ epplets/Emix.c	Thu Dec 18 19:20:45 2003
-@@ -6,11 +6,17 @@
- 
+--- epplets/Emix.c.orig	Sat Apr  1 06:56:17 2006
++++ epplets/Emix.c	Sat Jun  3 19:44:51 2006
+@@ -7,11 +7,16 @@
  #include "epplet.h"
  #include <sys/ioctl.h>
+ #include <fcntl.h>
 -#ifdef __FreeBSD__
 +#include <config.h>
-+
 +#ifdef HAVE_LINUX_SOUNDCARD_H
 +#include <linux/soundcard.h>
 +#elif HAVE_MACHINE_SOUNDCARD_H
diff --git a/x11-wm/epplets/files/patch-epplets::Makefile.in b/x11-wm/epplets/files/patch-epplets::Makefile.in
index 2c5b31075ba4..2e4c64253d53 100644
--- a/x11-wm/epplets/files/patch-epplets::Makefile.in
+++ b/x11-wm/epplets/files/patch-epplets::Makefile.in
@@ -1,212 +1,11 @@
---- epplets/Makefile.in.orig	Wed Nov  5 17:09:42 2003
-+++ epplets/Makefile.in	Fri Feb  6 23:32:36 2004
-@@ -106,13 +106,13 @@
- bindir = $(EBIN)
- edatadir = $(EROOT)
- 
--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@ \
--@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 @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@ \
- @PLAYCD_PROGS@ E-ScreenSave.epplet E-NetGraph.epplet E-MoonClock.epplet \
--E-UrlWatch.epplet E-LoadMeter.epplet E-GtkRc.epplet E-Pinger.epplet \
-+E-UrlWatch.epplet E-GtkRc.epplet E-Pinger.epplet \
- E-Pants.epplet E-Bandwidth.epplet E-Wireless.epplet
- 
- 
-@@ -123,166 +123,130 @@
- 
- ################ Conditional Builds ################
- E_Mixer_epplet_SOURCES = E-Mixer.c
--E_Mixer_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Mixer_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--E_Mixer_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) @SGI_LIBS@
-+E_Mixer_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) @SGI_LIBS@
- 
- Emix_epplet_SOURCES = Emix.c
--Emix_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- Emix_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_PlayCD_epplet_SOURCES = E-PlayCD.c
--E_PlayCD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_PlayCD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--E_PlayCD_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) -lcdaudio
-+E_PlayCD_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) -lcdaudio
- 
- EppletTest_epplet_SOURCES = TestEpplet.c
--EppletTest_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- EppletTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- EppletConfigTest_epplet_SOURCES = ConfigTestEpplet.c
--EppletConfigTest_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- EppletConfigTest_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_OpenGL_Demo_epplet_SOURCES = E-OpenGL-Demo.c
--E_OpenGL_Demo_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_OpenGL_Demo_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- ####################################################
- 
- E_Exec_epplet_SOURCES = E-Exec.c
--E_Exec_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Exec_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_SD_epplet_SOURCES = E-SD.c E-SD.h esdcloak.c utils.c utils.h esdcloak.h
--E_SD_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
- 
- E_Load_epplet_SOURCES = E-Load.c
--E_Load_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Load_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--E_Load_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
-+E_Load_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_LoadMeter_epplet_SOURCES = E-LoadMeter.c load.c
--E_LoadMeter_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_LoadMeter_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--E_LoadMeter_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
-+E_LoadMeter_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_Clock_epplet_SOURCES = E-Clock.c
--E_Clock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Clock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_MoonClock_epplet_SOURCES = E-MoonClock.c CalcEphem.c CalcEphem.h Moon.c
--E_MoonClock_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_MoonClock_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Time_epplet_SOURCES = E-Time.c
--E_Time_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Time_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Magic_epplet_SOURCES = E-Magic.c
--E_Magic_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Magic_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Toolbox_epplet_SOURCES = E-Toolbox.c
--E_Toolbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Toolbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Areas_epplet_SOURCES = E-Areas.c 
--E_Areas_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Areas_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Bandwidth_epplet_SOURCES = E-Bandwidth.c net.c net.h
--E_Bandwidth_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
--E_Bandwidth_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
-+E_Bandwidth_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lkvm
- 
- E_Net_epplet_SOURCES = E-Net.c net.c net.h
--E_Net_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
--E_Net_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
-+E_Net_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lkvm
- 
- E_NetFlame_epplet_SOURCES = E-NetFlame.c net.c net.h
--E_NetFlame_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
--E_NetFlame_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
-+E_NetFlame_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lkvm
- 
- E_Wireless_epplet_SOURCES = E-Wireless.c
--E_Wireless_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Wireless_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Cpu_epplet_SOURCES = E-Cpu.c proc.h
--E_Cpu_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Cpu_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--E_Cpu_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
-+E_Cpu_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_Power_epplet_SOURCES = E-Power.c
--E_Power_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Power_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Biff_epplet_SOURCES = E-Biff.c mbox.c
--E_Biff_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Biff_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_MemWatch_epplet_SOURCES = E-MemWatch.c
--E_MemWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_MemWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--E_MemWatch_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
-+E_MemWatch_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_Disk_epplet_SOURCES = E-Disk.c
--E_Disk_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Disk_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Sys_epplet_SOURCES = E-Sys.c
--E_Sys_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Sys_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--E_Sys_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
-+E_Sys_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_Slides_epplet_SOURCES = E-Slides.c
--E_Slides_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Slides_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Xss_epplet_SOURCES = E-Xss.c
--E_Xss_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Xss_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_ScreenShoot_epplet_SOURCES = \
- E-ScreenShoot.c E-ScreenShoot.h cloak.c utils.c utils.h cloak.h \
- E-ScreenShoot_ftp.c E-ScreenShoot_ftp.h
- 
--E_ScreenShoot_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_ScreenShoot_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_NetGraph_epplet_SOURCES = E-NetGraph.c net.c net.h
--E_NetGraph_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
--E_NetGraph_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
-+E_NetGraph_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lkvm
- 
- E_ScreenSave_epplet_SOURCES = \
- E-ScreenSave.c E-ScreenSave.h cloak.c utils.c utils.h cloak.h
- 
--E_ScreenSave_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_ScreenSave_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_UrlWatch_epplet_SOURCES = E-UrlWatch.c E-UrlWatch.h utils.c utils.h
--E_UrlWatch_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_UrlWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) $(X_LIBS)
--E_UrlWatch_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
-+E_UrlWatch_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
- 
- E_GtkRc_epplet_SOURCES = E-GtkRc.c
--E_GtkRc_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_GtkRc_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) $(X_LIBS)
--E_GtkRc_epplet_LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
-+E_GtkRc_epplet_LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
- 
- E_Mountbox_epplet_SOURCES = E-Mountbox.c E-Mountbox.h
--E_Mountbox_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Mountbox_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Pinger_epplet_SOURCES = E-Pinger.c
--E_Pinger_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Pinger_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
- E_Pants_epplet_SOURCES = E-Pants.c
--E_Pants_epplet_DEPENDENCIES = $(top_builddir)/api/libepplet.la
- E_Pants_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
- 
--INCLUDES = -I. -I$(top_builddir)/api -I$(top_srcdir)/api -I$(top_srcdir) -I.. -I$(includedir) -I$(prefix)/include -I/usr/local/include $(X_CFLAGS) @SGI_DEFINES@
--LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib -L/usr/local/lib $(LIBS) $(X_LIBS)
-+INCLUDES = -I. -I$(top_builddir)/api -I$(top_srcdir)/api -I$(top_srcdir) -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) @SGI_DEFINES@
-+LDADD = -lepplet -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
- 
- # 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 \
+--- epplets/Makefile.in.orig	Sat Jun  3 19:36:50 2006
++++ epplets/Makefile.in	Sat Jun  3 19:37:11 2006
+@@ -41,7 +41,7 @@
+ bin_PROGRAMS = E-Load.epplet$(EXEEXT) E-Clock.epplet$(EXEEXT) \
+ 	E-Time.epplet$(EXEEXT) E-Net.epplet$(EXEEXT) \
+ 	E-Cpu.epplet$(EXEEXT) E-Biff.epplet$(EXEEXT) \
+-	E-Power.epplet$(EXEEXT) @TEST_PROGS@ @MIXER_PROGS@ @GL_PROGS@ \
++	@TEST_PROGS@ @MIXER_PROGS@ @GL_PROGS@ \
+ 	E-MemWatch.epplet$(EXEEXT) E-Disk.epplet$(EXEEXT) \
+ 	E-Areas.epplet$(EXEEXT) E-Magic.epplet$(EXEEXT) \
+ 	E-Toolbox.epplet$(EXEEXT) E-NetFlame.epplet$(EXEEXT) \
diff --git a/x11-wm/epplets/pkg-plist b/x11-wm/epplets/pkg-plist
index e59e46e8f032..3006fd2df907 100644
--- a/x11-wm/epplets/pkg-plist
+++ b/x11-wm/epplets/pkg-plist
@@ -5,7 +5,6 @@ bin/E-Clock.epplet
 bin/E-Cpu.epplet
 bin/E-Disk.epplet
 bin/E-Exec.epplet
-bin/E-GtkRc.epplet
 bin/E-Load.epplet
 bin/E-LoadMeter.epplet
 bin/E-Magic.epplet
@@ -20,7 +19,6 @@ bin/E-OpenGL-Demo.epplet
 bin/E-Pants.epplet
 bin/E-Pinger.epplet
 bin/E-PlayCD.epplet
-%%APM_PROGS%%bin/E-Power.epplet
 bin/E-SD.epplet
 bin/E-ScreenSave.epplet
 bin/E-ScreenShoot.epplet
@@ -32,248 +30,233 @@ bin/E-UrlWatch.epplet
 bin/E-Wireless.epplet
 bin/E-Xss.epplet
 bin/Emix.epplet
-share/enlightenment/epplet_data/E-Biff/7of9.png
-share/enlightenment/epplet_data/E-Biff/newmail.png
-share/enlightenment/epplet_data/E-Biff/nomail.png
-share/enlightenment/epplet_data/E-Clock/E-Clock-Image.png
-share/enlightenment/epplet_data/E-Clock/E-Clock.ABOUT/MAIN
-share/enlightenment/epplet_data/E-Clock/E-Clock.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-Clock/E-Clock.ABOUT/bg.png
-share/enlightenment/epplet_data/E-Cpu/E-Cpu.ABOUT/MAIN
-share/enlightenment/epplet_data/E-Cpu/E-Cpu.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-Cpu/E-Cpu.ABOUT/bg.png
-share/enlightenment/epplet_data/E-GtkRc/E-GtkRc.ABOUT/MAIN
-share/enlightenment/epplet_data/E-GtkRc/E-GtkRc.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-GtkRc/E-GtkRc.ABOUT/bg.png
-share/enlightenment/epplet_data/E-Magic/8ball.png
-share/enlightenment/epplet_data/E-Magic/answers.txt
-share/enlightenment/epplet_data/E-Mixer/E-Mixer.ABOUT/E-Mixer-standard.png
-share/enlightenment/epplet_data/E-Mixer/E-Mixer.ABOUT/E-Mixer-tall.png
-share/enlightenment/epplet_data/E-Mixer/E-Mixer.ABOUT/E-Mixer-wide.png
-share/enlightenment/epplet_data/E-Mixer/E-Mixer.ABOUT/MAIN
-share/enlightenment/epplet_data/E-Mixer/E-Mixer.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-Mixer/E-Mixer.ABOUT/bg.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-01.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-02.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-03.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-04.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-05.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-06.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-07.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-08.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-09.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-10.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-11.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-12.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-13.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-14.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-15.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-16.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-17.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-18.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-19.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-20.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-21.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-22.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-23.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-24.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-25.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-26.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-27.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-28.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-29.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-30.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-31.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-32.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-33.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-34.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-35.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-36.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-37.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-38.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-39.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-40.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-41.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-42.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-43.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-44.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-45.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-46.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-47.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-48.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-49.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-50.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-51.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-52.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-53.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-54.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-55.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-56.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-57.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-58.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-59.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock-60.png
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock.ABOUT/MAIN
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-MoonClock/E-MoonClock.ABOUT/bg.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox-bg.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox-blockdev.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox-cd.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox-floppy.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox-jazz.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox-zip.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox.ABOUT/MAIN
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox.ABOUT/bg.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox.ABOUT/dialog.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox.ABOUT/shot.png
-share/enlightenment/epplet_data/E-Mountbox/E-Mountbox.ABOUT/shot_unmounted.png
-share/enlightenment/epplet_data/E-NetFlame/E-NetFlame.ABOUT/MAIN
-share/enlightenment/epplet_data/E-NetFlame/E-NetFlame.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-NetFlame/E-NetFlame.ABOUT/bg.png
-share/enlightenment/epplet_data/E-OpenGL-Demo/E-OpenGL-Demo.ABOUT/MAIN
-share/enlightenment/epplet_data/E-OpenGL-Demo/E-OpenGL-Demo.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-OpenGL-Demo/E-OpenGL-Demo.ABOUT/bg.png
-share/enlightenment/epplet_data/E-OpenGL-Demo/cube_texture.RGB
-share/enlightenment/epplet_data/E-Pants/E-Pants.ABOUT/MAIN
-share/enlightenment/epplet_data/E-Pants/E-Pants.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-Pants/E-Pants.ABOUT/bg.png
-share/enlightenment/epplet_data/E-Pinger/E-Pinger.ABOUT/MAIN
-share/enlightenment/epplet_data/E-Pinger/E-Pinger.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-Pinger/E-Pinger.ABOUT/bg.png
-share/enlightenment/epplet_data/E-PlayCD/E-PlayCD.ABOUT/E-PlayCD_Controls.png
-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
-%%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
-share/enlightenment/epplet_data/E-SD/E-SD.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-SD/E-SD.ABOUT/bg.png
-share/enlightenment/epplet_data/E-SD/E-SD_minitime.png
-share/enlightenment/epplet_data/E-SD/E-SD_standby.png
-share/enlightenment/epplet_data/E-ScreenSave/E-ScreenSave.ABOUT/MAIN
-share/enlightenment/epplet_data/E-ScreenSave/E-ScreenSave.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-ScreenSave/E-ScreenSave.ABOUT/bg.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/E_ScreenShoot_buttons.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/E_ScreenShoot_cloak.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/MAIN
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT/bg.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot_col.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot_minitime.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot_minitime2.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot_root.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot_shoot.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot_time.png
-share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot_win.png
-share/enlightenment/epplet_data/E-Toolbox/default.cfg
-share/enlightenment/epplet_data/E-Toolbox/ee2.png
-share/enlightenment/epplet_data/E-Toolbox/eterm.png
-share/enlightenment/epplet_data/E-Toolbox/folder.png
-share/enlightenment/epplet_data/E-Toolbox/linux.png
-share/enlightenment/epplet_data/E-Toolbox/mail.png
-share/enlightenment/epplet_data/E-Toolbox/netscape.png
-share/enlightenment/epplet_data/E-Toolbox/popup-sample.cfg
-share/enlightenment/epplet_data/E-Toolbox/sample.cfg
-share/enlightenment/epplet_data/E-UrlWatch/E-UrlWatch.ABOUT/MAIN
-share/enlightenment/epplet_data/E-UrlWatch/E-UrlWatch.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-UrlWatch/E-UrlWatch.ABOUT/bg.png
-share/enlightenment/epplet_data/E-UrlWatch/wooeep.wav
-share/enlightenment/epplet_data/E-Wireless/E-Wireless.ABOUT/MAIN
-share/enlightenment/epplet_data/E-Wireless/E-Wireless.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/E-Wireless/E-Wireless.ABOUT/bg.png
-share/enlightenment/epplet_data/E-Wireless/E-Wireless.ABOUT/delia.jpg
-share/enlightenment/epplet_data/E-Wireless/E-Wireless.ABOUT/delia.png
-share/enlightenment/epplet_data/Emix/Emix.ABOUT/MAIN
-share/enlightenment/epplet_data/Emix/Emix.ABOUT/aircut3.ttf
-share/enlightenment/epplet_data/Emix/Emix.ABOUT/bg.png
-share/enlightenment/epplet_data/Emix/Emix.AUTHORS
-share/enlightenment/epplet_data/Emix/Emix.COPYING
-share/enlightenment/epplet_data/Emix/Emix.README
-share/enlightenment/epplet_data/Emix/Emix.TODO
-share/enlightenment/epplet_data/aircut3.ttf
-share/enlightenment/epplet_data/bg.png
-share/enlightenment/epplet_icons/E-Biff.icon
-share/enlightenment/epplet_icons/E-Clock.icon
-share/enlightenment/epplet_icons/E-Cpu.icon
-share/enlightenment/epplet_icons/E-Disk.icon
-share/enlightenment/epplet_icons/E-GtkRc.icon
-share/enlightenment/epplet_icons/E-Load.icon
-share/enlightenment/epplet_icons/E-Magic.icon
-share/enlightenment/epplet_icons/E-MemWatch.icon
-share/enlightenment/epplet_icons/E-Mixer.icon
-share/enlightenment/epplet_icons/E-MoonClock.icon
-share/enlightenment/epplet_icons/E-Mountbox.icon
-share/enlightenment/epplet_icons/E-Net.icon
-share/enlightenment/epplet_icons/E-NetFlame.icon
-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
-%%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
-share/enlightenment/epplet_icons/E-Slides.icon
-share/enlightenment/epplet_icons/E-Sys.icon
-share/enlightenment/epplet_icons/E-Time.icon
-share/enlightenment/epplet_icons/E-UrlWatch.icon
-share/enlightenment/epplet_icons/E-Wireless.icon
-share/enlightenment/epplet_icons/E-Xss.icon
-share/enlightenment/epplet_icons/Emix.icon
-@unexec rmdir %D/share/enlightenment/epplet_icons
-@dirrm share/enlightenment/epplet_data/Emix/Emix.ABOUT
-@dirrm share/enlightenment/epplet_data/Emix
-@dirrm share/enlightenment/epplet_data/E-Wireless/E-Wireless.ABOUT
-@dirrm share/enlightenment/epplet_data/E-Wireless
-@dirrm share/enlightenment/epplet_data/E-UrlWatch/E-UrlWatch.ABOUT
-@dirrm share/enlightenment/epplet_data/E-UrlWatch
-@dirrm share/enlightenment/epplet_data/E-Toolbox
-@dirrm share/enlightenment/epplet_data/E-ScreenShoot/E-ScreenShoot.ABOUT
-@dirrm share/enlightenment/epplet_data/E-ScreenShoot
-@dirrm share/enlightenment/epplet_data/E-ScreenSave/E-ScreenSave.ABOUT
-@dirrm share/enlightenment/epplet_data/E-ScreenSave
-@dirrm share/enlightenment/epplet_data/E-SD/E-SD.ABOUT
-@dirrm share/enlightenment/epplet_data/E-SD
-@dirrm share/enlightenment/epplet_data/E-Power/E-Power.ABOUT
-@dirrm share/enlightenment/epplet_data/E-Power
-@dirrm share/enlightenment/epplet_data/E-PlayCD/E-PlayCD.ABOUT
-@dirrm share/enlightenment/epplet_data/E-PlayCD
-@dirrm share/enlightenment/epplet_data/E-Pinger/E-Pinger.ABOUT
-@dirrm share/enlightenment/epplet_data/E-Pinger
-@dirrm share/enlightenment/epplet_data/E-Pants/E-Pants.ABOUT
-@dirrm share/enlightenment/epplet_data/E-Pants
-@dirrm share/enlightenment/epplet_data/E-OpenGL-Demo/E-OpenGL-Demo.ABOUT
-@dirrm share/enlightenment/epplet_data/E-OpenGL-Demo
-@dirrm share/enlightenment/epplet_data/E-NetFlame/E-NetFlame.ABOUT
-@dirrm share/enlightenment/epplet_data/E-NetFlame
-@dirrm share/enlightenment/epplet_data/E-Mountbox/E-Mountbox.ABOUT
-@dirrm share/enlightenment/epplet_data/E-Mountbox
-@dirrm share/enlightenment/epplet_data/E-MoonClock/E-MoonClock.ABOUT
-@dirrm share/enlightenment/epplet_data/E-MoonClock
-@dirrm share/enlightenment/epplet_data/E-Mixer/E-Mixer.ABOUT
-@dirrm share/enlightenment/epplet_data/E-Mixer
-@dirrm share/enlightenment/epplet_data/E-Magic
-@dirrm share/enlightenment/epplet_data/E-GtkRc/E-GtkRc.ABOUT
-@dirrm share/enlightenment/epplet_data/E-GtkRc
-@dirrm share/enlightenment/epplet_data/E-Cpu/E-Cpu.ABOUT
-@dirrm share/enlightenment/epplet_data/E-Cpu
-@dirrm share/enlightenment/epplet_data/E-Clock/E-Clock.ABOUT
-@dirrm share/enlightenment/epplet_data/E-Clock
-@dirrm share/enlightenment/epplet_data/E-Biff
-@unexec rmdir %D/share/enlightenment/epplet_data
-@dirrmtry share/enlightenment
+include/epplet.h
+lib/libepplet.a
+lib/libepplet.la
+lib/libepplet.so
+lib/libepplet.so.1
+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/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-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-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
+share/e16/epplet_data/E-MoonClock/E-MoonClock-04.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-05.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-06.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-07.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-08.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-09.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-10.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-11.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-12.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-13.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-14.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-15.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-16.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-17.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-18.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-19.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-20.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-21.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-22.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-23.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-24.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-25.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-26.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-27.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-28.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-29.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-30.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-31.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-32.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-33.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-34.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-35.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-36.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-37.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-38.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-39.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-40.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-41.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-42.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-43.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-44.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-45.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-46.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-47.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-48.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-49.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-50.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-51.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-52.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-53.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-54.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-55.png
+share/e16/epplet_data/E-MoonClock/E-MoonClock-56.png
+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-Mountbox/E-Mountbox-bg.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox-blockdev.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox-cd.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox-floppy.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox-jazz.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox-zip.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox.ABOUT/MAIN
+share/e16/epplet_data/E-Mountbox/E-Mountbox.ABOUT/aircut3.ttf
+share/e16/epplet_data/E-Mountbox/E-Mountbox.ABOUT/bg.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox.ABOUT/dialog.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox.ABOUT/shot.png
+share/e16/epplet_data/E-Mountbox/E-Mountbox.ABOUT/shot_unmounted.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-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/aircut3.ttf
+share/e16/epplet_data/E-Power/E-Power.ABOUT/bg.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/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-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
+share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot_root.png
+share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot_shoot.png
+share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot_time.png
+share/e16/epplet_data/E-ScreenShoot/E-ScreenShoot_win.png
+share/e16/epplet_data/E-Toolbox/default.cfg
+share/e16/epplet_data/E-Toolbox/ee2.png
+share/e16/epplet_data/E-Toolbox/eterm.png
+share/e16/epplet_data/E-Toolbox/folder.png
+share/e16/epplet_data/E-Toolbox/linux.png
+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/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/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-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-Mountbox.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-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/E-Xss.icon
+share/e16/epplet_icons/Emix.icon
+@dirrmtry rmdir %D/share/e16/epplet_icons
+@dirrm share/e16/epplet_data/Emix/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
+@dirrm share/e16/epplet_data/E-UrlWatch/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
+@dirrm share/e16/epplet_data/E-ScreenSave/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
+@dirrm share/e16/epplet_data/E-Power/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
+@dirrm share/e16/epplet_data/E-Pinger/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
+@dirrm share/e16/epplet_data/E-OpenGL-Demo/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
+@dirrm share/e16/epplet_data/E-Mountbox/E-Mountbox.ABOUT
+@dirrm share/e16/epplet_data/E-Mountbox
+@dirrm share/e16/epplet_data/E-MoonClock/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
+@dirrm share/e16/epplet_data/E-Magic
+@dirrm share/e16/epplet_data/E-Cpu/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
+@dirrm share/e16/epplet_data/E-Biff
+@dirrm share/e16/epplet_data