Fri Jan 1 13:05:23 2021 UTC ()
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.


(rhialto)
diff -r1.1 -r1.2 pkgsrc/x11/x3270/DESCR
diff -r1.42 -r1.43 pkgsrc/x11/x3270/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/x3270/PLIST
diff -r1.16 -r1.17 pkgsrc/x11/x3270/distinfo
diff -r0 -r1.1 pkgsrc/x11/x3270/options.mk
diff -r1.10 -r0 pkgsrc/x11/x3270/patches/patch-aa

cvs diff -r1.1 -r1.2 pkgsrc/x11/x3270/DESCR (expand / switch to unified diff)

--- pkgsrc/x11/x3270/DESCR 2001/10/31 22:11:55 1.1
+++ pkgsrc/x11/x3270/DESCR 2021/01/01 13:05:22 1.2

cvs diff -r1.42 -r1.43 pkgsrc/x11/x3270/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/x3270/Makefile 2020/01/18 21:51:16 1.42
+++ pkgsrc/x11/x3270/Makefile 2021/01/01 13:05:22 1.43
@@ -1,38 +1,45 @@ @@ -1,38 +1,45 @@
1# $NetBSD: Makefile,v 1.42 2020/01/18 21:51:16 jperkin Exp $ 1# $NetBSD: Makefile,v 1.43 2021/01/01 13:05:22 rhialto Exp $
2 2
3DISTNAME= suite3270-3.3.14ga11-src 3DISTNAME= suite3270-4.0ga13-src
4PKGNAME= x3270-3.3.14ga11 4PKGNAME= x3270-4.0ga13
5PKGREVISION= 2 
6CATEGORIES= x11 5CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/}
8EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
9 8
10MAINTAINER= gls@NetBSD.org 9MAINTAINER= rhialto@NetBSD.org
11HOMEPAGE= http://x3270.bgp.nu/ 10HOMEPAGE= http://x3270.bgp.nu/
12COMMENT= 3270 Terminal emulator 11COMMENT= 3270 Terminal emulators (X11 and/or curses)
13LICENSE= modified-bsd 12LICENSE= modified-bsd
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16 15
17WRKSRC= ${WRKDIR}/x3270-3.3 16WRKSRC= ${WRKDIR}/suite3270-4.0
18USE_IMAKE= yes 17USE_TOOLS+= bdftopcf gmake
19USE_TOOLS+= bdftopcf 
20 18
21FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/misc 19FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/misc
22IMAKEOPTS+= -DFontDir=${PREFIX}/share/fonts/X11 
23 20
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
25CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11/misc 22CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11/misc
 23CONFIGURE_ARGS+= --enable-b3270
 24CONFIGURE_ARGS+= --enable-pr3287
 25CONFIGURE_ARGS+= --enable-s3270
 26
 27INSTALL_TARGET= install install.man
