Update to version 0.9.

13 files changed, 64 insertions, 192 deletions

diff --git a/x11/eterm/files/extra-patch-kanji b/x11/eterm/files/extra-patch-kanji
deleted file mode 100644
index 9542bc1..0000000
--- a/x11/eterm/files/extra-patch-kanji
+++ /dev/null
@@ -1,9 +0,0 @@
---- config.h.in.orig	Mon Oct 26 19:34:07 1998
-+++ config.h.in	Mon Oct 26 19:34:37 1998
-@@ -206,3 +206,6 @@
- 
- /* Define if you have the Kenny library (-lKenny).  */
- #undef HAVE_LIBKENNY
-+
-+/* Define if you want the KANJI mode enable. */
-+#define KANJI
diff --git a/x11/eterm/files/patch-ac b/x11/eterm/files/patch-ac
deleted file mode 100644
index e21ee51..0000000
--- a/x11/eterm/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig	Fri Nov  5 13:03:54 1999
-+++ src/Makefile.in	Sat Jan  8 19:27:47 2000
-@@ -106,7 +106,7 @@
- libEterm_la_SOURCES = activeconfig.c activeeterm.c activetags.c command.c 		graphics.c grkelot.c menubar.c misc.c netdisp.c options.c 		pixmap.c screen.c scrollbar.c system.c threads.c utmp.c
- 
- libEterm_la_DEPENDENCIES = $(DIST_ROOT)/libmej/libmej.la feature.h
--libEterm_la_LDFLAGS = -release $(VERSION)
-+libEterm_la_LDFLAGS = -version-info 8:8:8
- 
- bin_PROGRAMS = Eterm
- Eterm_SOURCES = main.c
-@@ -117,6 +117,10 @@
- LDADD = $(DIST_ROOT)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
- 
- EXTRA_DIST = activeconfig.h activeeterm.h activetags.h command.h debug.h              eterm_imlib.h eterm_utmp.h feature.h.in graphics.h grkelot.h grx.h main.h              menubar.h misc.h options.h pixmap.h profile.h screen.h scrollbar.h              system.h threads.h graphics/Makefile.am graphics/Makefile.in              graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h              graphics/qplot.c Eterm.xpm
-+
-+ifeq ($(PORTOBJFORMAT),elf)
-+LDFLAGS+=-Wl,-rpath,$(X11BASE)/lib
-+endif
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/x11/eterm/files/patch-af b/x11/eterm/files/patch-af
deleted file mode 100644
index c72092e..0000000
--- a/x11/eterm/files/patch-af
+++ /dev/null
@@ -1,66 +0,0 @@
---- themes/Eterm/MAIN.in.orig	Sun Jun 13 00:26:37 1999
-+++ themes/Eterm/MAIN.in	Sun Jun 13 00:28:40 1999
-@@ -94,7 +94,7 @@
- # scale 100%, 0 to tile, any other number specifies W/H in pixels
-   begin pixmaps
-     background %random(`cat pixmaps.list 2>/dev/null`)
--    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/"
-+    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/:@DATADIR@/Eterm/bg/scale/:@DATADIR@/Eterm/bg/tile/"
- 
- # Support for these is forthcoming
- #    scroll_up -1 -1 ~/.Eterm/up_arrow.ppm
---- themes/emacs/MAIN.in.orig	Sun Jun 13 00:26:37 1999
-+++ themes/emacs/MAIN.in	Sun Jun 13 00:29:06 1999
-@@ -94,7 +94,7 @@
- # scale 100%, 0 to tile, any other number specifies W/H in pixels
-   begin pixmaps
-     background %random(`cat pixmaps.list 2>/dev/null`)
--    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/"
-+    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/:@DATADIR@/Eterm/bg/scale/:@DATADIR@/Eterm/bg/tile/"
- 
- # Support for these is forthcoming
- #    scroll_up -1 -1 ~/.Eterm/up_arrow.ppm
---- themes/irc/MAIN.in.orig	Sun Jun 13 00:26:37 1999
-+++ themes/irc/MAIN.in	Sun Jun 13 00:29:24 1999
-@@ -94,7 +94,7 @@
- # scale 100%, 0 to tile, any other number specifies W/H in pixels
-   begin pixmaps
-     background %random(`cat pixmaps.list 2>/dev/null`)
--    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/"
-+    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/:@DATADIR@/Eterm/bg/scale/:@DATADIR@/Eterm/bg/tile/"
- 
- # Support for these is forthcoming
- #    scroll_up -1 -1 ~/.Eterm/up_arrow.ppm
---- themes/mutt/MAIN.in.orig	Sun Jun 13 00:26:37 1999
-+++ themes/mutt/MAIN.in	Sun Jun 13 00:30:14 1999
-@@ -94,7 +94,7 @@
- # scale 100%, 0 to tile, any other number specifies W/H in pixels
-   begin pixmaps
-     background %random(`cat pixmaps.list 2>/dev/null`)
--    path "~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/"
-+    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/:@DATADIR@/Eterm/bg/scale/:@DATADIR@/Eterm/bg/tile/"
- 
- # Support for these is forthcoming
- #    scroll_up -1 -1 ~/.Eterm/up_arrow.ppm
---- themes/tn3270/MAIN.in.orig	Sun Jun 13 00:26:37 1999
-+++ themes/tn3270/MAIN.in	Sun Jun 13 00:30:36 1999
-@@ -94,7 +94,7 @@
- # scale 100%, 0 to tile, any other number specifies W/H in pixels
-   begin pixmaps
-     background %random(`cat pixmaps.list 2>/dev/null`)
--    path "~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/"
-+    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/:@DATADIR@/Eterm/bg/scale/:@DATADIR@/Eterm/bg/tile/"
- 
- # Support for these is forthcoming
- #    scroll_up -1 -1 ~/.Eterm/up_arrow.ppm
---- themes/trans/MAIN.in.orig	Sun Jun 13 00:26:37 1999
-+++ themes/trans/MAIN.in	Sun Jun 13 00:33:48 1999
-@@ -96,7 +96,7 @@
- # scale 100%, 0 to tile, any other number specifies W/H in pixels
-   begin pixmaps
- #    background %random(`cat pixmaps.list 2>/dev/null`)
--#    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/"
-+#    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@DATADIR@/Eterm/pix/:@DATADIR@/Eterm/bg/scale/:@DATADIR@/Eterm/bg/tile/"
- 
- # Support for these is forthcoming
- #    scroll_up -1 -1 ~/.Eterm/up_arrow.ppm
diff --git a/x11/eterm/files/patch-ag b/x11/eterm/files/patch-ag
deleted file mode 100644
index 13ba71f..0000000
--- a/x11/eterm/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/feature.h.in.orig	Thu Nov 25 20:50:37 1999
-+++ src/feature.h.in	Thu Nov 25 20:50:49 1999
-@@ -380,7 +380,7 @@
-  * may seem to be owned by root.  But if you define this and don't have them,
-  * the utmp and tty stuff could break.  Do some testing.  DO NOT get this one
-  * wrong!  */
--/* #define HAVE_SAVED_UIDS */
-+#define HAVE_SAVED_UIDS
- 
- /* Use getgrnam() to determine the group id of TTY_GRP_NAME, and chgrp tty
-  * device files to that group.  This should be ok on SVR4 and Linux systems
diff --git a/x11/eterm/files/patch-ah b/x11/eterm/files/patch-ah
deleted file mode 100644
index 38ee5f0..0000000
--- a/x11/eterm/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c.orig	Thu Nov 25 20:51:39 1999
-+++ src/main.c	Thu Nov 25 20:53:30 1999
-@@ -26,6 +26,8 @@
- 
- static const char cvs_ident[] = "$Id: main.c,v 1.35 1999/04/20 00:46:37 mej Exp $";
- 
-+#define NEED_LINUX_HACK 1
-+
- /* includes */
- #include "main.h"
- #ifdef USE_ACTIVE_TAGS
diff --git a/x11/eterm/files/patch-ai b/x11/eterm/files/patch-ai
deleted file mode 100644
index 3610a6b..0000000
--- a/x11/eterm/files/patch-ai
+++ /dev/null
@@ -1,35 +0,0 @@
-*** src/command.c.old	Thu Dec 23 01:39:37 1999
---- src/command.c	Thu Dec 23 01:42:00 1999
-***************
-*** 40,45 ****
---- 40,47 ----
-  #include "feature.h"
-  #include "config.h"
-  
-+ #undef HAVE_SAVED_UIDS
-+ 
-  /* System Headers */
-  #include <stdio.h>
-  #include <stdlib.h>
-***************
-*** 120,125 ****
---- 122,128 ----
-  #endif
-  #ifdef HAVE_TERMIOS_H
-  # include <termios.h>
-+ # include <sys/ttydefaults.h>
-  #else
-  # include <sgtty.h>
-  #endif
-***************
-*** 2100,2105 ****
---- 2103,2111 ----
-  # endif
-  # if VTIME != VEOL
-    tio->c_cc[VTIME] = 0;
-+ # endif
-+ # ifdef VSTATUS
-+   tio->c_cc[VSTATUS] = CSTATUS;
-  # endif
-  
-    /* input modes */
diff --git a/x11/eterm/files/patch-aj b/x11/eterm/files/patch-aj
deleted file mode 100644
index 8313be6..0000000
--- a/x11/eterm/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmej/Makefile.in.orig	Sat Jan  8 19:29:13 2000
-+++ libmej/Makefile.in	Sat Jan  8 19:29:50 2000
-@@ -107,7 +107,7 @@
- 
- INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
- 
--libmej_la_LDFLAGS = -release $(VERSION)
-+libmej_la_LDFLAGS = -version-info 8:8:8
- 
- EXTRA_DIST = debug.h global.h mem.h strings.h strptime.h strptime.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/eterm/files/patch-libmej:Makefile.in b/x11/eterm/files/patch-libmej:Makefile.in
new file mode 100644
index 0000000..d76485d
--- /dev/null
+++ b/x11/eterm/files/patch-libmej:Makefile.in
@@ -0,0 +1,11 @@
+--- libmej/Makefile.in.orig	Mon Feb  7 21:52:12 2000
++++ libmej/Makefile.in	Mon Feb  7 21:52:44 2000
+@@ -120,7 +120,7 @@
+ 
+ INCLUDES = -I. -I.. -I$(includedir) -I$(prefix)/include
+ 
+-libmej_la_LDFLAGS = -release $(VERSION)
++libmej_la_LDFLAGS = -version-info 9:9:9
+ 
+ EXTRA_DIST = debug.h global.h mem.h strings.h strptime.h strptime.c
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/eterm/files/patch-sec1 b/x11/eterm/files/patch-sec1
deleted file mode 100644
index 3998d62..0000000
--- a/x11/eterm/files/patch-sec1
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: src/command.c
-===================================================================
-RCS file: /cvs/enlightenment/Eterm/src/command.c,v
-retrieving revision 1.1.1.1.2.7
-diff -u -r1.1.1.1.2.7 command.c
---- src/command.c	1999/11/02 16:34:35	1.1.1.1.2.7
-+++ src/command.c	2000/06/02 02:06:56
-@@ -4694,6 +4694,9 @@
- 	  return;		/* Make sure there are 2 args left */
- 	y = args[++i];
- 	x = args[++i];
-+	if (x > scr->width || y > scr->height) {
-+	  return;
-+        }
- 	XResizeWindow(Xdisplay, TermWin.parent, x, y);
- 	break;
-       case 5:
-@@ -4713,6 +4716,9 @@
- 	  return;		/* Make sure there are 2 args left */
- 	y = args[++i];
- 	x = args[++i];
-+	if (x > (scr->width / TermWin.fwidth) || y > (scr->height / TermWin.fheight)) {
-+	  return;
-+        }
- 	XResizeWindow(Xdisplay, TermWin.parent,
- 		      Width2Pixel(x) + 2 * TermWin.internalBorder + (scrollbar_visible()? scrollbar_total_width() : 0),
- 		      Height2Pixel(y) + 2 * TermWin.internalBorder + (menubar_visible()? menuBar_TotalHeight() : 0));
diff --git a/x11/eterm/files/patch-src:Makefile.in b/x11/eterm/files/patch-src:Makefile.in
new file mode 100644
index 0000000..4b361a2
--- /dev/null
+++ b/x11/eterm/files/patch-src:Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Mon Feb  7 21:50:25 2000
++++ src/Makefile.in	Mon Feb  7 21:51:29 2000
+@@ -120,7 +120,7 @@
+ 
+ 
+ libEterm_la_DEPENDENCIES = $(top_builddir)/libmej/libmej.la feature.h
+-libEterm_la_LDFLAGS = -release $(VERSION)
++libEterm_la_LDFLAGS = -version-info 9:9:9
+ 
+ bin_PROGRAMS = Eterm
+ Eterm_SOURCES = main.c
diff --git a/x11/eterm/files/patch-src:command.c b/x11/eterm/files/patch-src:command.c
new file mode 100644
index 0000000..c75bc1d
--- /dev/null
+++ b/x11/eterm/files/patch-src:command.c
@@ -0,0 +1,21 @@
+--- src/command.c.orig	Mon Feb  7 22:20:41 2000
++++ src/command.c	Mon Feb  7 22:22:16 2000
+@@ -40,6 +40,8 @@
+ #include "config.h"
+ #include "feature.h"
+ 
++#undef HAVE_SAVED_UIDS
++
+ /* System Headers */
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -1560,6 +1562,9 @@
+ # endif
+ # if VTIME != VEOL
+   tio->c_cc[VTIME] = 0;
++# endif
++# ifdef VSTATUS
++    tio->c_cc[VSTATUS] = CSTATUS;
+ # endif
+ 
+   /* input modes */
diff --git a/x11/eterm/files/patch-src:startup.c b/x11/eterm/files/patch-src:startup.c
new file mode 100644
index 0000000..1096a87
--- /dev/null
+++ b/x11/eterm/files/patch-src:startup.c
@@ -0,0 +1,11 @@
+--- src/startup.c.orig	Mon Feb  7 22:24:54 2000
++++ src/startup.c	Mon Feb  7 22:24:57 2000
+@@ -29,6 +29,8 @@
+ #include "config.h"
+ #include "feature.h"
+ 
++#define NEED_LINUX_HACK 1
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/x11/eterm/files/patch-themes:Makefile.in b/x11/eterm/files/patch-themes:Makefile.in
new file mode 100644
index 0000000..df28d12
--- /dev/null
+++ b/x11/eterm/files/patch-themes:Makefile.in
@@ -0,0 +1,10 @@
+--- themes/Makefile.in.orig	Wed Feb  2 05:36:43 2000
++++ themes/Makefile.in	Wed Feb  9 03:46:59 2000
+@@ -239,6 +239,7 @@
+ 	    $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
+ 	    $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \
+ 	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in ; \
++	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in.orig ; \
+ 	  else \
+ 	    echo "ALERT!  Not overwriting $$i theme in $(DESTDIR)$(pkgdatadir)/themes.  You will need to update this theme manually." ; \
+ 	  fi ; \