Update to version 0.8.9

PR:		13537
Submitted by:	Will Andrews <andrews@technologist.com>

4 files changed, 30 insertions, 33 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 5035bba0d910..960e1acaf028 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	eterm
-# Version required:    0.8.8
+# Version required:    0.8.9
 # Date created:        24 November 1997
 # Whom:                Murray Stokely <murray@cdrom.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Eterm-0.8.8
-PKGNAME=	eterm-0.8.8
+DISTNAME=	Eterm-0.8.9
+PKGNAME=	eterm-0.8.9
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.eterm.org/pub/Eterm/ \
 		http://eterm.is.nontoxic.org/download/ \
@@ -31,19 +31,20 @@ pre-patch:
 	${CP} ${FILESDIR}/patch-kanji ${PATCHDIR}
 .endif
 
+# this is needed to remove leftover files from applied patches.
+pre-install:
+.for i in Eterm emacs irc mutt tn3270 trans
+	@${RM} -f ${WRKSRC}/themes/$i/*.orig
+.endfor
+
 post-install:
-	${CHOWN} root.wheel ${PREFIX}/bin/Eterm
-	${CHMOD} 4755 ${PREFIX}/bin/Eterm
-	${INSTALL_SCRIPT} ${WRKSRC}/doc/colortest.sh ${PREFIX}/share/Eterm
+	@${CHMOD} 4711 ${PREFIX}/bin/Eterm
 .ifndef NOPORTDOCS
-	${MKDIR} ${PREFIX}/share/doc/Eterm
-	${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm
-	${INSTALL_DATA} ${WRKSRC}/doc/Eterm.help ${PREFIX}/share/doc/Eterm
-	${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ref ${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
-	${INSTALL_DATA} ${WRKSRC}/doc/menu_cmd ${PREFIX}/share/doc/Eterm
+	@${MKDIR} ${PREFIX}/share/doc/Eterm
+	@${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 f1fcc6ceb611..6738ac97c13e 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1 +1 @@
-MD5 (Eterm-0.8.8.tar.gz) = 19c0571f900757e5a90ac36baac3f79b
+MD5 (Eterm-0.8.9.tar.gz) = 9e4945a6920f7d10cf28516266307519
diff --git a/x11/eterm/files/patch-ac b/x11/eterm/files/patch-ac
index 502ce8dc705b..589752a8235a 100644
--- a/x11/eterm/files/patch-ac
+++ b/x11/eterm/files/patch-ac
@@ -1,14 +1,13 @@
-*** src/Makefile.in	Wed Jan 13 05:54:45 1999
---- src/Makefile.in~	Sun Feb  7 23:00:35 1999
-***************
-*** 123,128 ****
---- 123,131 ----
-               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 = 
+--- 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 @@
+ 
+ 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
+ 
++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/pkg-plist b/x11/eterm/pkg-plist
index b96555434ada..6ebdf89a28cd 100644
--- a/x11/eterm/pkg-plist
+++ b/x11/eterm/pkg-plist
@@ -1,5 +1,6 @@
 bin/Esetroot
 bin/Eterm
+@exec chmod 4711 %D/bin/Eterm
 lib/libEterm.a
 lib/libEterm.so
 lib/libEterm.so.8
@@ -8,7 +9,6 @@ lib/libmej.so
 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/colortest.sh
 share/Eterm/pix/014.png
 share/Eterm/pix/backwave.jpg
 share/Eterm/pix/button1.jpg
@@ -40,13 +40,10 @@ share/Eterm/themes/tn3270/pixmaps.list
 share/Eterm/themes/trans/MAIN
 share/Eterm/themes/trans/pixmaps.list
 share/Eterm/themes/trans/trans.menu
-share/doc/Eterm/Eterm.help
-share/doc/Eterm/Eterm.ref
 share/doc/Eterm/Eterm.tcap
 share/doc/Eterm/Eterm.ti
 share/doc/Eterm/FAQ.html
 share/doc/Eterm/ReleaseNotes
-share/doc/Eterm/menu_cmd
 @dirrm share/doc/Eterm
 @dirrm share/Eterm/themes/Eterm
 @dirrm share/Eterm/themes/chooser