Hi,

The diff below updates gsed to its latest version.

A couple of highlights:

* USE_GROFF is not needed

* I've patched lib/Makefile.in to not install charset.alias, because
  an identical file is already provided by libiconv:
$ diff -u /usr/local/lib/charset.alias 
/usr/ports/pobj/gsed-4.2.1/fake-amd64/usr/local/lib/charset.alias
--- /usr/local/lib/charset.alias        Fri Feb 24 19:28:39 2012
+++ /usr/ports/pobj/gsed-4.2.1/fake-amd64/usr/local/lib/charset.alias   Mon Feb 
27 12:18:55 2012
@@ -1,7 +1,7 @@
 # This file contains a table of character encoding aliases,
 # suitable for operating system 'openbsd5.1'.
 # It was automatically generated from config.charset.
-# Packages using this file:  
+# Packages using this file: sed 
 646 ASCII
 ISO8859-1 ISO-8859-1
 ISO8859-2 ISO-8859-2

* issue addressed by patches/patch-po_Makefile_in_in has been fixed
  upstream

Comments? OKs?

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/gsed/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile    20 Nov 2010 19:56:48 -0000      1.3
+++ Makefile    27 Feb 2012 11:46:18 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=               GNU stream editor
 
-VERSION=               4.1.5
+VERSION=               4.2.1
 DISTNAME=              sed-${VERSION}
 PKGNAME=               gsed-${VERSION}
 CATEGORIES=            textproc
@@ -26,6 +26,5 @@ BUILD_DEPENDS=                devel/bison
 CONFIGURE_STYLE=       gnu
 CONFIGURE_ARGS+=       --program-prefix=g
 USE_GMAKE=             Yes
-USE_GROFF =            Yes
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/gsed/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    17 Sep 2007 08:39:53 -0000      1.1.1.1
+++ distinfo    27 Feb 2012 11:46:18 -0000
@@ -1,5 +1,5 @@
-MD5 (sed-4.1.5.tar.gz) = ehy7uzNBKHMI4UC9SDTDug==
-RMD160 (sed-4.1.5.tar.gz) = SbEumaVcbS54rSNvAgXmPkZEQXM=
-SHA1 (sed-4.1.5.tar.gz) = jldeikRWg5LVtuCJ6rXaXNvUWIU=
-SHA256 (sed-4.1.5.tar.gz) = vpVb73qB1pIi6Slong3g7PZME9xbFbLuVpbV72b97sA=
-SIZE (sed-4.1.5.tar.gz) = 799584
+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
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: patches/patch-lib_Makefile_in
diff -N patches/patch-lib_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Makefile_in       27 Feb 2012 11:46:18 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+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
+         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: /cvs/ports/textproc/gsed/patches/patch-lib_regex_internal_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_regex_internal_h
--- patches/patch-lib_regex_internal_h  17 Sep 2007 08:39:53 -0000      1.1.1.1
+++ patches/patch-lib_regex_internal_h  27 Feb 2012 11:46:18 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-lib_regex_internal_h,v 1.1.1.1 2007/09/17 08:39:53 sturm Exp $
---- lib/regex_internal.h.orig  Tue Dec  6 09:50:56 2005
-+++ lib/regex_internal.h       Mon Sep 17 09:09:08 2007
-@@ -410,7 +410,6 @@ static unsigned int re_string_context_at (const re_str
+--- 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
  #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
  #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
  
Index: patches/patch-po_Makefile_in_in
===================================================================
RCS file: patches/patch-po_Makefile_in_in
diff -N patches/patch-po_Makefile_in_in
--- patches/patch-po_Makefile_in_in     17 Sep 2007 08:39:53 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2007/09/17 08:39:53 sturm Exp $
---- po/Makefile.in.in.orig     Tue Nov  9 19:04:18 2004
-+++ po/Makefile.in.in  Sun Feb 12 23:05:16 2006
-@@ -26,7 +26,7 @@ gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = /usr/bin/install -d
- mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo 
"$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
- 
- GMSGFMT = @GMSGFMT@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/gsed/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   17 Sep 2007 08:39:53 -0000      1.1.1.1
+++ pkg/PLIST   27 Feb 2012 11:46:18 -0000
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2007/09/17 08:39:53 sturm Exp $
-bin/gsed
+@bin bin/gsed
 @info info/sed.info
 @man man/man1/gsed.1
 share/locale/af/
@@ -13,6 +13,7 @@ share/locale/el/LC_MESSAGES/sed.mo
 share/locale/eo/LC_MESSAGES/sed.mo
 share/locale/es/LC_MESSAGES/sed.mo
 share/locale/et/LC_MESSAGES/sed.mo
+share/locale/eu/LC_MESSAGES/sed.mo
 share/locale/fi/LC_MESSAGES/sed.mo
 share/locale/fr/LC_MESSAGES/sed.mo
 share/locale/ga/LC_MESSAGES/sed.mo
@@ -26,6 +27,7 @@ share/locale/ja/LC_MESSAGES/sed.mo
 share/locale/ko/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
 share/locale/pt_BR/LC_MESSAGES/sed.mo
 share/locale/ro/LC_MESSAGES/sed.mo
 share/locale/ru/LC_MESSAGES/sed.mo
@@ -34,4 +36,7 @@ share/locale/sl/LC_MESSAGES/sed.mo
 share/locale/sr/LC_MESSAGES/sed.mo
 share/locale/sv/LC_MESSAGES/sed.mo
 share/locale/tr/LC_MESSAGES/sed.mo
+share/locale/uk/LC_MESSAGES/sed.mo
+share/locale/vi/LC_MESSAGES/sed.mo
 share/locale/zh_CN/LC_MESSAGES/sed.mo
+share/locale/zh_TW/LC_MESSAGES/sed.mo

Reply via email to