eterm: Update to 0.9.6

Don't install as setuid root.

7 files changed, 21 insertions, 174 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index c2f703500fe..9cd3011ca1d 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.82 2019/08/11 13:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2019/09/01 12:08:17 nia Exp $
 
-DISTNAME=	Eterm-0.9.5
+DISTNAME=	Eterm-0.9.6
 PKGNAME=	${DISTNAME:S/^E/e/}
-PKGREVISION=	19
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=eterm/}
 DISTFILES=	${DEFAULT_DISTFILES} ${PIXMAP_FILES}
-PIXMAP_FILES=	${DISTNAME:S/Eterm-/Eterm-bg-/}.tar.gz
+PIXMAP_FILES=	Eterm-bg-0.9.5.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.eterm.org/
 COMMENT=	Enlightened terminal emulator for the X Window System
+LICENSE=	mit
 
 USE_TOOLS+=		perl:run
 USE_LIBTOOL=		YES
@@ -20,32 +20,21 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-multi-charset=unicode
 CONFIGURE_ARGS+=	--enable-auto-encoding
 
-EXTRACT_DIR.${PIXMAP_FILES}=	${WRKSRC}
+CONFIGURE_ARGS+=	--enable-trans
+CONFIGURE_ARGS+=	--disable-utmp
 
 PKG_SYSCONFSUBDIR=	Eterm
 OWN_DIRS=		${PKG_SYSCONFDIR}/themes
 
-.include "../../mk/bsd.prefs.mk"
-
-# 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
+EXTRACT_DIR.${PIXMAP_FILES}=	${WRKSRC}
 
 .include "options.mk"
-
 .include "../../devel/libast/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXres/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
 BUILDLINK_DEPMETHOD.iconv?=	build
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eterm/PLIST b/x11/eterm/PLIST
index 0c258cc5b68..dde0027cad1 100644
--- a/x11/eterm/PLIST
+++ b/x11/eterm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/09/21 07:29:30 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/09/01 12:08:17 nia Exp $
 bin/Esetroot
 bin/Etbg
 bin/Etbg_update_list
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index a5ceb29e18b..50a3055e91f 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.21 2015/11/04 03:28:28 agc Exp $
+$NetBSD: distinfo,v 1.22 2019/09/01 12:08:17 nia Exp $
 
-SHA1 (Eterm-0.9.5.tar.gz) = f2d75354a48734f63f018f7173cebee81f2358c7
-RMD160 (Eterm-0.9.5.tar.gz) = 19e006f0fe2bdd6a95818f11b96bb978b9cb6762
-SHA512 (Eterm-0.9.5.tar.gz) = ef16ec5ddf0dd91ed4c40eff2289f7a61aa5c0fbf3b95bd14afe38557572f586f1dcd459c258cdfadb1dfbc1c50874492c9cc69ee4152a569b097e86c0d7cc44
-Size (Eterm-0.9.5.tar.gz) = 796872 bytes
+SHA1 (Eterm-0.9.6.tar.gz) = b4cb00f898ffd2de9bf7ae0ecde1cc3a5fee9f02
+RMD160 (Eterm-0.9.6.tar.gz) = 96e2ebf7ee7464ffab8bbecec2976a1e5935712e
+SHA512 (Eterm-0.9.6.tar.gz) = 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe
+Size (Eterm-0.9.6.tar.gz) = 831756 bytes
 SHA1 (Eterm-bg-0.9.5.tar.gz) = 26e81a1e91228c971c70ba06e006ef69490ef208
 RMD160 (Eterm-bg-0.9.5.tar.gz) = acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0
 SHA512 (Eterm-bg-0.9.5.tar.gz) = 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
 Size (Eterm-bg-0.9.5.tar.gz) = 1883627 bytes
 SHA1 (patch-aa) = 19da5e05392994a60fdf47e9d52c82fc41cefa4c
 SHA1 (patch-ab) = d019a18bb32f890d6de7c5bb0cdb43e7715a7d4d
