[pkgsrc/trunk]: pkgsrc/textproc/OdfConverter Update OdfConverter from 1.1 to ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fe3675b8943
branches:  trunk
changeset: 562400:4fe3675b8943
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Mon Jul 27 05:39:21 2009 +0000

description:
Update OdfConverter from 1.1 to 3.0.

The intervening changes don't appear to be well documented but are
voluminously summarised at http://odf-converter.sourceforge.net/blog/

diffstat:

 textproc/OdfConverter/Makefile         |  50 +++++++++++++++++++++++++++------
 textproc/OdfConverter/distinfo         |  12 ++++---
 textproc/OdfConverter/patches/patch-aa |   6 ++--
 textproc/OdfConverter/patches/patch-ab |  14 +++++++++
 textproc/OdfConverter/patches/patch-ac |  18 ++++++++++++
 5 files changed, 83 insertions(+), 17 deletions(-)

diffs (152 lines):

diff -r fb91a39aa194 -r 4fe3675b8943 textproc/OdfConverter/Makefile
--- a/textproc/OdfConverter/Makefile    Mon Jul 27 05:15:53 2009 +0000
+++ b/textproc/OdfConverter/Makefile    Mon Jul 27 05:39:21 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/07/27 04:20:25 dsainty Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/27 05:39:21 dsainty Exp $
 #
 
-DISTNAME=      OdfConverter--src-1.1
-PKGNAME=       OdfConverter-1.1
+DISTNAME=      OdfAddinForOffice-src-3.0
+PKGNAME=       OdfConverter-3.0
 CATEGORIES=    converters textproc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=odf-converter/}
 EXTRACT_SUFX=  .zip
@@ -14,6 +14,9 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+# mono-basic DLLs are required at run-time (but not at build time).
+DEPENDS+=      mono-basic-[0-9]*:../../lang/mono-basic
+
 USE_LANGUAGES= c
 USE_TOOLS+=    gmake pkg-config
 
@@ -23,20 +26,49 @@
 BUILD_DIRS+=   source/Presentation/Converter
 BUILD_DIRS+=   source/Spreadsheet/Converter
 BUILD_DIRS+=   source/AdditionalTools/zlib123/contrib/minizip
-BUILD_DIRS+=   source/Shell/OdfConverterTest
+BUILD_DIRS+=   source/shell/odfconverter
 
 MAKE_JOBS_SAFE=        no
 
 INSTALLATION_DIRS=     bin share/doc/OdfConverter
 
+#
+# The Subversion repository has a number of file name case issues.  The
+# essential ones are fixed here so that the build can complete on a
+# 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
 post-extract:
-       cd ${WRKDIR} && mv "Copy of 4thMarch" ${DISTNAME:Q}
+       cd ${WRKDIR} && mv "odf-converter-r5224/trunk" ${DISTNAME:Q}
+       set -e; \
+       find "${WRKSRC}" -name '[Mm][Aa][Kk][Ee][Ff][Ii][Ll][Ee]' -print | \
+         while read file; do \
+           dir=`dirname "$$file"`; mv "$$file" "$$dir/Makefile"; done
+       set -e; files=""; \
+       for file in ${FILE_CASE_FIXES}; do \
+         while [ -n "$$file" -a "$$file" != "." ]; do \
+           files="$$file $$files"; base=`basename "$$file"`; \
+           file=`dirname "$$file"`; \
+         done; \
+       done; \
+       for file in $$files; do \
+         base=`basename "$$file"`; subdir=`dirname "$$file"`; \
+         lcbase=`basename "$$file" | tr 'A-Z' 'a-z'`; \
+         subdir="${WRKSRC}/$$subdir"; \
+         if [ -e "$$subdir/$$lcbase" -a ! -e "$$subdir/$$base" ]; then \
+           mv "$$subdir/$$lcbase" "$$subdir/$$base"; \
+         fi; \
+       done
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/source/Shell/OdfConverterTest/OdfConverter \
-               ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/source/Shell/OdfConverterTest/README.TXT \
-               ${DESTDIR}${PREFIX}/share/doc/OdfConverter
+       ${INSTALL_PROGRAM} ${WRKSRC}/source/shell/odfconverter/OdfConverter \
+               ${DESTDIR}${PREFIX}/bin/
+       ${INSTALL_DATA} ${WRKSRC}/source/shell/odfconverter/readme.txt \
+               ${DESTDIR}${PREFIX}/share/doc/OdfConverter/README.TXT
 
 .include "../../lang/mono/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fb91a39aa194 -r 4fe3675b8943 textproc/OdfConverter/distinfo
