From nobody Mon Feb 12 07:12:14 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TYFyQ46flz59hCH; Mon, 12 Feb 2024 07:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYFyQ24pSz40lv; Mon, 12 Feb 2024 07:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707721934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zn1qlJkIydqpZHhh0jVhpb/WqXomf6bgjiEXlKBWXrQ=; b=QdfowzjWGElU5xarM2G5N6DNdCUdKLa8Ti7paOjs1kAwIrY/CLMGE61cV7OsZe4iAc3yz7 M7CC3VhspRz8otpauuG8Q5CLHtsK2r45o9OWjnovecB9FgZnVp7K/ZJ7qY7NUXEHJ9jmag /MTSJOG7jEY1c0BtpBfsZJqShBmm3NcZKFiSPldHfp9q+qCWsTEYYUnm/5ll/Nfwl9XPr7 kSJ68TIIFB3T87dFKmRPY2yHtuIXOGQwhszT0xX/RAoT+YdQh2+2rHSHcbP/68ZAfu2Div S6lJh4dGUyCa9HOAboWauNoGgXSzRyitROnskNBWF3b9EDTkO6XUaFNG4w5fCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707721934; a=rsa-sha256; cv=none; b=UrQ1373+k528Pl3aDOK9tY7LzTlxq4a2JyJH7uUaVt/8zo2C+yhKu2wdPczvD3bdCUmbU7 9PecfX5uu+mO6Mov+d+QQXd65HCgKPFBd1JSqMoo2VaKAuY4yoZswlN64BWmNPHwtEBilH w6QEHiBKan3GV1xSXe0cSSgIJpNIiAYZgOS6dUdFct9+7JftdJXglbaCodUvTl0qFZgW0/ ahqUy+htyN+MBw6KwZq/uNGXxGxcJwne2SiPg4y3jrIZRjvvYGTsnooJqCWEa4Ao4dtH5/ QWzRxt9OGZyBmkUYPKMqJWZNQys1TmcT7yDDnTLbh0D4gMHqG7vaA4BoUARZFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707721934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zn1qlJkIydqpZHhh0jVhpb/WqXomf6bgjiEXlKBWXrQ=; b=LvmesP7CLDWDl7rDgNM76rXFAeTRXLQYU/VRXq/sydCeFzXPxKqvo2oYlimN8PpMj6/KgK JiIV6IyDrmadIcmvHrUGg06O2wWeL6nhYSaP3z3Qb9W7sbxwQVxAmpgsllc8tDHJehmBiD w3JmzdiZnHGDxD1ASThRs73e9KrKU5IOuQjOpHpAowy6mJ1mk0U/aAJ0AmssEh2+CUP8dC WjKfHMAvOkFf2OqTvVz9hrDNRmlIfA0ZJGtJE8ue15vVJlN2qs089B2AycZA/dHsTqjslQ n+/f+rELbl3/Ru5I3oXZ7+dNmRwkveTxblKG2u34q4lVwqhkb+0WMwOYyZWmqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYFyQ18R2zHkW; Mon, 12 Feb 2024 07:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41C7CEcY052759; Mon, 12 Feb 2024 07:12:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41C7CEmt052756; Mon, 12 Feb 2024 07:12:14 GMT (envelope-from git) Date: Mon, 12 Feb 2024 07:12:14 GMT Message-Id: <202402120712.41C7CEmt052756@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 573c1a05772f - main - x11/x3270: Update to 4.3ga4 and fix -CURRENT kcmp collision List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 573c1a05772f7ee5b02ac4f246867295b1ece82b Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=573c1a05772f7ee5b02ac4f246867295b1ece82b commit 573c1a05772f7ee5b02ac4f246867295b1ece82b Author: Kevin Bowling AuthorDate: 2024-02-12 07:11:34 +0000 Commit: Kevin Bowling CommitDate: 2024-02-12 07:11:34 +0000 x11/x3270: Update to 4.3ga4 and fix -CURRENT kcmp collision --- x11/x3270/Makefile | 7 ++--- x11/x3270/distinfo | 6 ++-- x11/x3270/files/patch-Common_c3270_keymap.c | 47 ++++++++++++++++++++++++++++ x11/x3270/files/patch-pr3287_Makefile.obj.in | 19 +++++++++++ x11/x3270/pkg-plist | 1 + 5 files changed, 73 insertions(+), 7 deletions(-) diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index 82f6075d74de..5f495acdc170 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -1,9 +1,8 @@ PORTNAME?= x3270 -PORTVERSION= 4.2 -PORTREVISION= 2 +PORTVERSION= 4.3 CATEGORIES?= x11 net -MASTER_SITES= http://x3270.bgp.nu/download/04.02/ -DISTFILES= suite3270-${PORTVERSION}ga10-src.tgz +MASTER_SITES= http://x3270.bgp.nu/download/04.03/ +DISTFILES= suite3270-${PORTVERSION}ga4-src.tgz MAINTAINER= kbowling@FreeBSD.org COMMENT?= 3270 Terminal emulator diff --git a/x11/x3270/distinfo b/x11/x3270/distinfo index 3c88e811149e..a7de616bb2ae 100644 --- a/x11/x3270/distinfo +++ b/x11/x3270/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685990899 -SHA256 (suite3270-4.2ga10-src.tgz) = db513225f074144a5a0221d57ede37cca1468c2c2d158ea09981f50012ebdbe7 -SIZE (suite3270-4.2ga10-src.tgz) = 12739495 +TIMESTAMP = 1707720825 +SHA256 (suite3270-4.3ga4-src.tgz) = 3b7bf11de9a05a5f203cb845bd8e7fb805c2a06ca606ccf8cdee4ff5c80caa4b +SIZE (suite3270-4.3ga4-src.tgz) = 13163509 diff --git a/x11/x3270/files/patch-Common_c3270_keymap.c b/x11/x3270/files/patch-Common_c3270_keymap.c new file mode 100644 index 000000000000..3fd1dcafd314 --- /dev/null +++ b/x11/x3270/files/patch-Common_c3270_keymap.c @@ -0,0 +1,47 @@ +--- Common/c3270/keymap.c.orig 2024-02-12 06:58:07 UTC ++++ Common/c3270/keymap.c +@@ -111,7 +111,7 @@ static int + * Returns 0 if equal, nonzero if not. + */ + static int +-kcmp(k_t *a, k_t *b) ++kcmp3270(k_t *a, k_t *b) + { + if (a->key && b->key && (a->key == b->key)) { + return 0; +@@ -139,7 +139,7 @@ kvcmp(k_t *a, k_t *b, int len) + int i; + + for (i = 0; i < len; i++) { +- if (kcmp(&a[i], &b[i])) ++ if (kcmp3270(&a[i], &b[i])) + return 1; + } + return 0; +@@ -673,7 +673,7 @@ lookup_key(int kcode, ucs4_t ucs4, int modifiers) + for (k = master_keymap; k != NULL; k = k->next) { + if (IS_INACTIVE(k)) + continue; +- if (!kcmp(&code, &k->codes[0])) { ++ if (!kcmp3270(&code, &k->codes[0])) { + if (k->ncodes == 1) { + shortest = k; + break; +@@ -693,7 +693,7 @@ lookup_key(int kcode, ucs4_t ucs4, int modifiers) + } + + /* See if this character matches the next one we want. */ +- if (!kcmp(&code, ¤t_match->codes[consumed])) { ++ if (!kcmp3270(&code, ¤t_match->codes[consumed])) { + consumed++; + if (consumed == current_match->ncodes) { + /* Final match. */ +@@ -721,7 +721,7 @@ lookup_key(int kcode, ucs4_t ucs4, int modifiers) + continue; + } + if (k->ncodes > consumed && !codecmp(k, current_match, consumed) && +- !kcmp(&k->codes[consumed], &code)) { ++ !kcmp3270(&k->codes[consumed], &code)) { + consumed++; + if (k->ncodes == consumed) { + j = ambiguous(k, consumed); diff --git a/x11/x3270/files/patch-pr3287_Makefile.obj.in b/x11/x3270/files/patch-pr3287_Makefile.obj.in new file mode 100644 index 000000000000..f265a4b08571 --- /dev/null +++ b/x11/x3270/files/patch-pr3287_Makefile.obj.in @@ -0,0 +1,19 @@ +--- pr3287/Makefile.obj.in.orig 2024-02-12 07:06:47 UTC ++++ pr3287/Makefile.obj.in +@@ -45,6 +45,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ + LIBS = @LIBS@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ + + HOST = @host@ +@@ -70,7 +71,7 @@ install: pr3287 prtodir + [ -d $(DESTDIR)$(BINDIR) ] || \ + mkdir -p $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) pr3287 $(DESTDIR)$(BINDIR)/pr3287 +- $(INSTALL_PROGRAM) prtodir $(DESTDIR)$(BINDIR)/prtodir ++ $(INSTALL_SCRIPT) prtodir $(DESTDIR)$(BINDIR)/prtodir + + install.man: man + [ -d $(DESTDIR)$(MANDIR)/man1 ] || \ diff --git a/x11/x3270/pkg-plist b/x11/x3270/pkg-plist index 42c965c0a394..cf1c7bf7f37d 100644 --- a/x11/x3270/pkg-plist +++ b/x11/x3270/pkg-plist @@ -1,6 +1,7 @@ bin/b3270 bin/c3270 bin/pr3287 +bin/prtodir bin/s3270 bin/tcl3270 %%X3270%%bin/x3270