CVS commit: pkgsrc/converters/orcus0.12

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 20 10:52:53 UTC 2016

Modified Files:
        pkgsrc/converters/orcus0.12: Makefile PLIST buildlink3.mk

Log Message:
Add libixion dependency. Add missing includes to bl3.mk.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/converters/orcus0.12/Makefile \
    pkgsrc/converters/orcus0.12/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/orcus0.12/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/orcus0.12/Makefile
diff -u pkgsrc/converters/orcus0.12/Makefile:1.2 pkgsrc/converters/orcus0.12/Makefile:1.3
--- pkgsrc/converters/orcus0.12/Makefile:1.2    Mon Sep 19 14:20:33 2016
+++ pkgsrc/converters/orcus0.12/Makefile        Tue Sep 20 10:52:53 2016
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2016/09/19 14:20:33 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/09/20 10:52:53 wiz Exp $
 
 DISTNAME=      liborcus-0.12.0
 PKGNAME=       ${DISTNAME:S/liborcus/liborcus0.12/}
+PKGREVISION=   1
 CATEGORIES=    converters
 MASTER_SITES=  http://kohei.us/files/orcus/src/
 EXTRACT_SUFX=  .tar.xz
@@ -17,15 +18,15 @@ USE_TOOLS+=         gmake pkg-config
 GNU_CONFIGURE=         yes
 # python detection completely broken
 CONFIGURE_ARGS+=       --disable-python
-# needs unpackaged libixion
-CONFIGURE_ARGS+=       --disable-spreadsheet-model
 CONFIGURE_ARGS+=       --disable-werror
 
 PKGCONFIG_OVERRIDE+=   liborcus.pc.in
+PKGCONFIG_OVERRIDE+=   liborcus-spreadsheet-model.pc.in
 
 PTHREAD_AUTO_VARS=     yes
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/mdds1.2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../math/libixion/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/converters/orcus0.12/buildlink3.mk
diff -u pkgsrc/converters/orcus0.12/buildlink3.mk:1.2 pkgsrc/converters/orcus0.12/buildlink3.mk:1.3
--- pkgsrc/converters/orcus0.12/buildlink3.mk:1.2       Mon Sep 19 14:20:33 2016
+++ pkgsrc/converters/orcus0.12/buildlink3.mk   Tue Sep 20 10:52:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/09/19 14:20:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2016/09/20 10:52:53 wiz Exp $
 
 BUILDLINK_TREE+=       orcus012
 
@@ -8,8 +8,8 @@ ORCUS012_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.orcus012+=       orcus0.12>=0.12.0
 BUILDLINK_PKGSRCDIR.orcus012?= ../../converters/orcus0.12
 
-#.include "../../devel/boost-libs/buildlink3.mk"
-#.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/mdds1.2/buildlink3.mk"
+.include "../../math/libixion/buildlink3.mk"
 .endif # ORCUS012_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -orcus012

Index: pkgsrc/converters/orcus0.12/PLIST
diff -u pkgsrc/converters/orcus0.12/PLIST:1.1 pkgsrc/converters/orcus0.12/PLIST:1.2
--- pkgsrc/converters/orcus0.12/PLIST:1.1       Mon Sep 19 14:10:38 2016
+++ pkgsrc/converters/orcus0.12/PLIST   Tue Sep 20 10:52:53 2016
@@ -1,8 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2016/09/19 14:10:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/09/20 10:52:53 wiz Exp $
 bin/orcus-css-dump
+bin/orcus-csv
 bin/orcus-detect
+bin/orcus-gnumeric
 bin/orcus-json
 bin/orcus-mso-encryption
+bin/orcus-ods
+bin/orcus-xls-xml
+bin/orcus-xlsx
+bin/orcus-xml
 bin/orcus-xml-dump
 bin/orcus-yaml
 bin/orcus-zip-dump
@@ -48,8 +54,17 @@ include/liborcus-0.12/orcus/sax_parser.h
 include/liborcus-0.12/orcus/sax_parser_base.hpp
 include/liborcus-0.12/orcus/sax_token_parser.hpp
 include/liborcus-0.12/orcus/sax_token_parser_thread.hpp
+include/liborcus-0.12/orcus/spreadsheet/auto_filter.hpp
+include/liborcus-0.12/orcus/spreadsheet/document.hpp
 include/liborcus-0.12/orcus/spreadsheet/export_interface.hpp
+include/liborcus-0.12/orcus/spreadsheet/factory.hpp
+include/liborcus-0.12/orcus/spreadsheet/global_settings.hpp
 include/liborcus-0.12/orcus/spreadsheet/import_interface.hpp
+include/liborcus-0.12/orcus/spreadsheet/shared_strings.hpp
+include/liborcus-0.12/orcus/spreadsheet/sheet.hpp
+include/liborcus-0.12/orcus/spreadsheet/sheet_properties.hpp
+include/liborcus-0.12/orcus/spreadsheet/sheet_range.hpp
+include/liborcus-0.12/orcus/spreadsheet/styles.hpp
 include/liborcus-0.12/orcus/spreadsheet/types.hpp
 include/liborcus-0.12/orcus/stream.hpp
 include/liborcus-0.12/orcus/string_pool.hpp
@@ -67,4 +82,6 @@ include/liborcus-0.12/orcus/zip_archive_
 lib/liborcus-0.12.la
 lib/liborcus-mso-0.12.la
 lib/liborcus-parser-0.12.la
+lib/liborcus-spreadsheet-model-0.12.la
 lib/pkgconfig/liborcus-0.12.pc
+lib/pkgconfig/liborcus-spreadsheet-model-0.12.pc