26 28
27PKG_SYSCONFSUBDIR= x3270 29PKG_SYSCONFSUBDIR= x3270
28 30
29EGDIR= ${PREFIX}/share/examples/x3270 31EGDIR= ${PREFIX}/share/examples/x3270
30CONF_FILES= ${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts 32CONF_FILES= ${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts
31INSTALLATION_DIRS+= ${EGDIR} 33INSTALLATION_DIRS+= ${EGDIR}
32 34
 35post-install:
 36 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/ibm_hosts ${DESTDIR}/${EGDIR}
 37 if [ "${PLIST.tcl}" = "yes" ]; then \
 38 ${INSTALL_SCRIPT} ${WRKSRC}/tcl3270/Examples/* ${DESTDIR}${EGDIR}; \
 39 fi
 40
 41.include "options.mk"
 42
33.include "../../converters/libiconv/buildlink3.mk" 43.include "../../converters/libiconv/buildlink3.mk"
34.include "../../security/openssl/buildlink3.mk" 44.include "../../security/openssl/buildlink3.mk"
35.include "../../x11/libXaw/buildlink3.mk" 
36.include "../../x11/libXt/buildlink3.mk" 
37.include "../../x11/xbitmaps/buildlink3.mk" 
38.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"

cvs diff -r1.9 -r1.10 pkgsrc/x11/x3270/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/x3270/PLIST 2014/06/01 18:47:24 1.9
+++ pkgsrc/x11/x3270/PLIST 2021/01/01 13:05:22 1.10
@@ -1,25 +1,37 @@ @@ -1,25 +1,37 @@
1@comment $NetBSD: PLIST,v 1.9 2014/06/01 18:47:24 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.10 2021/01/01 13:05:22 rhialto Exp $
2bin/x3270 2bin/b3270
3bin/x3270if 3${PLIST.curses}bin/c3270
4share/fonts/X11/misc/3270-12.pcf.gz 4bin/pr3287
5share/fonts/X11/misc/3270-12b.pcf.gz 5bin/s3270
6share/fonts/X11/misc/3270-20.pcf.gz 6${PLIST.tcl}bin/tcl3270
7share/fonts/X11/misc/3270-20b.pcf.gz 7${PLIST.x11}bin/x3270
8share/fonts/X11/misc/3270.pcf.gz 8${PLIST.x11}bin/x3270a
9share/fonts/X11/misc/3270b.pcf.gz 9${PLIST.x11}bin/x3270if
10share/fonts/X11/misc/3270gr.pcf.gz 10man/man1/b3270.1
11share/fonts/X11/misc/3270gt12.pcf.gz 11${PLIST.curses}man/man1/c3270.1
12share/fonts/X11/misc/3270gt12b.pcf.gz 12man/man1/pr3287.1
13share/fonts/X11/misc/3270gt16.pcf.gz 13man/man1/s3270.1
14share/fonts/X11/misc/3270gt16b.pcf.gz 14${PLIST.tcl}man/man1/tcl3270.1
15share/fonts/X11/misc/3270gt24.pcf.gz 15${PLIST.x11}man/man1/x3270-script.1
16share/fonts/X11/misc/3270gt24b.pcf.gz 16${PLIST.x11}man/man1/x3270.1
17share/fonts/X11/misc/3270gt32.pcf.gz 17${PLIST.x11}man/man1/x3270if.1
18share/fonts/X11/misc/3270gt32b.pcf.gz 
19share/fonts/X11/misc/3270gt8.pcf.gz 
20share/fonts/X11/misc/3270h.pcf.gz 
21${IMAKE_MAN_DIR}/x3270.${IMAKE_MAN_SUFFIX} 
22man/man1/x3270-script.1 
23man/man1/x3270if.1 
24man/man5/ibm_hosts.5 18man/man5/ibm_hosts.5
 19${PLIST.tcl}share/examples/x3270/cms_cmd.tcl3270
25share/examples/x3270/ibm_hosts 20share/examples/x3270/ibm_hosts
 21${PLIST.x11}share/fonts/X11/misc/3270-12.pcf.gz
 22${PLIST.x11}share/fonts/X11/misc/3270-12b.pcf.gz
 23${PLIST.x11}share/fonts/X11/misc/3270-20.pcf.gz
 24${PLIST.x11}share/fonts/X11/misc/3270-20b.pcf.gz
 25${PLIST.x11}share/fonts/X11/misc/3270.pcf.gz
 26${PLIST.x11}share/fonts/X11/misc/3270b.pcf.gz
 27${PLIST.x11}share/fonts/X11/misc/3270gr.pcf.gz
 28${PLIST.x11}share/fonts/X11/misc/3270gt12.pcf.gz
 29${PLIST.x11}share/fonts/X11/misc/3270gt12b.pcf.gz
 30${PLIST.x11}share/fonts/X11/misc/3270gt16.pcf.gz
 31${PLIST.x11}share/fonts/X11/misc/3270gt16b.pcf.gz
 32${PLIST.x11}share/fonts/X11/misc/3270gt24.pcf.gz
 33${PLIST.x11}share/fonts/X11/misc/3270gt24b.pcf.gz
 34${PLIST.x11}share/fonts/X11/misc/3270gt32.pcf.gz
 35${PLIST.x11}share/fonts/X11/misc/3270gt32b.pcf.gz
 36${PLIST.x11}share/fonts/X11/misc/3270gt8.pcf.gz
 37${PLIST.x11}share/fonts/X11/misc/3270h.pcf.gz

cvs diff -r1.16 -r1.17 pkgsrc/x11/x3270/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/x3270/distinfo 2015/11/04 03:28:57 1.16
+++ pkgsrc/x11/x3270/distinfo 2021/01/01 13:05:22 1.17
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.16 2015/11/04 03:28:57 agc Exp $ 1$NetBSD: distinfo,v 1.17 2021/01/01 13:05:22 rhialto Exp $
2 2
3SHA1 (suite3270-3.3.14ga11-src.tgz) = 23bf5b29a2c3c10b935b66a95f666de350ae9c2d 3SHA1 (suite3270-4.0ga13-src.tgz) = 36ed7d2262f12c1be5b127a596020b88e904eca5
4RMD160 (suite3270-3.3.14ga11-src.tgz) = 5c7a66175bff8ec2b77565eba5f7c90928cec502 4RMD160 (suite3270-4.0ga13-src.tgz) = 0cda8679f530707eeba561a6ce30776287af3853
5SHA512 (suite3270-3.3.14ga11-src.tgz) = 1f4b735b1baa0c813809324989becd1b62807bf05033f0415a9cd7523af04728bc2511213a091e8c4377163a4c26635168633c12d331da3f0a683f736c041bca 5SHA512 (suite3270-4.0ga13-src.tgz) = bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b
6Size (suite3270-3.3.14ga11-src.tgz) = 6902551 bytes 6Size (suite3270-4.0ga13-src.tgz) = 3317494 bytes
7SHA1 (patch-aa) = 826eb5ab930d4d4b1dc340c15a4160c303291f16 

File Added: pkgsrc/x11/x3270/options.mk
# $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

File Deleted: pkgsrc/x11/x3270/patches/Attic/patch-aa