Update Eterm to 0.8.10

This release is simply a bugfix release of 0.8.9.  The 0.8.x series has become
the "stable" branch of Eterm and will only involve bugfixes, no new features.
All the feature development is occuring in the 0.9 series.

Fixes pkg/12105 by myself

7 files changed, 27 insertions, 67 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 954d0802ca5..664aa03f7fd 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:06:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/04/28 11:07:34 zuntum Exp $
 
-DISTNAME=		Eterm-0.8.9
-PKGNAME=		eterm-0.8.9
+DISTNAME=		Eterm-0.8.10
+PKGNAME=		eterm-0.8.10
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.eterm.org/pub/Eterm/ \
 			ftp://alien.eterm.org/pub/Eterm/ \
@@ -22,19 +22,11 @@ PIXMAP_FILES=		Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \
 
 USE_X11BASE=		yes
 USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
-pre-build:
-	@if ${PKG_INFO} -qe 'eterm<0.8.9'; then				\
-		${ECHO} "**** An older version of Eterm is installed";	\
-		${ECHO} "**** ${PKGNAME} cannot be built with it installed."; \
-		${ECHO} "**** Please delete it before building";	\
-		${ECHO} "**** or use \"${MAKE} update\".";		\
-		${FALSE};						\
-	fi
-
 post-extract:
 	${LN} -sf ${WRKSRC} ${WRKDIR}/Eterm
 	cd ${WRKDIR};							\
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 47cd19434be..74e57f86c1d 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:37 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/04/28 11:07:34 zuntum Exp $
 
-SHA1 (Eterm-0.8.9.tar.gz) = 1bebc1707cd8f39e9c5a9ea55a9f656cdbc536a4
-Size (Eterm-0.8.9.tar.gz) = 564885 bytes
+SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d
+Size (Eterm-0.8.10.tar.gz) = 593026 bytes
 SHA1 (Eterm-bg-scale-1.tar.gz) = 39c6146740edf04ddb0aa40ed4e078e8317b0557
 Size (Eterm-bg-scale-1.tar.gz) = 3420298 bytes
 SHA1 (Eterm-bg-scale-2.tar.gz) = 711365b4478dc7cb3891c77a5d9054778c581184
@@ -9,7 +9,6 @@ Size (Eterm-bg-scale-2.tar.gz) = 3145775 bytes
 SHA1 (Eterm-bg-tile.tar.gz) = 2ccb31a8fd0e80e5dd92aebef6baf5554f66e361
 Size (Eterm-bg-tile.tar.gz) = 1568166 bytes
 SHA1 (patch-aa) = 056585ad4c39b60a3dbf41d8c7e65d31ba5f7fcd
-SHA1 (patch-ab) = d9b2874485ffcf411f83fd69f2fdc822bc76e657
-SHA1 (patch-ac) = c45dba8ca41b4d3d788c3b070aa09bedc9a22b1d
-SHA1 (patch-ad) = 2fbe515a55d352e52da9f0eb828697993541eb00
-SHA1 (patch-ae) = 88a8a097830694dec581bd3f84f2858fa3f38ae5
+SHA1 (patch-ab) = cdea7fe7a3c546e9f89a7eb86ec079f34572e984
+SHA1 (patch-ac) = 26b0f5c13f2b621db1c5edf84c5123b315225d8d
+SHA1 (patch-ad) = a750146fe3a0b0b2796997cf2e20e38f14be86bf
diff --git a/x11/eterm/patches/patch-ab b/x11/eterm/patches/patch-ab
index 08a5064bf54..2ab11bb1d85 100644
--- a/x11/eterm/patches/patch-ab
+++ b/x11/eterm/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.2 1999/10/28 00:31:59 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2001/04/28 11:07:35 zuntum Exp $
 
 --- doc/Makefile.in.orig	Mon Apr 26 10:54:04 1999
 +++ doc/Makefile.in	Mon Oct 25 16:29:33 1999
 @@ -253,7 +253,7 @@
