From nobody Tue Feb 01 00:49:08 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D9E28198058C; Tue, 1 Feb 2022 00:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JnmXN5RW6z4b0T; Tue, 1 Feb 2022 00:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643676548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TytKMh0gaHJQD01YzKi0BXGpG+exKiH631RFwOm/Co0=; b=VjKtMb6MQOlK3LSzURkCrKJ8QF//iu5ipBUqyH/OXvt+pm1WYoaFdugAknAU/aXgI2S9Fg wqsHUTSb++xfEj+W6OQbsNQ3tMLR5ZSorW2/AWoynaSp/f+HC/Ta7N6lJb/mBYFyDMiMAZ ZYt7IqM34YhyEC/75ZZImfy+2peojQDBYcQ8XZmAIgc2GXpDgos7e3g22jNnVkTQWxgjMa iLhdwGR6myCU4Nggj3/cQdVL0bt1ATOyCSoPlJExvIGwP+wpMJ3LCSR6v6k4sA4jAvnXEI BzcX7X4zAK7DTAYjpoYouje58LW6XhFxMsKQ5uSOpyUtlBA4zlZi9hZ9R783/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9173826802; Tue, 1 Feb 2022 00:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2110n8EM073340; Tue, 1 Feb 2022 00:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2110n8MC073339; Tue, 1 Feb 2022 00:49:08 GMT (envelope-from git) Date: Tue, 1 Feb 2022 00:49:08 GMT Message-Id: <202202010049.2110n8MC073339@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: a318fc309b73 - main - devel/rsvndump: Unbreak following 3f32ccaefa18 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a318fc309b7361934ffcaca7525e8a4314877b5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643676548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TytKMh0gaHJQD01YzKi0BXGpG+exKiH631RFwOm/Co0=; b=bUZvuqu12xOJpCRYD45jG1dCSwXtMZNqJyFB/CIuYtE5wzUWJYid4GDYR5LSiH5IEbsfSK ZtXn7KjN6A4K8cPXAwyx/+SrUdoQwuWpAUP95Z9Bbb87xsVnZVdf/sIjwLuJtm7KtNacMH WwyFs5g/9uLPjSS+5LULb+liRqPKiX2cPvuSGEwUfxRsX7hGKpelA0ZyJn2E70P4xXb/ch HIoFFjj3eUEByPCiVqV54UU8QH1yDV4GZ8pZAPhQMQcUHP3am5Bevh3W7FMwIEbb8dbtAV oN8Eeur0t21AaWw0V/dLSP13bXp8Eqrre/VNN6f06oL2Vf+zpjXsO4cP2ZdX2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643676548; a=rsa-sha256; cv=none; b=KIvRjn0YbVu6XJdvq4dpguV7SMSh/iI/Mh73srUKu0XVZCYbvOO5Dz7WZ1rza9YZudeEz1 gcwMt3BLsOz9jYwaZ8nBqL1Kw0Ef/qpw13r6UwzwmbImhsvp0Xamv1poxFV6iFiPIaj3pl Q+IrDMohOMt8wzqjQH3hguEmYFpzOXTZkcvFcBr+peY9TsGOxvm2BCy+DQNeS2nTLyxy/8 T5TcR5m621DWr1PzWjfyqDcD18osMi/bAsPkzNqkq1DdX1yke5N1bjqxrCYLRD7tX0jSdN BLtq28gzzuzMVSiL92o6n8dWtSkAtN23n6yEn5DgPj5Jhw6Uptbw97iDSvYcSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a318fc309b7361934ffcaca7525e8a4314877b5b commit a318fc309b7361934ffcaca7525e8a4314877b5b Author: Cy Schubert AuthorDate: 2022-02-01 00:46:42 +0000 Commit: Cy Schubert 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