CVS commit: pkgsrc/converters/orcus

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/converters/orcus
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Tue, 6 Dec 2016 15:13:20 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Dec  6 15:13:20 UTC 2016

Modified Files:
        pkgsrc/converters/orcus: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/converters/orcus/patches: patch-configure

Log Message:
Update to 0.11.2

Changelog:
2016-05-11  Kohei Yoshida  <kohei.yoshida%gmail.com@localhost>  [d6084fe1771052e516ecfb270cb24dd9917a1895]

        Up the version to 0.11.2.

2016-05-11  Kohei Yoshida  <kohei.yoshida%gmail.com@localhost>  [70fd8327c94b27a99e2c7800e91c13e5099cceda]

        Make it buildable with mdds-1.2.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/converters/orcus/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/orcus/PLIST \
    pkgsrc/converters/orcus/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/orcus/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/converters/orcus/patches/patch-configure

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

Modified files:

Index: pkgsrc/converters/orcus/Makefile
diff -u pkgsrc/converters/orcus/Makefile:1.15 pkgsrc/converters/orcus/Makefile:1.16
--- pkgsrc/converters/orcus/Makefile:1.15       Fri Oct  7 18:25:40 2016
+++ pkgsrc/converters/orcus/Makefile    Tue Dec  6 15:13:20 2016
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2016/10/07 18:25:40 adam Exp $
+# $NetBSD: Makefile,v 1.16 2016/12/06 15:13:20 ryoon Exp $
 
