CVS commit: pkgsrc/x11/x3270

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/x3270
From: "Olaf Seibert" <rhialto%netbsd.org@localhost>
Date: Wed, 29 Dec 2021 13:25:47 +0000

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Wed Dec 29 13:25:47 UTC 2021

Modified Files:
        pkgsrc/x11/x3270: Makefile PLIST distinfo options.mk

Log Message:
x11/x3270: update to suite3270-4.1ga11.

Removed some out-of-date documentation.
https://x3270.miraheze.org/wiki/Main_Page is the most up-to-date.

Improvements:
- Added a macros menu to c3270 and wc3270.
- Corrected support for the macros resource without a qualifying host
  name.
- The entire list of command-line options is now displayed only with the
  --help command-line option, not for every unknown option.
- Added the lineMode resource.
- Added the noTelnetInputMode resource.
- Added the wrap graphic rendition to b3270.
- Added the Pause() action.
- Changed the default for unlockDelay in all emulators from true to
  false. This is a very significant change.
- The overlayPaste resource is now set to true by default.
- GNOME desktop integration is now included.
- wc3270 now does continuous selections in NVT mode, and allows a single
  character to be selected.
- wc3270 no longer moves the cursor for mouse clicks in NVT mode.
- Double-clicking on a URL in x3270 (on most platforms) and in wc3270
  now opens that link in the browser.
- The session file folder is no longer marked as a system file, so
  backup software will not skip it.
- Added the SubjectNames() action and TlsSubjectNames query.
- Added the ability to set an accept host name to the wc3270 Session
  Wizard.
- Switched several actions that return values to explicitly return
  nothing.
- Added the ability to include the OIA in a PrintText() action screen
  image.
- Added the OIA to the screen image displayed by the HTTP server.
- Added validation of keymaps, macros and idle actions at init time.
- Added cursor blink support to wc3270.
- Added the SaveInput() action and RestoreInput() action.
- In b3270, error messages from failed host connection attempts are now
  labeled separately from other errors.
- Added the -subst option to the String() action.

Bug fixes:
- Fixed an issue in b3270 where the cursor would continue to be
  displayed when the host disconnected.
- APL characters were not displayed properly in x3270 in NVT mode, when
  using a 3270 font.
- On MacOS, the ./configure script would skip c3270 if it was not
  enabled explicitly.
- Fixed a number of typos in compiled strings and comments (courtesy of
  Philipp Kern).
- Fixed a c3270 crash seen on NetBSD.
- Fixed an issue with c3270 exiting prematurely, seen on NetBSD.
- Fixed an x3270 install issue (courtesy of Olaf 'Rhialto' Seibert).
- The last screenful of NVT mode text is no longer lost when scrolling
  backwards.
- The programs ar and ranlib are resolved dynamically now when building.
- Numeric fields no longer ignore non-numeric characters and commas,
  when the NumericLock resource is false. When it is true, commas are
  considered valid numeric characters.
- Proxy connections did not initialize TELNET state properly (courtesy
  of Andreas Krebbel).
- When running on Cygwin, child scripts (the Script() action, Execute()
  action and Prompt() action) failed with a bind error.
- When the print dialog was canceled, the PrintText() action and
  ScreenTrace() action would fail silently.
- The emulator would sometimes crash when a pending connection was
  broken.
- Windows error messages are now encoded using the selected code page,
  not the system ANSI code page.
- Fixed several scripting scenarios, such as aborting a Source() action,
  which would leave the keyboard locked.
- The String() action no longer requires an input field to be present in
  order to run.
- Corrected an issue where an empty error message would be displayed for
  a connection failure.
- Corrected a typo in a file transfer message name (courtesy of Philipp
  Kern).
- Added logic to ensure the icon directory exists when installing x3270
  on Linux (courtesy of Philipp Kern).
- Fixed the representation of APL underlined alphabetics in b3270 screen
  updates in NVT mode, and in the output of the Ascii() action.
- Fixed a crash when an action started with a comment (# or !).
- Fixed a version generation bug that prevented the code from building
  on MacOS when SOURCE_DATE_EPOCH was set.
- Corrected usage messages.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/x3270/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/x3270/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/x3270/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/x3270/options.mk

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

Modified files:

Index: pkgsrc/x11/x3270/Makefile
diff -u pkgsrc/x11/x3270/Makefile:1.46 pkgsrc/x11/x3270/Makefile:1.47
--- pkgsrc/x11/x3270/Makefile:1.46      Sat Jun 26 13:51:20 2021
+++ pkgsrc/x11/x3270/Makefile   Wed Dec 29 13:25:47 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2021/06/26 13:51:20 rhialto Exp $
+# $NetBSD: Makefile,v 1.47 2021/12/29 13:25:47 rhialto Exp $
 
-DISTNAME=      suite3270-4.0ga14-src
-PKGNAME=       x3270-4.0ga14
+DISTNAME=      suite3270-4.1ga11-src
+PKGNAME=       x3270-4.1ga11
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=x3270/}
 EXTRACT_SUFX=  .tgz
@@ -13,13 +13,12 @@ LICENSE=    modified-bsd
 
 GNU_CONFIGURE= yes
 
-WRKSRC=                ${WRKDIR}/suite3270-4.0
+WRKSRC=                ${WRKDIR}/suite3270-4.1
 USE_TOOLS+=    bdftopcf gmake
 
 FONTS_DIRS.x11+=       ${PREFIX}/share/fonts/X11/misc
 
 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
