Update to 0.5.1.

5 files changed, 67 insertions, 75 deletions

diff --git a/devel/liborcus/Makefile b/devel/liborcus/Makefile
index 4861c84bef63..d14c008cf86a 100644
--- a/devel/liborcus/Makefile
+++ b/devel/liborcus/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	liborcus
-PORTVERSION=	0.3.0
+PORTVERSION=	0.5.1
 CATEGORIES=	devel misc
 MASTER_SITES=	http://kohei.us/files/orcus/src/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Standalone file import filter library for spreadsheet documents
@@ -18,12 +17,14 @@ LIB_DEPENDS=	zip:${PORTSDIR}/archivers/libzip \
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
+USES=		pathfix pkgconfig
 
 CONFIGURE_ARGS=	--disable-spreadsheet-model --disable-werror \
+		--with-boost="${LOCALBASE}" \
 		--with-boost-system=boost_system
 CONFIGURE_ENV=	ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/liborcus/distinfo b/devel/liborcus/distinfo
index e44d21131270..2e319a95a3d0 100644
--- a/devel/liborcus/distinfo
+++ b/devel/liborcus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liborcus_0.3.0.tar.bz2) = 30829484b2328d0666c859b32370d3826b3468f3945d054abdac8234f4083c77
-SIZE (liborcus_0.3.0.tar.bz2) = 1373518
+SHA256 (liborcus-0.5.1.tar.bz2) = e632373149c0b29a971aa74c079f8825bc6bc7b09c0899c8de004ee7e72ad765
+SIZE (liborcus-0.5.1.tar.bz2) = 1445106
diff --git a/devel/liborcus/files/patch-src__Makefile.in b/devel/liborcus/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..08aeb36ce84c
--- /dev/null
+++ b/devel/liborcus/files/patch-src__Makefile.in
@@ -0,0 +1,12 @@
+--- src/Makefile.in.bak	2013-04-12 21:56:47.000000000 -0400
++++ src/Makefile.in	2013-04-16 19:34:26.000000000 -0400
+@@ -437,7 +437,8 @@
+ 	orcus_zip_dump.cpp
+ 
+ orcus_zip_dump_LDADD = \
+-	parser/liborcus-parser-@ORCUS_API_VERSION@.la
++	parser/liborcus-parser-@ORCUS_API_VERSION@.la \
++	$(BOOST_SYSTEM_LIB)
+ 
+ orcus_zip_dump_CPPFLAGS = 
+ 
diff --git a/devel/liborcus/files/patch-src__liborcus__dom_tree.cpp b/devel/liborcus/files/patch-src__liborcus__dom_tree.cpp
deleted file mode 100644
index 50e6b7836d4b..000000000000
--- a/devel/liborcus/files/patch-src__liborcus__dom_tree.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/liborcus/dom_tree.cpp.orig	2012-11-28 07:21:10.000000000 -0500
-+++ src/liborcus/dom_tree.cpp	2013-02-19 16:17:53.000000000 -0500
-@@ -34,6 +34,8 @@
- #include <iostream>
- #include <sstream>
- 
-+#include <boost/noncopyable.hpp>
-+
- using namespace std;
- 
- namespace orcus {
diff --git a/devel/liborcus/pkg-plist b/devel/liborcus/pkg-plist
index 4072ac70c08b..48499d83ee08 100644
--- a/devel/liborcus/pkg-plist
+++ b/devel/liborcus/pkg-plist
@@ -1,60 +1,50 @@
+bin/orcus-mso-encryption
 bin/orcus-xml-dump
-include/liborcus-0.4/orcus/cell_buffer.hpp
-include/liborcus-0.4/orcus/css_parser.hpp
-include/liborcus-0.4/orcus/csv_parser.hpp
-include/liborcus-0.4/orcus/dom_tree.hpp
-include/liborcus-0.4/orcus/env.hpp
-include/liborcus-0.4/orcus/exception.hpp
-include/liborcus-0.4/orcus/global.hpp
-include/liborcus-0.4/orcus/odf/odf_token_constants.hpp
-include/liborcus-0.4/orcus/odf/odf_token_constants.inl
-include/liborcus-0.4/orcus/odf/odf_tokens.hpp
-include/liborcus-0.4/orcus/odf/ods_context.hpp
-include/liborcus-0.4/orcus/odf/ods_handler.hpp
-include/liborcus-0.4/orcus/odf/para_context.hpp
-include/liborcus-0.4/orcus/ooxml/content_types.hpp
-include/liborcus-0.4/orcus/ooxml/global.hpp
-include/liborcus-0.4/orcus/ooxml/ooxml_token_constants.hpp
-include/liborcus-0.4/orcus/ooxml/ooxml_token_constants.inl
-include/liborcus-0.4/orcus/ooxml/ooxml_tokens.hpp
-include/liborcus-0.4/orcus/ooxml/ooxml_types.hpp
-include/liborcus-0.4/orcus/ooxml/opc_context.hpp
-include/liborcus-0.4/orcus/ooxml/opc_reader.hpp
-include/liborcus-0.4/orcus/ooxml/opc_token_constants.hpp
-include/liborcus-0.4/orcus/ooxml/opc_token_constants.inl
-include/liborcus-0.4/orcus/ooxml/schemas.hpp
-include/liborcus-0.4/orcus/ooxml/xlsx_context.hpp
-include/liborcus-0.4/orcus/ooxml/xlsx_handler.hpp
-include/liborcus-0.4/orcus/ooxml/xlsx_sheet_context.hpp
-include/liborcus-0.4/orcus/ooxml/xlsx_types.hpp
-include/liborcus-0.4/orcus/ooxml/xlsx_workbook_context.hpp
-include/liborcus-0.4/orcus/orcus_csv.hpp
-include/liborcus-0.4/orcus/orcus_gnumeric.hpp
-include/liborcus-0.4/orcus/orcus_ods.hpp
-include/liborcus-0.4/orcus/orcus_xlsx.hpp
-include/liborcus-0.4/orcus/orcus_xml.hpp
-include/liborcus-0.4/orcus/pstring.hpp
-include/liborcus-0.4/orcus/sax_ns_parser.hpp
-include/liborcus-0.4/orcus/sax_parser.hpp
-include/liborcus-0.4/orcus/sax_token_parser.hpp
-include/liborcus-0.4/orcus/spreadsheet/export_interface.hpp
-include/liborcus-0.4/orcus/spreadsheet/import_interface.hpp
-include/liborcus-0.4/orcus/spreadsheet/types.hpp
-include/liborcus-0.4/orcus/tokens.hpp
-include/liborcus-0.4/orcus/types.hpp
-include/liborcus-0.4/orcus/xml_context.hpp
-include/liborcus-0.4/orcus/xml_handler.hpp
-include/liborcus-0.4/orcus/xml_namespace.hpp
-include/liborcus-0.4/orcus/xml_parser.hpp
-include/liborcus-0.4/orcus/xml_simple_handler.hpp
-include/liborcus-0.4/orcus/xml_structure_tree.hpp
-lib/liborcus-0.4.a
-lib/liborcus-0.4.la
-lib/liborcus-0.4.so
-lib/liborcus-0.4.so.0
-libdata/pkgconfig/liborcus-0.4.pc
-@dirrm include/liborcus-0.4/orcus/spreadsheet
-@dirrm include/liborcus-0.4/orcus/ooxml
-@dirrm include/liborcus-0.4/orcus/odf
-@dirrm include/liborcus-0.4/orcus
-@dirrm include/liborcus-0.4
+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/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/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
+include/liborcus-0.6/orcus/ooxml/encryption_info.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
+lib/liborcus-0.6.a
+lib/liborcus-0.6.la
+lib/liborcus-0.6.so
+lib/liborcus-0.6.so.0
+lib/liborcus-mso-0.6.a
+lib/liborcus-mso-0.6.la
+lib/liborcus-mso-0.6.so
+lib/liborcus-mso-0.6.so.0
+lib/liborcus-parser-0.6.a
+lib/liborcus-parser-0.6.la
+lib/liborcus-parser-0.6.so
+lib/liborcus-parser-0.6.so.0
+libdata/pkgconfig/liborcus-0.6.pc
+@dirrm include/liborcus-0.6/orcus/spreadsheet
+@dirrm include/liborcus-0.6/orcus/ooxml
+@dirrm include/liborcus-0.6/orcus
+@dirrm include/liborcus-0.6