Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Feb 2020 17:53:31 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r525184 - in head/textproc/docbook-to-man: . files
Message-ID:  <202002041753.014HrVwd092308@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Tue Feb  4 17:53:31 2020
New Revision: 525184
URL: https://svnweb.freebsd.org/changeset/ports/525184

Log:
  Convert to options helper
  
  - Update MASTER_SITES
  - Update header of patch files
  - Update WWW
  - Take maintainership

Modified:
  head/textproc/docbook-to-man/Makefile
  head/textproc/docbook-to-man/files/patch-Instant__Imakefile
  head/textproc/docbook-to-man/files/patch-Transpec__Imakefile
  head/textproc/docbook-to-man/files/patch-cmd__Imakefile
  head/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh
  head/textproc/docbook-to-man/pkg-descr

Modified: head/textproc/docbook-to-man/Makefile
==============================================================================
--- head/textproc/docbook-to-man/Makefile	Tue Feb  4 17:53:25 2020	(r525183)
+++ head/textproc/docbook-to-man/Makefile	Tue Feb  4 17:53:31 2020	(r525184)
@@ -5,10 +5,10 @@ PORTNAME=	docbook-to-man
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/tools/dtm/
+MASTER_SITES=	https://www.oasis-open.org/docbook/tools/dtm/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	DocBook SGML DTD into nroff/troff -man macros converter
 
 RUN_DEPENDS=	docbook>0:textproc/docbook
@@ -22,21 +22,19 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	OPENJADE
 OPENJADE_DESC=	Use OpenJade SGML/XML/DSSSL toolkit instead of Jade
 
-.include <bsd.port.options.mk>
+OPENJADE_RUN_DEPENDS=	onsgmls:textproc/openjade
+OPENJADE_RUN_DEPENDS_OFF=	nsgmls:textproc/jade
 
-.if ${PORT_OPTIONS:MOPENJADE}
-RUN_DEPENDS+=	onsgmls:textproc/openjade
-NSGMLS=		onsgmls
-.else
-RUN_DEPENDS+=	nsgmls:textproc/jade
-NSGMLS=		nsgmls
-.endif
-
 post-extract:
 	@${MV} ${WRKSRC}/Doc/instant.1 ${WRKSRC}/Instant/oinstant.man
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}| ; \
-		s|%%NSGMLS%%|${NSGMLS}|' ${WRKSRC}/cmd/docbook-to-man.sh
+	@${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>

Modified: head/textproc/docbook-to-man/files/patch-Instant__Imakefile
==============================================================================
--- head/textproc/docbook-to-man/files/patch-Instant__Imakefile	Tue Feb  4 17:53:25 2020	(r525183)
+++ head/textproc/docbook-to-man/files/patch-Instant__Imakefile	Tue Feb  4 17:53:31 2020	(r525184)
@@ -1,5 +1,5 @@
---- Instant/Imakefile.orig	Mon Jun 17 05:50:29 1996
-+++ Instant/Imakefile	Fri Oct  5 18:18:22 2001
+--- Instant/Imakefile.orig	1996-06-17 03:50:29 UTC
++++ Instant/Imakefile
 @@ -1,14 +1,18 @@
  #define IHaveSubdirs
  #define PassCDebugFlags
@@ -21,7 +21,7 @@
  DEFINES		= -DDEF_TPT_LIB=\"$(TPTLIB)\"
  
  SRCS	= main.c util.c info.c translate.c traninit.c tranvar.c tables.c \
-@@ -19,4 +23,4 @@
+@@ -19,4 +23,4 @@ OBJS	= main.o util.o info.o translate.o traninit.o tra
  MakeSubdirs($(SUBDIRS))
  DependSubdirs($(SUBDIRS))
  

Modified: head/textproc/docbook-to-man/files/patch-Transpec__Imakefile
==============================================================================
--- head/textproc/docbook-to-man/files/patch-Transpec__Imakefile	Tue Feb  4 17:53:25 2020	(r525183)
+++ head/textproc/docbook-to-man/files/patch-Transpec__Imakefile	Tue Feb  4 17:53:31 2020	(r525184)
@@ -1,5 +1,5 @@
---- Transpec/Imakefile.orig	Mon Jun 17 05:50:28 1996
-+++ Transpec/Imakefile	Fri Oct  5 18:20:17 2001
+--- Transpec/Imakefile.orig	1996-06-17 03:50:28 UTC
++++ Transpec/Imakefile
 @@ -1,5 +1,6 @@
 -ROOT =		/usr/local
 -TPTLIB =	$(ROOT)/lib/tpt

Modified: head/textproc/docbook-to-man/files/patch-cmd__Imakefile
==============================================================================
--- head/textproc/docbook-to-man/files/patch-cmd__Imakefile	Tue Feb  4 17:53:25 2020	(r525183)
+++ head/textproc/docbook-to-man/files/patch-cmd__Imakefile	Tue Feb  4 17:53:31 2020	(r525184)
@@ -1,5 +1,5 @@
---- cmd/Imakefile.orig	Mon Jun 17 05:50:30 1996
-+++ cmd/Imakefile	Fri Oct  5 18:18:22 2001
+--- cmd/Imakefile.orig	1996-06-17 03:50:30 UTC
++++ cmd/Imakefile
 @@ -1,4 +1,5 @@
 -ROOT =	/usr/local
 +PREFIX ?=	/usr/local

Modified: head/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh
==============================================================================
--- head/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh	Tue Feb  4 17:53:25 2020	(r525183)
+++ head/textproc/docbook-to-man/files/patch-cmd__docbook-to-man.sh	Tue Feb  4 17:53:31 2020	(r525184)
@@ -1,5 +1,5 @@
---- cmd/docbook-to-man.sh.orig	Mon Jun 17 05:50:30 1996
-+++ cmd/docbook-to-man.sh	Fri Oct  5 18:18:22 2001
+--- cmd/docbook-to-man.sh.orig	1996-06-17 03:50:30 UTC
++++ cmd/docbook-to-man.sh
 @@ -40,9 +40,9 @@
  # ***** change the following paths if your installation of nsgmls and / or
  # ***** DocBook isn't into the default places.
@@ -13,7 +13,7 @@
  
  
  # ***** modify the following line (to "=false") if you're not using the
-@@ -51,19 +51,16 @@
+@@ -51,19 +51,16 @@ DOCBOOK=$SGMLS/Davenport/dtd
  doElanPSInclude=true
  
  
@@ -35,7 +35,7 @@
  
  error=false
  
-@@ -159,17 +156,8 @@
+@@ -159,17 +156,8 @@ cat >> /tmp/dtm.$$.psinc <<\!
  .ds f4\"
  !
  

Modified: head/textproc/docbook-to-man/pkg-descr
==============================================================================
--- head/textproc/docbook-to-man/pkg-descr	Tue Feb  4 17:53:25 2020	(r525183)
+++ head/textproc/docbook-to-man/pkg-descr	Tue Feb  4 17:53:31 2020	(r525184)
@@ -1,4 +1,4 @@
-A batch converter that transforms UNIX-style manpages from the
-DocBook SGML DTD into nroff/troff -man macros.
+A batch converter that transforms UNIX-style manpages from the DocBook SGML DTD
+into nroff/troff -man macros.
 
-WWW: http://www.oasis-open.org/docbook/tools/dtm/
+WWW: https://www.oasis-open.org/docbook/tools/dtm/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002041753.014HrVwd092308>