18 files changed, 339 insertions, 461 deletions

diff --git a/x11-wm/epplets/files/patch-Makefile.in b/x11-wm/epplets/files/patch-Makefile.in
new file mode 100644
index 000000000000..7c496c07f610
--- /dev/null
+++ b/x11-wm/epplets/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Nov  6 07:09:39 2003
++++ Makefile.in	Mon Dec  8 02:20:28 2003
+@@ -107,7 +107,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = api epplets debian
++SUBDIRS = epplets debian
+ 
+ EXTRA_DIST = autogen.sh epplets.spec
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/x11-wm/epplets/files/patch-ab b/x11-wm/epplets/files/patch-ab
deleted file mode 100644
index db8d318df74f..000000000000
--- a/x11-wm/epplets/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- epplets/Emix.c.orig	Mon Dec 27 18:41:49 1999
-+++ epplets/Emix.c	Mon Dec 27 18:41:58 1999
-@@ -6,7 +6,7 @@
- 
- #include <epplet.h>
- #include <sys/ioctl.h>
--#include <sys/soundcard.h>
-+#include <machine/soundcard.h>
- 
- int open_mixer(void);
- int read_volume(int);
diff --git a/x11-wm/epplets/files/patch-ac b/x11-wm/epplets/files/patch-ac
deleted file mode 100644
index deef5d049c0e..000000000000
--- a/x11-wm/epplets/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- epplets/E-ScreenShoot.c.orig	Mon Dec 27 18:44:18 1999
-+++ epplets/E-ScreenShoot.c	Mon Dec 27 18:45:24 1999
-@@ -20,6 +20,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- 
- 
diff --git a/x11-wm/epplets/files/patch-af b/x11-wm/epplets/files/patch-af
deleted file mode 100644
index 2b72e157e5c2..000000000000
--- a/x11-wm/epplets/files/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
---- epplets/E-SD.c.orig	Fri Dec 10 03:49:59 1999
-+++ epplets/E-SD.c	Thu Jan 13 15:35:22 2000
-@@ -20,6 +20,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/socket.h>
- #include <unistd.h>
diff --git a/x11-wm/epplets/files/patch-ag b/x11-wm/epplets/files/patch-ag
deleted file mode 100644
index 0eb953b269be..000000000000
--- a/x11-wm/epplets/files/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
---- epplets/E-ScreenSave.c.orig	Thu Jan 13 15:14:42 2000
-+++ epplets/E-ScreenSave.c	Thu Jan 13 15:15:03 2000
-@@ -20,6 +20,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- 
- 
diff --git a/x11-wm/epplets/files/patch-ah b/x11-wm/epplets/files/patch-ah
deleted file mode 100644
index 3c2bfaa39495..000000000000
--- a/x11-wm/epplets/files/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
---- epplets/E-MoonClock.c.orig	Thu Jan 13 15:15:35 2000
-+++ epplets/E-MoonClock.c	Thu Jan 13 15:16:05 2000
-@@ -26,9 +26,9 @@
-  */
- 
- 
--#include <sys/resource.h>
- #include <stdio.h>
--#include <time.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include "epplet.h"
- #include "CalcEphem.h"
- 
diff --git a/x11-wm/epplets/files/patch-ai b/x11-wm/epplets/files/patch-ai
deleted file mode 100644
index 48ef54710ea1..000000000000
--- a/x11-wm/epplets/files/patch-ai
+++ /dev/null
@@ -1,10 +0,0 @@
---- epplets/E-UrlWatch.c.orig	Thu Jan 13 15:16:22 2000
-+++ epplets/E-UrlWatch.c	Thu Jan 13 15:16:37 2000
-@@ -20,6 +20,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/x11-wm/epplets/files/patch-aj b/x11-wm/epplets/files/patch-aj
deleted file mode 100644
index 1a0716169970..000000000000
--- a/x11-wm/epplets/files/patch-aj
+++ /dev/null
@@ -1,117 +0,0 @@
---- epplets/E-Power.c.bak	Sat Mar 25 02:35:06 2000
-+++ epplets/E-Power.c	Sat Mar 25 03:37:24 2000
-@@ -1,5 +1,10 @@
- #include "epplet.h"
- 
-+#include<stdio.h>
-+#include<fcntl.h>
-+#include<sys/ioctl.h>
-+#include<machine/apm_bios.h>
-+
- int                prev_bat_val = 110;
- int                bat_val = 0;
- int                time_val = 0;
-@@ -18,25 +23,24 @@
- static void
- cb_timer(void *data)
- {
--   static FILE *f;
-+   int fd;
- 
--   f = fopen("/proc/apm", "r");
--   if (f)
-+   fd = open("/dev/apm", O_RDONLY);
-+   if (fd != -1)
-      {
- 	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;
-+	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;
- 	
--	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;
--	bat_val=atoi(s1);
--	if (!strcmp(s3, "sec"))
--	   time_val = atoi(s2);
--	else if (!strcmp(s3, "min"))
--	   time_val = atoi(s2) * 60;
--	fclose(f);
-+	close(fd);
- 	
- 	up = bat_val - prev_bat_val;
- 	up2 = up;
-@@ -52,50 +56,47 @@
- 	
-         s_ptr = s;
- 
--        if( bat_flags != 0xff
--	    && bat_flags & 0x80 )
--	  {
--	    s_ptr += Esnprintf( s_ptr, sizeof(s_ptr), "no battery" );
--	  }
--	else
--	  {
- 	    if( bat_val > 0 )
--	      s_ptr += Esnprintf( s_ptr, sizeof(s_ptr), "%i%%", bat_val );
-+	      s_ptr += Esnprintf( s_ptr, sizeof("%i%%"), "%i%%", bat_val );
- 
- 	    switch( bat_stat )
- 	      {
- 		case 0:
--	          s_ptr += Esnprintf( s_ptr, sizeof(s_ptr), ", high" );
-+	          s_ptr += Esnprintf( s_ptr, sizeof(", high"), ", high" );
- 		  break;
- 		case 1:
--	          s_ptr += Esnprintf( s_ptr, sizeof(s_ptr), ", low" );
-+	          s_ptr += Esnprintf( s_ptr, sizeof(", low"), ", low" );
- 		  break;
- 		case 2:
--	          s_ptr += Esnprintf( s_ptr, sizeof(s_ptr), ", crit." );
-+	          s_ptr += Esnprintf( s_ptr, sizeof(", crit."), ", crit." );
- 		  break;
- 		case 3:
--	          s_ptr += Esnprintf( s_ptr, sizeof(s_ptr), ", charge" );
-+	          s_ptr += Esnprintf( s_ptr, sizeof(", charge"), ", charge" );
- 		  break;
- 	      }
--	  }
--	s_ptr += Esnprintf( s_ptr, sizeof(s_ptr), "\n" );
-+
-+	s_ptr += Esnprintf( s_ptr, sizeof("\n"), "\n" );
- 
- 
- 	if( ac_stat == 1 )
-           {
--	    s_ptr += Esnprintf(s_ptr, sizeof(s_ptr), "AC on-line" );
-+	    s_ptr += Esnprintf(s_ptr, sizeof("AC on-line"), "AC on-line" );
-           }
-         else
-           {
-+	    if( time_val >= 0){
- 	    hours = time_val / 3600;
-             minutes = (time_val / 60) % 60;
- 	    if (up2 > 0)
--	       s_ptr += Esnprintf(s_ptr, sizeof(s_ptr), "(%i:%02i)\n%i:%02i", 
-+	       s_ptr += Esnprintf(s_ptr, sizeof("(%i:%02i)\n%i:%02i"), "(%i:%02i)\n%i:%02i", 
- 		       		(((100 - bat_val) * 2 * 60) / up2) / 60, 
- 		       		(((100 - bat_val) * 2 * 60) / up2) % 60, 
- 		       		hours, minutes);
- 	    else
--	       s_ptr += Esnprintf(s_ptr, sizeof(s_ptr), "%i:%02i", hours, minutes);
-+	       s_ptr += Esnprintf(s_ptr, sizeof("%i:%02i"), "%i:%02i", hours, minutes);
-+	    }
-+	    else
-+	      s_ptr += Esnprintf(s_ptr, sizeof("unknown"),"unknown");
-           }
- 	Epplet_change_label(label, s);
- 
-
-
diff --git a/x11-wm/epplets/files/patch-ak b/x11-wm/epplets/files/patch-ak
deleted file mode 100644
index 54c22018da98..000000000000
--- a/x11-wm/epplets/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Jun 19 19:21:53 2000
-+++ Makefile.in	Mon Jun 19 19:22:19 2000
-@@ -100,7 +100,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = api epplets
-+SUBDIRS = epplets
- 
- EXTRA_DIST = autogen.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/x11-wm/epplets/files/patch-al b/x11-wm/epplets/files/patch-al
deleted file mode 100644
index 6a3a4fb3d11f..000000000000
--- a/x11-wm/epplets/files/patch-al
+++ /dev/null
@@ -1,268 +0,0 @@
---- epplets/Makefile.in.orig	Tue Jan  4 23:55:53 2000
-+++ epplets/Makefile.in	Fri Aug 10 13:38:45 2001
-@@ -75,7 +75,7 @@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBGTOP_CONFIG = @LIBGTOP_CONFIG@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lepplet
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- MAINT = @MAINT@
-@@ -108,7 +108,7 @@
- E_Mixer_epplet_SOURCES = E-Mixer.c
- E_Mixer_epplet_DEPENDENCIES = $(top_srcdir)/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 = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) @SGI_LIBS@
- 
- Emix_epplet_SOURCES = Emix.c
- Emix_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
-@@ -117,7 +117,7 @@
- E_PlayCD_epplet_SOURCES = E-PlayCD.c
- E_PlayCD_epplet_DEPENDENCIES = $(top_srcdir)/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 = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) -lcdaudio
- 
- EppletTest_epplet_SOURCES = TestEpplet.c
- EppletTest_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
-@@ -139,7 +139,7 @@
- E_Load_epplet_SOURCES = E-Load.c
- E_Load_epplet_DEPENDENCIES = $(top_srcdir)/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 = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_Clock_epplet_SOURCES = E-Clock.c
- E_Clock_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
-@@ -172,7 +172,7 @@
- E_Cpu_epplet_SOURCES = E-Cpu.c proc.h
- E_Cpu_epplet_DEPENDENCIES = $(top_srcdir)/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 = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_Power_epplet_SOURCES = E-Power.c
- E_Power_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
-@@ -185,7 +185,7 @@
- E_MemWatch_epplet_SOURCES = E-MemWatch.c
- E_MemWatch_epplet_DEPENDENCIES = $(top_srcdir)/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 = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_Disk_epplet_SOURCES = E-Disk.c
- E_Disk_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
-@@ -194,7 +194,7 @@
- E_Sys_epplet_SOURCES = E-Sys.c
- E_Sys_epplet_DEPENDENCIES = $(top_srcdir)/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 = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS) $(GTLIBS)
- 
- E_Slides_epplet_SOURCES = E-Slides.c
- E_Slides_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
-@@ -221,14 +221,14 @@
- E_UrlWatch_epplet_SOURCES = E-UrlWatch.c E-UrlWatch.h utils.c utils.h
- E_UrlWatch_epplet_DEPENDENCIES = $(top_srcdir)/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 = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
- 
- E_Mountbox_epplet_SOURCES = E-Mountbox.c E-Mountbox.h
- E_Mountbox_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
- E_Mountbox_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)
-+LDADD = -L$(libdir) -L$(prefix)/lib -L/usr/local/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)`
-@@ -275,7 +275,7 @@
- E_Time_epplet_OBJECTS =  E-Time.o
- E_Time_epplet_LDADD = $(LDADD)
- E_Net_epplet_OBJECTS =  E-Net.o net.o
--E_Net_epplet_LDADD = $(LDADD)
-+E_Net_epplet_LDADD = $(LDADD) -lkvm
- E_Cpu_epplet_OBJECTS =  E-Cpu.o
- E_Biff_epplet_OBJECTS =  E-Biff.o mbox.o
- E_Biff_epplet_LDADD = $(LDADD)
-@@ -289,7 +289,7 @@
- E_Magic_epplet_OBJECTS =  E-Magic.o
- E_Magic_epplet_LDADD = $(LDADD)
- E_NetFlame_epplet_OBJECTS =  E-NetFlame.o net.o
--E_NetFlame_epplet_LDADD = $(LDADD)
-+E_NetFlame_epplet_LDADD = $(LDADD) -lkvm
- E_Sys_epplet_OBJECTS =  E-Sys.o
- E_ScreenShoot_epplet_OBJECTS =  E-ScreenShoot.o cloak.o utils.o
- E_ScreenShoot_epplet_LDADD = $(LDADD)
-@@ -306,7 +306,7 @@
- E_ScreenSave_epplet_OBJECTS =  E-ScreenSave.o cloak.o utils.o
- E_ScreenSave_epplet_LDADD = $(LDADD)
- E_NetGraph_epplet_OBJECTS =  E-NetGraph.o net.o
--E_NetGraph_epplet_LDADD = $(LDADD)
-+E_NetGraph_epplet_LDADD = $(LDADD) -lkvm
- E_MoonClock_epplet_OBJECTS =  E-MoonClock.o CalcEphem.o Moon.o
- E_MoonClock_epplet_LDADD = $(LDADD)
- E_UrlWatch_epplet_OBJECTS =  E-UrlWatch.o utils.o
-@@ -352,6 +352,8 @@
- 	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	  else :; fi; \
- 	done
-+	chgrp kmem $(bindir)/E-Net.epplet $(bindir)/E-NetFlame.epplet $(bindir)/E-NetGraph.epplet
-+	chmod 2755 $(bindir)/E-Net.epplet $(bindir)/E-NetFlame.epplet $(bindir)/E-NetGraph.epplet
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
-@@ -397,115 +399,121 @@
- 
- maintainer-clean-libtool:
- 
--EppletTest.epplet: $(EppletTest_epplet_OBJECTS) $(EppletTest_epplet_DEPENDENCIES)
-+EppletTest.epplet: $(EppletTest_epplet_OBJECTS)
- 	@rm -f EppletTest.epplet
- 	$(LINK) $(EppletTest_epplet_LDFLAGS) $(EppletTest_epplet_OBJECTS) $(EppletTest_epplet_LDADD) $(LIBS)
- 
--EppletConfigTest.epplet: $(EppletConfigTest_epplet_OBJECTS) $(EppletConfigTest_epplet_DEPENDENCIES)
-+EppletConfigTest.epplet: $(EppletConfigTest_epplet_OBJECTS)
- 	@rm -f EppletConfigTest.epplet
- 	$(LINK) $(EppletConfigTest_epplet_LDFLAGS) $(EppletConfigTest_epplet_OBJECTS) $(EppletConfigTest_epplet_LDADD) $(LIBS)
- 
--E-Mixer.epplet: $(E_Mixer_epplet_OBJECTS) $(E_Mixer_epplet_DEPENDENCIES)
-+E-Mixer.epplet: $(E_Mixer_epplet_OBJECTS)
- 	@rm -f E-Mixer.epplet
- 	$(LINK) $(E_Mixer_epplet_LDFLAGS) $(E_Mixer_epplet_OBJECTS) $(E_Mixer_epplet_LDADD) $(LIBS)
- 
--Emix.epplet: $(Emix_epplet_OBJECTS) $(Emix_epplet_DEPENDENCIES)
-+Emix.epplet: $(Emix_epplet_OBJECTS)
- 	@rm -f Emix.epplet
- 	$(LINK) $(Emix_epplet_LDFLAGS) $(Emix_epplet_OBJECTS) $(Emix_epplet_LDADD) $(LIBS)
- 
--E-PlayCD.epplet: $(E_PlayCD_epplet_OBJECTS) $(E_PlayCD_epplet_DEPENDENCIES)
-+E-PlayCD.epplet: $(E_PlayCD_epplet_OBJECTS)
- 	@rm -f E-PlayCD.epplet
- 	$(LINK) $(E_PlayCD_epplet_LDFLAGS) $(E_PlayCD_epplet_OBJECTS) $(E_PlayCD_epplet_LDADD) $(LIBS)
- 
--E-Load.epplet: $(E_Load_epplet_OBJECTS) $(E_Load_epplet_DEPENDENCIES)
-+E-Load.epplet: $(E_Load_epplet_OBJECTS)
- 	@rm -f E-Load.epplet
- 	$(LINK) $(E_Load_epplet_LDFLAGS) $(E_Load_epplet_OBJECTS) $(E_Load_epplet_LDADD) $(LIBS)
- 
--E-Clock.epplet: $(E_Clock_epplet_OBJECTS) $(E_Clock_epplet_DEPENDENCIES)
-+E-Clock.epplet: $(E_Clock_epplet_OBJECTS)
- 	@rm -f E-Clock.epplet
- 	$(LINK) $(E_Clock_epplet_LDFLAGS) $(E_Clock_epplet_OBJECTS) $(E_Clock_epplet_LDADD) $(LIBS)
- 
--E-Time.epplet: $(E_Time_epplet_OBJECTS) $(E_Time_epplet_DEPENDENCIES)
-+E-Time.epplet: $(E_Time_epplet_OBJECTS)
- 	@rm -f E-Time.epplet
- 	$(LINK) $(E_Time_epplet_LDFLAGS) $(E_Time_epplet_OBJECTS) $(E_Time_epplet_LDADD) $(LIBS)
- 
--E-Net.epplet: $(E_Net_epplet_OBJECTS) $(E_Net_epplet_DEPENDENCIES)
-+E-Net.epplet: $(E_Net_epplet_OBJECTS)
- 	@rm -f E-Net.epplet
- 	$(LINK) $(E_Net_epplet_LDFLAGS) $(E_Net_epplet_OBJECTS) $(E_Net_epplet_LDADD) $(LIBS)
-+	@chgrp kmem E-Net.epplet
-+	@chmod 2755 E-Net.epplet
- 
--E-Cpu.epplet: $(E_Cpu_epplet_OBJECTS) $(E_Cpu_epplet_DEPENDENCIES)
-+E-Cpu.epplet: $(E_Cpu_epplet_OBJECTS)
- 	@rm -f E-Cpu.epplet
- 	$(LINK) $(E_Cpu_epplet_LDFLAGS) $(E_Cpu_epplet_OBJECTS) $(E_Cpu_epplet_LDADD) $(LIBS)
- 
--E-Biff.epplet: $(E_Biff_epplet_OBJECTS) $(E_Biff_epplet_DEPENDENCIES)
-+E-Biff.epplet: $(E_Biff_epplet_OBJECTS)
- 	@rm -f E-Biff.epplet
- 	$(LINK) $(E_Biff_epplet_LDFLAGS) $(E_Biff_epplet_OBJECTS) $(E_Biff_epplet_LDADD) $(LIBS)
- 
--E-Power.epplet: $(E_Power_epplet_OBJECTS) $(E_Power_epplet_DEPENDENCIES)
-+E-Power.epplet: $(E_Power_epplet_OBJECTS)
- 	@rm -f E-Power.epplet
- 	$(LINK) $(E_Power_epplet_LDFLAGS) $(E_Power_epplet_OBJECTS) $(E_Power_epplet_LDADD) $(LIBS)
- 
--E-MemWatch.epplet: $(E_MemWatch_epplet_OBJECTS) $(E_MemWatch_epplet_DEPENDENCIES)
-+E-MemWatch.epplet: $(E_MemWatch_epplet_OBJECTS)
- 	@rm -f E-MemWatch.epplet
- 	$(LINK) $(E_MemWatch_epplet_LDFLAGS) $(E_MemWatch_epplet_OBJECTS) $(E_MemWatch_epplet_LDADD) $(LIBS)
- 
--E-Disk.epplet: $(E_Disk_epplet_OBJECTS) $(E_Disk_epplet_DEPENDENCIES)
-+E-Disk.epplet: $(E_Disk_epplet_OBJECTS)
- 	@rm -f E-Disk.epplet
- 	$(LINK) $(E_Disk_epplet_LDFLAGS) $(E_Disk_epplet_OBJECTS) $(E_Disk_epplet_LDADD) $(LIBS)
- 
--E-Areas.epplet: $(E_Areas_epplet_OBJECTS) $(E_Areas_epplet_DEPENDENCIES)
-+E-Areas.epplet: $(E_Areas_epplet_OBJECTS)
- 	@rm -f E-Areas.epplet
- 	$(LINK) $(E_Areas_epplet_LDFLAGS) $(E_Areas_epplet_OBJECTS) $(E_Areas_epplet_LDADD) $(LIBS)
- 
--E-Magic.epplet: $(E_Magic_epplet_OBJECTS) $(E_Magic_epplet_DEPENDENCIES)
-+E-Magic.epplet: $(E_Magic_epplet_OBJECTS)
- 	@rm -f E-Magic.epplet
- 	$(LINK) $(E_Magic_epplet_LDFLAGS) $(E_Magic_epplet_OBJECTS) $(E_Magic_epplet_LDADD) $(LIBS)
- 
--E-NetFlame.epplet: $(E_NetFlame_epplet_OBJECTS) $(E_NetFlame_epplet_DEPENDENCIES)
-+E-NetFlame.epplet: $(E_NetFlame_epplet_OBJECTS)
- 	@rm -f E-NetFlame.epplet
- 	$(LINK) $(E_NetFlame_epplet_LDFLAGS) $(E_NetFlame_epplet_OBJECTS) $(E_NetFlame_epplet_LDADD) $(LIBS)
-+	@chgrp kmem E-NetFlame.epplet
-+	@chmod 2755 E-NetFlame.epplet
- 
--E-Sys.epplet: $(E_Sys_epplet_OBJECTS) $(E_Sys_epplet_DEPENDENCIES)
-+E-Sys.epplet: $(E_Sys_epplet_OBJECTS)
- 	@rm -f E-Sys.epplet
- 	$(LINK) $(E_Sys_epplet_LDFLAGS) $(E_Sys_epplet_OBJECTS) $(E_Sys_epplet_LDADD) $(LIBS)
- 
--E-ScreenShoot.epplet: $(E_ScreenShoot_epplet_OBJECTS) $(E_ScreenShoot_epplet_DEPENDENCIES)
-+E-ScreenShoot.epplet: $(E_ScreenShoot_epplet_OBJECTS)
- 	@rm -f E-ScreenShoot.epplet
- 	$(LINK) $(E_ScreenShoot_epplet_LDFLAGS) $(E_ScreenShoot_epplet_OBJECTS) $(E_ScreenShoot_epplet_LDADD) $(LIBS)
- 
--E-Slides.epplet: $(E_Slides_epplet_OBJECTS) $(E_Slides_epplet_DEPENDENCIES)
-+E-Slides.epplet: $(E_Slides_epplet_OBJECTS)
- 	@rm -f E-Slides.epplet
- 	$(LINK) $(E_Slides_epplet_LDFLAGS) $(E_Slides_epplet_OBJECTS) $(E_Slides_epplet_LDADD) $(LIBS)
- 
--E-Xss.epplet: $(E_Xss_epplet_OBJECTS) $(E_Xss_epplet_DEPENDENCIES)
-+E-Xss.epplet: $(E_Xss_epplet_OBJECTS)
- 	@rm -f E-Xss.epplet
- 	$(LINK) $(E_Xss_epplet_LDFLAGS) $(E_Xss_epplet_OBJECTS) $(E_Xss_epplet_LDADD) $(LIBS)
- 
--E-Mountbox.epplet: $(E_Mountbox_epplet_OBJECTS) $(E_Mountbox_epplet_DEPENDENCIES)
-+E-Mountbox.epplet: $(E_Mountbox_epplet_OBJECTS)
- 	@rm -f E-Mountbox.epplet
- 	$(LINK) $(E_Mountbox_epplet_LDFLAGS) $(E_Mountbox_epplet_OBJECTS) $(E_Mountbox_epplet_LDADD) $(LIBS)
- 
--E-Exec.epplet: $(E_Exec_epplet_OBJECTS) $(E_Exec_epplet_DEPENDENCIES)
-+E-Exec.epplet: $(E_Exec_epplet_OBJECTS)
- 	@rm -f E-Exec.epplet
- 	$(LINK) $(E_Exec_epplet_LDFLAGS) $(E_Exec_epplet_OBJECTS) $(E_Exec_epplet_LDADD) $(LIBS)
- 
--E-SD.epplet: $(E_SD_epplet_OBJECTS) $(E_SD_epplet_DEPENDENCIES)
-+E-SD.epplet: $(E_SD_epplet_OBJECTS)
- 	@rm -f E-SD.epplet
- 	$(LINK) $(E_SD_epplet_LDFLAGS) $(E_SD_epplet_OBJECTS) $(E_SD_epplet_LDADD) $(LIBS)
- 
--E-ScreenSave.epplet: $(E_ScreenSave_epplet_OBJECTS) $(E_ScreenSave_epplet_DEPENDENCIES)
-+E-ScreenSave.epplet: $(E_ScreenSave_epplet_OBJECTS)
- 	@rm -f E-ScreenSave.epplet
- 	$(LINK) $(E_ScreenSave_epplet_LDFLAGS) $(E_ScreenSave_epplet_OBJECTS) $(E_ScreenSave_epplet_LDADD) $(LIBS)
- 
--E-NetGraph.epplet: $(E_NetGraph_epplet_OBJECTS) $(E_NetGraph_epplet_DEPENDENCIES)
-+E-NetGraph.epplet: $(E_NetGraph_epplet_OBJECTS)
- 	@rm -f E-NetGraph.epplet
- 	$(LINK) $(E_NetGraph_epplet_LDFLAGS) $(E_NetGraph_epplet_OBJECTS) $(E_NetGraph_epplet_LDADD) $(LIBS)
-+	@chgrp kmem E-NetGraph.epplet
-+	@chmod 2755 E-NetGraph.epplet
- 
--E-MoonClock.epplet: $(E_MoonClock_epplet_OBJECTS) $(E_MoonClock_epplet_DEPENDENCIES)
-+E-MoonClock.epplet: $(E_MoonClock_epplet_OBJECTS)
- 	@rm -f E-MoonClock.epplet
- 	$(LINK) $(E_MoonClock_epplet_LDFLAGS) $(E_MoonClock_epplet_OBJECTS) $(E_MoonClock_epplet_LDADD) $(LIBS)
- 
--E-UrlWatch.epplet: $(E_UrlWatch_epplet_OBJECTS) $(E_UrlWatch_epplet_DEPENDENCIES)
-+E-UrlWatch.epplet: $(E_UrlWatch_epplet_OBJECTS)
- 	@rm -f E-UrlWatch.epplet
- 	$(LINK) $(E_UrlWatch_epplet_LDFLAGS) $(E_UrlWatch_epplet_OBJECTS) $(E_UrlWatch_epplet_LDADD) $(LIBS)
- 
diff --git a/x11-wm/epplets/files/patch-configure b/x11-wm/epplets/files/patch-configure
new file mode 100644
index 000000000000..8ed049a52175
--- /dev/null
+++ b/x11-wm/epplets/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Aug 26 12:12:44 2003
++++ configure	Mon Dec  8 02:20:46 2003
+@@ -5414,6 +5414,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-wm/epplets/files/patch-ae b/x11-wm/epplets/files/patch-epplets::E-Cpu.c
index 513f4fd2aaa3..513f4fd2aaa3 100644
--- a/x11-wm/epplets/files/patch-ae
+++ b/x11-wm/epplets/files/patch-epplets::E-Cpu.c
diff --git a/x11-wm/epplets/files/patch-ad b/x11-wm/epplets/files/patch-epplets::E-Load.c
index ba9cd874c724..ba9cd874c724 100644
--- a/x11-wm/epplets/files/patch-ad
+++ b/x11-wm/epplets/files/patch-epplets::E-Load.c
diff --git a/x11-wm/epplets/files/patch-am b/x11-wm/epplets/files/patch-epplets::E-Net.c
index 1fdecf40cef1..1fdecf40cef1 100644
--- a/x11-wm/epplets/files/patch-am
+++ b/x11-wm/epplets/files/patch-epplets::E-Net.c
diff --git a/x11-wm/epplets/files/patch-epplets::E-Power.c b/x11-wm/epplets/files/patch-epplets::E-Power.c
new file mode 100644
index 000000000000..412a263e0e69
--- /dev/null
+++ b/x11-wm/epplets/files/patch-epplets::E-Power.c
@@ -0,0 +1,106 @@
+--- 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::Makefile.in b/x11-wm/epplets/files/patch-epplets::Makefile.in
new file mode 100644
index 000000000000..f80ea8952b60
--- /dev/null
+++ b/x11-wm/epplets/files/patch-epplets::Makefile.in
@@ -0,0 +1,202 @@
+--- epplets/Makefile.in.orig	Thu Nov  6 07:09:42 2003
++++ epplets/Makefile.in	Mon Dec  8 04:09:40 2003
+@@ -107,7 +107,7 @@
+ 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@ \
++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 E-Exec.epplet @ESD_PROGS@ \
+@@ -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 \
diff --git a/x11-wm/epplets/files/patch-epplets::mbox.c b/x11-wm/epplets/files/patch-epplets::mbox.c
new file mode 100644
index 000000000000..b99b7e75adec
--- /dev/null
+++ b/x11-wm/epplets/files/patch-epplets::mbox.c
@@ -0,0 +1,10 @@
+--- epplets/mbox.c.orig	Tue Apr  9 05:39:38 2002
++++ epplets/mbox.c	Mon Dec  8 02:46:36 2003
+@@ -32,7 +32,6 @@
+ #include <string.h>
+ #include <time.h>
+ #include <utime.h>
+-#include <malloc.h>
+ #include <limits.h>
+ 
+ #define ISSPACE(c) isspace((unsigned char) c)
diff --git a/x11-wm/epplets/files/patch-an b/x11-wm/epplets/files/patch-epplets::net.c
index 709c13c821fb..709c13c821fb 100644
--- a/x11-wm/epplets/files/patch-an
+++ b/x11-wm/epplets/files/patch-epplets::net.c