Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id BDF851A921F for ; Fri, 1 Jan 2021 13:05:25 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id F242D85107; Fri, 1 Jan 2021 13:05:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 392B0850DA for ; Fri, 1 Jan 2021 13:05:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id iniO0jCeATxR for ; Fri, 1 Jan 2021 13:05:23 +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 2CAC184D39 for ; Fri, 1 Jan 2021 13:05:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2A492FA9D; Fri, 1 Jan 2021 13:05:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16095063238580" MIME-Version: 1.0 Date: Fri, 1 Jan 2021 13:05:23 +0000 From: "Olaf Seibert" Subject: CVS commit: pkgsrc/x11/x3270 To: pkgsrc-changes@NetBSD.org Reply-To: rhialto@netbsd.org X-Mailer: log_accum Message-Id: <20210101130523.2A492FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16095063238580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rhialto Date: Fri Jan 1 13:05:23 UTC 2021 Modified Files: pkgsrc/x11/x3270: DESCR Makefile PLIST distinfo Added Files: pkgsrc/x11/x3270: options.mk Removed Files: pkgsrc/x11/x3270/patches: patch-aa Log Message: x11/x3270: update to 4.0ga13. Includes the curses version of the terminal emulator now. Changelogs are quite fragmented over various alpha/beta versions; here are some main points. Major changes Task engine The scripting infrastructure has been rewritten. It is now called the task engine. There are no longer any artificial dependencies between actions initiated by different sources (keyboard, scripts, HTTP requests, etc.). Accidental blocking behavior has been (almost) eliminated. Unrelated operations are now properly concurrent, within the limitations of there still being just one emulated terminal and host session to control. For example, c3270 and wc3270 now continue to respond to host messages while at the prompt or while a printer dialog is showing. Tasks also carry context consistently now. For example, the Wait(Output) now works with HTTP requests. The state of the task engine can be displayed with the Tasks query. b3270 A new emulator has been created, b3270. It is a common back-end process that handles the 3270 protocol and host interactions, communicating with different user-interface implementations using a simple XML-based protocol. None of the existing emulators have been converted to use b3270, but a new Windows emulator (wx3270) uses it. x3270 prompt The c3270 prompt has been generalized and is available to all of the 3270 emulators as the x3270 prompt. The Prompt() action (or a menu option) creates a new instance of the prompt in a window. The prompt now uses color to distinguish error messages. tcl3270 re-implementation tcl3270 has been re-implemented as a simple wrapper around s3270. This eliminates many of the arbitrary limitations and blocking behaviors of the previous implementation. Show() / Query() merge and expansion The common Query() action and the c3270/wc3270-specific Show() action have been merged and expanded. Show() is an alias for Query(), and many queries have been added or changed: (omitted) Set()/Toggle() changes A new Set() action has been added, which is similar to the Toggle() action. The difference between Set() and Toggle() happens when no value is specified for a setting. Without a value specified, Set() will display the current value; Toggle() will (if the setting is Boolean) invert the setting's value. Both actions list the current values of all settings if no parameters are given. Many additional resources can now be changed at run-time via Set() or Toggle(). These previously-deprecated resources were removed: cursorPos (assumed true now) dsTrace eventTrace dftBufferSize x3270 APL mode APL keyboard operation on x3270 has changed. There is no longer a fixed APL keymap. Instead, the key combination Shift-Escape toggles a new APL mode, which changes how how paste operations are handled (preferring the APL definitions for Unicode characters that have both APL and non-APL mappings), as well as setting a temporary keyboard map and a temporary compose map. The separate APL host code page has been removed; APL text can be displayed using any host code page. after this, lots of bug fixes and minor tweaks, as far as I can tell. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/x3270/DESCR cvs rdiff -u -r1.42 -r1.43 pkgsrc/x11/x3270/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/x3270/PLIST cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/x3270/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/x3270/options.mk cvs rdiff -u -r1.10 -r0 pkgsrc/x11/x3270/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16095063238580 Content-Disposition: inline Content-Length: 7040 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/x3270/DESCR diff -u pkgsrc/x11/x3270/DESCR:1.1 pkgsrc/x11/x3270/DESCR:1.2 --- pkgsrc/x11/x3270/DESCR:1.1 Wed Oct 31 22:11:55 2001 +++ pkgsrc/x11/x3270/DESCR Fri Jan 1 13:05:22 2021 @@ -1 +1 @@ -IBM 3278/3279 terminal emulator for X windows +IBM 3278/3279 terminal emulator for X windows and/or curses. Index: pkgsrc/x11/x3270/Makefile diff -u pkgsrc/x11/x3270/Makefile:1.42 pkgsrc/x11/x3270/Makefile:1.43 --- pkgsrc/x11/x3270/Makefile:1.42 Sat Jan 18 21:51:16 2020 +++ pkgsrc/x11/x3270/Makefile Fri Jan 1 13:05:22 2021 @@ -1,28 +1,30 @@ -# $NetBSD: Makefile,v 1.42 2020/01/18 21:51:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.43 2021/01/01 13:05:22 rhialto Exp $ -DISTNAME= suite3270-3.3.14ga11-src -PKGNAME= x3270-3.3.14ga11 -PKGREVISION= 2 +DISTNAME= suite3270-4.0ga13-src +PKGNAME= x3270-4.0ga13 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/} EXTRACT_SUFX= .tgz -MAINTAINER= gls@NetBSD.org +MAINTAINER= rhialto@NetBSD.org HOMEPAGE= http://x3270.bgp.nu/ -COMMENT= 3270 Terminal emulator +COMMENT= 3270 Terminal emulators (X11 and/or curses) LICENSE= modified-bsd GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/x3270-3.3 -USE_IMAKE= yes -USE_TOOLS+= bdftopcf +WRKSRC= ${WRKDIR}/suite3270-4.0 +USE_TOOLS+= bdftopcf gmake FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/misc -IMAKEOPTS+= -DFontDir=${PREFIX}/share/fonts/X11 CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11/misc +CONFIGURE_ARGS+= --enable-b3270 +CONFIGURE_ARGS+= --enable-pr3287 +CONFIGURE_ARGS+= --enable-s3270 + +INSTALL_TARGET= install install.man PKG_SYSCONFSUBDIR= x3270 @@ -30,9 +32,14 @@ EGDIR= ${PREFIX}/share/examples/x3270 CONF_FILES= ${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts INSTALLATION_DIRS+= ${EGDIR} +post-install: + ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/ibm_hosts ${DESTDIR}/${EGDIR} + if [ "${PLIST.tcl}" = "yes" ]; then \ + ${INSTALL_SCRIPT} ${WRKSRC}/tcl3270/Examples/* ${DESTDIR}${EGDIR}; \ + fi + +.include "options.mk" + .include "../../converters/libiconv/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -.include "../../x11/libXaw/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xbitmaps/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/x3270/PLIST diff -u pkgsrc/x11/x3270/PLIST:1.9 pkgsrc/x11/x3270/PLIST:1.10 --- pkgsrc/x11/x3270/PLIST:1.9 Sun Jun 1 18:47:24 2014 +++ pkgsrc/x11/x3270/PLIST Fri Jan 1 13:05:22 2021 @@ -1,25 +1,37 @@ -@comment $NetBSD: PLIST,v 1.9 2014/06/01 18:47:24 wiz Exp $ -bin/x3270 -bin/x3270if -share/fonts/X11/misc/3270-12.pcf.gz -share/fonts/X11/misc/3270-12b.pcf.gz -share/fonts/X11/misc/3270-20.pcf.gz -share/fonts/X11/misc/3270-20b.pcf.gz -share/fonts/X11/misc/3270.pcf.gz -share/fonts/X11/misc/3270b.pcf.gz -share/fonts/X11/misc/3270gr.pcf.gz -share/fonts/X11/misc/3270gt12.pcf.gz -share/fonts/X11/misc/3270gt12b.pcf.gz -share/fonts/X11/misc/3270gt16.pcf.gz -share/fonts/X11/misc/3270gt16b.pcf.gz -share/fonts/X11/misc/3270gt24.pcf.gz -share/fonts/X11/misc/3270gt24b.pcf.gz -share/fonts/X11/misc/3270gt32.pcf.gz -share/fonts/X11/misc/3270gt32b.pcf.gz -share/fonts/X11/misc/3270gt8.pcf.gz -share/fonts/X11/misc/3270h.pcf.gz -${IMAKE_MAN_DIR}/x3270.${IMAKE_MAN_SUFFIX} -man/man1/x3270-script.1 -man/man1/x3270if.1 +@comment $NetBSD: PLIST,v 1.10 2021/01/01 13:05:22 rhialto Exp $ +bin/b3270 +${PLIST.curses}bin/c3270 +bin/pr3287 +bin/s3270 +${PLIST.tcl}bin/tcl3270 +${PLIST.x11}bin/x3270 +${PLIST.x11}bin/x3270a +${PLIST.x11}bin/x3270if +man/man1/b3270.1 +${PLIST.curses}man/man1/c3270.1 +man/man1/pr3287.1 +man/man1/s3270.1 +${PLIST.tcl}man/man1/tcl3270.1 +${PLIST.x11}man/man1/x3270-script.1 +${PLIST.x11}man/man1/x3270.1 +${PLIST.x11}man/man1/x3270if.1 man/man5/ibm_hosts.5 +${PLIST.tcl}share/examples/x3270/cms_cmd.tcl3270 share/examples/x3270/ibm_hosts +${PLIST.x11}share/fonts/X11/misc/3270-12.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270-12b.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270-20.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270-20b.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270b.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gr.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt12.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt12b.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt16.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt16b.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt24.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt24b.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt32.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt32b.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270gt8.pcf.gz +${PLIST.x11}share/fonts/X11/misc/3270h.pcf.gz Index: pkgsrc/x11/x3270/distinfo diff -u pkgsrc/x11/x3270/distinfo:1.16 pkgsrc/x11/x3270/distinfo:1.17 --- pkgsrc/x11/x3270/distinfo:1.16 Wed Nov 4 03:28:57 2015 +++ pkgsrc/x11/x3270/distinfo Fri Jan 1 13:05:22 2021 @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.16 2015/11/04 03:28:57 agc Exp $ +$NetBSD: distinfo,v 1.17 2021/01/01 13:05:22 rhialto Exp $ -SHA1 (suite3270-3.3.14ga11-src.tgz) = 23bf5b29a2c3c10b935b66a95f666de350ae9c2d -RMD160 (suite3270-3.3.14ga11-src.tgz) = 5c7a66175bff8ec2b77565eba5f7c90928cec502 -SHA512 (suite3270-3.3.14ga11-src.tgz) = 1f4b735b1baa0c813809324989becd1b62807bf05033f0415a9cd7523af04728bc2511213a091e8c4377163a4c26635168633c12d331da3f0a683f736c041bca -Size (suite3270-3.3.14ga11-src.tgz) = 6902551 bytes -SHA1 (patch-aa) = 826eb5ab930d4d4b1dc340c15a4160c303291f16 +SHA1 (suite3270-4.0ga13-src.tgz) = 36ed7d2262f12c1be5b127a596020b88e904eca5 +RMD160 (suite3270-4.0ga13-src.tgz) = 0cda8679f530707eeba561a6ce30776287af3853 +SHA512 (suite3270-4.0ga13-src.tgz) = bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b +Size (suite3270-4.0ga13-src.tgz) = 3317494 bytes Added files: Index: pkgsrc/x11/x3270/options.mk diff -u /dev/null pkgsrc/x11/x3270/options.mk:1.1 --- /dev/null Fri Jan 1 13:05:23 2021 +++ pkgsrc/x11/x3270/options.mk Fri Jan 1 13:05:22 2021 @@ -0,0 +1,36 @@ +# $NetBSD: options.mk,v 1.1 2021/01/01 13:05:22 rhialto Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.x3270 +PKG_SUPPORTED_OPTIONS= curses x11 tcl +PKG_SUGGESTED_OPTIONS+= curses x11 +PLIST_VARS= curses x11 tcl + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mcurses) +.include "../../mk/curses.buildlink3.mk" +CONFIGURE_ARGS+= --enable-c3270 +PLIST.curses= yes +.else +CONFIGURE_ARGS+= --disable-c3270 +.endif + +.if !empty(PKG_OPTIONS:Mx11) +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" +CONFIGURE_ARGS+= --enable-x3270 +CONFIGURE_ARGS+= --enable-x3270if +PLIST.x11= yes +.else +CONFIGURE_ARGS+= --disable-x3270 +CONFIGURE_ARGS+= --disable-x3270if +.endif + +.if !empty(PKG_OPTIONS:Mtcl) +.include "../../lang/tcl/buildlink3.mk" +CONFIGURE_ARGS+= --enable-tcl3270 +PLIST.tcl= yes +.else +CONFIGURE_ARGS+= --disable-tcl3270 +.endif --_----------=_16095063238580--