4 files changed, 65 insertions, 37 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 8c4d00554634..17c8e75f2312 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,47 +1,43 @@
 # New ports collection makefile for:	eterm
-# Version required:    0.6apl2
+# Version required:    0.7+PL5
 # Date created:        24 November 1997
 # Whom:                Murray Stokely <murray@cdrom.com>
 #
-# $Id: Makefile,v 1.4 1997/11/29 22:06:43 asami Exp $
+# $Id: Makefile,v 1.5 1997/11/29 23:43:27 asami Exp $
 #
 
-DISTNAME=	Eterm-DR-0.6aPL2
-PKGNAME=	eterm-0.6a2
+DISTNAME=	Eterm-DR-0.7+PL5
+PKGNAME=	eterm-0.7
 CATEGORIES=	x11
-MASTER_SITES=	ftp://cthulhu.mandrake.net/pub/Eterm/
+MASTER_SITES=	ftp://ftp.mandrake.net/pub/Eterm/ \
+		http://www.tcserv.com/archive/E/ \
+		http://www.spd.louisville.edu/~mejenn01/archive/E/
 
 MAINTAINER=	murray@cdrom.com
 
-LIB_DEPENDS=	Im\\.4\\.:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	Imlib\\.1\\.:${PORTSDIR}/graphics/imlib
 
-BROKEN=		R_OK undefined
-WRKSRC=		$(WRKDIR)/Eterm-DR-0.6a
+WRKSRC=		$(WRKDIR)/Eterm-DR-0.7
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_X11=	yes
 MAN1=		Eterm.1
+ALL_TARGET=	FreeBSD
 
-do-build:
-	cd ${WRKSRC}/src && \
-	${GMAKE} clean && \
-	${GMAKE} FreeBSD && \
-	cd ../doc && \
-	${GMAKE} alldoc
-
-do-install:
-	${INSTALL_PROGRAM} $(WRKSRC)/src/Eterm $(PREFIX)/bin
-	${INSTALL_PROGRAM} $(WRKSRC)/doc/dorand $(PREFIX)/bin
-	${INSTALL_SCRIPT} $(WRKSRC)/doc/random_pixmap.sh $(PREFIX)/bin
-	${INSTALL_MAN} $(WRKSRC)/doc/Eterm.1 $(PREFIX)/man/man1
-	${MKDIR} $(PREFIX)/share/Eterm
-	${INSTALL_MAN} $(WRKSRC)/doc/FAQ $(PREFIX)/share/Eterm
-	${INSTALL_MAN} $(WRKSRC)/RELNOTES.Eterm $(PREFIX)/share/Eterm
+post-install:
+	strip ${PREFIX}/bin/Eterm
+	chown root.wheel ${PREFIX}/bin/Eterm
+	chmod 4755 ${PREFIX}/bin/Eterm
+.ifndef NOPORTDOCS
+	${INSTALL_DATA} ${WRKSRC}/RELNOTES.Eterm ${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
+	${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/Eterm
+	${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/Eterm
+	${INSTALL_DATA} ${WRKSRC}/doc/FAQ.html ${PREFIX}/share/Eterm
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/colortest.sh ${PREFIX}/share/Eterm
-	${INSTALL_SCRIPT} ${WRKSRC}/doc/menu.sh ${PREFIX}/share/Eterm
-	${INSTALL_MAN} ${WRKSRC}/doc/Eterm.help ${PREFIX}/share/Eterm
-	${INSTALL_MAN} ${WRKSRC}/doc/Eterm.ref ${PREFIX}/share/Eterm
-	${INSTALL_MAN} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/Eterm
-	${INSTALL_MAN} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/Eterm
-	${INSTALL_MAN} ${WRKSRC}/doc/MAIN.dist ${PREFIX}/share/Eterm
+	${INSTALL_DATA} ${WRKSRC}/doc/menu_cmd ${PREFIX}/share/Eterm
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 9bddccdfe58d..7e6efb3cd11b 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1 +1 @@
-MD5 (Eterm-DR-0.6aPL2.tar.gz) = bba0554d1a20359855ba40581df8be57
+MD5 (Eterm-DR-0.7+PL5.tar.gz) = 3560703665a45f830dd2655def07637c
diff --git a/x11/eterm/files/patch-ac b/x11/eterm/files/patch-ac
new file mode 100644
index 000000000000..5652f3284813
--- /dev/null
+++ b/x11/eterm/files/patch-ac
@@ -0,0 +1,15 @@
+--- src/Makefile.in.orig	Sun Feb 22 23:52:06 1998
++++ src/Makefile.in	Sun Feb 22 23:52:27 1998
+@@ -32,10 +32,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 -lXext -lpng -ljpeg -lz -lutil -lm
+ 	mv FreeBSD Eterm
+ 
+ VERSION.h:
diff --git a/x11/eterm/pkg-plist b/x11/eterm/pkg-plist
index 175a75ef144d..a3aee9ce8d90 100644
--- a/x11/eterm/pkg-plist
+++ b/x11/eterm/pkg-plist
@@ -1,14 +1,31 @@
 bin/Eterm
-bin/dorand
-bin/random_pixmap.sh
+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/irc/MAIN
+share/Eterm/themes/irc/good-pixmaps.list
+share/Eterm/themes/irc/rv-pixmaps.list
+share/Eterm/themes/mutt/MAIN
+share/Eterm/themes/mutt/good-pixmaps.list
+share/Eterm/themes/mutt/rv-pixmaps.list
+share/Eterm/themes/tn3270/MAIN
+share/Eterm/themes/tn3270/good-pixmaps.list
+share/Eterm/themes/tn3270/rv-pixmaps.list
 man/man1/Eterm.1.gz
+share/Eterm/RELNOTES.Eterm
 share/Eterm/Eterm.help
+share/Eterm/Eterm.menu
 share/Eterm/Eterm.ref
-share/Eterm/Eterm.ti
 share/Eterm/Eterm.tcap
-share/Eterm/FAQ
-share/Eterm/RELNOTES.Eterm
-share/Eterm/MAIN.dist
+share/Eterm/Eterm.ti
+share/Eterm/FAQ.html
 share/Eterm/colortest.sh
-share/Eterm/menu.sh
+share/Eterm/menu_cmd
+@dirrm share/Eterm/themes/tn3270
+@dirrm share/Eterm/themes/mutt
+@dirrm share/Eterm/themes/irc
+@dirrm share/Eterm/themes/Eterm
+@dirrm share/Eterm/themes
 @dirrm share/Eterm