git: 2010fd9a6afe - main - textproc/docbook-to-man: Use openjade after jade deprecation (f9de5757c461e2dc78c9bac1788c44961ab995cb)

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2010fd9a6afe4e7201ac51c7eac0e96939d08adb

commit 2010fd9a6afe4e7201ac51c7eac0e96939d08adb
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2024-10-29 14:21:41 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <bsd.port.mk>
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\"
  !