CVS commit: pkgsrc/x11/eterm

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Sep  1 12:08:18 UTC 2019

Modified Files:
        pkgsrc/x11/eterm: Makefile PLIST distinfo
        pkgsrc/x11/eterm/patches: patch-ai
Removed Files:
        pkgsrc/x11/eterm/patches: patch-ad patch-ah patch-src_command.c

Log Message:
eterm: Update to 0.9.6

Don't install as setuid root.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/x11/eterm/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/eterm/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/eterm/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/eterm/patches/patch-ad
cvs rdiff -u -r1.7 -r0 pkgsrc/x11/eterm/patches/patch-ah
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/eterm/patches/patch-ai
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/eterm/patches/patch-src_command.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/eterm/Makefile
diff -u pkgsrc/x11/eterm/Makefile:1.82 pkgsrc/x11/eterm/Makefile:1.83
--- pkgsrc/x11/eterm/Makefile:1.82      Sun Aug 11 13:25:10 2019
+++ pkgsrc/x11/eterm/Makefile   Sun Sep  1 12:08:17 2019
@@ -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@localhost
 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_SYSC
 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"

Index: pkgsrc/x11/eterm/PLIST
diff -u pkgsrc/x11/eterm/PLIST:1.7 pkgsrc/x11/eterm/PLIST:1.8
--- pkgsrc/x11/eterm/PLIST:1.7  Mon Sep 21 07:29:30 2009
+++ pkgsrc/x11/eterm/PLIST      Sun Sep  1 12:08:17 2019
@@ -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

Index: pkgsrc/x11/eterm/distinfo
diff -u pkgsrc/x11/eterm/distinfo:1.21 pkgsrc/x11/eterm/distinfo:1.22
--- pkgsrc/x11/eterm/distinfo:1.21      Wed Nov  4 03:28:28 2015
+++ pkgsrc/x11/eterm/distinfo   Sun Sep  1 12:08:17 2019
@@ -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

Index: pkgsrc/x11/eterm/patches/patch-ai
diff -u pkgsrc/x11/eterm/patches/patch-ai:1.3 pkgsrc/x11/eterm/patches/patch-ai:1.4
--- pkgsrc/x11/eterm/patches/patch-ai:1.3       Sat Nov 25 14:01:18 2006
+++ pkgsrc/x11/eterm/patches/patch-ai   Sun Sep  1 12:08:18 2019
@@ -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