From nobody Tue Oct 29 14:42:47 2024 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 4XdCfH6Txtz5bY9R; Tue, 29 Oct 2024 14:42:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdCfH4yW4z4TPh; Tue, 29 Oct 2024 14:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730212967; 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=dvBgOQTWu2X+qd5veS0Fk4Hj3VZSSm5JCku2gra3TJI=; b=OBzmXgs4tKwxGTRw0RIMMQs9wofAejHTPpt6ZroUWAxSXvwy5gGXYERlZ6c875C1BKXQ+S j3AlR0++qLW+v35GC8LrOh6mRZwNprLq1X2cuaKGa3NtYQMNr3I1b6QJihR3GBVNY91hxJ uyryeN6BUIyu5H6zTHXrPVSgcdVutsiPT2a0Jzjc1QMbgGNB2VLioUKloAWmk9BUTgq1LY uKdmg8SEf1wG1FY3IlpLZiq6SNGwd2jB6cbxh7vjLmyF33gfKSt0Ws3+GJ6f20ny8iEoay Wig75a7Ph2udQrvrVxGjS17zKjET7ZpWIC0nyIL8lRR/8Rz6tZKZF/Tvw1OYrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730212967; 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=dvBgOQTWu2X+qd5veS0Fk4Hj3VZSSm5JCku2gra3TJI=; b=kpc9x9fhjSzFOo16dfddlH/PrM1RqfQPnMUxRFRlty6X+p3zieXpXxadCi9guI4NKoXwtz ZkZPbkHlqu8aJvB2Jlcyk/nZkBOPxHmz3rH99XXTVIHWFSIW9LY86+icAi2RafAwBCGvu0 LbQjIXEHRFrb8bbDspFTN5Xpj60HVm78xeYVn36942CeEm+yEcPg3zz5cUY8T+CGgQudSX KFtV1MCsYqx/YTzr2NQuUa97ecFsbZLHxiXa16BX3jKoyYXBz1wuznKPaoj7Yur110Zqdt TFxudCHNjJl2+Z2XFXR9fp+IXATFHr9yS0FrWRSBSZ1Wv3ViPOb/31yW/hbUZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730212967; a=rsa-sha256; cv=none; b=WBjxQOZ5uInT4IDeQEt0mox5RMLWnZjjQSDmudKdarST+EOxFR3EaZYOZ78mKbT1WtmnAZ AN2OxhGpFcK646uwBPCzawalPijsr18KOX3m3LIiXrK+EDevWtncQSzgiucXmlIB5XuTsG 1HLbekOTDTPGpdxHWCeklQnw3MNLPF72Dx4U4UI/tc9FO+WAX5OCJOgFeqxxLX9tigmefd kNGQMOxT+qfnXpdssYkliHjHnQqEoGB4sKdd+BF4gD0NwU69fqxqDLvmGjO5T38JLSlcYT QbUcGvUZNY/Ys77VHdodT6/nPIHp/2ZRYXeNZ1h+wTdmM/rqVIZrqh5RpuvLCQ== 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 4XdCfH4BMjzS4h; Tue, 29 Oct 2024 14:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49TEglBt069560; Tue, 29 Oct 2024 14:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TEglrS069557; Tue, 29 Oct 2024 14:42:47 GMT (envelope-from git) Date: Tue, 29 Oct 2024 14:42:47 GMT Message-Id: <202410291442.49TEglrS069557@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 2010fd9a6afe - main - textproc/docbook-to-man: Use openjade after jade deprecation (f9de5757c461e2dc78c9bac1788c44961ab995cb) 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2010fd9a6afe4e7201ac51c7eac0e96939d08adb Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2010fd9a6afe4e7201ac51c7eac0e96939d08adb commit 2010fd9a6afe4e7201ac51c7eac0e96939d08adb Author: Yasuhiro Kimura AuthorDate: 2024-10-29 14:21:41 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-10-29 14:38:54 +0000 textproc/docbook-to-man: Use openjade after jade deprecation (f9de5757c461e2dc78c9bac1788c44961ab995cb) - Remove OPENJADE option - Bump PORTREVISION for dependency change PR: 282097 --- textproc/docbook-to-man/Makefile | 19 +++---------------- .../docbook-to-man/files/patch-cmd__docbook-to-man.sh | 13 ++++--------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/textproc/docbook-to-man/Makefile b/textproc/docbook-to-man/Makefile index 04ce9a423a6f..79395dcd90a6 100644 --- a/textproc/docbook-to-man/Makefile +++ b/textproc/docbook-to-man/Makefile @@ -1,6 +1,6 @@ PORTNAME= docbook-to-man PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= https://www.oasis-open.org/docbook/tools/dtm/ DISTNAME= docbook-to-man @@ -11,30 +11,17 @@ WWW= https://www.oasis-open.org/docbook/tools/dtm/ LICENSE= MIT -RUN_DEPENDS= docbook>0:textproc/docbook +RUN_DEPENDS= docbook>=0:textproc/docbook \ + openjade>=0:textproc/openjade USES= imake MAKE_JOBS_UNSAFE= yes -# There are two ports that satisfy the nsgmls requirement. -# Jade is preferred, but OpenJade can be selected if needed. -OPTIONS_DEFINE= OPENJADE -OPENJADE_DESC= Use OpenJade SGML/XML/DSSSL toolkit instead of Jade - -OPENJADE_RUN_DEPENDS= onsgmls:textproc/openjade -OPENJADE_RUN_DEPENDS_OFF= nsgmls:textproc/jade - post-extract: @${MV} ${WRKSRC}/Doc/instant.1 ${WRKSRC}/Instant/oinstant.man post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/cmd/docbook-to-man.sh -post-patch-OPENJADE-off: - @${REINPLACE_CMD} -e 's|%%NSGMLS%%|nsgmls|' ${WRKSRC}/cmd/docbook-to-man.sh - -post-patch-OPENJADE-on: - @${REINPLACE_CMD} -e 's|%%NSGMLS%%|onsgmls|' ${WRKSRC}/cmd/docbook-to-man.sh - .include diff --git a/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh b/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh index fca24cb7fc0d..5003141911b3 100644 --- a/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh +++ b/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh @@ -13,18 +13,13 @@ # ***** modify the following line (to "=false") if you're not using the -@@ -51,19 +51,16 @@ DOCBOOK=$SGMLS/Davenport/dtd - doElanPSInclude=true - - -- - # Everything below this line should be pretty standard and not require - # modification. +@@ -57,13 +57,11 @@ doElanPSInclude=true #ulimit -c unlimited - PARSER=nsgmls +-PARSER=nsgmls -INSTANT=instant ++PARSER=onsgmls +INSTANT=oinstant INSTANT_OPT=-d @@ -35,7 +30,7 @@ error=false -@@ -159,17 +156,8 @@ cat >> /tmp/dtm.$$.psinc <<\! +@@ -159,17 +157,8 @@ cat >> /tmp/dtm.$$.psinc <<\! .ds f4\" !