From af0569e8ff0b7931bf22cf0e49af999ed2817013 Mon Sep 17 00:00:00 2001 From: brad Date: Tue, 25 Dec 2012 01:29:54 +0000 Subject: [PATCH] Update to GNU sed 4.2.2. ok sthen@ --- textproc/gsed/Makefile | 9 ++++----- textproc/gsed/distinfo | 7 ++----- textproc/gsed/patches/patch-lib_Makefile_in | 8 ++++---- textproc/gsed/patches/patch-lib_regex_internal_h | 8 ++++---- textproc/gsed/pkg/PLIST | 6 +++++- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile index b08d7597f77..2fecc21fdd0 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -1,11 +1,13 @@ -# $OpenBSD: Makefile,v 1.4 2012/02/28 08:46:27 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.5 2012/12/25 01:29:54 brad Exp $ COMMENT= GNU stream editor -VERSION= 4.2.1 +VERSION= 4.2.2 DISTNAME= sed-${VERSION} PKGNAME= gsed-${VERSION} CATEGORIES= textproc +MASTER_SITES= ${MASTER_SITE_GNU:=sed/} +EXTRACT_SUFX= .tar.bz2 HOMEPAGE= http://www.gnu.org/software/sed/ @@ -19,13 +21,10 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c -MASTER_SITES= ${MASTER_SITE_GNU:=sed/} - MODULES= devel/gettext BUILD_DEPENDS= devel/bison CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --program-prefix=g -USE_GMAKE= Yes .include diff --git a/textproc/gsed/distinfo b/textproc/gsed/distinfo index a38447064e7..492fe894438 100644 --- a/textproc/gsed/distinfo +++ b/textproc/gsed/distinfo @@ -1,5 +1,2 @@ -MD5 (sed-4.2.1.tar.gz) = 8P1NfaV01HB+RCKF/S07hg== -RMD160 (sed-4.2.1.tar.gz) = x+47XU5Pqrlmx68JLXg4ifEK/Ko= -SHA1 (sed-4.2.1.tar.gz) = UC9fqa/4kfA4O6rrGVi2bbxLBcg= -SHA256 (sed-4.2.1.tar.gz) = h3NUHOCX/cTFuefaEqgt/7swzZH3vBafUvBfk7f8MGA= -SIZE (sed-4.2.1.tar.gz) = 1152453 +SHA256 (sed-4.2.2.tar.bz2) = 8EjRg42ihMi8l1PkUGuFoeDMHqiZnTb2mVvLlGDN29c= +SIZE (sed-4.2.2.tar.bz2) = 1059414 diff --git a/textproc/gsed/patches/patch-lib_Makefile_in b/textproc/gsed/patches/patch-lib_Makefile_in index c742f1327d5..48a47788650 100644 --- a/textproc/gsed/patches/patch-lib_Makefile_in +++ b/textproc/gsed/patches/patch-lib_Makefile_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.1 2012/02/28 08:46:27 dcoppa Exp $ +$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 Mon Feb 27 12:24:53 2012 -+++ lib/Makefile.in Mon Feb 27 12:26:41 2012 -@@ -1159,7 +1159,7 @@ install-exec-localcharset: all-local +--- 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 ;; \ diff --git a/textproc/gsed/patches/patch-lib_regex_internal_h b/textproc/gsed/patches/patch-lib_regex_internal_h index 10d12af118e..6005d9d2671 100644 --- a/textproc/gsed/patches/patch-lib_regex_internal_h +++ b/textproc/gsed/patches/patch-lib_regex_internal_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_regex_internal_h,v 1.2 2012/02/28 08:46:27 dcoppa Exp $ ---- lib/regex_internal.h.orig Wed Jun 3 21:10:51 2009 -+++ lib/regex_internal.h Mon Feb 27 12:17:54 2012 -@@ -458,7 +458,6 @@ static unsigned int re_string_context_at (const re_str +$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)) diff --git a/textproc/gsed/pkg/PLIST b/textproc/gsed/pkg/PLIST index f26ded500ac..a0895496115 100644 --- a/textproc/gsed/pkg/PLIST +++ b/textproc/gsed/pkg/PLIST @@ -1,10 +1,13 @@ -@comment $OpenBSD: PLIST,v 1.2 2012/02/28 08:46:27 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.3 2012/12/25 01:29:54 brad 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/ca/LC_MESSAGES/sed.mo share/locale/cs/LC_MESSAGES/sed.mo share/locale/da/LC_MESSAGES/sed.mo @@ -25,6 +28,7 @@ share/locale/id/LC_MESSAGES/sed.mo share/locale/it/LC_MESSAGES/sed.mo share/locale/ja/LC_MESSAGES/sed.mo share/locale/ko/LC_MESSAGES/sed.mo +share/locale/nb/LC_MESSAGES/sed.mo share/locale/nl/LC_MESSAGES/sed.mo share/locale/pl/LC_MESSAGES/sed.mo share/locale/pt/LC_MESSAGES/sed.mo