-DISTNAME=      liborcus-0.9.2
+DISTNAME=      liborcus-0.11.2
 PKGNAME=       ${DISTNAME:S/lib//}
-PKGREVISION=   2
 CATEGORIES=    converters
 MASTER_SITES=  http://kohei.us/files/orcus/src/
 EXTRACT_SUFX=  .tar.xz
@@ -12,20 +11,29 @@ HOMEPAGE=   https://gitlab.com/orcus/orcus
 COMMENT=       Import filter library for spreadsheet documents (0.10 branch)
 LICENSE=       mpl-2.0
 
+SUBST_CLASSES+=                        fix-python
+SUBST_STAGE.fix-python=                pre-configure
+SUBST_MESSAGE.fix-python=      Fixing python pkg-config file name
+SUBST_FILES.fix-python+=        configure
+SUBST_VARS.fix-python+=                PYVERSSUFFIX
+
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=                    gmake pkg-config
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
 CONFIGURE_ARGS+=       --with-boost-system=boost_system
 CONFIGURE_ARGS+=       --disable-spreadsheet-model
 CONFIGURE_ARGS+=       --disable-werror
+CONFIGURE_ARGS+=       --disable-python
 
 PKGCONFIG_OVERRIDE+=   liborcus.pc.in
 
 PTHREAD_AUTO_VARS=     yes
 
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/mdds/buildlink3.mk"
+.include "../../devel/mdds1.2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+#.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/orcus/PLIST
diff -u pkgsrc/converters/orcus/PLIST:1.3 pkgsrc/converters/orcus/PLIST:1.4
--- pkgsrc/converters/orcus/PLIST:1.3   Tue Sep  8 19:40:59 2015
+++ pkgsrc/converters/orcus/PLIST       Tue Dec  6 15:13:20 2016
@@ -1,52 +1,63 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/08 19:40:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/12/06 15:13:20 ryoon Exp $
 bin/orcus-css-dump
 bin/orcus-detect
+bin/orcus-json
 bin/orcus-mso-encryption
 bin/orcus-xml-dump
+bin/orcus-yaml
 bin/orcus-zip-dump
-include/liborcus-0.10/orcus/base64.hpp
-include/liborcus-0.10/orcus/cell_buffer.hpp
-include/liborcus-0.10/orcus/config.hpp
-include/liborcus-0.10/orcus/css_document_tree.hpp
-include/liborcus-0.10/orcus/css_parser.hpp
-include/liborcus-0.10/orcus/css_parser_base.hpp
-include/liborcus-0.10/orcus/css_selector.hpp
-include/liborcus-0.10/orcus/css_types.hpp
-include/liborcus-0.10/orcus/csv_parser.hpp
-include/liborcus-0.10/orcus/csv_parser_base.hpp
-include/liborcus-0.10/orcus/dom_tree.hpp
-include/liborcus-0.10/orcus/env.hpp
-include/liborcus-0.10/orcus/exception.hpp
-include/liborcus-0.10/orcus/format_detection.hpp
-include/liborcus-0.10/orcus/global.hpp
-include/liborcus-0.10/orcus/interface.hpp
-include/liborcus-0.10/orcus/measurement.hpp
-include/liborcus-0.10/orcus/ooxml/encryption_info.hpp
-include/liborcus-0.10/orcus/orcus_csv.hpp
-include/liborcus-0.10/orcus/orcus_gnumeric.hpp
-include/liborcus-0.10/orcus/orcus_import_xlsx.hpp
-include/liborcus-0.10/orcus/orcus_ods.hpp
-include/liborcus-0.10/orcus/orcus_xls_xml.hpp
-include/liborcus-0.10/orcus/orcus_xlsx.hpp
-include/liborcus-0.10/orcus/orcus_xml.hpp
-include/liborcus-0.10/orcus/parser_global.hpp
-include/liborcus-0.10/orcus/pstring.hpp
-include/liborcus-0.10/orcus/sax_ns_parser.hpp
-include/liborcus-0.10/orcus/sax_parser.hpp
-include/liborcus-0.10/orcus/sax_parser_base.hpp
-include/liborcus-0.10/orcus/sax_token_parser.hpp
-include/liborcus-0.10/orcus/spreadsheet/export_interface.hpp
-include/liborcus-0.10/orcus/spreadsheet/import_interface.hpp
-include/liborcus-0.10/orcus/spreadsheet/types.hpp
-include/liborcus-0.10/orcus/stream.hpp
-include/liborcus-0.10/orcus/string_pool.hpp
-include/liborcus-0.10/orcus/tokens.hpp
-include/liborcus-0.10/orcus/types.hpp
-include/liborcus-0.10/orcus/xml_namespace.hpp
-include/liborcus-0.10/orcus/xml_structure_tree.hpp
-include/liborcus-0.10/orcus/zip_archive.hpp
-include/liborcus-0.10/orcus/zip_archive_stream.hpp
-lib/liborcus-0.10.la
-lib/liborcus-mso-0.10.la
-lib/liborcus-parser-0.10.la
-lib/pkgconfig/liborcus-0.10.pc
+include/liborcus-0.11/orcus/base64.hpp
+include/liborcus-0.11/orcus/cell_buffer.hpp
+include/liborcus-0.11/orcus/config.hpp
+include/liborcus-0.11/orcus/css_document_tree.hpp
+include/liborcus-0.11/orcus/css_parser.hpp
+include/liborcus-0.11/orcus/css_parser_base.hpp
+include/liborcus-0.11/orcus/css_selector.hpp
+include/liborcus-0.11/orcus/css_types.hpp
+include/liborcus-0.11/orcus/csv_parser.hpp
+include/liborcus-0.11/orcus/csv_parser_base.hpp
+include/liborcus-0.11/orcus/dom_tree.hpp
+include/liborcus-0.11/orcus/env.hpp
+include/liborcus-0.11/orcus/exception.hpp
+include/liborcus-0.11/orcus/format_detection.hpp
+include/liborcus-0.11/orcus/global.hpp
+include/liborcus-0.11/orcus/info.hpp
+include/liborcus-0.11/orcus/interface.hpp
+include/liborcus-0.11/orcus/json_document_tree.hpp
+include/liborcus-0.11/orcus/json_parser.hpp
+include/liborcus-0.11/orcus/json_parser_base.hpp
+include/liborcus-0.11/orcus/measurement.hpp
+include/liborcus-0.11/orcus/ooxml/encryption_info.hpp
+include/liborcus-0.11/orcus/orcus_csv.hpp
+include/liborcus-0.11/orcus/orcus_gnumeric.hpp
+include/liborcus-0.11/orcus/orcus_import_ods.hpp
+include/liborcus-0.11/orcus/orcus_import_xlsx.hpp
+include/liborcus-0.11/orcus/orcus_ods.hpp
+include/liborcus-0.11/orcus/orcus_xls_xml.hpp
+include/liborcus-0.11/orcus/orcus_xlsx.hpp
+include/liborcus-0.11/orcus/orcus_xml.hpp
+include/liborcus-0.11/orcus/parser_base.hpp
+include/liborcus-0.11/orcus/parser_global.hpp
+include/liborcus-0.11/orcus/pstring.hpp
+include/liborcus-0.11/orcus/sax_ns_parser.hpp
+include/liborcus-0.11/orcus/sax_parser.hpp
+include/liborcus-0.11/orcus/sax_parser_base.hpp
+include/liborcus-0.11/orcus/sax_token_parser.hpp
+include/liborcus-0.11/orcus/spreadsheet/export_interface.hpp
+include/liborcus-0.11/orcus/spreadsheet/import_interface.hpp
+include/liborcus-0.11/orcus/spreadsheet/types.hpp
+include/liborcus-0.11/orcus/stream.hpp
+include/liborcus-0.11/orcus/string_pool.hpp
+include/liborcus-0.11/orcus/tokens.hpp
+include/liborcus-0.11/orcus/types.hpp
+include/liborcus-0.11/orcus/xml_namespace.hpp
+include/liborcus-0.11/orcus/xml_structure_tree.hpp
+include/liborcus-0.11/orcus/yaml_document_tree.hpp
+include/liborcus-0.11/orcus/yaml_parser.hpp
+include/liborcus-0.11/orcus/yaml_parser_base.hpp
+include/liborcus-0.11/orcus/zip_archive.hpp
+include/liborcus-0.11/orcus/zip_archive_stream.hpp
+lib/liborcus-0.11.la
+lib/liborcus-mso-0.11.la
+lib/liborcus-parser-0.11.la
+lib/pkgconfig/liborcus-0.11.pc
Index: pkgsrc/converters/orcus/buildlink3.mk
diff -u pkgsrc/converters/orcus/buildlink3.mk:1.3 pkgsrc/converters/orcus/buildlink3.mk:1.4
--- pkgsrc/converters/orcus/buildlink3.mk:1.3   Tue Sep  8 19:40:59 2015
+++ pkgsrc/converters/orcus/buildlink3.mk       Tue Dec  6 15:13:20 2016
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/09/08 19:40:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2016/12/06 15:13:20 ryoon Exp $
 
 BUILDLINK_TREE+=       orcus
 
 .if !defined(ORCUS_BUILDLINK3_MK)
 ORCUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.orcus+=  orcus>=0.9.0
+BUILDLINK_API_DEPENDS.orcus+=  orcus>=0.11.2
 BUILDLINK_PKGSRCDIR.orcus?=    ../../converters/orcus
 
 #.include "../../devel/boost-libs/buildlink3.mk"

Index: pkgsrc/converters/orcus/distinfo
diff -u pkgsrc/converters/orcus/distinfo:1.7 pkgsrc/converters/orcus/distinfo:1.8
--- pkgsrc/converters/orcus/distinfo:1.7        Sat Feb 13 08:46:02 2016
+++ pkgsrc/converters/orcus/distinfo    Tue Dec  6 15:13:20 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2016/02/13 08:46:02 wiz Exp $
+$NetBSD: distinfo,v 1.8 2016/12/06 15:13:20 ryoon Exp $
 
-SHA1 (liborcus-0.9.2.tar.xz) = 4c55f1bdc65490e8e79bbf7d069a64381eb1d1bc
-RMD160 (liborcus-0.9.2.tar.xz) = 3487f65c6e9068f3d5cef402ae2f931c1a616cdb
-SHA512 (liborcus-0.9.2.tar.xz) = 1dd847012cf78df962c28408e0b56412a89e1d978d532a17fa92352f6788bbc1a0fe806c2d886ff148a8ee2db54620ce039b1809f347a976dca0078f248fd8ea
-Size (liborcus-0.9.2.tar.xz) = 1558072 bytes
-SHA1 (patch-configure) = 7577f013df36a42a68d04e14974a531059c7f1c8
+SHA1 (liborcus-0.11.2.tar.xz) = 2ae75c98001eb227dd7de6a9a366c371f050ecee
+RMD160 (liborcus-0.11.2.tar.xz) = dff886f2ef0401af9f712b08f37e8318488ac955
+SHA512 (liborcus-0.11.2.tar.xz) = 2100ae273e5c963123a5212d51793fe11a7fae9268a21629007034b92c3bf283522313a033de78a6a732b367c42a6eb4f6d3288d33124827fa0788f75abdd741
+Size (liborcus-0.11.2.tar.xz) = 1627540 bytes
+SHA1 (patch-configure) = 15e4db5685f6bb81a890f8cc1e86f35132748394

Index: pkgsrc/converters/orcus/patches/patch-configure
diff -u pkgsrc/converters/orcus/patches/patch-configure:1.5 pkgsrc/converters/orcus/patches/patch-configure:1.6
--- pkgsrc/converters/orcus/patches/patch-configure:1.5 Sat Feb 13 08:46:02 2016
+++ pkgsrc/converters/orcus/patches/patch-configure     Tue Dec  6 15:13:20 2016
@@ -1,11 +1,38 @@
-$NetBSD: patch-configure,v 1.5 2016/02/13 08:46:02 wiz Exp $
+$NetBSD: patch-configure,v 1.6 2016/12/06 15:13:20 ryoon Exp $
 
-Fix unportable test(1) operator.
-Adapt for mdds-1.0.
+* Fix unportable test(1) operator.
+* Support pkgsrc pkg-config file name rule
 
---- configure.orig     2015-06-18 23:43:37.000000000 +0000
+--- configure.orig     2016-05-12 01:03:48.000000000 +0000
 +++ configure
-@@ -17533,7 +17533,7 @@ else
+@@ -17272,7 +17272,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ # added as of 1.35.0.  If we have a version <1.35, we must not attempt to
+ # find Boost.System as it didn't exist by then.
+ if test $boost_major_version -ge 135; then
+-  if test x"$BOOST_SYSTEM_LIBS" == "x" -o x"$BOOST_SYSTEM_LDFLAGS" == "x"; then
++  if test x"$BOOST_SYSTEM_LIBS" = "x" -o x"$BOOST_SYSTEM_LDFLAGS" = "x"; then
+ if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;}
+@@ -17565,7 +17565,7 @@ boost_filesystem_save_LIBS=$LIBS
+ boost_filesystem_save_LDFLAGS=$LDFLAGS
+ LIBS="$LIBS $BOOST_SYSTEM_LIBS"
+ LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
+-if test x"$BOOST_FILESYSTEM_LIBS" == "x" -o x"$BOOST_FILESYSTEM_LDFLAGS" == "x"; then
++if test x"$BOOST_FILESYSTEM_LIBS" = "x" -o x"$BOOST_FILESYSTEM_LDFLAGS" = "x"; then
+ if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost filesystem library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost filesystem library" >&6;}
+@@ -17858,7 +17858,7 @@ LIBS=$boost_filesystem_save_LIBS
+ LDFLAGS=$boost_filesystem_save_LDFLAGS
+ 
+ 
+-if test x"$BOOST_SYSTEM_LIBS" == "x" -o x"$BOOST_SYSTEM_LDFLAGS" == "x"; then
++if test x"$BOOST_SYSTEM_LIBS" = "x" -o x"$BOOST_SYSTEM_LDFLAGS" = "x"; then
+ if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;}
+@@ -18158,7 +18158,7 @@ else
  
  fi
  
