Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1710328069157830"
MIME-Version: 1.0
Date: Wed, 13 Mar 2024 11:07:49 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/nbsed/files
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20240313110749.33E6DFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1710328069157830
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Wed Mar 13 11:07:49 UTC 2024

Modified Files:
	pkgsrc/textproc/nbsed/files: main.c sed.1

Log Message:
nbsed: Remove REG_GNU code.

This is a feature only available on newer NetBSD.  Neither -G nor -g are
supported by any other sed's that I can find, so just completely remove the
options, as we only need to be compatible.  The libnbcompat regcomp is very
old, and so trying to merge in REG_GNU support would also be very difficult.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/nbsed/files/main.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/nbsed/files/sed.1

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


--_----------=_1710328069157830
Content-Disposition: inline
Content-Length: 2655
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/nbsed/files/main.c
diff -u pkgsrc/textproc/nbsed/files/main.c:1.6 pkgsrc/textproc/nbsed/files/main.c:1.7
--- pkgsrc/textproc/nbsed/files/main.c:1.6	Tue Mar 12 16:45:07 2024
+++ pkgsrc/textproc/nbsed/files/main.c	Wed Mar 13 11:07:48 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.6 2024/03/12 16:45:07 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.7 2024/03/13 11:07:48 jperkin Exp $	*/
 
 /*-
  * Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -45,7 +45,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.6 2024/03/12 16:45:07 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.7 2024/03/13 11:07:48 jperkin Exp $");
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $");
 #endif
@@ -179,15 +179,12 @@ main(int argc, char *argv[])
 	fflag = 0;
 	inplace = NULL;
 
-	while ((c = getopt(argc, argv, "EGI::ae:f:gi::lnru")) != -1)
+	while ((c = getopt(argc, argv, "EI::ae:f:i::lnru")) != -1)
 		switch (c) {
 		case 'r':		/* Gnu sed compat */
 		case 'E':
 			rflags |= REG_EXTENDED;
 			break;
-		case 'G':
-			rflags &= ~REG_GNU;
-			break;
 		case 'I':
 			inplace = optarg ? optarg : __UNCONST("");
 			ispan = 1;	/* span across input files */
@@ -206,9 +203,6 @@ main(int argc, char *argv[])
 			fflag = 1;
 			add_compunit(CU_FILE, optarg);
 			break;
-		case 'g':
-			rflags |= REG_GNU;
-			break;
 		case 'i':
 			inplace = optarg ? optarg : __UNCONST("");
 			ispan = 0;	/* don't span across input files */

Index: pkgsrc/textproc/nbsed/files/sed.1
diff -u pkgsrc/textproc/nbsed/files/sed.1:1.2 pkgsrc/textproc/nbsed/files/sed.1:1.3
--- pkgsrc/textproc/nbsed/files/sed.1:1.2	Tue Mar 12 16:45:07 2024
+++ pkgsrc/textproc/nbsed/files/sed.1	Wed Mar 13 11:07:49 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sed.1,v 1.2 2024/03/12 16:45:07 christos Exp $
+.\"	$NetBSD: sed.1,v 1.3 2024/03/13 11:07:49 jperkin Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -40,11 +40,11 @@
 .Nd stream editor
 .Sh SYNOPSIS
 .Nm
-.Op Fl aEGglnru
+.Op Fl aElnru
 .Ar command
 .Op Ar
 .Nm
-.Op Fl aEGglnru
+.Op Fl aElnru
 .Op Fl e Ar command
 .Op Fl f Ar command_file
 .Op Fl I Ns Op Ar extension
@@ -97,13 +97,6 @@ Append the editing commands found in the
 .Ar command_file
 to the list of commands.
 The editing commands should each be listed on a separate line.
-.It Fl G
-Turn off GNU regex extensions (the default).
-.It Fl g
-Turn on GNU regex extensions.
-See
-.Xr regex 3
-for details.
 .It Fl I Ns Op Ar extension
 Edit files in-place, saving backups with the specified
 .Ar extension .


--_----------=_1710328069157830--