1 files changed, 23 insertions, 16 deletions
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 622b9c82722..a095f634756 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2002/12/26 04:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/27 19:44:46 salo Exp $
+#
 
 DISTNAME=		Eterm-0.9.2
-PKGNAME=		eterm-0.9.2
+PKGNAME=		${DISTNAME:S/^E/e/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.eterm.org/pub/Eterm/ \
 			ftp://alien.eterm.org/pub/Eterm/ \
@@ -17,18 +19,30 @@ ETERM_SRCS=		${DISTNAME}${EXTRACT_SUFX}
 PIXMAP_FILES=		Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \
 			Eterm-bg-tile.tar.gz
 
-USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
-USE_LIBTOOL=		yes
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+USE_X11BASE=		YES
+USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386" && ${USE_MMX} != "NO"
-CONFIGURE_ARGS+=        --enable-mmx
+# Install Eterm as setuid root so that utmp logging function correctly.
+#
+# XXX: If installed setuid root on Solaris, pseudo-tty is owned by root,
+#      and it's not possible to resume a screen session as a normal user.
+#      (this behaviour should be reviewed again, since this workaround
+#      is 2 years and several version updates old.)
+#
+.if ${OPSYS} != "SunOS"
+SPECIAL_PERMS=		${PREFIX}/bin/Eterm ${SETUID_ROOT_PERMS}
 .endif
+
+.if ${MACHINE_ARCH} == "i386" && ${USE_MMX} != "NO"
+CONFIGURE_ARGS+=	--enable-mmx
 BUILD_DEFS+=		USE_MMX
+.endif
 
 post-extract:
 	${LN} -sf ${WRKSRC} ${WRKDIR}/Eterm
@@ -37,14 +51,7 @@ post-extract:
 		${GZCAT} ${DISTDIR}/$$f | ${PAX} -r;			\
 	done
 
-.if ${OPSYS} == "NetBSD"
-post-install:
-	# Make Eterm setuid root so that utmp logging functions correctly.
-	#
-	${CHOWN} 0 ${PREFIX}/bin/Eterm
-	${CHMOD} 4711 ${PREFIX}/bin/Eterm
-.endif
-
 .include "../../devel/libast/buildlink2.mk"
 .include "../../graphics/imlib2/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"