summaryrefslogtreecommitdiff
path: root/converters/orcus
diff options
context:
space:
mode:
Diffstat (limited to 'converters/orcus')
-rw-r--r--converters/orcus/Makefile3
-rw-r--r--converters/orcus/distinfo4
-rw-r--r--converters/orcus/patches/patch-configure62
3 files changed, 65 insertions, 4 deletions
diff --git a/converters/orcus/Makefile b/converters/orcus/Makefile
index ae1213267c5..9c63c8a6fc4 100644
--- a/converters/orcus/Makefile
+++ b/converters/orcus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2015/09/08 19:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/13 08:46:02 wiz Exp $
DISTNAME= liborcus-0.9.2
PKGNAME= ${DISTNAME:S/lib//}
+PKGREVISION= 1
CATEGORIES= converters
MASTER_SITES= http://kohei.us/files/orcus/src/
EXTRACT_SUFX= .tar.xz
diff --git a/converters/orcus/distinfo b/converters/orcus/distinfo
index 0e027592121..f7a46b808a5 100644
--- a/converters/orcus/distinfo
+++ b/converters/orcus/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 01:43:51 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/02/13 08:46:02 wiz 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) = cfa852b78bba47d00bf3f5e939f2f7d185536bdb
+SHA1 (patch-configure) = 7577f013df36a42a68d04e14974a531059c7f1c8
diff --git a/converters/orcus/patches/patch-configure b/converters/orcus/patches/patch-configure
index a3af40b652a..0af1b729fda 100644
--- a/converters/orcus/patches/patch-configure
+++ b/converters/orcus/patches/patch-configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-configure,v 1.4 2015/09/08 19:40:59 wiz Exp $
+$NetBSD: patch-configure,v 1.5 2016/02/13 08:46:02 wiz Exp $
Fix unportable test(1) operator.
+Adapt for mdds-1.0.
--- configure.orig 2015-06-18 23:43:37.000000000 +0000
+++ configure
@@ -13,3 +14,62 @@ Fix unportable test(1) operator.
CXXFLAGS="$CXXFLAGS -Werror"
+@@ -19229,7 +19229,7 @@ fi
+ 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"
+ 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
+ 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`
+ 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"
+ 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
+ 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`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -19283,14 +19283,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`
+ 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`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MDDS_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:
+
+ $MDDS_PKG_ERRORS
+