diff options
author | dsainty <dsainty> | 2009-07-27 05:39:21 +0000 |
---|---|---|
committer | dsainty <dsainty> | 2009-07-27 05:39:21 +0000 |
commit | 03df58c534cf15cb6b55f07f2c3669f86e5149a8 (patch) | |
tree | 0edb1cbe14a69a1a872bf77c3ae90b820f7332fd /textproc/OdfConverter | |
parent | 7ed9d8709004fe0933ce4c9fb17d92d511f5b75f (diff) | |
download | pkgsrc-03df58c534cf15cb6b55f07f2c3669f86e5149a8.tar.gz |
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 (limited to 'textproc/OdfConverter')
-rw-r--r-- | textproc/OdfConverter/Makefile | 50 | ||||
-rw-r--r-- | textproc/OdfConverter/distinfo | 12 | ||||
-rw-r--r-- | textproc/OdfConverter/patches/patch-aa | 6 | ||||
-rw-r--r-- | textproc/OdfConverter/patches/patch-ab | 14 | ||||
-rw-r--r-- | textproc/OdfConverter/patches/patch-ac | 18 |
5 files changed, 83 insertions, 17 deletions
diff --git a/textproc/OdfConverter/Makefile b/textproc/OdfConverter/Makefile index 8eb6e2d6b25..9d7a14a6d5f 100644 --- a/textproc/OdfConverter/Makefile +++ b/textproc/OdfConverter/Makefile @@ -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 @@ LICENSE= modified-bsd 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/Word/Converter 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 --git a/textproc/OdfConverter/distinfo b/textproc/OdfConverter/distinfo index 111f9db3ca2..f63c7f89ae9 100644 --- a/textproc/OdfConverter/distinfo +++ b/textproc/OdfConverter/distinfo @@ -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 --git a/textproc/OdfConverter/patches/patch-aa b/textproc/OdfConverter/patches/patch-aa index b3e41de8381..3ed3a814990 100644 --- a/textproc/OdfConverter/patches/patch-aa +++ b/textproc/OdfConverter/patches/patch-aa @@ -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 --git a/textproc/OdfConverter/patches/patch-ab b/textproc/OdfConverter/patches/patch-ab new file mode 100644 index 00000000000..e1e4e62fc9f --- /dev/null +++ b/textproc/OdfConverter/patches/patch-ab @@ -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 --git a/textproc/OdfConverter/patches/patch-ac b/textproc/OdfConverter/patches/patch-ac new file mode 100644 index 00000000000..121435e2e4d --- /dev/null +++ b/textproc/OdfConverter/patches/patch-ac @@ -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) |