- 	$(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $@.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 > $@
diff --git a/x11/eterm/patches/patch-ac b/x11/eterm/patches/patch-ac
index b436f73961f..8aa4a3623b6 100644
--- a/x11/eterm/patches/patch-ac
+++ b/x11/eterm/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 1999/10/28 00:33:09 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2001/04/28 11:07:35 zuntum Exp $
 
 --- themes/Makefile.in.orig	Mon Apr 26 10:53:58 1999
 +++ themes/Makefile.in	Mon Oct 25 18:10:44 1999
@@ -9,7 +9,7 @@ $NetBSD: patch-ac,v 1.1 1999/10/28 00:33:09 jlam Exp $
 -	  if test ! -d $(DESTDIR)$(pkgdatadir)/themes/$$i ; then \
  	    echo "Installing $$i theme in $(DESTDIR)$(pkgdatadir)/themes" ; \
  	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
- 	    $(CP) $$i/???* $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
+	    $(CP) $(srcdir)/$$i/???* $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
  	    $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
  	    $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \
  	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/MAIN.in ; \
@@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.1 1999/10/28 00:33:09 jlam Exp $
 -	    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) active.tags $(HOME)/.active.tags ; \
+-	@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.
diff --git a/x11/eterm/patches/patch-ad b/x11/eterm/patches/patch-ad
index 73045001f6c..be263902851 100644
--- a/x11/eterm/patches/patch-ad
+++ b/x11/eterm/patches/patch-ad
@@ -1,28 +1,12 @@
-$NetBSD: patch-ad,v 1.1 1999/10/28 00:33:10 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2001/04/28 11:07:35 zuntum Exp $
 
---- utils/Etbg.c.orig	Fri Mar 26 20:13:46 1999
-+++ utils/Etbg.c	Mon Oct 25 17:50:41 1999
-@@ -26,12 +26,20 @@
- #include <stdio.h>
- #include <string.h>
+--- utils/Etbg.c.orig	Thu Oct 28 02:18:26 1999
++++ utils/Etbg.c
+@@ -24,7 +24,6 @@
+  */
  
-+#ifdef FALSE
-+#undef FALSE
-+#endif
-+#define FALSE	0
-+
-+#ifdef TRUE
-+#undef TRUE
-+#endif
-+#define TRUE	1
-+
- int 
- main(int argc, char **argv)
- {
--  enum {
--    FALSE, TRUE
--  } scale = FALSE, trans = FALSE;
-+  int scale = FALSE, trans = FALSE;
-   unsigned int i, pic = 0, tint = 0, shade = 0;
+ #include <stdio.h>
+-#include <string.h>
  
-   for (i = 1; i < argc; i++) {
+ #ifndef FALSE
+ # define FALSE (0)
diff --git a/x11/eterm/patches/patch-ae b/x11/eterm/patches/patch-ae
deleted file mode 100644
index 2c3fe7ec09f..00000000000
--- a/x11/eterm/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/03/05 12:42:00 skrll Exp $
-
---- src/Makefile.in.orig	Mon Apr 26 15:53:52 1999
-+++ src/Makefile.in
-@@ -117,7 +117,7 @@
- INCLUDES = -I. -I../libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
- 
- Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir)
--LDADD = -L$(DIST_ROOT)/src/.libs -lEterm -L$(DIST_ROOT)/libmej/.libs -L$(libdir) -L$(prefix)/lib $(LIBS) -lmej $(GRLIBS) $(X_LIBS)
-+LDADD = -lEterm -L$(libdir) ../libmej/libmej.la -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
- 
- EXTRA_DIST = activeconfig.h activeeterm.h activetags.h command.h debug.h              eterm_imlib.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
- 
diff --git a/x11/eterm/pkg/PLIST b/x11/eterm/pkg/PLIST
index d49896ddd78..0ca05008cac 100644
--- a/x11/eterm/pkg/PLIST
+++ b/x11/eterm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:59 agc Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/04/28 11:07:36 zuntum Exp $
 bin/Esetroot
 bin/Etbg
 bin/Etcolors.sh
@@ -7,13 +7,11 @@ bin/Etmenu.sh
 lib/libEterm.a
 lib/libEterm.la
 lib/libEterm.so
-lib/libEterm.so.8
-lib/libEterm.so.8.9
+lib/libEterm-0.8.10.so
 lib/libmej.a
 lib/libmej.la
 lib/libmej.so
-lib/libmej.so.8
-lib/libmej.so.8.9
+lib/libmej-0.8.10.so
 man/man1/Eterm.1
 share/Eterm/pix/004.png
 share/Eterm/pix/014.png