@@ -32,6 +31,12 @@ EGDIR=                       ${PREFIX}/share/examples/x3270
 CONF_FILES=            ${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts
 INSTALLATION_DIRS+=    ${EGDIR}
 
+SUBST_CLASSES+=                share
+SUBST_STAGE.share=     pre-configure
+SUBST_MESSAGE.share=   Fixing /usr/share
+SUBST_FILES.share=     x3270/Makefile.obj.in
+SUBST_SED.share+=      -e 's;/usr/share;${PREFIX}/share;'
+
 post-install:
        ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/ibm_hosts ${DESTDIR}/${EGDIR}
        if [ "${PLIST.tcl}" = "yes" ]; then \

Index: pkgsrc/x11/x3270/PLIST
diff -u pkgsrc/x11/x3270/PLIST:1.10 pkgsrc/x11/x3270/PLIST:1.11
--- pkgsrc/x11/x3270/PLIST:1.10 Fri Jan  1 13:05:22 2021
+++ pkgsrc/x11/x3270/PLIST      Wed Dec 29 13:25:47 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2021/01/01 13:05:22 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.11 2021/12/29 13:25:47 rhialto Exp $
 bin/b3270
 ${PLIST.curses}bin/c3270
 bin/pr3287
@@ -12,10 +12,10 @@ ${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.gtk}share/applications/x3270.desktop
 ${PLIST.tcl}share/examples/x3270/cms_cmd.tcl3270
 share/examples/x3270/ibm_hosts
 ${PLIST.x11}share/fonts/X11/misc/3270-12.pcf.gz
@@ -35,3 +35,8 @@ ${PLIST.x11}share/fonts/X11/misc/3270gt3
 ${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
+${PLIST.gtk}share/icons/hicolor/192x192/apps/x3270.png
+${PLIST.gtk}share/icons/hicolor/256x256/apps/x3270.png
+${PLIST.gtk}share/icons/hicolor/48x48/apps/x3270.png
+${PLIST.gtk}share/icons/hicolor/512x512/apps/x3270.png
+${PLIST.gtk}share/icons/hicolor/96x96/apps/x3270.png

Index: pkgsrc/x11/x3270/distinfo
diff -u pkgsrc/x11/x3270/distinfo:1.20 pkgsrc/x11/x3270/distinfo:1.21
--- pkgsrc/x11/x3270/distinfo:1.20      Tue Oct 26 11:34:33 2021
+++ pkgsrc/x11/x3270/distinfo   Wed Dec 29 13:25:47 2021
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 11:34:33 nia Exp $
+$NetBSD: distinfo,v 1.21 2021/12/29 13:25:47 rhialto Exp $
 
-BLAKE2s (suite3270-4.0ga14-src.tgz) = 10b8672ed9a197c15363b8022b50f1926dfcc44cf526880b2c3ae0cbc48228be
-SHA512 (suite3270-4.0ga14-src.tgz) = 0c76946420bbc2a483ab321658350a5b3e1c03e66b65e99f1a8cb4d350e07eedd44f9f24671244f3c374f512e5d211304785b8e44ae125265ce8f71f0a9dcc65
-Size (suite3270-4.0ga14-src.tgz) = 3318277 bytes
+BLAKE2s (suite3270-4.1ga11-src.tgz) = 73136a3953dd24c6656a8dd7fc38a8fee0994f3c5cf636928471e4e6b0da3c42
+SHA512 (suite3270-4.1ga11-src.tgz) = 1032a03bf9b24ae9d0e9b9f8b6a7c6319dff2c77db14257f22eb05b52b308e9134d8c6a5080178081f7ba893936e2eca63bb0e04b804d4a7df2507a5b3f625fb
+Size (suite3270-4.1ga11-src.tgz) = 3900772 bytes

Index: pkgsrc/x11/x3270/options.mk
diff -u pkgsrc/x11/x3270/options.mk:1.3 pkgsrc/x11/x3270/options.mk:1.4
--- pkgsrc/x11/x3270/options.mk:1.3     Sat Jun 26 13:51:20 2021
+++ pkgsrc/x11/x3270/options.mk Wed Dec 29 13:25:47 2021
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2021/06/26 13:51:20 rhialto Exp $
+# $NetBSD: options.mk,v 1.4 2021/12/29 13:25:47 rhialto Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.x3270
-PKG_SUPPORTED_OPTIONS= curses x11 tcl
-PKG_SUGGESTED_OPTIONS+=        curses x11
-PLIST_VARS=            curses x11 tcl
+PKG_SUPPORTED_OPTIONS= curses x11 tcl gtk
+PKG_SUGGESTED_OPTIONS+=        curses x11 gtk
+PLIST_VARS=            curses x11 tcl gtk
 
 .include "../../mk/bsd.options.mk"
 
@@ -23,7 +23,15 @@ CONFIGURE_ARGS+=     --enable-x3270
 CONFIGURE_ARGS+=       --enable-x3270if
 PLIST.x11=             yes
 REPLACE_BASH+=         x3270/x3270a.in
-USE_TOOLS+=    bash:run
+USE_TOOLS+=            bash:run
+
+.  if !empty(PKG_OPTIONS:Mgtk)
+.    include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+ICON_THEMES=           yes
+INSTALLATION_DIRS+=    ${PREFIX}/share/applications
+INSTALLATION_DIRS+=    ${PREFIX}/share/icons/hicolor
+PLIST.gtk=             yes
+.  endif
 .else
 CONFIGURE_ARGS+=       --disable-x3270
 CONFIGURE_ARGS+=       --disable-x3270if

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index