--- a/textproc/OdfConverter/distinfo    Mon Jul 27 05:15:53 2009 +0000
+++ b/textproc/OdfConverter/distinfo    Mon Jul 27 05:39:21 2009 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/04/14 18:33:30 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/07/27 05:39:21 dsainty Exp $
 
-SHA1 (OdfConverter--src-1.1.zip) = 7254502a15024a668a2c6d788a4ff4cc7cf4523e
-RMD160 (OdfConverter--src-1.1.zip) = 57b10317453bd9a84cc787c9cb600844c88f7696
-Size (OdfConverter--src-1.1.zip) = 46541334 bytes
-SHA1 (patch-aa) = e880c861a9c7d0968ac10899c80c8bd05fa601f6
+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-ab) = 1240ea11736009463bf937ccc547e5037d411626
+SHA1 (patch-ac) = fef2eeffedf729644c5e75ae1359a2f66018faeb
diff -r fb91a39aa194 -r 4fe3675b8943 textproc/OdfConverter/patches/patch-aa
--- a/textproc/OdfConverter/patches/patch-aa    Mon Jul 27 05:15:53 2009 +0000
+++ b/textproc/OdfConverter/patches/patch-aa    Mon Jul 27 05:39:21 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/04/14 18:33:30 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/27 05:39:21 dsainty Exp $
 
---- source/Shell/OdfConverterTest/Makefile.orig        2007-12-19 15:16:04.000000000 +0100
-+++ source/Shell/OdfConverterTest/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 -r fb91a39aa194 -r 4fe3675b8943 textproc/OdfConverter/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/OdfConverter/patches/patch-ab    Mon Jul 27 05:39:21 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2009/07/27 05:39:21 dsainty Exp $
+
+--- source/Spreadsheet/Converter/Makefile.orig 2008-09-26 21:49:52.000000000 +1200
++++ source/Spreadsheet/Converter/Makefile      2009-07-16 17:10:15.000000000 +1200
+@@ -25,6 +25,9 @@
+ SOURCE=${wildcard *.cs}
+ DISTFILES=$(SOURCE) $(ODF2OOX_RES) $(OOX2ODF_RES)
+ 
++RESOURCE_FLAGS+=-r:System.Drawing
++RESOURCE_FLAGS+=-r:System.Windows.Forms
++
+ all-local: Spreadsheet.dll SpreadsheetStatic.dll 
+ Spreadsheet.dll: $(SOURCE) Makefile $(OOX2ODF_RES) $(ODF2OOX_RES)
+       $(CSC) $(CSC_DEBUG) $(RESOURCE_FLAGS) -target:library \
diff -r fb91a39aa194 -r 4fe3675b8943 textproc/OdfConverter/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/OdfConverter/patches/patch-ac    Mon Jul 27 05:39:21 2009 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2009/07/27 05:39:21 dsainty 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
+@@ -49,9 +49,9 @@
+       
+ #if MONO
+       // Dummy validation class
+-      public class OdfValidator
++      public class OdfValidator : IValidator
+       {
+-              public OdfValidator(Report report)
++              public OdfValidator(ConversionReport report)
+               { 
+               }
+               public void validate(String fileName)