Received: by mail.netbsd.org (Postfix, from userid 605) id C9DC784D24; Fri, 30 Nov 2018 17:25:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C3BB684D21 for ; Fri, 30 Nov 2018 17:25:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Sse4HRn-Xhpj for ; Fri, 30 Nov 2018 17:25:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3AA8584C81 for ; Fri, 30 Nov 2018 17:25:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2D912FB1F; Fri, 30 Nov 2018 17:25:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1543598706196590" MIME-Version: 1.0 Date: Fri, 30 Nov 2018 17:25:06 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/x11/aterm To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20181130172506.2D912FB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1543598706196590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Nov 30 17:25:06 UTC 2018 Modified Files: pkgsrc/x11/aterm: Makefile distinfo options.mk pkgsrc/x11/aterm/patches: patch-aa patch-ad patch-ae Log Message: x11/aterm: Update to 1.0.1. Bit over 11 years late, but at least we got there in the end! ChangeLog: 2007-08-01 vae * adding CL generation to makefiles * fixing configure bug * preparing configure for 1.0.1 * changed MWM HINTS, re gentoo bug #139554. 2006-06-26 sasha * fixed compile errors when no XLocale is available 2006-03-29 sasha * converted main.c back to unix mode * converted screen.c back to unix mode 2006-02-17 sasha * fixed bug preventing from pasting more then 16Kb into aterm 2006-02-13 sasha * minor cleanups * fix for the high-ascii pasting in screen.c - need to use XA_STRING ??? 2006-01-08 sasha * added patch for background refresh on desktop changes in ion3 when pixmap has not changed 2005-12-21 sasha * added uninstall target to the top Makefile 2005-12-06 sasha * Added patch for XIM support gratiously provided by calkin@ieee.org 2005-09-19 sasha * updated mappings for F1-F4 to modern \033OP, etc. * possibly fixed pasting on 64bit systems 2005-09-06 sasha * updated contacts info in man page * applyed term size patch from daniel@roe.ch 2005-07-11 sasha * fixed geometry printing into stderr To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 pkgsrc/x11/aterm/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/aterm/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/aterm/options.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/aterm/patches/patch-aa cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/aterm/patches/patch-ad cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/aterm/patches/patch-ae Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1543598706196590 Content-Disposition: inline Content-Length: 9195 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/aterm/Makefile diff -u pkgsrc/x11/aterm/Makefile:1.55 pkgsrc/x11/aterm/Makefile:1.56 --- pkgsrc/x11/aterm/Makefile:1.55 Wed Nov 14 22:22:38 2018 +++ pkgsrc/x11/aterm/Makefile Fri Nov 30 17:25:05 2018 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2018/11/14 22:22:38 kleink Exp $ +# $NetBSD: Makefile,v 1.56 2018/11/30 17:25:05 nia Exp $ # -DISTNAME= aterm-1.0.0 -PKGREVISION= 19 +DISTNAME= aterm-1.0.1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aterm/} EXTRACT_SUFX= .tar.bz2 @@ -12,6 +11,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.afterstep.org/aterm.php COMMENT= Aterm (Afterstep XVT) - a VT102 emulator for the X window system +LICENSE= gnu-gpl-v2 GNU_CONFIGURE= YES MAKE_JOBS_SAFE= no Index: pkgsrc/x11/aterm/distinfo diff -u pkgsrc/x11/aterm/distinfo:1.17 pkgsrc/x11/aterm/distinfo:1.18 --- pkgsrc/x11/aterm/distinfo:1.17 Sun May 1 19:59:27 2016 +++ pkgsrc/x11/aterm/distinfo Fri Nov 30 17:25:05 2018 @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.17 2016/05/01 19:59:27 dholland Exp $ +$NetBSD: distinfo,v 1.18 2018/11/30 17:25:05 nia Exp $ -SHA1 (aterm-1.0.0.tar.bz2) = 806fd20aec2851c5eea26d9e6a707985da3579a3 -RMD160 (aterm-1.0.0.tar.bz2) = b74f54b6aa6f1d4a094671507c30f627f074eb48 -SHA512 (aterm-1.0.0.tar.bz2) = 715cbf0416ff8cf23705a5333f0666a1f3afec3e17c6988e196f1798b1b4cf75e43085572b9d2906aee6060771a792545a7aa0aa9d2f4c2f0e7db7ac6e4021d3 -Size (aterm-1.0.0.tar.bz2) = 248708 bytes -SHA1 (patch-aa) = 63dd4599dcf49c6269502d7871b99ae01e42f581 +SHA1 (aterm-1.0.1.tar.bz2) = a975753b415306a0734efc3773de8a86129bb54b +RMD160 (aterm-1.0.1.tar.bz2) = 74c46af824c19d0c24c26178f0cb38c2d4e66e21 +SHA512 (aterm-1.0.1.tar.bz2) = 05c78590bba55d892d9f7add384e4ae8d56197dbcd9caff2be4a52d5c162e767a464359ba806fc95961d8035575a2b4a962fc35cfa44f95025b477fa3e15e56b +Size (aterm-1.0.1.tar.bz2) = 276810 bytes +SHA1 (patch-aa) = 6cd2d1144d79b000fb21efe239efedd6b9a0f05b SHA1 (patch-ac) = 0e28da19c8f146ff14984add086e03a38db561ef -SHA1 (patch-ad) = e9af3fb1b7ce2b25401d0e781f519f2b7cac0973 -SHA1 (patch-ae) = 4c08e766c18c46a9e606d80cc785d954cb2bf14c +SHA1 (patch-ad) = 0a23eb40ccf1ecb181c167e9c156a99924a288b3 +SHA1 (patch-ae) = 71f79a38bde196410b80dc50d67c343604e206fa SHA1 (patch-src_misc.c) = af6b8c7ccde2dba8bbcdcd91f7e6e37c3d1c5301 SHA1 (patch-src_pixmap.c) = 6288ba39bb7c7d80df7a48ff9df53cebee29a84c SHA1 (patch-src_xdefaults.c) = dec764692c359503d6bd091dbfd2c44bdf220cf8 Index: pkgsrc/x11/aterm/options.mk diff -u pkgsrc/x11/aterm/options.mk:1.3 pkgsrc/x11/aterm/options.mk:1.4 --- pkgsrc/x11/aterm/options.mk:1.3 Sun May 1 19:35:09 2016 +++ pkgsrc/x11/aterm/options.mk Fri Nov 30 17:25:05 2018 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2016/05/01 19:35:09 dholland Exp $ +# $NetBSD: options.mk,v 1.4 2018/11/30 17:25:05 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.aterm PKG_SUPPORTED_OPTIONS= aterm-big5 aterm-greek aterm-kanji aterm-xterm-scroll \ @@ -7,7 +7,9 @@ PKG_SUPPORTED_OPTIONS= aterm-big5 aterm- .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mafterstep) +.include "../../graphics/tiff/buildlink3.mk" .include "../../wm/afterstep/buildlink3.mk" +LDFLAGS.NetBSD+=-lexecinfo .else CONFIGURE_ARGS+=--without-afterimage_config --without-afterstep_config .endif Index: pkgsrc/x11/aterm/patches/patch-aa diff -u pkgsrc/x11/aterm/patches/patch-aa:1.6 pkgsrc/x11/aterm/patches/patch-aa:1.7 --- pkgsrc/x11/aterm/patches/patch-aa:1.6 Sun May 1 19:56:40 2016 +++ pkgsrc/x11/aterm/patches/patch-aa Fri Nov 30 17:25:05 2018 @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.6 2016/05/01 19:56:40 dholland Exp $ +$NetBSD: patch-aa,v 1.7 2018/11/30 17:25:05 nia Exp $ - Use ctype.h functions properly. - Silence debug prints. - Don't assume :0 if DISPLAY isn't set. ---- src/main.c.orig 2005-06-20 16:10:19.000000000 +0000 +--- src/main.c.orig 2007-08-01 14:08:29.000000000 +0000 +++ src/main.c @@ -196,7 +196,7 @@ xerror_handler (Display * dpy, XErrorEve void @@ -15,20 +15,7 @@ $NetBSD: patch-aa,v 1.6 2016/05/01 19:56 int i = atoi(rs_color[idx]); if (i >= 8 && i <= 15) { /* bright colors */ -@@ -1037,12 +1037,10 @@ resize_window(XEvent* ev) - XConfigureEvent *xconf = &(ev->xconfigure); - - while( XCheckTypedWindowEvent( Xdisplay, TermWin.parent, ConfigureNotify, ev ) ); -- fprintf( stderr, "config_geom = %dx%d\n", xconf->width, xconf->height ); - resize_window1(xconf->width, xconf->height); - #if 1 - XTranslateCoordinates (Xdisplay, TermWin.parent, Xroot, 0, 0, &root_x, &root_y, &wdumm); - -- fprintf( stderr, "root_geom = %dx%d%+d%+d, root_size = %dx%d\n", xconf->width, xconf->height, root_x, root_y, XdisplayWidth, XdisplayHeight ); - TermWin.root_x = root_x ; - TermWin.root_y = root_y ; - TermWin.root_width = xconf->width ; -@@ -1215,7 +1213,7 @@ set_window_color(int idx, const char *co +@@ -1218,7 +1218,7 @@ set_window_color(int idx, const char *co return; /* handle color aliases */ @@ -37,7 +24,7 @@ $NetBSD: patch-aa,v 1.6 2016/05/01 19:56 i = atoi(color); if (i >= 8 && i <= 15) { /* bright colors */ i -= 8; -@@ -1432,7 +1430,7 @@ change_font(int init, const char *fontna +@@ -1435,7 +1435,7 @@ change_font(int init, const char *fontna break; default: @@ -46,7 +33,7 @@ $NetBSD: patch-aa,v 1.6 2016/05/01 19:56 return; if (idx < 0 || idx >= (NFONTS)) return; -@@ -2047,9 +2045,14 @@ main(int argc, char *argv[]) +@@ -2057,9 +2057,14 @@ main(int argc, char *argv[]) */ get_options(argc, argv); Index: pkgsrc/x11/aterm/patches/patch-ad diff -u pkgsrc/x11/aterm/patches/patch-ad:1.3 pkgsrc/x11/aterm/patches/patch-ad:1.4 --- pkgsrc/x11/aterm/patches/patch-ad:1.3 Sun May 1 19:59:28 2016 +++ pkgsrc/x11/aterm/patches/patch-ad Fri Nov 30 17:25:05 2018 @@ -1,22 +1,22 @@ -$NetBSD: patch-ad,v 1.3 2016/05/01 19:59:28 dholland Exp $ +$NetBSD: patch-ad,v 1.4 2018/11/30 17:25:05 nia Exp $ wtmpx handling fixes. ---- src/rxvt.h.orig Sat May 4 08:47:56 2002 +--- src/rxvt.h.orig 2006-02-17 21:35:37.000000000 +0000 +++ src/rxvt.h -@@ -549,11 +549,13 @@ - #ifdef WTMP_SUPPORT - # ifdef HAVE_UTMPX_H /* means we're on Solaris (or Irix?) */ - # undef WTMP_FILENAME --# if defined(WTMPX_FILE) || defined(_WTMPX_FILE) -+# if defined(WTMPX_FILE) || defined(_WTMPX_FILE) || defined(_PATH_WTMPX) - # if defined(WTMPX_FILE) - # define WTMP_FILENAME WTMPX_FILE --# else -+# elif defined(_WTMPX_FILE) - # define WTMP_FILENAME _WTMPX_FILE -+# else -+# define WTMP_FILENAME _PATH_WTMPX - # endif - # define update_wtmp updwtmpx - # else +@@ -647,11 +647,13 @@ typedef struct MwmHints { + #ifdef WTMP_SUPPORT + # ifdef HAVE_UTMPX_H /* means we're on Solaris (or Irix?) */ + # undef WTMP_FILENAME +-# if defined(WTMPX_FILE) || defined(_WTMPX_FILE) ++# if defined(WTMPX_FILE) || defined(_WTMPX_FILE) || defined(_PATH_WTMPX) + # if defined(WTMPX_FILE) + # define WTMP_FILENAME WTMPX_FILE +-# else ++# elif defined(_WTMPX_FILE) + # define WTMP_FILENAME _WTMPX_FILE ++# else ++# define WTMP_FILENAME _PATH_WTMPX + # endif + # define update_wtmp updwtmpx + # else Index: pkgsrc/x11/aterm/patches/patch-ae diff -u pkgsrc/x11/aterm/patches/patch-ae:1.8 pkgsrc/x11/aterm/patches/patch-ae:1.9 --- pkgsrc/x11/aterm/patches/patch-ae:1.8 Sun May 1 19:56:40 2016 +++ pkgsrc/x11/aterm/patches/patch-ae Fri Nov 30 17:25:05 2018 @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.8 2016/05/01 19:56:40 dholland Exp $ +$NetBSD: patch-ae,v 1.9 2018/11/30 17:25:05 nia Exp $ - Use pseudo-terminal multiplexor on NetBSD. - Correctly set the terminal size on FreeBSD and NetBSD. @@ -6,9 +6,9 @@ $NetBSD: patch-ae,v 1.8 2016/05/01 19:56 - Use ctype.h functions correctly. ---- src/command.c.orig 2005-06-21 20:08:16.000000000 +0000 +--- src/command.c.orig 2006-06-26 18:01:20.000000000 +0000 +++ src/command.c -@@ -542,7 +542,7 @@ get_pty(void) +@@ -556,7 +556,7 @@ get_pty(void) ptydev = ttydev = _getpty(&fd, O_RDWR | O_NDELAY, 0622, 0); if (ptydev == NULL) goto Failed; @@ -17,16 +17,7 @@ $NetBSD: patch-ae,v 1.8 2016/05/01 19:56 { extern char *ptsname(); -@@ -1085,6 +1085,8 @@ run_command(char *argv[]) - #endif /* SRIOCSREDIR */ - } - -+ tt_winsize(0); /* set window size */ -+ - /* reset signals and spin off the command interpreter */ - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); -@@ -1225,9 +1227,9 @@ init_command(char *argv[]) +@@ -1251,9 +1251,9 @@ init_command(char *argv[]) meta_char = (Options & Opt_meta8 ? 0x80 : 033); if (rs_modifier && strlen(rs_modifier) == 4 @@ -39,7 +30,7 @@ $NetBSD: patch-ae,v 1.8 2016/05/01 19:56 switch (rs_modifier[3]) { case '2': ModXMask = Mod2Mask; -@@ -1302,13 +1304,13 @@ init_xlocale(void) +@@ -1329,13 +1329,13 @@ init_xlocale(void) for (s = tmp; *s; s++) { char *end, *next_s; @@ -55,7 +46,7 @@ $NetBSD: patch-ae,v 1.8 2016/05/01 19:56 /* */ ; *++end = '\0'; if (*s) { -@@ -1340,13 +1342,13 @@ init_xlocale(void) +@@ -1367,13 +1367,13 @@ init_xlocale(void) unsigned short i; char *end, *next_s; --_----------=_1543598706196590--