@@ -14,62 +41,80 @@ Adapt for mdds-1.0.
  
        CXXFLAGS="$CXXFLAGS -Werror"
  
-@@ -19229,7 +19229,7 @@ fi
- fi
+@@ -18401,7 +18401,7 @@ fi
+ 
+ if test "x$with_gnumeric_filter" != "xno"; then :
+ 
+-        if test x"$BOOST_IOSTREAMS_LIBS" == "x" -o x"$BOOST_IOSTREAMS_LDFLAGS" == "x"; then
++        if test x"$BOOST_IOSTREAMS_LIBS" = "x" -o x"$BOOST_IOSTREAMS_LDFLAGS" = "x"; then
+ if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost iostreams library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost iostreams library" >&6;}
+@@ -18694,7 +18694,7 @@ fi
+ 
+ if test "x$with_tools" != "xno"; then :
+ 
+-        if test x"$BOOST_PROGRAM_OPTIONS_LIBS" == "x" -o x"$BOOST_PROGRAM_OPTIONS_LDFLAGS" == "x"; then
++        if test x"$BOOST_PROGRAM_OPTIONS_LIBS" = "x" -o x"$BOOST_PROGRAM_OPTIONS_LDFLAGS" = "x"; then
+ if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost program_options library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost program_options library" >&6;}
+@@ -18982,7 +18982,7 @@ fi
+ 
+ 
  
