diff --git a/x11/eterm/patches/patch-configure b/x11/eterm/patches/patch-configure
index a793b6f5a74..763ad29618e 100644
--- a/x11/eterm/patches/patch-configure
+++ b/x11/eterm/patches/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Aug 12 04:49:16 2000
-+++ configure	Sat Aug 12 04:49:29 2000
-@@ -3822,7 +3822,7 @@
+--- configure.orig	Fri Nov  5 19:56:30 1999
++++ configure	Thu Mar  7 20:46:29 2002
+@@ -3822,7 +3822,7 @@ cat >> confdefs.h <<EOF
  EOF
  
  
diff --git a/x11/eterm/patches/patch-libmej_Makefile.in b/x11/eterm/patches/patch-libmej_Makefile.in
index eaee4b6b7db..e25d2c0721d 100644
--- a/x11/eterm/patches/patch-libmej_Makefile.in
+++ b/x11/eterm/patches/patch-libmej_Makefile.in
@@ -1,6 +1,6 @@
---- libmej/Makefile.in.orig	Fri Nov  5 14:03:53 1999
-+++ libmej/Makefile.in	Mon Jul  3 01:58:10 2000
-@@ -107,7 +107,7 @@
+--- libmej/Makefile.in.orig	Fri Nov  5 20:03:53 1999
++++ libmej/Makefile.in	Thu Mar  7 20:46:29 2002
+@@ -107,7 +107,7 @@ libmej_la_SOURCES = debug.c mem.c string
  
  INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
  
diff --git a/x11/eterm/patches/patch-src_Makefile.in b/x11/eterm/patches/patch-src_Makefile.in
index 6f730ae37d2..a3878f548e3 100644
--- a/x11/eterm/patches/patch-src_Makefile.in
+++ b/x11/eterm/patches/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Fri Nov  5 14:03:54 1999
-+++ src/Makefile.in	Mon Jul  3 01:58:09 2000
-@@ -106,7 +106,7 @@
+--- src/Makefile.in.orig	Fri Nov  5 20:03:54 1999
++++ src/Makefile.in	Thu Mar  7 20:46:29 2002
+@@ -106,7 +106,7 @@ lib_LTLIBRARIES = libEterm.la
  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
diff --git a/x11/eterm/patches/patch-src_command.c b/x11/eterm/patches/patch-src_command.c
index 0683a4ca3db..bec8664c7ba 100644
--- a/x11/eterm/patches/patch-src_command.c
+++ b/x11/eterm/patches/patch-src_command.c
@@ -1,6 +1,6 @@
---- src/command.c.orig	Tue Nov  2 11:34:35 1999
-+++ src/command.c	Sat Aug 12 04:58:09 2000
-@@ -676,6 +676,8 @@
+--- src/command.c.orig	Tue Nov  2 17:34:35 1999
++++ src/command.c	Thu Mar  7 20:46:30 2002
+@@ -676,6 +676,8 @@ privileges(int mode)
  
  #ifdef HAVE_SETRESGID
        setresgid(my_rgid, my_rgid, my_egid);
@@ -9,7 +9,7 @@
  #elif defined(HAVE_SAVED_UIDS)
        setregid(my_rgid, my_rgid);
  #else
-@@ -685,6 +687,8 @@
+@@ -685,6 +687,8 @@ privileges(int mode)
  
  #ifdef HAVE_SETRESUID
        setresuid(my_ruid, my_ruid, my_euid);
@@ -18,7 +18,7 @@
  #elif defined(HAVE_SAVED_UIDS)
        setreuid(my_ruid, my_ruid);
  #else
-@@ -705,6 +709,8 @@
+@@ -705,6 +709,8 @@ privileges(int mode)
  
  #ifdef HAVE_SETRESUID
        setresuid(my_ruid, my_euid, my_euid);
@@ -27,7 +27,7 @@
  #elif defined(HAVE_SAVED_UIDS)
        setreuid(my_ruid, my_euid);
  #else
