diff options
author | jaapb <jaapb@pkgsrc.org> | 2013-08-24 16:12:10 +0000 |
---|---|---|
committer | jaapb <jaapb@pkgsrc.org> | 2013-08-24 16:12:10 +0000 |
commit | a704d10ffbfbdeaab83cd2de3e76bce1c2f7d0fc (patch) | |
tree | 85fc2dbcd3a7174df832a13a5dc7e799c08a5aa9 /converters/orcus/patches | |
parent | 6a86bb598cff8e2ae6e1e51e0346f9e321dc2657 (diff) | |
download | pkgsrc-a704d10ffbfbdeaab83cd2de3e76bce1c2f7d0fc.tar.gz |
Packaged converters/orcus, a library that deals with spreadsheet documents
(libreoffice dependency).
Diffstat (limited to 'converters/orcus/patches')
-rw-r--r-- | converters/orcus/patches/patch-bin_pack-release.sh | 14 | ||||
-rw-r--r-- | converters/orcus/patches/patch-configure | 23 | ||||
-rw-r--r-- | converters/orcus/patches/patch-src_parser_Makefile.am | 14 |
3 files changed, 51 insertions, 0 deletions
diff --git a/converters/orcus/patches/patch-bin_pack-release.sh b/converters/orcus/patches/patch-bin_pack-release.sh new file mode 100644 index 00000000000..b027cd98c46 --- /dev/null +++ b/converters/orcus/patches/patch-bin_pack-release.sh @@ -0,0 +1,14 @@ +$NetBSD: patch-bin_pack-release.sh,v 1.1 2013/08/24 16:12:10 jaapb Exp $ + +Use proper test equality operator +--- bin/pack-release.sh.orig 2012-09-07 17:44:34.000000000 +0000 ++++ bin/pack-release.sh +@@ -23,7 +23,7 @@ popd > /dev/null + + tar jcvfh $PACKAGE $DIR + +-if [ "$1" == "md5" ]; then ++if [ "$1" = "md5" ]; then + # prefix the package name with md5 sum. + MD5SUM=`md5sum $PACKAGE | sed -e 's/\ .*//g'` + mv $PACKAGE $MD5SUM-$PACKAGE diff --git a/converters/orcus/patches/patch-configure b/converters/orcus/patches/patch-configure new file mode 100644 index 00000000000..a18cbf53d86 --- /dev/null +++ b/converters/orcus/patches/patch-configure @@ -0,0 +1,23 @@ +$NetBSD: patch-configure,v 1.1 2013/08/24 16:12:10 jaapb Exp $ + +Remove tac linuxism and use tail -r instead +--- configure.orig 2013-04-13 01:56:48.000000000 +0000 ++++ configure +@@ -15667,7 +15667,7 @@ $as_echo "#define HAVE_BOOST_SYSTEM /**/ + + LDFLAGS_SAVE=$LDFLAGS + if test "x$ax_boost_user_system_lib" = "x"; then +- for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do ++ for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tail -r` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +@@ -15715,7 +15715,7 @@ fi + + done + if test "x$link_system" != "xyes"; then +- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do ++ for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tail -r` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 diff --git a/converters/orcus/patches/patch-src_parser_Makefile.am b/converters/orcus/patches/patch-src_parser_Makefile.am new file mode 100644 index 00000000000..eeb008731fb --- /dev/null +++ b/converters/orcus/patches/patch-src_parser_Makefile.am @@ -0,0 +1,14 @@ +$NetBSD: patch-src_parser_Makefile.am,v 1.1 2013/08/24 16:12:10 jaapb Exp $ + +Link boost library properly +--- src/parser/Makefile.am.orig 2013-04-12 14:25:03.000000000 +0000 ++++ src/parser/Makefile.am +@@ -18,7 +18,7 @@ liborcus_parser_@ORCUS_API_VERSION@_la_S + zip_archive.cpp \ + zip_archive_stream.cpp + +-liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined ++liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined -lboost_system + liborcus_parser_@ORCUS_API_VERSION@_la_LIBADD = \ + $(ZLIB_LIBS) + |