- # ============
--# mdds support
-+# mdds-1.0 support
- # ============
- 
- pkg_failed=no
-@@ -19240,12 +19240,12 @@ if test -n "$MDDS_CFLAGS"; then
-     pkg_cv_MDDS_CFLAGS="$MDDS_CFLAGS"
+-        if test x"$BOOST_SYSTEM_LIBS" == "x" -o x"$BOOST_SYSTEM_LDFLAGS" == "x"; then
++        if test x"$BOOST_SYSTEM_LIBS" = "x" -o x"$BOOST_SYSTEM_LDFLAGS" = "x"; then
+ if test x"$boost_cv_inc_path" = xno; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost system library" >&5
+ $as_echo "$as_me: Boost not available, not searching for the Boost system library" >&6;}
+@@ -19769,12 +19769,12 @@ if test -n "$PYTHON_CFLAGS"; then
+     pkg_cv_PYTHON_CFLAGS="$PYTHON_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.11.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "mdds >= 0.11.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.0 >= 0.11.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "mdds-1.0 >= 0.11.0") 2>&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python3 >= 0.28\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "python3 >= 0.28") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-@PYVERSSUFFIX@ >= 0.28\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "python-@PYVERSSUFFIX@ >= 0.28") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
--  pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds >= 0.11.0" 2>/dev/null`
-+  pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds-1.0 >= 0.11.0" 2>/dev/null`
+-  pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python3 >= 0.28" 2>/dev/null`
++  pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-@PYVERSSUFFIX@ >= 0.28" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -19257,12 +19257,12 @@ if test -n "$MDDS_LIBS"; then
-     pkg_cv_MDDS_LIBS="$MDDS_LIBS"
+@@ -19786,12 +19786,12 @@ if test -n "$PYTHON_LIBS"; then
+     pkg_cv_PYTHON_LIBS="$PYTHON_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds >= 0.11.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "mdds >= 0.11.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.0 >= 0.11.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "mdds-1.0 >= 0.11.0") 2>&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python3 >= 0.28\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "python3 >= 0.28") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-@PYVERSSUFFIX@ >= 0.28\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "python-@PYVERSSUFFIX@ >= 0.28") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
--  pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds >= 0.11.0" 2>/dev/null`
-+  pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds-1.0 >= 0.11.0" 2>/dev/null`
+-  pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python3 >= 0.28" 2>/dev/null`
++  pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-@PYVERSSUFFIX@ >= 0.28" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -19283,14 +19283,14 @@ else
+@@ -19812,14 +19812,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
--              MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds >= 0.11.0" 2>&1`
-+              MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds-1.0 >= 0.11.0" 2>&1`
+-              PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python3 >= 0.28" 2>&1`
++              PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-@PYVERSSUFFIX@ >= 0.28" 2>&1`
          else
--              MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds >= 0.11.0" 2>&1`
-+              MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds-1.0 >= 0.11.0" 2>&1`
+-              PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python3 >= 0.28" 2>&1`
++              PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-@PYVERSSUFFIX@ >= 0.28" 2>&1`
          fi
        # Put the nasty error message in config.log where it belongs
-       echo "$MDDS_PKG_ERRORS" >&5
+       echo "$PYTHON_PKG_ERRORS" >&5
  
--      as_fn_error $? "Package requirements (mdds >= 0.11.0) were not met:
-+      as_fn_error $? "Package requirements (mdds-1.0 >= 0.11.0) were not met:
+-      as_fn_error $? "Package requirements (python3 >= 0.28) were not met:
++      as_fn_error $? "Package requirements (python-@PYVERSSUFFIX@ >= 0.28) were not met:
  
- $MDDS_PKG_ERRORS
+ $PYTHON_PKG_ERRORS

Prev by Date: CVS commit: pkgsrc/security/openssl
Next by Date: CVS commit: pkgsrc/misc/libreoffice
Previous by Thread: CVS commit: pkgsrc/security/openssl
Next by Thread: CVS commit: pkgsrc/misc/libreoffice
Indexes:

Home | Main Index | Thread Index | Old Index