14 files changed, 81 insertions, 197 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 71d0c34f09a2..0cbec5eda295 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	eterm
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.2
 CATEGORIES+=	x11
 MASTER_SITES=	http://www.eterm.org/download/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -38,15 +37,17 @@ MAN1=		Eterm.1
 CONFIGURE_ARGS+=--enable-mmx
 .endif
 
+post-patch:
+	@${RM} ${WRKSRC}/themes/Eterm/*.orig
+	@${RM} ${WRKSRC}/themes/auto/*.orig
+	@${RM} ${WRKSRC}/themes/trans/*.orig
+
 post-install:
 	@${CHMOD} 4711 ${PREFIX}/bin/Eterm
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/Eterm
 	@${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm
-	@${INSTALL_DATA} ${WRKSRC}/doc/Eterm.1.html ${PREFIX}/share/doc/Eterm
 	@${INSTALL_DATA} ${WRKSRC}/doc/Eterm_reference.html ${PREFIX}/share/doc/Eterm
-	@${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/doc/Eterm
-	@${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/doc/Eterm
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index e8471b318bea..67ec402fe8f3 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1 +1 @@
-MD5 (Eterm-0.9.1.tar.gz) = a3b767d29b82fc7541c9ba65931e5d37
+MD5 (Eterm-0.9.2.tar.gz) = e8c82cf52b25fdd51d16ff76b993ba68
diff --git a/x11/eterm/files/patch-Eterm:theme.cfg.in b/x11/eterm/files/patch-Eterm:theme.cfg.in
deleted file mode 100644
index 3a8d97ac0b46..000000000000
--- a/x11/eterm/files/patch-Eterm:theme.cfg.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- themes/Eterm/theme.cfg.in.orig	Wed Jul  4 00:53:52 2001
-+++ themes/Eterm/theme.cfg.in	Sat Sep 22 16:15:24 2001
-@@ -16,7 +16,7 @@
- begin color
- 
- # Foreground, background, cursor, scrollbar, pointer colors
--    foreground #aaaaaa
-+    foreground #ffffff
-     background black
-     cursor #ffff00
-     cursor_text #880000
-@@ -401,7 +401,7 @@
- #    line_space 2
- 
- # Value to use for $TERM
--    term_name Eterm
-+    term_name xterm-color
- 
- # Program to exec (intended for use with themes)
- #    exec foo
diff --git a/x11/eterm/files/patch-auto:theme.cfg.in b/x11/eterm/files/patch-auto:theme.cfg.in
deleted file mode 100644
index ffff2c0f143e..000000000000
--- a/x11/eterm/files/patch-auto:theme.cfg.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- themes/auto/theme.cfg.in.orig	Sat Sep 22 16:17:07 2001
-+++ themes/auto/theme.cfg.in	Sat Sep 22 16:16:09 2001
-@@ -1,7 +1,7 @@
- <Eterm-0.9.1>
- 
- begin color
--    foreground #aaaaaa
-+    foreground #ffffff
-     background black
-     cursor #ffff00
-     cursor_text #880000
diff --git a/x11/eterm/files/patch-configure b/x11/eterm/files/patch-configure
new file mode 100644
index 000000000000..d91832fbad92
--- /dev/null
+++ b/x11/eterm/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure.orig	Thu Oct 31 18:48:54 2002
++++ configure	Thu Mar 27 23:47:00 2003
+@@ -5610,6 +5610,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/eterm/files/patch-default_font_index b/x11/eterm/files/patch-default_font_index
deleted file mode 100644
index da07f08e6e36..000000000000
--- a/x11/eterm/files/patch-default_font_index
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/font.c.orig	Sat Jul 21 22:25:23 2001
-+++ src/font.c	Fri Sep  7 01:11:47 2001
-@@ -21,7 +21,7 @@
-  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  */
- 
--static const char cvs_ident[] = "$Id: font.c,v 1.28 2001/07/22 03:25:23 mej Exp $";
-+static const char cvs_ident[] = "$Id: font.c,v 1.29 2001/09/06 22:26:20 mej Exp $";
- 
- #include "config.h"
- #include "feature.h"
-@@ -41,7 +41,8 @@
- #include "windows.h"
- 
- char **etfonts = NULL;
--unsigned char font_idx = DEF_FONT_IDX, def_font_idx = DEF_FONT_IDX, font_cnt = 0;
-+unsigned char font_idx = DEF_FONT_IDX, font_cnt = 0;
-+int def_font_idx = DEF_FONT_IDX;
- char *rs_font[NFONTS];
- #ifdef MULTI_CHARSET
- char *rs_mfont[NFONTS];
---- src/font.h.orig	Thu Jun 14 00:31:08 2001
-+++ src/font.h	Fri Sep  7 01:11:47 2001
-@@ -73,7 +73,8 @@
- } fontshadow_t;
- 
- /************ Variables ************/
--extern unsigned char font_idx, def_font_idx, font_cnt, font_chg;
-+extern unsigned char font_idx, font_cnt, font_chg;
-+extern int def_font_idx;
- extern const char *def_fontName[];
- extern char *rs_font[NFONTS];
- extern char **etfonts, **etmfonts;
diff --git a/x11/eterm/files/patch-doc:Makefile.in b/x11/eterm/files/patch-doc:Makefile.in
index 6ebfc8c1596d..a2d79de08b83 100644
--- a/x11/eterm/files/patch-doc:Makefile.in
+++ b/x11/eterm/files/patch-doc:Makefile.in
@@ -1,25 +1,36 @@
---- doc/Makefile.in.orig	Wed Aug 29 03:23:41 2001
-+++ doc/Makefile.in	Fri Sep  7 01:40:20 2001
-@@ -267,15 +267,15 @@
- 	$(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@
+--- doc/Makefile.in.orig	Thu Feb 13 20:03:45 2003
++++ doc/Makefile.in	Thu Feb 13 20:04:52 2003
+@@ -215,7 +215,6 @@
+ 
+ install-data-am: install-man
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-data: install-data-am
+ 
+ install-am: all-am
+@@ -267,24 +266,10 @@
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
  
- Eterm.1.html: Eterm.1
--	(nroff -man $< | man2html -title Eterm > $@) || :
-+	(nroff -man Eterm.1 | man2html -title Eterm > $@) || :
  
- install-data-hook:
+-all: Makefile Eterm.1.html
++all: Makefile
+ 
+ Eterm.1: $(top_srcdir)/doc/Eterm.1.in
+ 	$(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@
+-
+-Eterm.1.html: Eterm.1
+-	(nroff -man $< | man2html -title Eterm > $@) || :
+-
+-install-data-hook:
 -	$(TIC) Eterm.ti || (mkinstalldirs $(HOME)/.terminfo && $(TIC) -o$(HOME)/.terminfo Eterm.ti) || :
--	-infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new
+-	-(infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' \
+-	  -e 's!^\([[:space:]]:co#.*\):\\$$!\1:pa#64:Co#8:AF=\\E[3%dm:AB=\\E[4%dm:op=\\E[39m\\E[49m:\\!' \
+-	  -e 's!:$$!:\\!' ; echo '	:ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:' \
+-	  ) > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new
 -	-if test -f /usr/share/misc/termcap && test -f Eterm.tcap ; then \
--	    grep 'Eterm-color' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \
+-	    grep -i 'Eterm Terminal Emulator' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \
 -	    cap_mkdb termcap ; \
 -	fi || :
-+#	$(TIC) Eterm.ti || (mkinstalldirs $(HOME)/.terminfo && $(TIC) -o$(HOME)/.terminfo Eterm.ti) || :
-+#	-infocmp -C -sc Eterm | sed -e '/Reconstructed/d' -e '/\.\.sa=/d' > Eterm.tcap.new && mv Eterm.tcap.new Eterm.tcap || rm -f Eterm.tcap.new
-+#	-if test -f /usr/share/misc/termcap && test -f Eterm.tcap ; then \
-+#	    grep 'Eterm-color' /usr/share/misc/termcap || cat Eterm.tcap >> /usr/share/misc/termcap ; \
-+#	    cap_mkdb termcap ; \
-+#	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.
diff --git a/x11/eterm/files/patch-src:Makefile.in b/x11/eterm/files/patch-src:Makefile.in
index e8d99db3efe7..ecb4a23b248a 100644
--- a/x11/eterm/files/patch-src:Makefile.in
+++ b/x11/eterm/files/patch-src:Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Wed Aug 29 03:23:38 2001
-+++ src/Makefile.in	Fri Sep  7 00:29:05 2001
-@@ -123,7 +123,7 @@
+--- src/Makefile.in.orig	Fri Feb 14 00:23:27 2003
++++ src/Makefile.in	Fri Feb 14 00:24:05 2003
+@@ -138,7 +138,7 @@
  
  EXTRA_libEterm_la_SOURCES = $(MMX_SRCS)
  
 -libEterm_la_LDFLAGS = -release $(VERSION)
 +libEterm_la_LDFLAGS = -version-info 9:9:9
- @HAVE_MMX_TRUE@libEterm_la_DEPENDENCIES = feature.h $(MMX_OBJS)
- @HAVE_MMX_FALSE@libEterm_la_DEPENDENCIES = feature.h
- @HAVE_MMX_TRUE@libEterm_la_LIBADD = $(MMX_OBJS)
+ @HAVE_MMX_TRUE@libEterm_la_DEPENDENCIES = @HAVE_MMX_TRUE@feature.h $(MMX_OBJS)
+ @HAVE_MMX_FALSE@libEterm_la_DEPENDENCIES = @HAVE_MMX_FALSE@feature.h
+ @HAVE_MMX_TRUE@libEterm_la_LIBADD = @HAVE_MMX_TRUE@$(MMX_OBJS)
diff --git a/x11/eterm/files/patch-src:command.c b/x11/eterm/files/patch-src:command.c
deleted file mode 100644
index c75bc1d31398..000000000000
--- a/x11/eterm/files/patch-src:command.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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-themes-Eterm:menus.cfg b/x11/eterm/files/patch-themes-Eterm:menus.cfg
new file mode 100644
index 000000000000..26bed650b360
--- /dev/null
+++ b/x11/eterm/files/patch-themes-Eterm:menus.cfg
@@ -0,0 +1,8 @@
+--- themes/Eterm/menus.cfg.orig	Thu Feb 13 19:46:52 2003
++++ themes/Eterm/menus.cfg	Thu Feb 13 19:46:57 2003
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.2>
+ begin menu
+   title Font
+   begin menuitem
diff --git a/x11/eterm/files/patch-themes-auto:menus.cfg b/x11/eterm/files/patch-themes-auto:menus.cfg
new file mode 100644
index 000000000000..3b73bcc83eaa
--- /dev/null
+++ b/x11/eterm/files/patch-themes-auto:menus.cfg
@@ -0,0 +1,8 @@
+--- themes/auto/menus.cfg.orig	Thu Feb 13 19:42:55 2003
++++ themes/auto/menus.cfg	Thu Feb 13 19:43:09 2003
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.2>
+ begin menu
+   title Font
+   begin menuitem
diff --git a/x11/eterm/files/patch-themes-trans:menus.cfg b/x11/eterm/files/patch-themes-trans:menus.cfg
new file mode 100644
index 000000000000..3fc18d6699a9
--- /dev/null
+++ b/x11/eterm/files/patch-themes-trans:menus.cfg
@@ -0,0 +1,8 @@
+--- themes/trans/menus.cfg.orig	Thu Feb 13 19:43:48 2003
++++ themes/trans/menus.cfg	Thu Feb 13 19:43:57 2003
+@@ -1,4 +1,4 @@
+-<Eterm-0.9.1>
++<Eterm-0.9.2>
+ begin menu
+   title Font
+   begin menuitem
diff --git a/x11/eterm/files/patch-vim_escape_handling b/x11/eterm/files/patch-vim_escape_handling
deleted file mode 100644
index 6a5ff9d270c4..000000000000
--- a/x11/eterm/files/patch-vim_escape_handling
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/term.c.orig	Thu Aug 23 19:22:55 2001
-+++ src/term.c	Fri Sep  7 01:13:07 2001
-@@ -21,7 +21,7 @@
-  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  */
- 
--static const char cvs_ident[] = "$Id: term.c,v 1.68 2001/08/23 21:04:36 mej Exp $";
-+static const char cvs_ident[] = "$Id: term.c,v 1.69 2001/09/06 22:38:21 mej Exp $";
- 
- #include "config.h"
- #include "feature.h"
-@@ -945,15 +945,12 @@
- process_csi_seq(void)
- {
- 
--  unsigned char ch, priv;
--  unsigned int nargs;
--  int arg[ESC_ARGS];
--
--  nargs = 0;
--  arg[0] = 0;
--  arg[1] = 0;
-+  unsigned char ch;
-+  unsigned char priv = 0;
-+  unsigned int nargs = 0;
-+  int arg[ESC_ARGS] = {0, 0};
-+  int ignore = 0;
- 
--  priv = 0;
-   ch = cmd_getc();  /* Get the next character */
-   if (ch >= '<' && ch <= '?') {
-     priv = ch;  /* DEC private mode sequence.  Get next character. */
-@@ -977,6 +974,8 @@
-       scr_add_lines(&ch, 0, 1);  /* Insert verbatim non-printable character (NPC) */
-       return;
-     }
-+    if (ch == '-')  /* HACK: Ignore this sequence, but finish reading */
-+      ignore = 1;   /* xterm ignores more than this, but we need this for vim */
-     if (ch < '@')
-       ch = cmd_getc();  /* Separator.  Go to next digit or operation. */
-   } while (ch >= ' ' && ch < '@');
-@@ -986,6 +985,9 @@
-   } else if (ch < ' ')
-     return;  /* An NPC.  Punt. */
- 
-+  if(ignore)
-+    return;
-+
-   switch (ch) {
-     case '@':
-       scr_insdel_chars((arg[0] ? arg[0] : 1), INSERT);
-@@ -1067,6 +1069,8 @@
-       break;
- 
-     case 'c':
-+      /* TODO: A different response should be sent depending on the value of
-+        priv and of arg[0], but what should those reponses be? */
- #ifndef NO_VT100_ANS
-       tt_printf(VT100_ANS);
- #endif
-@@ -1403,7 +1407,7 @@
- process_terminal_mode(int mode, int priv, unsigned int nargs, int arg[])
- {
-   unsigned int i;
--  int state;
-+  int state; /* This gets set by the PrivCases macro */
- 
-   if (nargs == 0)
-     return;
-@@ -1526,6 +1530,7 @@
- 	    else
- 	      Options |= Opt_home_on_input;
- 	    break;
-+      
-           case 1047:            /* Alternate screen & clear */
-             PrivCases(PrivMode_Screen);
-             scr_change_screen(state);
diff --git a/x11/eterm/pkg-plist b/x11/eterm/pkg-plist
index ad42ff59b256..74207b2f383e 100644
--- a/x11/eterm/pkg-plist
+++ b/x11/eterm/pkg-plist
@@ -36,29 +36,26 @@ share/Eterm/pix/tile/blackstone.jpg
 share/Eterm/pix/tile/circuit.jpg
 share/Eterm/pix/tile/giger1.jpg
 share/Eterm/pix/tile/nebula.jpg
+share/Eterm/themes/Escreen/menus.cfg
+share/Eterm/themes/Escreen/pixmaps.list
+share/Eterm/themes/Escreen/theme.cfg
 share/Eterm/themes/Eterm/menus.cfg
 share/Eterm/themes/Eterm/pixmaps.list
 share/Eterm/themes/Eterm/theme.cfg
 share/Eterm/themes/auto/menus.cfg
 share/Eterm/themes/auto/pixmaps.list
 share/Eterm/themes/auto/theme.cfg
-share/Eterm/themes/chooser/menus.cfg
-share/Eterm/themes/chooser/pixmaps.list
-share/Eterm/themes/chooser/theme.cfg
 share/Eterm/themes/trans/menus.cfg
 share/Eterm/themes/trans/pixmaps.list
 share/Eterm/themes/trans/theme.cfg
-%%PORTDOCS%%share/doc/Eterm/Eterm.1.html
-%%PORTDOCS%%share/doc/Eterm/Eterm.tcap
-%%PORTDOCS%%share/doc/Eterm/Eterm.ti
 %%PORTDOCS%%share/doc/Eterm/Eterm_reference.html
 %%PORTDOCS%%share/doc/Eterm/ReleaseNotes
 @dirrm share/Eterm/pix/scale
 @dirrm share/Eterm/pix/tile
 @dirrm share/Eterm/pix
+@dirrm share/Eterm/themes/Escreen
 @dirrm share/Eterm/themes/Eterm
 @dirrm share/Eterm/themes/auto
-@dirrm share/Eterm/themes/chooser
 @dirrm share/Eterm/themes/trans
 @dirrm share/Eterm/themes
 @dirrm share/Eterm