1 files changed, 11 insertions, 212 deletions
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) \