From patchwork Thu Oct 7 05:46:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Foo Chuan Wei X-Patchwork-Id: 33666 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD9EE27BBE3; Thu, 7 Oct 2021 07:09:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 559B627BBE1 for ; Thu, 7 Oct 2021 07:09:15 +0100 (BST) Received: from localhost ([::1]:34572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYMag-0003Vz-6g for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 02:09:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYMaU-0003Vl-Lc for guix-patches@gnu.org; Thu, 07 Oct 2021 02:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYMaU-00063i-DT for guix-patches@gnu.org; Thu, 07 Oct 2021 02:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYMaU-0006xL-7f for guix-patches@gnu.org; Thu, 07 Oct 2021 02:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51067] [PATCH] gnu: Add traditional vi (ex-vi) Resent-From: Foo Chuan Wei Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 06:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51067@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163358692526714 (code B ref -1); Thu, 07 Oct 2021 06:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Oct 2021 06:08:45 +0000 Received: from localhost ([127.0.0.1]:45794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYMaD-0006wn-7e for submit@debbugs.gnu.org; Thu, 07 Oct 2021 02:08:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:37978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYMa8-0006wd-63 for submit@debbugs.gnu.org; Thu, 07 Oct 2021 02:08:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYMa8-0003Vb-24 for guix-patches@gnu.org; Thu, 07 Oct 2021 02:08:40 -0400 Received: from mail-pu1apc01olkn081a.outbound.protection.outlook.com ([2a01:111:f400:febe::81a]:6186 helo=APC01-PU1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYMa5-0005hP-Nt for guix-patches@gnu.org; Thu, 07 Oct 2021 02:08:39 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iiswpGOE1QI4pdhIkjqcZ68gjotedR7rG0dzvqspFrnvs84F4w4BJaqszDe2iW14jINuc6XoqdTvnDnxyr/Ku5cK+C3adrlNE0EqMA057cCxaNLSgEdd1ifoj2s7CcpqO8FJp+GapaReMHidsfovDY1kjZ5ZmjSfn4jl7YcuIU9/umPNAoS5L6yihopwbpB0XXKw/eyINfcKL2LoC+4ZepqsSCFQhoHSBqhhlO/KdPvGtm39ZxtlsOpv8NlLcVDAC+wC94pzavrSog8ZGMsFmOZxJQRgmvoi7eJr75M1P76IJ94QRMJUfFyrqz/YnbcGby4CxboOkCZ56SHZ5/eduA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7mFNqaQozNASYq363K29M3fE/0s9JbtAfRk0boQasws=; b=bZ/xt4pV4QFNrEh1cLvTw1F0+y5JS3jhHka/e8kky8X3kDLhFRS2T0cPOk2frMJz1UKHp4dZzJy+WTeqcpHsixekUibQG3lfCZX3sAKBhqXRULcudbKnLwC/ORTisuLFXRovv7IgvestXp1+YKmQaFqI27SEVOAA8MGjvozCZ5nmlYpPKHDVkaGca6lc0otnVX/rTTwuezCwGnc71+RpuFCzqWiE0CaUamEUoM8IzmTt6mEfsvKRFVejwZhiECy2ljB8PwNt0D80qnhNh4rFPIQqVz5u4Nmpv8jJzQjWnsMO+6NRcXO3308E88GrRdm23LOO4dP/CJAlWHWnDDTPZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7mFNqaQozNASYq363K29M3fE/0s9JbtAfRk0boQasws=; b=HGCKXhzLKU0E1H8Hb+IKjqICJlQBhW8X++3ILtiGdu4Yy31pt6O5+dPv+1buYRqkj9V6lqMgROOKdECac/LEWT/Gmfr6iQTZBggy17Wma6YcM3GaMMCcnJzKHZ05sYNt3QQGT+fKGGCHzUEUqTzgy7QWFsOBBDF9CzMwialxIBi8pnPOAxEfTZVAwQuo+eSnu50QfdNo3ldG6qRqiD4xErdj1mk0hqVeja7rNMgwZYPphPvGBRwwJakWhtdytL4nyHyuQRllrQJYeSJZmZ3ZGVqJEI9FemxEOPivUHhTbynBf6Gedq2bPDVFiuzLQz61mLuDW71uZKrEZFhsXKdEeA== Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) by PSBPR01MB3541.apcprd01.prod.exchangelabs.com (2603:1096:301:d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Thu, 7 Oct 2021 06:03:30 +0000 Received: from PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::b81b:9b11:fede:9015]) by PU1PR01MB2155.apcprd01.prod.exchangelabs.com ([fe80::b81b:9b11:fede:9015%6]) with mapi id 15.20.4587.019; Thu, 7 Oct 2021 06:03:30 +0000 Date: Thu, 7 Oct 2021 05:46:33 +0000 From: Foo Chuan Wei Message-ID: Mail-Followup-To: guix-patches@gnu.org Content-Disposition: inline X-TMN: [6GvJQC3STeS9a0PFLw/mM1cFt9gQUBk1] X-ClientProxiedBy: HK0PR01CA0072.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::36) To PU1PR01MB2155.apcprd01.prod.exchangelabs.com (2603:1096:803:1c::21) X-Microsoft-Original-Message-ID: <20211007054633.azznavdri7bjyaqr@localhost> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (202.160.34.226) by HK0PR01CA0072.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.19 via Frontend Transport; Thu, 7 Oct 2021 06:03:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8f7d5365-9345-4af5-8337-08d989582f44 X-MS-TrafficTypeDiagnostic: PSBPR01MB3541: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9Sny+VnnIWRDPKYvqL1HA2n1IracITjPwYdHXneQZRHEO/XKT9n49SfVs5a/vwOC/yr8hCMWzwMlIgkjPyWoEGBXkQbAqR8xUlWVvvkqEKuL03cKPBP1IvLuCT1w6LzMDsrn0gZxVNjF0JFWSCk5uqVcI4wrL+a6YS9vjw2oLSrCUre67ZMl+xnO5Nktgqn0qgmhXpeMo4xFh9F4HcNlHfw/o8CLubCyiQxxzfXoa0RYlt5dAtWqLVItFzGsfOE2DD01BAX8vTG+7XuE98nxhDZxakPMqLVDaNSTqaVPcJi8Y0boSbZKoJJux0/IKQWCK5uHLSi1aagCUyH88X8guU8yhPCxCr+TpAhW3MgGmBzQVb6drpJ62Z2su94pMql8IAzPEzcHr0VFNx7ul+Iy9qxYG4eaHVYn7K+H3W3h2lfIu0rjKTfvOhDN2KsLjUBTG3sASU08ElKNLYSpA3sdSs4REZz+GrsainBDJ2WLoBU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Tetp3o2pI6wVam84FfLVyzcQUrgKmJssUmYrA/RKLpb4OWx/3hwykcXTWh+sosVhU/P0goOqupkR8hs1rRUmX61IYamnp/ZtG9jXesZpafmUgqHlXwGpjvpRRr+93POZIzYvT4Oj/ysAQkBY04gDxQ== X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-5c337.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 8f7d5365-9345-4af5-8337-08d989582f44 X-MS-Exchange-CrossTenant-AuthSource: PU1PR01MB2155.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 06:03:30.2287 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSBPR01MB3541 Received-SPF: pass client-ip=2a01:111:f400:febe::81a; envelope-from=chuanwei.foo@hotmail.com; helo=APC01-PU1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/text-editors.scm (ex-vi): New public variable. --- gnu/packages/patches/ex-vi-makefile.patch | 53 +++++++++++++++++++++++ gnu/packages/text-editors.scm | 30 +++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 gnu/packages/patches/ex-vi-makefile.patch base-commit: ddec49858a27cf68fd39b2ff61514cca87329a5e diff --git a/gnu/packages/patches/ex-vi-makefile.patch b/gnu/packages/patches/ex-vi-makefile.patch new file mode 100644 index 0000000000..d835eb981d --- /dev/null +++ b/gnu/packages/patches/ex-vi-makefile.patch @@ -0,0 +1,53 @@ +diff -ur ex-050325-orig/Makefile ex-050325/Makefile +--- ex-050325-orig/Makefile ++++ ex-050325/Makefile +@@ -75,11 +75,13 @@ + # @(#)Makefile 1.50 (gritter) 2/20/05 + # + ++CC = gcc ++ + # + # Destinations for installation. $(PRESERVEDIR) is used for recovery files. + # It will get mode 1777. + # +-PREFIX = /usr/local ++PREFIX = ${out} + BINDIR = $(PREFIX)/bin + LIBEXECDIR = $(PREFIX)/libexec + MANDIR = $(PREFIX)/share/man +@@ -94,7 +96,7 @@ + # + # A BSD-like install program. GNU install will fit well here, too. + # +-INSTALL = /usr/ucb/install ++INSTALL = install + + # + # Compiler and linker flags. +@@ -205,13 +207,13 @@ + # + # You may also get terminfo access by using the ncurses library. + # +-#TERMLIB = ncurses ++TERMLIB = ncurses + # + # The preferred choice for ex on Linux distributions, other systems that + # provide a good termcap file, or when setting the TERMCAP environment + # variable is deemed sufficient, is the included 2.11BSD termcap library. + # +-TERMLIB = termlib ++#TERMLIB = termlib + + # + # Since ex uses sbrk() internally, a conflict with the libc's version of +@@ -330,8 +332,7 @@ + ln -s ex $(DESTDIR)$(BINDIR)/vedit + ln -s ex $(DESTDIR)$(BINDIR)/vi + ln -s ex $(DESTDIR)$(BINDIR)/view +- test -d $(DESTDIR)$(PRESERVEDIR) || mkdir -p $(DESTDIR)$(PRESERVEDIR) +- chmod 1777 $(DESTDIR)$(PRESERVEDIR) ++ + + ex.o: config.h ex_argv.h ex.h ex_proto.h ex_temp.h ex_tty.h ex_tune.h + ex.o: ex_vars.h libterm/libterm.h diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 29b159f1a7..df4d4b045a 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1195,3 +1195,33 @@ uncluttered user interface. It supports a multitude of translation formats provided by the Translate Toolkit, including XLIFF and PO.") (home-page "https://virtaal.translatehouse.org/") (license license:gpl2+))) + +(define-public ex-vi + (package + (name "ex-vi") + (version "050325") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/ex-vi/ex-vi/" + version "/ex-" version ".tar.bz2")) + (sha256 + (base32 + "0294cfxp91gyi0v3v4qdxcwlxp1nm986ir8r7d374ig9cz7yfjys")) + (patches (search-patches "ex-vi-makefile.patch")))) + (build-system gnu-build-system) + (inputs `(("ncurses" ,ncurses))) + (arguments '(#:phases (modify-phases %standard-phases + (delete 'configure)) + #:tests? #f)) + (synopsis "The traditional vi") + (description + "The traditional vi editor, ported to modern Unix systems. + +This implementation is derived from ex/vi 3.7 of 6/7/85 and the BSD +termcap library, originally from the 2.11BSD distribution. All of them +were changed to compile and run on newer POSIX compatible Unix systems. +Support for international character sets was added, including support +for multibyte locales (based on UTF-8 or East Asian encodings), and some +changes were made to get closer to the POSIX.2 guidelines for ex and vi.") + (home-page "http://ex-vi.sourceforge.net") + (license license:bsd-4)))