OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 30-Apr-2009 23:21:47
Branch: HEAD Handle: 2009043022214700
Modified files:
openpkg-src/sed sed.patch sed.spec
Log:
upgrading package: sed 4.1.5 -> 4.2
Summary:
Revision Changes Path
1.10 +3 -46 openpkg-src/sed/sed.patch
1.62 +6 -8 openpkg-src/sed/sed.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sed/sed.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 sed.patch
--- openpkg-src/sed/sed.patch 7 Mar 2006 14:43:36 -0000 1.9
+++ openpkg-src/sed/sed.patch 30 Apr 2009 21:21:47 -0000 1.10
@@ -1,50 +1,7 @@
-Index: configure
---- configure.orig 2006-02-03 10:24:40 +0100
-+++ configure 2006-03-07 15:40:49 +0100
-@@ -11265,16 +11265,7 @@
- esac
- done ;;
- gettext-fix )
-- sed -e '/^mkinstalldirs *=/a\' \
-- -e "install_sh=$install_sh" \
-- -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
-- intl/Makefile > intl/Makefile.tmp
-- mv intl/Makefile.tmp intl/Makefile
-- sed -e '/^mkinstalldirs *=/a\' \
-- -e "install_sh=$install_sh" \
-- -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \
-- po/Makefile > po/Makefile.tmp
-- mv po/Makefile.tmp po/Makefile ;;
-+ ;;
- esac
- done
- _ACEOF
-Index: lib/getline.c
---- lib/getline.c.orig 2005-06-21 16:09:37 +0200
-+++ lib/getline.c 2006-03-07 15:37:47 +0100
-@@ -23,6 +23,7 @@
-
- #include <limits.h>
- #include <errno.h>
-+#include <sys/types.h>
-
- /* Read up to (and including) a '\n' from STREAM into *LINEPTR
- (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
-Index: lib/getopt.c
---- lib/getopt.c.orig 2005-06-21 16:09:37 +0200
-+++ lib/getopt.c 2006-03-07 15:37:47 +0100
-@@ -43,6 +43,7 @@
- #endif
-
- #include <stdio.h>
-+#include <string.h>
-
- /* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
Index: lib/regex_internal.h
---- lib/regex_internal.h.orig 2005-12-06 09:50:56 +0100
-+++ lib/regex_internal.h 2006-03-07 15:37:47 +0100
-@@ -410,7 +410,9 @@
+--- lib/regex_internal.h.orig 2009-03-31 08:52:25 +0200
++++ lib/regex_internal.h 2009-04-30 22:41:19 +0200
+@@ -458,7 +458,9 @@
#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sed/sed.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 sed.spec
--- openpkg-src/sed/sed.spec 18 Apr 2009 13:15:17 -0000 1.61
+++ openpkg-src/sed/sed.spec 30 Apr 2009 21:21:47 -0000 1.62
@@ -31,8 +31,8 @@
Class: BASE
Group: ShellUtils
License: GPL
-Version: 4.1.5
-Release: 20080101
+Version: 4.2
+Release: 20090430
# list of sources
Source0: ftp://ftp.gnu.org/gnu/sed/sed-%{version}.tar.gz
@@ -61,9 +61,6 @@
%prep
%setup -q
%patch -p0
- case "%{l_platform -t}" in
- *-sunos5.6) %{l_shtool} subst -e 's;ISPRINT;isprint;g' sed/execute.c
;;
- esac
( echo "am_cv_func_iconv=no"
echo "am_cv_lib_iconv=no"
echo "ac_cv_header_libintl_h=no"
@@ -81,17 +78,18 @@
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --infodir=%{l_prefix}/info \
--with-included-regex \
--disable-nls
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