-SHA1 (patch-ad) = f70a92e4eb84466e379653cbd3a9188db6d408c8
-SHA1 (patch-ah) = 9d2a995fa118e30be20aa3fdc18ffee1eeec1192
-SHA1 (patch-ai) = 94d684a490752831de2fb2aba92c0b9f461ddb5a
+SHA1 (patch-ai) = 1f1a050c27b042c5cccff91aae4ced7b887b68b1
 SHA1 (patch-src_Makefile.in) = 3000a407bed7d7c23bfc127fd09b0723d9c0b395
-SHA1 (patch-src_command.c) = 4e7bce478c5532f1cf7d9c5f0bcb4415d1c380fe
 SHA1 (patch-src_screen.c) = f820501e3a67cfc59dedd1dd5e3eb6f06ae2be23
diff --git a/x11/eterm/patches/patch-ad b/x11/eterm/patches/patch-ad
deleted file mode 100644
index ccd83d08413..00000000000
--- a/x11/eterm/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/12/26 04:58:45 wiz Exp $
---- utils/Etbg.c.orig	Sat Dec 14 12:42:36 2002
-+++ utils/Etbg.c	Sat Dec 14 12:42:50 2002
-@@ -26,7 +26,6 @@
- #include <config.h>
- 
- #include <stdio.h>
--#include <string.h>
- 
- #ifndef FALSE
- #  define FALSE (0)
diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah
deleted file mode 100644
index b641de71287..00000000000
--- a/x11/eterm/patches/patch-ah
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2008/05/09 18:43:07 agc Exp $
-
---- src/utmp.c.orig	2006-05-11 04:33:40.000000000 +0100
-+++ src/utmp.c	2006-11-25 13:01:25.000000000 +0000
-@@ -44,11 +44,20 @@
- static int utmp_pos;            /* BSD position of utmp-stamp */
- #  endif
- 
-+
- # ifdef USE_SYSV_UTMP
- 
- #  ifdef HAVE_UTMPX_H
-+#   include <utmp.h>
- #   undef WTMP_FILENAME
--#   define WTMP_FILENAME WTMPX_FILE
-+#   ifndef _PATH_WTMPX
-+#     define _PATH_WTMPX	"/var/log/wtmp"
-+#   endif
-+#   if defined(WTMPX_FILE)
-+#     define WTMP_FILENAME WTMPX_FILE
-+#   else
-+#     define WTMP_FILENAME _PATH_WTMPX
-+#   endif
- #   define update_wtmp updwtmpx
- #  else /* HAVE_UTMPX_H */
- 
-@@ -128,22 +137,26 @@
-     privileges(INVOKE);
- #   ifdef HAVE_UTMPX_H
-     getutmp(&utmp, &utmp2);
--    getutid(&utmp2);            /* position to entry in utmp file */
-+    getutxid(&utmp);            /* position to entry in utmp file */
- #   else
--    getutid(&utmp);             /* position to entry in utmp file */
-+    getutxid(&utmp);             /* position to entry in utmp file */
- #   endif
- 
-     /* set up the new entry */
-     strncpy(utmp.ut_id, ut_id, sizeof(utmp.ut_id));
-     strncpy(utmp.ut_line, pty, sizeof(utmp.ut_line));
-+#   ifndef __APPLE__
-     strncpy(utmp.ut_name, pwent->pw_name, sizeof(utmp.ut_name));
-+#   endif
-     strncpy(utmp.ut_user, pwent->pw_name, sizeof(utmp.ut_user));
-     strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
-     utmp.ut_type = USER_PROCESS;
-     utmp.ut_pid = getpid();
- #   ifdef HAVE_UTMPX_H
-+#     ifndef __APPLE__
-     utmp.ut_session = getsid(0);
-     utmp.ut_xtime = time(NULL);
-+#     endif /* __APPLE__ */
-     utmp.ut_tv.tv_usec = 0;
- #   else
-     utmp.ut_time = time(NULL);
-@@ -152,16 +165,15 @@
-     /*
-      * write a utmp entry to the utmp file
-      */
--    utmpname(UTMP_FILENAME);
-+    utmpxname(UTMP_FILENAME);
- #   ifdef HAVE_UTMPX_H
-     getutmp(&utmp, &utmp2);
--    pututline(&utmp2);
-     pututxline(&utmp);
- #   else
-     pututline(&utmp);
- #   endif
-     update_wtmp(WTMP_FILENAME, &utmp);
--    endutent();                 /* close the file */
-+    endutxent();                 /* close the file */
-     privileges(REVERT);
-     return;
-     fd = 0;
-@@ -177,19 +189,19 @@
-     if (!ut_id[0])
-         return;                 /* entry not made */
- 
--    utmpname(UTMP_FILENAME);
--    setutent();
--    strncpy(utmp.ut_id, ut_id, sizeof(utmp.ut_id));
--    utmp.ut_type = USER_PROCESS;
--    if (getutid(&utmp) == NULL) {
-+    utmpxname(UTMP_FILENAME);
-+    setutxent();
-+    strncpy(utmpx.ut_id, ut_id, sizeof(utmpx.ut_id));
-+    utmpx.ut_type = USER_PROCESS;
-+    if (getutxid(&utmp) == NULL) {
-         return;
-     }
--    utmp.ut_type = DEAD_PROCESS;
-+    utmpx.ut_type = DEAD_PROCESS;
-     utmp.ut_time = time(NULL);
--    pututline(&utmp);
-+    pututxline(&utmpx);
-     getutmpx(&utmp, &utmpx);
-     update_wtmp(WTMP_FILENAME, &utmpx);
--    endutent();
-+    endutxent();
- 
- #   else /* HAVE_UTMPX_H */
-     struct utmp *putmp;
diff --git a/x11/eterm/patches/patch-ai b/x11/eterm/patches/patch-ai
index 1164585c84a..cab39bdc296 100644
--- a/x11/eterm/patches/patch-ai
+++ b/x11/eterm/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.3 2006/11/25 14:01:18 sketch Exp $
+$NetBSD: patch-ai,v 1.4 2019/09/01 12:08:18 nia Exp $
 
---- doc/Makefile.in.orig	2006-11-25 13:02:09.000000000 +0000
-+++ doc/Makefile.in	2006-11-25 13:02:41.000000000 +0000
-@@ -414,7 +414,7 @@
- 	uninstall-man1
+--- doc/Makefile.in.orig	2011-03-16 06:10:30.000000000 +0000
++++ doc/Makefile.in
+@@ -417,7 +417,7 @@ uninstall-man: uninstall-man1
+ 	uninstall-man uninstall-man1
  
  
 -all: Makefile Eterm.1.html
diff --git a/x11/eterm/patches/patch-src_command.c b/x11/eterm/patches/patch-src_command.c
deleted file mode 100644
index 2e2c53e0537..00000000000
--- a/x11/eterm/patches/patch-src_command.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_command.c,v 1.1 2012/12/25 21:00:00 joerg Exp $
-
---- src/command.c.orig	2012-12-25 16:04:29.000000000 +0000
-+++ src/command.c
-@@ -1387,9 +1387,7 @@ sco_get_pty(void)
- #endif
- 
- #ifdef HAVE_DEV_PTMX
--inline int svr_get_pty(void);
--
--inline int
-+static int
- svr_get_pty(void)
- {
- 
-@@ -1420,9 +1418,7 @@ svr_get_pty(void)
- #define PTYCHAR1 "pqrstuvwxyz"
- #define PTYCHAR2 "0123456789abcdefghijklmnopqrstuvwxyz"
- 
--inline int gen_get_pty(void);
--
--inline int
-+static int
- gen_get_pty(void)
- {
-