[pkgsrc/trunk]: pkgsrc/archivers/lzmalib Common/String.h confounds with case ...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/098342acb84e
branches:  trunk
changeset: 547713:098342acb84e
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Sep 29 07:55:47 2008 +0000

description:
Common/String.h confounds with case insensitive filesystem.
Remove "Common" from include path.

diffstat:

 archivers/lzmalib/distinfo         |   4 +++-
 archivers/lzmalib/patches/patch-ab |  16 ++++++++++++++++
 archivers/lzmalib/patches/patch-ac |  23 +++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletions(-)

diffs (60 lines):

diff -r 7c68115aa819 -r 098342acb84e archivers/lzmalib/distinfo
--- a/archivers/lzmalib/distinfo        Mon Sep 29 01:28:50 2008 +0000
+++ b/archivers/lzmalib/distinfo        Mon Sep 29 07:55:47 2008 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/04 12:07:15 obache Exp $
+$NetBSD: distinfo,v 1.2 2008/09/29 07:55:47 obache Exp $
 
 SHA1 (lzmalib-0.0.1.tar.gz) = 638e511d1c6c5018f071b0f145bdfb242c34b6ce
 RMD160 (lzmalib-0.0.1.tar.gz) = caad5a009f3247ee1d0ee1500b90db5469ce1bd4
 Size (lzmalib-0.0.1.tar.gz) = 112202 bytes
 SHA1 (patch-aa) = 475d43320384887faf6d14c13d2f7b941327299e
+SHA1 (patch-ab) = dd8fcbce7a0a2ace551b8f84ab3b866e11b2742d
+SHA1 (patch-ac) = 46b577410eb57cb0a17961f87006248ec0e08653
diff -r 7c68115aa819 -r 098342acb84e archivers/lzmalib/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/lzmalib/patches/patch-ab        Mon Sep 29 07:55:47 2008 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2008/09/29 07:55:47 obache Exp $
+
+Common/String.h confounds with case insensitive filesystem.
+Remove "Common" from include path.
+
+--- configure.orig     2008-07-23 15:28:16.000000000 +0900
++++ configure
+@@ -1671,7 +1671,7 @@ MYVPATH="`find . -type d | tr '\n' ':'`"
+ # Building flags
+ MYCFLAGS="-Wall -fPIC -fsigned-char -O2"
+ MYCXXFLAGS="-Wall -fPIC -fsigned-char -O2"
+-MYCPPFLAGS="-I. -I./Common -I./7zip/Common -I./7zip/Compress/LZMA -I./7zip/Compress/LZMA_Alone"
++MYCPPFLAGS="-I. -I./7zip/Common -I./7zip/Compress/LZMA -I./7zip/Compress/LZMA_Alone"
+ MYLDFLAGS="-L."
+ 
+ 
diff -r 7c68115aa819 -r 098342acb84e archivers/lzmalib/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/lzmalib/patches/patch-ac        Mon Sep 29 07:55:47 2008 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2008/09/29 07:55:47 obache Exp $
+
+Common/String.h confounds with case insensitive filesystem.
+Remove "Common" from include path.
+
+--- mylib.cpp.orig     2008-07-23 18:24:22.000000000 +0900
++++ mylib.cpp
+@@ -1,10 +1,10 @@
+ #include "lzmalib.h"
+ 
+-#include "MyWindows.h"
+-#include "MyInitGuid.h"
+-#include "CommandLineParser.h"
+-#include "StringConvert.h"
+-#include "StringToInt.h"
++#include "Common/MyWindows.h"
++#include "Common/MyInitGuid.h"
++#include "Common/CommandLineParser.h"
++#include "Common/StringConvert.h"
++#include "Common/StringToInt.h"
+ #include "FileStreams.h"
+ #include "StreamUtils.h"
+ #include "LZMADecoder.h"