Revision: 26582
http://sourceforge.net/p/gar/code/26582
Author: dmichelsen
Date: 2019-09-30 12:02:20 +0000 (Mon, 30 Sep 2019)
Log Message:
-----------
sed/trunk: Update to 4.7
Modified Paths:
--------------
csw/mgar/pkg/sed/trunk/Makefile
csw/mgar/pkg/sed/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch
Modified: csw/mgar/pkg/sed/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sed/trunk/Makefile 2019-09-23 05:37:01 UTC (rev 26581)
+++ csw/mgar/pkg/sed/trunk/Makefile 2019-09-30 12:02:20 UTC (rev 26582)
@@ -1,12 +1,10 @@
# $Id$
NAME = sed
-VERSION = 4.2.2
+# VERSION = 4.2.2
+VERSION = 4.7
GARTYPE = v2
-PACKAGES = CSWgsed
-CATALOGNAME_CSWgsed = gsed
-
DESCRIPTION = The GNU non-interactive text Stream-oriented EDitor (sed)
define BLURB
Sed, the GNU Stream Editor, copies the named files (standard input
default) to
@@ -13,32 +11,33 @@
the standard output, edited according to a script of commands.
endef
-SPKG_DESC_CSWgsed = $(DESCRIPTION)
+MASTER_SITES += $(GNU_MIRROR)
+MASTER_SITES += http://meyering.net/sed/
+DISTFILES += $(DISTNAME).tar.xz
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-PATCHFILES += 0001-Enhance-Solaris-ACL-error-handling.patch
+# We define upstream file regex so we can be notifed of new upstream software
release
+FILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-# the patch above is not stock, but fixes mantis id 4705
-VERSION_FLAG_PATCH = 1
+PACKAGES += CSWgsed
+SPKG_DESC_CSWgsed = $(DESCRIPTION)
-# We define upstream file regex so we can be notifed of new upstream software
release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
# Use GNU because of issue with syntax containing ellipsis in lib/regcomp.c.
# See http://markmail.org/message/7ki46iiok3ddu3sa
GARCOMPILER = GNU
-RUNTIME_DEP_PKGS += CSWlibintl8
+RUNTIME_DEP_PKGS += CSWlibintl9
# No special platform optimization
NOISALIST = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --program-prefix=g
CONFIGURE_ARGS += --with-included-gettext
-SHELL = /bin/bash
+# This is needed for the testsuite, for details see
+# https://lists.gnu.org/archive/html/bug-sed/2019-09/msg00010.html
+EXTRA_CONFIGURE_EXPORTS += CONFIG_SHELL
+CONFIGURE_ENV_CONFIG_SHELL = /bin/bash
EXTRA_MERGE_EXCLUDE_FILES = $(sharedstatedir)/.*locale.alias
EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias
@@ -45,16 +44,8 @@
include gar/category.mk
-# Make sure we are using gnu tools (esp. sed)
-PATH := /opt/csw/gnu:$(PATH)
-
post-merge:
- @(cd $(PKGROOT)$(prefix); \
- mkdir gnu; cd gnu; \
- for f in ../bin/g*; do \
- echo Linking $$f; \
- base=$$(basename $$f); \
- gln -s $$f ./$${base/g/}; \
- done )
+ ginstall -d $(DESTDIR)$(prefix)/gnu
+ $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/g*)),ln -s
../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/sed/trunk/checksums
===================================================================
--- csw/mgar/pkg/sed/trunk/checksums 2019-09-23 05:37:01 UTC (rev 26581)
+++ csw/mgar/pkg/sed/trunk/checksums 2019-09-30 12:02:20 UTC (rev 26582)
@@ -1 +1 @@
-4111de4faa3b9848a0686b2f260c5056 sed-4.2.2.tar.gz
+777ddfd9d71dd06711fe91f0925e1573 sed-4.7.tar.xz
Deleted:
csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch
===================================================================
--- csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch
2019-09-23 05:37:01 UTC (rev 26581)
+++ csw/mgar/pkg/sed/trunk/files/0001-Enhance-Solaris-ACL-error-handling.patch
2019-09-30 12:02:20 UTC (rev 26582)
@@ -1,35 +0,0 @@
-From 0f12f3e3f629d05ae8ca63d8e3820875e73be453 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Sun, 13 Mar 2011 14:57:11 +0100
-Subject: [PATCH] Enhance Solaris ACL error handling
-
-Gracefully handle EOPNOTSUPP in qcopy_acl and qset_acl. These
-functions, as used in coreutils, were causing the test suite to fail
-on Solaris 8 i386 with ZFS-backed NFSv3 mounts. The failures included
-errors such as:
-
-gsed -i -e '/^##/d' Makefile
-gsed: preserving permissions for `./sedYtai3X': Operation not
-supported on transport endpoint
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
----
- lib/copy-acl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/copy-acl.c b/lib/copy-acl.c
-index 5cc75e1..cebc8e8 100644
---- a/lib/copy-acl.c
-+++ b/lib/copy-acl.c
-@@ -212,7 +212,7 @@ qcopy_acl (const char *src_name, int source_desc, const
char *dst_name,
-
- if (ace_count < 0)
- {
-- if (errno == ENOSYS || errno == EINVAL)
-+ if (errno == ENOSYS || errno == EINVAL || errno == EOPNOTSUPP)
- {
- ace_count = 0;
- ace_entries = NULL;
---
-1.8.0
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
