Date: Tue, 1 Feb 2022 00:49:08 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a318fc309b73 - main - devel/rsvndump: Unbreak following 3f32ccaefa18 Message-ID: <202202010049.2110n8MC073339@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a318fc309b7361934ffcaca7525e8a4314877b5b commit a318fc309b7361934ffcaca7525e8a4314877b5b Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2022-02-01 00:46:42 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2022-02-01 00:49:03 +0000 devel/rsvndump: Unbreak following 3f32ccaefa18 The check for asciidoc version was horribly broken. Fix it. While at it $ver_min is not used. Don't produce it. --- devel/rsvndump/Makefile | 2 -- devel/rsvndump/files/patch-configure | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile index 42353bde2605..bbe0c2099811 100644 --- a/devel/rsvndump/Makefile +++ b/devel/rsvndump/Makefile @@ -11,8 +11,6 @@ COMMENT= Remote Subversion repository dumpfile generator LICENSE= GPLv2 -BROKEN= fails to build with asciidoc >= 10 - USES= bdb LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ libgdbm.so:databases/gdbm \ diff --git a/devel/rsvndump/files/patch-configure b/devel/rsvndump/files/patch-configure index 245f588dd3f2..c8b99264c0aa 100644 --- a/devel/rsvndump/files/patch-configure +++ b/devel/rsvndump/files/patch-configure @@ -1,6 +1,16 @@ ---- configure.orig 2012-05-14 20:40:27 UTC -+++ configure -@@ -3977,9 +3977,9 @@ fi +--- configure.orig 2012-05-14 13:40:27.000000000 -0700 ++++ configure 2022-01-31 16:46:09.229670000 -0800 +@@ -3970,16 +3970,16 @@ + as_fn_error $? "Asciidoc could not be located in your \$PATH" "$LINENO" 5 + fi + ver_info=`$ASCIIDOC --version` +- ver_maj=`echo $ver_info | sed 's/^.* \([0-9]\)*\.\([0-9]\)*\.\([0-9]*\).*$/\1/'` +- ver_min=`echo $ver_info | sed 's/^.* \([0-9]\)*\.\([0-9]\)*\.\([0-9]*\).*$/\2/'` +- ver_rev=`echo $ver_info | sed 's/^.* \([0-9]\)*\.\([0-9]\)*\.\([0-9]*\).*$/\3/'` ++ ver_maj=`echo $ver_info | sed 's/^.* \([0-9]\*)\.\([0-9]\)*\.\([0-9]*\).*$/\1/'` ++# ver_min=`echo $ver_info | sed 's/^.* \([0-9]\*)\.\([0-9]\)*\.\([0-9]*\).*$/\2/'` ++ ver_rev=`echo $ver_info | sed 's/^.* \([0-9]\*)\.\([0-9]\)*\.\([0-9]*\).*$/\3/'` + prog_version_ok="yes" if test $ver_maj -lt 8; then prog_version_ok="no" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202010049.2110n8MC073339>