5 files changed, 32 insertions, 14 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 7a22e2a12fa1..994900a0661a 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	eterm
-# Version required:    0.8.9
+# Version required:    0.8.10
 # Date created:        24 November 1997
 # Whom:                Murray Stokely <murray@cdrom.com>
 #
 # $FreeBSD$
 #
 
-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/ \
 		http://eterm.is.nontoxic.org/download/ \
@@ -44,7 +44,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm
 	@${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/doc/Eterm
 	@${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/doc/Eterm
-	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ.html ${PREFIX}/share/doc/Eterm
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 6738ac97c13e..5d2ad791014d 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1 +1 @@
-MD5 (Eterm-0.8.9.tar.gz) = 9e4945a6920f7d10cf28516266307519
+MD5 (Eterm-0.8.10.tar.gz) = 44b0b498d8186205d0898b266643fbf1
diff --git a/x11/eterm/files/patch-ac b/x11/eterm/files/patch-ac
index 589752a8235a..e21ee51e5acf 100644
--- a/x11/eterm/files/patch-ac
+++ b/x11/eterm/files/patch-ac
@@ -1,13 +1,22 @@
---- src/Makefile.in	Mon Apr 26 10:53:52 1999
-+++ src/Makefile.in.new	Wed Sep  1 14:34:27 1999
-@@ -121,6 +121,10 @@
+--- 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
  
- 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
+ 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
- CONFIG_CLEAN_FILES = 
diff --git a/x11/eterm/files/patch-aj b/x11/eterm/files/patch-aj
new file mode 100644
index 000000000000..8313be6fe80b
--- /dev/null
+++ b/x11/eterm/files/patch-aj
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/x11/eterm/pkg-plist
index 6ebdf89a28cd..ba0a1613c9e4 100644
--- a/x11/eterm/pkg-plist
+++ b/x11/eterm/pkg-plist
@@ -10,9 +10,9 @@ lib/libmej.so.8
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/Eterm/pix/014.png
+share/Eterm/pix/40.png
+share/Eterm/pix/6.png
 share/Eterm/pix/backwave.jpg
-share/Eterm/pix/button1.jpg
-share/Eterm/pix/button5.jpg
 share/Eterm/pix/circuit.png
 share/Eterm/pix/fourthday.jpg
 share/Eterm/pix/gaia.jpg
@@ -42,7 +42,6 @@ share/Eterm/themes/trans/pixmaps.list
 share/Eterm/themes/trans/trans.menu
 share/doc/Eterm/Eterm.tcap
 share/doc/Eterm/Eterm.ti
-share/doc/Eterm/FAQ.html
 share/doc/Eterm/ReleaseNotes
 @dirrm share/doc/Eterm
 @dirrm share/Eterm/themes/Eterm