Hi ports --
Attached is an update to GNU sed. The version we have is >7 years old.
Some notes:
* Tarball is now an xz not a bz2
* The existing patches go away
* A new patch is added. Our makeinfo is too old to regen the info file,
but the info file is already there, so avoid needlessly regenerating it,
which we can't do anyway.
* Added debug packages because it's an easy addition. But am fine if
it's not desirable.
Tested on amd64, arm64, and mips64. One test fails,
test-vc-list-files-cvs.sh, but it's not a sed test, it's a gnulib test.
Not sure how much it matters. The test fails with:
cvs [checkout aborted]: can't chdir(/gsed-4.8_writes_to_HOME): No such
file or directory
cvs [checkout aborted]: can't chdir(/gsed-4.8_writes_to_HOME): No such
file or directory
FAIL test-vc-list-files-cvs.sh (exit status: 1)
I then built everything that depends on gsed. Everything built OK.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/gsed/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 16 Jul 2019 21:29:41 -0000 1.12
+++ Makefile 22 Jan 2020 15:23:01 -0000
@@ -2,12 +2,11 @@
COMMENT= GNU stream editor
-DISTNAME= sed-4.2.2
+DISTNAME= sed-4.8
PKGNAME= g${DISTNAME}
-REVISION= 3
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=sed/}
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
HOMEPAGE= https://www.gnu.org/software/sed/
@@ -17,6 +16,8 @@ MAINTAINER= Armin Wolfermann <armin@wol
PERMIT_PACKAGE= Yes
WANTLIB= c iconv intl
+
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
LIB_DEPENDS= devel/gettext,-runtime
BUILD_DEPENDS= devel/bison
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/gsed/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 25 Dec 2012 01:29:54 -0000 1.3
+++ distinfo 22 Jan 2020 15:23:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (sed-4.2.2.tar.bz2) = 8EjRg42ihMi8l1PkUGuFoeDMHqiZnTb2mVvLlGDN29c=
-SIZE (sed-4.2.2.tar.bz2) = 1059414
+SHA256 (sed-4.8.tar.xz) = 95sM/qcbN6ju7ISQ22xfeudxnDVYfyHtsGF/Nw7v9jM=
+SIZE (sed-4.8.tar.xz) = 1348048
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 22 Jan 2020 15:23:01 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Don't try to regen info file; our makeinfo is too old.
+
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -3575,7 +3575,7 @@ check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
+-all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(LIBRARIES) $(MANS) $(DATA) \
++all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(MANS) $(DATA) \
+ $(HEADERS) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+@@ -3805,7 +3805,7 @@ install-html-am: $(HTMLS)
+ done; }
+ install-info: install-info-recursive
+
+-install-info-am: $(INFO_DEPS)
++install-info-am:
+ @$(NORMAL_INSTALL)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: patches/patch-lib_Makefile_in
diff -N patches/patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in 25 Dec 2012 01:29:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.2 2012/12/25 01:29:54 brad Exp $
-
-No need to install charset.alias: an identical file is already
-provided by libiconv.
-
---- lib/Makefile.in.orig Sat Dec 22 09:21:10 2012
-+++ lib/Makefile.in Sun Dec 23 16:39:35 2012
-@@ -1698,7 +1698,7 @@ install-exec-localcharset: all-local
- case '$(host_os)' in \
- darwin[56]*) \
- need_charset_alias=true ;; \
-- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+ darwin* | cygwin* | mingw* | pw32* | cegcc* | openbsd*) \
- need_charset_alias=false ;; \
- *) \
- need_charset_alias=true ;; \
Index: patches/patch-lib_regex_internal_h
===================================================================
RCS file: patches/patch-lib_regex_internal_h
diff -N patches/patch-lib_regex_internal_h
--- patches/patch-lib_regex_internal_h 25 Dec 2012 01:29:54 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-lib_regex_internal_h,v 1.3 2012/12/25 01:29:54 brad Exp $
---- lib/regex_internal.h.orig Sat Dec 22 08:21:52 2012
-+++ lib/regex_internal.h Sun Dec 23 16:39:35 2012
-@@ -448,7 +448,6 @@ static unsigned int re_string_context_at (const re_str
- #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
- #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
-
--#include <alloca.h>
-
- #ifndef _LIBC
- # if HAVE_ALLOCA
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/gsed/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 25 Dec 2012 01:29:54 -0000 1.3
+++ pkg/PLIST 22 Jan 2020 15:23:01 -0000
@@ -5,9 +5,8 @@
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/sed.mo
-share/locale/ast/
-share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/sed.mo
+share/locale/bg/LC_MESSAGES/sed.mo
share/locale/ca/LC_MESSAGES/sed.mo
share/locale/cs/LC_MESSAGES/sed.mo
share/locale/da/LC_MESSAGES/sed.mo
