Upgrade to 0.8.6, remove dummy MASTER_SITES.

4 files changed, 31 insertions, 41 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index f5a5a1d7e38d..c4d238f61c26 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,35 +1,34 @@
 # New ports collection makefile for:	eterm
-# Version required:    0.7+PL5
+# Version required:    0.8.6
 # Date created:        24 November 1997
 # Whom:                Murray Stokely <murray@cdrom.com>
 #
-# $Id: Makefile,v 1.7 1998/08/05 09:31:41 asami Exp $
+# $Id: Makefile,v 1.8 1998/09/25 09:52:45 asami Exp $
 #
 
-DISTNAME=	Eterm-DR-0.7+PL5
-PKGNAME=	eterm-0.7
+DISTNAME=	Eterm-0.8.6
+PKGNAME=	eterm-0.8.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.mandrake.net/pub/Eterm/ \
-		http://www.tcserv.com/archive/E/ \
-		http://www.spd.louisville.edu/~mejenn01/archive/E/
+MASTER_SITES=	ftp://ftp.enlightenment.org/pub/Eterm/ \
+		http://www.tcserv.com/archive/E/
 
 MAINTAINER=	murray@cdrom.com
 
 LIB_DEPENDS=	Imlib.1:${PORTSDIR}/graphics/imlib
 
-WRKSRC=		$(WRKDIR)/Eterm-DR-0.7
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+
+#ALL_TARGET=	FreeBSD
 MAN1=		Eterm.1
-ALL_TARGET=	FreeBSD
 
 post-install:
-	strip ${PREFIX}/bin/Eterm
-	chown root.wheel ${PREFIX}/bin/Eterm
-	chmod 4755 ${PREFIX}/bin/Eterm
+	strip ${PREFIX}/bin/Eterm-0.8
+	chown root.wheel ${PREFIX}/bin/Eterm-0.8
+	chmod 4755 ${PREFIX}/bin/Eterm-0.8
 .ifndef NOPORTDOCS
-	${INSTALL_DATA} ${WRKSRC}/RELNOTES.Eterm ${PREFIX}/share/Eterm
+	${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/Eterm
 	${INSTALL_DATA} ${WRKSRC}/doc/Eterm.help ${PREFIX}/share/Eterm
 	${INSTALL_DATA} ${WRKSRC}/doc/Eterm.menu ${PREFIX}/share/Eterm
 	${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ref ${PREFIX}/share/Eterm
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 7e6efb3cd11b..48ca1aecf112 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1 +1 @@
-MD5 (Eterm-DR-0.7+PL5.tar.gz) = 3560703665a45f830dd2655def07637c
+MD5 (Eterm-0.8.6.tar.gz) = 795d4353a156232fec4283e946573d93
diff --git a/x11/eterm/files/patch-ac b/x11/eterm/files/patch-ac
index f2f1aa3a6461..57fbdd18a596 100644
--- a/x11/eterm/files/patch-ac
+++ b/x11/eterm/files/patch-ac
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Wed Jan 28 14:36:42 1998
-+++ src/Makefile.in	Sun Oct  4 15:55:01 1998
-@@ -19,6 +19,10 @@
+--- src/Makefile.in.orig	Tue Sep 15 01:05:43 1998
++++ src/Makefile.in	Sat Oct 10 01:06:41 1998
+@@ -25,6 +25,10 @@
  	main.h menubar.h misc.h rxvtgrx.h screen.h scrollbar.h options.h \
          system.h
  
@@ -11,16 +11,3 @@
  #
  # Distribution variables
  #
-@@ -32,10 +36,10 @@
- all: Eterm
- 
- Eterm: VERSION.h feature.h $(OBJS) ../libmej/libmej.a
--	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB) -lmej -lIm -lXext -lpng -ljpeg -lz -lm
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB) -lmej -lImlib -lXext -lpng -ljpeg -lz -lutil -lm
- 
- FreeBSD: VERSION.h $(OBJS) ../libmej/libmej.a
--	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lutil $(XLIB) -lmej -lIm -lXext -lpng -ljpeg -lz -lm
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -lutil $(XLIB) -lmej -lImlib -ltiff34 -lgif -lXext -lpng -ljpeg -lz -lutil -lm
- 	mv FreeBSD Eterm
- 
- VERSION.h:
diff --git a/x11/eterm/pkg-plist b/x11/eterm/pkg-plist
index bd73cb0a9682..55746c27d56b 100644
--- a/x11/eterm/pkg-plist
+++ b/x11/eterm/pkg-plist
@@ -1,30 +1,34 @@
+bin/Esetroot
 bin/Eterm
+bin/Eterm-0.8
 share/Eterm/themes/Eterm/Eterm.menu
 share/Eterm/themes/Eterm/MAIN
-share/Eterm/themes/Eterm/good-pixmaps.list
-share/Eterm/themes/Eterm/rv-pixmaps.list
-share/Eterm/themes/irc/irc.menu
+share/Eterm/themes/chooser/MAIN
+share/Eterm/themes/chooser/chooser.menu
+share/Eterm/themes/emacs/MAIN
+share/Eterm/themes/emacs/emacs.menu
 share/Eterm/themes/irc/MAIN
-share/Eterm/themes/irc/good-pixmaps.list
-share/Eterm/themes/irc/rv-pixmaps.list
+share/Eterm/themes/irc/irc.menu
 share/Eterm/themes/mutt/MAIN
-share/Eterm/themes/mutt/good-pixmaps.list
-share/Eterm/themes/mutt/rv-pixmaps.list
+share/Eterm/themes/mutt/mutt.menu
 share/Eterm/themes/tn3270/MAIN
-share/Eterm/themes/tn3270/good-pixmaps.list
-share/Eterm/themes/tn3270/rv-pixmaps.list
-share/Eterm/RELNOTES.Eterm
+share/Eterm/themes/trans/MAIN
+share/Eterm/themes/trans/trans.menu
 share/Eterm/Eterm.help
 share/Eterm/Eterm.menu
 share/Eterm/Eterm.ref
 share/Eterm/Eterm.tcap
 share/Eterm/Eterm.ti
 share/Eterm/FAQ.html
+share/Eterm/ReleaseNotes
 share/Eterm/colortest.sh
 share/Eterm/menu_cmd
+@dirrm share/Eterm/themes/trans
 @dirrm share/Eterm/themes/tn3270
 @dirrm share/Eterm/themes/mutt
 @dirrm share/Eterm/themes/irc
+@dirrm share/Eterm/themes/emacs
+@dirrm share/Eterm/themes/chooser
 @dirrm share/Eterm/themes/Eterm
 @dirrm share/Eterm/themes
 @dirrm share/Eterm