Update to 0.7.0

* Change to 0.8.0 branch
* Change license to mpl-2.0 from mit

Changelog:
Add some more formats.

4 files changed, 51 insertions, 48 deletions

diff --git a/converters/orcus/Makefile b/converters/orcus/Makefile
index 597f9b9230c..e265a069884 100644
--- a/converters/orcus/Makefile
+++ b/converters/orcus/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2014/08/13 10:57:33 adam Exp $
+# $NetBSD: Makefile,v 1.8 2014/10/13 21:43:20 ryoon Exp $
 
-DISTNAME=	liborcus-0.5.1
+DISTNAME=	liborcus-0.7.0
 PKGNAME=	${DISTNAME:S/lib//}
-PKGREVISION=	4
 CATEGORIES=	converters
 MASTER_SITES=	http://kohei.us/files/orcus/src/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,7 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	https://gitorious.org/orcus/
 COMMENT=	Import filter library for spreadsheet documents
-LICENSE=	mit
+LICENSE=	mpl-2.0
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
diff --git a/converters/orcus/PLIST b/converters/orcus/PLIST
index 2a2f846e79e..11208fb0061 100644
--- a/converters/orcus/PLIST
+++ b/converters/orcus/PLIST
@@ -1,38 +1,45 @@
-@comment $NetBSD: PLIST,v 1.1 2013/08/24 16:12:10 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/10/13 21:43:20 ryoon Exp $
+bin/orcus-detect
 bin/orcus-mso-encryption
 bin/orcus-xml-dump
 bin/orcus-zip-dump
-include/liborcus-0.6/orcus/base64.hpp
-include/liborcus-0.6/orcus/cell_buffer.hpp
-include/liborcus-0.6/orcus/css_parser.hpp
-include/liborcus-0.6/orcus/csv_parser.hpp
-include/liborcus-0.6/orcus/dom_tree.hpp
-include/liborcus-0.6/orcus/env.hpp
-include/liborcus-0.6/orcus/exception.hpp
-include/liborcus-0.6/orcus/global.hpp
-include/liborcus-0.6/orcus/ooxml/encryption_info.hpp
-include/liborcus-0.6/orcus/orcus_csv.hpp
-include/liborcus-0.6/orcus/orcus_gnumeric.hpp
-include/liborcus-0.6/orcus/orcus_ods.hpp
-include/liborcus-0.6/orcus/orcus_xlsx.hpp
-include/liborcus-0.6/orcus/orcus_xml.hpp
-include/liborcus-0.6/orcus/pstring.hpp
-include/liborcus-0.6/orcus/sax_ns_parser.hpp
-include/liborcus-0.6/orcus/sax_parser.hpp
-include/liborcus-0.6/orcus/sax_parser_global.hpp
-include/liborcus-0.6/orcus/sax_token_parser.hpp
-include/liborcus-0.6/orcus/spreadsheet/export_interface.hpp
-include/liborcus-0.6/orcus/spreadsheet/import_interface.hpp
-include/liborcus-0.6/orcus/spreadsheet/types.hpp
-include/liborcus-0.6/orcus/stream.hpp
-include/liborcus-0.6/orcus/string_pool.hpp
-include/liborcus-0.6/orcus/tokens.hpp
-include/liborcus-0.6/orcus/types.hpp
-include/liborcus-0.6/orcus/xml_namespace.hpp
-include/liborcus-0.6/orcus/xml_structure_tree.hpp
-include/liborcus-0.6/orcus/zip_archive.hpp
-include/liborcus-0.6/orcus/zip_archive_stream.hpp
-lib/liborcus-0.6.la
-lib/liborcus-mso-0.6.la
-lib/liborcus-parser-0.6.la
-lib/pkgconfig/liborcus-0.6.pc
+include/liborcus-0.8/orcus/base64.hpp
+include/liborcus-0.8/orcus/cell_buffer.hpp
+include/liborcus-0.8/orcus/css_parser.hpp
+include/liborcus-0.8/orcus/csv_parser.hpp
+include/liborcus-0.8/orcus/csv_parser_base.hpp
+include/liborcus-0.8/orcus/dom_tree.hpp
+include/liborcus-0.8/orcus/env.hpp
+include/liborcus-0.8/orcus/exception.hpp
+include/liborcus-0.8/orcus/format_detection.hpp
+include/liborcus-0.8/orcus/global.hpp
+include/liborcus-0.8/orcus/interface.hpp
+include/liborcus-0.8/orcus/measurement.hpp
+include/liborcus-0.8/orcus/ooxml/encryption_info.hpp
+include/liborcus-0.8/orcus/orcus_csv.hpp
+include/liborcus-0.8/orcus/orcus_gnumeric.hpp
+include/liborcus-0.8/orcus/orcus_ods.hpp
+include/liborcus-0.8/orcus/orcus_xls_xml.hpp
+include/liborcus-0.8/orcus/orcus_xlsx.hpp
+include/liborcus-0.8/orcus/orcus_xml.hpp
+include/liborcus-0.8/orcus/parser_global.hpp
+include/liborcus-0.8/orcus/pstring.hpp
+include/liborcus-0.8/orcus/sax_ns_parser.hpp
+include/liborcus-0.8/orcus/sax_parser.hpp
+include/liborcus-0.8/orcus/sax_parser_base.hpp
+include/liborcus-0.8/orcus/sax_token_parser.hpp
+include/liborcus-0.8/orcus/spreadsheet/export_interface.hpp
+include/liborcus-0.8/orcus/spreadsheet/import_interface.hpp
+include/liborcus-0.8/orcus/spreadsheet/types.hpp
+include/liborcus-0.8/orcus/stream.hpp
+include/liborcus-0.8/orcus/string_pool.hpp
+include/liborcus-0.8/orcus/tokens.hpp
+include/liborcus-0.8/orcus/types.hpp
+include/liborcus-0.8/orcus/xml_namespace.hpp
+include/liborcus-0.8/orcus/xml_structure_tree.hpp
+include/liborcus-0.8/orcus/zip_archive.hpp
+include/liborcus-0.8/orcus/zip_archive_stream.hpp
+lib/liborcus-0.8.la
+lib/liborcus-mso-0.8.la
+lib/liborcus-parser-0.8.la
+lib/pkgconfig/liborcus-0.8.pc
diff --git a/converters/orcus/buildlink3.mk b/converters/orcus/buildlink3.mk
index 1e80cfa48c4..5526a7fbaeb 100644
--- a/converters/orcus/buildlink3.mk
+++ b/converters/orcus/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/08/24 16:12:10 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/10/13 21:43:20 ryoon Exp $
 
 BUILDLINK_TREE+=	orcus
 
 .if !defined(ORCUS_BUILDLINK3_MK)
 ORCUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.orcus+=	orcus>=0.5.1
+BUILDLINK_API_DEPENDS.orcus+=	orcus>=0.7.0
 BUILDLINK_PKGSRCDIR.orcus?=	../../converters/orcus
 
 #.include "../../devel/boost-libs/buildlink3.mk"
diff --git a/converters/orcus/distinfo b/converters/orcus/distinfo
index add392784ad..d5f469a8ae8 100644
--- a/converters/orcus/distinfo
+++ b/converters/orcus/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/11/30 16:11:15 richard Exp $
+$NetBSD: distinfo,v 1.3 2014/10/13 21:43:20 ryoon Exp $
 
-SHA1 (liborcus-0.5.1.tar.bz2) = 9303d513e4b63a1d6e4bce7cfeb13635e568b466
-RMD160 (liborcus-0.5.1.tar.bz2) = 53c0cc12a3264b970f81ebb5b5c43208cee70688
-Size (liborcus-0.5.1.tar.bz2) = 1445106 bytes
-SHA1 (patch-bin_pack-release.sh) = 6eefed463a1bc44ce2cbceb128d347b3096768f0
-SHA1 (patch-configure) = ac0fd8f94d5ae154266776b80acd41c3fe96e916
-SHA1 (patch-src_Makefile.in) = 734abfe6287972d704869a2ccf6534ea094d33ad
+SHA1 (liborcus-0.7.0.tar.bz2) = c33e1eb55144fef1070cb0bf35a2c12198fcaa71
+RMD160 (liborcus-0.7.0.tar.bz2) = 81cfc4c7bf67dd1a26d816a2b7b1447c0054cfe7
+Size (liborcus-0.7.0.tar.bz2) = 1665988 bytes