Update to gsed-4.8

Existing patches go away. A new patch is added because our makeinfo is too
old to regen the info file but regeneration is unneccesary, so skip it.
Use PORTHOME=${WRKDIR} to fix a broken test; from both sthen@ and cwen@
independently.
Additional testing by cwen@ and Armin Wolfermann (MAINTAINER).
ok cwen@
This commit is contained in:
bcallah 2020-01-23 00:36:27 +00:00
parent bd5f6ac0ee
commit a32c0e1666
6 changed files with 36 additions and 36 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.12 2019/07/16 21:29:41 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2020/01/23 00:36:27 bcallah Exp $
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/
@ -18,10 +17,14 @@ PERMIT_PACKAGE= Yes
WANTLIB= c iconv intl
DEBUG_PACKAGES = ${BUILD_PACKAGES}
LIB_DEPENDS= devel/gettext,-runtime
BUILD_DEPENDS= devel/bison
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --program-prefix=g
PORTHOME = ${WRKDIR}
.include <bsd.port.mk>

View File

@ -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

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-Makefile_in,v 1.1 2020/01/23 00:36:27 bcallah Exp $
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=; \

View File

@ -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 ;; \

View File

@ -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

View File

@ -1,13 +1,12 @@
@comment $OpenBSD: PLIST,v 1.3 2012/12/25 01:29:54 brad Exp $
@comment $OpenBSD: PLIST,v 1.4 2020/01/23 00:36:27 bcallah Exp $
@bin bin/gsed
@info info/sed.info
@man man/man1/gsed.1
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