-@@ -714,6 +720,8 @@
+@@ -714,6 +720,8 @@ privileges(int mode)
  
  #ifdef HAVE_SETRESGID
        setresgid(my_rgid, my_egid, my_egid);
@@ -36,7 +36,7 @@
  #elif defined(HAVE_SAVED_UIDS)
        setregid(my_rgid, my_egid);
  #else
-@@ -2298,8 +2306,16 @@
+@@ -2298,8 +2306,16 @@ run_command(char *argv[])
         because the exec*() calls reset the saved uid/gid to the
         effective uid/gid                               -- mej */
  # ifndef __CYGWIN32__
diff --git a/x11/eterm/patches/patch-src_options.c b/x11/eterm/patches/patch-src_options.c
index 5f99a84ebae..a53f9c17482 100644
--- a/x11/eterm/patches/patch-src_options.c
+++ b/x11/eterm/patches/patch-src_options.c
@@ -1,6 +1,6 @@
---- src/options.c.orig	Tue Nov  2 08:34:35 1999
-+++ src/options.c	Thu Aug 10 20:42:57 2000
-@@ -1328,6 +1328,10 @@
+--- src/options.c.orig	Tue Nov  2 17:34:35 1999
++++ src/options.c	Thu Mar  7 20:46:30 2002
+@@ -1328,6 +1328,10 @@ get_initial_options(int argc, char *argv
  #define CTX_UNDEF        ((unsigned char) -1)
  #define CTX_MAX          8
  
@@ -11,7 +11,7 @@
  /* This structure defines a context and its attributes */
  
  struct context_struct {
-@@ -1566,6 +1570,7 @@
+@@ -1566,6 +1570,7 @@ shell_expand(char *s)
    unsigned long fsize, cnt1 = 0, cnt2 = 0;
    const unsigned long max = CONFIG_BUFF - 1;
    char *Command, *Output, *EnvVar, *OutFile;
@@ -19,7 +19,7 @@
    FILE *fp;
  
    ASSERT_RVAL(s != NULL, (char *) NULL);
-@@ -1716,40 +1721,51 @@
+@@ -1716,40 +1721,51 @@ shell_expand(char *s)
  	  }
            ASSERT(l < CONFIG_BUFF);
  	  Command[l] = 0;
diff --git a/x11/eterm/patches/patch-src_system.c b/x11/eterm/patches/patch-src_system.c
index 55f0825daf5..91ac45cec3a 100644
--- a/x11/eterm/patches/patch-src_system.c
+++ b/x11/eterm/patches/patch-src_system.c
@@ -1,6 +1,6 @@
---- src/system.c.orig	Wed Oct 27 12:44:06 1999
-+++ src/system.c	Sat Aug 12 05:02:38 2000
-@@ -67,8 +67,16 @@
+--- src/system.c.orig	Wed Oct 27 18:44:06 1999
++++ src/system.c	Thu Mar  7 20:46:30 2002
+@@ -67,8 +67,16 @@ system_wait(char *command)
    D_OPTIONS(("system_wait(%s) called.\n", command));
  
    if (!(pid = fork())) {
@@ -17,7 +17,7 @@
      execl("/bin/sh", "sh", "-c", command, (char *) NULL);
      print_error("system_wait():  execl(%s) failed -- %s", command, strerror(errno));
      exit(EXIT_FAILURE);
-@@ -87,8 +95,16 @@
+@@ -87,8 +95,16 @@ system_no_wait(char *command)
    D_OPTIONS(("system_no_wait(%s) called.\n", command));
  
    if (!(pid = fork())) {
diff --git a/x11/eterm/patches/patch-src_utmp.c b/x11/eterm/patches/patch-src_utmp.c
index 153a0689959..01020a51c95 100644
--- a/x11/eterm/patches/patch-src_utmp.c
+++ b/x11/eterm/patches/patch-src_utmp.c
@@ -1,6 +1,6 @@
---- src/utmp.c.orig	Wed Sep 29 09:16:31 1999
-+++ src/utmp.c		Fri Aug 11 11:38:27 2000
-@@ -68,7 +68,7 @@
+--- src/utmp.c.orig	Wed Sep 29 18:16:31 1999
++++ src/utmp.c	Thu Mar  7 20:46:30 2002
+@@ -68,7 +68,7 @@ static const char cvs_ident[] = "$Id: ut
  #ifdef HAVE_LASTLOG_H
  # include <lastlog.h>
  #endif
@@ -9,7 +9,7 @@
  # include <ttyent.h>
  #endif
  
-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ cleanutent(void)
  #else /* USE_SYSV_UTMP */
  /* BSD utmp support */
  
@@ -18,7 +18,7 @@
  
  /* used to hold the line we are using */
  static char ut_line[32];
-@@ -321,7 +321,7 @@
+@@ -321,7 +321,7 @@ b_login(struct utmp *ut)
    }
  }
  
@@ -27,7 +27,7 @@
  static int utmp_pos = 0;	/* position of utmp-stamp */
  
  /*----------------------------------------------------------------------*
-@@ -379,7 +379,7 @@
+@@ -379,7 +379,7 @@ write_utmp(struct utmp *putmp)
    return rval;
  }
  
@@ -36,7 +36,7 @@
  
  /*
   * make a utmp entry
-@@ -402,7 +402,7 @@
+@@ -402,7 +402,7 @@ makeutent(const char *pty, const char *h
      return;
    }
  
@@ -45,7 +45,7 @@
    strncpy(ut_line, pty, 31);
  
    strncpy(utmp.ut_line, pty, UT_LINESIZE);
-@@ -411,7 +411,7 @@
+@@ -411,7 +411,7 @@ makeutent(const char *pty, const char *h
    utmp.ut_time = time(NULL);
  
    b_login(&utmp);
@@ -54,7 +54,7 @@
    strncpy(utmp.ut_line, ut_id, sizeof(utmp.ut_line));
    strncpy(utmp.ut_name, pwent->pw_name, sizeof(utmp.ut_name));
    strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
-@@ -428,10 +428,10 @@
+@@ -428,10 +428,10 @@ makeutent(const char *pty, const char *h
  void
  cleanutent(void)
  {
@@ -67,7 +67,7 @@
    FILE *fd;
  
    privileges(INVOKE);
-@@ -445,7 +445,7 @@
+@@ -445,7 +445,7 @@ cleanutent(void)
      fclose(fd);
    }
    privileges(REVERT);
diff --git a/x11/eterm/patches/patch-themes_Makefile_in b/x11/eterm/patches/patch-themes_Makefile_in
new file mode 100644
index 00000000000..f443f97f829
--- /dev/null
+++ b/x11/eterm/patches/patch-themes_Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-themes_Makefile_in,v 1.1 2002/03/07 20:00:19 espie Exp $
+--- themes/Makefile.in.orig	Thu Mar  7 20:49:14 2002
++++ themes/Makefile.in	Thu Mar  7 20:49:22 2002
+@@ -225,8 +225,8 @@ install-data-hook:
+ 	    echo "ALERT!  Not overwriting theme $$i in $(DESTDIR)$(pkgdatadir)/themes.  You will need to update this theme manually." ; \
+ 	  fi ; \
+ 	done
+-	@if test ! -f $(HOME)/.active.tags ; then $(CP) $(srcdir)/active.tags $(HOME)/.active.tags ; \
+-	   else echo "Not installing $(HOME)/.active.tags -- File exists." ; fi
++#	@if test ! -f $(HOME)/.active.tags ; then $(CP) $(srcdir)/active.tags $(HOME)/.active.tags ; \
++#	   else echo "Not installing $(HOME)/.active.tags -- File exists." ; fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.