OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Jan-2008 19:12:56 Branch: HEAD Handle: 2008012818125600 Modified files: openpkg-src/msort msort.patch msort.spec Log: upgrading package: msort 8.42 -> 8.43 Summary: Revision Changes Path 1.2 +17 -16 openpkg-src/msort/msort.patch 1.3 +2 -2 openpkg-src/msort/msort.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/msort/msort.patch ============================================================================ $ cvs diff -u -r1.1 -r1.2 msort.patch --- openpkg-src/msort/msort.patch 8 Oct 2007 07:06:37 -0000 1.1 +++ openpkg-src/msort/msort.patch 28 Jan 2008 18:12:56 -0000 1.2 @@ -1,6 +1,6 @@ Index: compdefs.h --- compdefs.h.orig 2007-03-23 04:51:52 +0100 -+++ compdefs.h 2007-10-08 09:03:21 +0200 ++++ compdefs.h 2008-01-28 19:11:30 +0100 @@ -4,9 +4,6 @@ #if defined HAVE_LOCALE_H && defined HAVE_SETLOCALE && defined HAVE_WCSXFRM #define LOCALE_SORT_ORDER @@ -12,8 +12,8 @@ #if defined USEUNINUMOK && defined HAVE_UNINUM_NSDEFS_H && defined HAVE_UNINUM_UNINUM_H #define USE_UNINUM Index: configure ---- configure.orig 2007-10-05 12:10:50 +0200 -+++ configure 2007-10-08 09:03:21 +0200 +--- configure.orig 2008-01-28 05:42:53 +0100 ++++ configure 2008-01-28 19:11:30 +0100 @@ -3051,7 +3051,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -34,7 +34,7 @@ { { echo "$as_me:$LINENO: error: libtre not found. see http://laurikari.net/tre/" >&5 Index: conversions.c --- conversions.c.orig 2007-10-05 10:59:19 +0200 -+++ conversions.c 2007-10-08 09:03:21 +0200 ++++ conversions.c 2008-01-28 19:11:30 +0100 @@ -23,7 +23,7 @@ #ifdef HAVE_STDINT_H #include <stdint.h> @@ -46,7 +46,7 @@ #include <uninum/unicode.h> Index: dstr.c --- dstr.c.orig 2007-10-05 10:59:22 +0200 -+++ dstr.c 2007-10-08 09:03:21 +0200 ++++ dstr.c 2008-01-28 19:11:30 +0100 @@ -24,7 +24,7 @@ #ifdef HAVE_STDINT_H #include <stdint.h> @@ -58,7 +58,7 @@ #else Index: input.c --- input.c.orig 2007-10-05 11:00:44 +0200 -+++ input.c 2007-10-08 09:04:15 +0200 ++++ input.c 2008-01-28 19:11:30 +0100 @@ -25,7 +25,7 @@ #ifdef HAVE_STDINT_H #include <stdint.h> @@ -97,8 +97,8 @@ perror(msg); exit(1); Index: misc.c ---- misc.c.orig 2007-10-05 11:01:30 +0200 -+++ misc.c 2007-10-08 09:03:21 +0200 +--- misc.c.orig 2008-01-28 05:25:39 +0100 ++++ misc.c 2008-01-28 19:11:47 +0100 @@ -17,6 +17,7 @@ */ @@ -123,20 +123,21 @@ +#include "tre/regex.h" #include "key.h" #ifdef HAVE_UNINUM_UNICODE_H - #include <uninum/unicode.h> -+#include <uninum/nsdefs.h> -+#include <uninum/uninum.h> +-#include <uninum/nsdefs.h> +-#include <uninum/unicode.h> ++#include "uninum/nsdefs.h" ++#include "uninum/unicode.h" ++#include "uninum/uninum.h" #else #include "unicode.h" #endif --#include <uninum/nsdefs.h> -#include <uninum/uninum.h> #include "dstr.h" #include "exitcode.h" #include "retcodes.h" Index: msort.c ---- msort.c.orig 2007-10-05 12:01:07 +0200 -+++ msort.c 2007-10-08 09:03:21 +0200 +--- msort.c.orig 2008-01-28 08:58:44 +0100 ++++ msort.c 2008-01-28 19:11:30 +0100 @@ -50,7 +50,7 @@ #include <sys/file.h> #include <sys/stat.h> @@ -157,7 +158,7 @@ #ifdef HAVE_LONG_LONG Index: sorts.c --- sorts.c.orig 2007-10-05 11:02:36 +0200 -+++ sorts.c 2007-10-08 09:03:21 +0200 ++++ sorts.c 2008-01-28 19:11:30 +0100 @@ -24,9 +24,9 @@ #endif #include <stdio.h> @@ -172,7 +173,7 @@ #else Index: strs.c --- strs.c.orig 2007-10-05 11:02:14 +0200 -+++ strs.c 2007-10-08 09:03:21 +0200 ++++ strs.c 2008-01-28 19:11:30 +0100 @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> @@ . patch -p0 <<'@@ .' Index: openpkg-src/msort/msort.spec ============================================================================ $ cvs diff -u -r1.2 -r1.3 msort.spec --- openpkg-src/msort/msort.spec 1 Jan 2008 14:59:14 -0000 1.2 +++ openpkg-src/msort/msort.spec 28 Jan 2008 18:12:56 -0000 1.3 @@ -31,8 +31,8 @@ Class: EVAL Group: ShellUtils License: GPL -Version: 8.42 -Release: 20080101 +Version: 8.43 +Release: 20080128 # list of sources Source0: http://billposer.org/Software/Downloads/msort-%{version}.tar.gz @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org