Fix patches and build on case-sensitive file systems.

4 files changed, 17 insertions, 17 deletions

diff --git a/textproc/OdfConverter/Makefile b/textproc/OdfConverter/Makefile
index 2a1d8cc7a20..7b0961b9a38 100644
--- a/textproc/OdfConverter/Makefile
+++ b/textproc/OdfConverter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/12 02:31:22 obache Exp $
+# $NetBSD: Makefile,v 1.5 2009/09/02 08:47:15 wiz Exp $
 #
 
 DISTNAME=	OdfAddinForOffice-src-3.0
@@ -27,7 +27,7 @@ BUILD_DIRS+=	source/Word/Converter
 BUILD_DIRS+=	source/Presentation/Converter
 BUILD_DIRS+=	source/Spreadsheet/Converter
 BUILD_DIRS+=	source/AdditionalTools/zlib123/contrib/minizip
-BUILD_DIRS+=	source/shell/odfconverter
+BUILD_DIRS+=	source/Shell/OdfConverter
 
 MAKE_JOBS_SAFE=	no
 
@@ -39,10 +39,10 @@ INSTALLATION_DIRS=	bin share/doc/OdfConverter
 # case-sensitive filesystem.
 #
 FILE_CASE_FIXES=	${BUILD_DIRS}
-FILE_CASE_FIXES+=	source/shell/odfconverter/OdfCommandLineException.cs
-FILE_CASE_FIXES+=	source/shell/odfconverter/OdfConverter.cs
-FILE_CASE_FIXES+=	source/shell/odfconverter/OoxValidator.cs
-FILE_CASE_FIXES+=	source/shell/odfconverter/OdfValidator.cs
+FILE_CASE_FIXES+=	source/Shell/OdfConverter/OdfCommandLineException.cs
+FILE_CASE_FIXES+=	source/Shell/OdfConverter/OdfConverter.cs
+FILE_CASE_FIXES+=	source/Shell/OdfConverter/OoxValidator.cs
+FILE_CASE_FIXES+=	source/Shell/OdfConverter/OdfValidator.cs
 post-extract:
 	cd ${WRKDIR} && mv "odf-converter-r5224/trunk" ${DISTNAME:Q}
 	set -e; \
@@ -66,9 +66,9 @@ post-extract:
 	done
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/source/shell/odfconverter/OdfConverter \
+	${INSTALL_PROGRAM} ${WRKSRC}/source/Shell/OdfConverter/OdfConverter \
 		${DESTDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/source/shell/odfconverter/readme.txt \
+	${INSTALL_DATA} ${WRKSRC}/source/Shell/OdfConverter/README.TXT \
 		${DESTDIR}${PREFIX}/share/doc/OdfConverter/README.TXT
 
 .include "../../lang/mono/buildlink3.mk"
diff --git a/textproc/OdfConverter/distinfo b/textproc/OdfConverter/distinfo
index f63c7f89ae9..4c2372eac0f 100644
--- a/textproc/OdfConverter/distinfo
+++ b/textproc/OdfConverter/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/07/27 05:39:21 dsainty Exp $
+$NetBSD: distinfo,v 1.3 2009/09/02 08:47:15 wiz Exp $
 
 SHA1 (OdfAddinForOffice-src-3.0.zip) = 678d98672ecca9adabe1221b1725c255f4f88fe5
 RMD160 (OdfAddinForOffice-src-3.0.zip) = ff6ddab2784ef1d54261cde15abfb7e98e30b80a
 Size (OdfAddinForOffice-src-3.0.zip) = 34547426 bytes
-SHA1 (patch-aa) = f7fabaa6252b313aa17381b1cab2b1854a6b567b
+SHA1 (patch-aa) = 0cd0e5263c2cf3cc524662fb751e4d9812f83f32
 SHA1 (patch-ab) = 1240ea11736009463bf937ccc547e5037d411626
-SHA1 (patch-ac) = fef2eeffedf729644c5e75ae1359a2f66018faeb
+SHA1 (patch-ac) = 5e48d1f5a0a40912f56154bbbaaeea74819cd202
diff --git a/textproc/OdfConverter/patches/patch-aa b/textproc/OdfConverter/patches/patch-aa
index 3ed3a814990..7adaf08fc6c 100644
--- a/textproc/OdfConverter/patches/patch-aa
+++ b/textproc/OdfConverter/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2009/07/27 05:39:21 dsainty Exp $
+$NetBSD: patch-aa,v 1.3 2009/09/02 08:47:15 wiz Exp $
 
---- source/shell/odfconverter/Makefile.orig	2007-12-19 15:16:04.000000000 +0100
-+++ source/shell/odfconverter/Makefile
+--- source/Shell/OdfConverter/Makefile.orig	2007-12-19 15:16:04.000000000 +0100
++++ source/Shell/OdfConverter/Makefile
 @@ -71,9 +71,9 @@ else
  	    bundle.o \
  	    $(EXPORTDYNAMIC) \
diff --git a/textproc/OdfConverter/patches/patch-ac b/textproc/OdfConverter/patches/patch-ac
index 121435e2e4d..f4ff096bb94 100644
--- a/textproc/OdfConverter/patches/patch-ac
+++ b/textproc/OdfConverter/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1 2009/07/27 05:39:21 dsainty Exp $
+$NetBSD: patch-ac,v 1.2 2009/09/02 08:47:15 wiz Exp $
 
 Fix Mono-specific coding errors.
 
---- source/shell/odfconverter/OdfValidator.cs.orig	2009-02-11 10:50:02.000000000 +1300
-+++ source/shell/odfconverter/OdfValidator.cs	2009-07-16 17:23:31.469982005 +1200
+--- source/Shell/OdfConverter/OdfValidator.cs.orig	2009-02-11 10:50:02.000000000 +1300
++++ source/Shell/OdfConverter/OdfValidator.cs	2009-07-16 17:23:31.469982005 +1200
 @@ -49,9 +49,9 @@
  	
  #if MONO