ports/186481: [PATCH] textproc/docbook-utils stage support

Eero Hänninen fax at nohik.ee
Wed Feb 5 14:10:00 UTC 2014


>Number:         186481
>Category:       ports
>Synopsis:       [PATCH] textproc/docbook-utils stage support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 05 14:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Eero Hänninen
>Release:        10.0-RELEASE
>Organization:
>Environment:
FreeBSD sneezy 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014     root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
- stage support
- added LICENSE
- fixed CONFLICTS
- added AUTOTOOLS
- fix USES
- convert NOPORTDOCS to MDOCS

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN docbook-utils.orig/Makefile docbook-utils/Makefile
--- docbook-utils.orig/Makefile	2013-09-21 02:17:30.000000000 +0300
+++ docbook-utils/Makefile	2014-02-05 15:56:07.000000000 +0200
@@ -11,6 +11,8 @@
 MAINTAINER=	gabor at FreeBSD.org
 COMMENT=	Generates various output formats from DocBook SGML documents
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \
 		${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular \
 		nsgmls:${PORTSDIR}/textproc/jade
@@ -19,31 +21,21 @@
 		sgmlspl:${PORTSDIR}/textproc/p5-SGMLSpm \
 		lynx:${PORTSDIR}/www/lynx
 
-CONFLICTS=	docbook2X-*
+CONFLICTS=	docbook2X-[0-9]*
 
-USES=		perl5
+USES=		perl5 gmake
 USE_PERL5=	run
 USE_TEX=	jadetex
+USE_AUTOTOOLS=	autoconf aclocal automake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 MAKE_ARGS+=	docdir="${DOCSDIR}" htmldir="${DOCSDIR}/html"
 
-MAN1=		jw.1 sgmldiff.1 docbook2man-spec.pl.1 docbook2texi-spec.pl.1
-MAN7=		backend-spec.7 frontend-spec.7
-MLINKS=		jw.1 docbook2dvi.1 \
-		jw.1 docbook2html.1 \
-		jw.1 docbook2man.1 \
-		jw.1 docbook2pdf.1 \
-		jw.1 docbook2ps.1 \
-		jw.1 docbook2rtf.1 \
-		jw.1 docbook2tex.1 \
-		jw.1 docbook2texi.1 \
-		jw.1 docbook2txt.1
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
+OPTIONS_DEFINE=	DOCS
+
+OPTIONS_DEFAULT=	DOCS
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/sgml/catalog|${PREFIX}/share/sgml/catalog|g' \
 		${WRKSRC}/doc/HTML/Makefile.in
@@ -51,12 +43,13 @@
 			-e 's|/usr/bin/|${LOCALBASE}/bin/|g' \
 			${WRKSRC}/doc/refentry/*.sgml \
 			${WRKSRC}/backends/txt
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|SUBDIRS = refentry man HTML|SUBDIRS = refentry man|' \
-			${WRKSRC}/doc/Makefile.in
+.if ! ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e 's|SUBDIRS = refentry man HTML|SUBDIRS = refentry man|g' \
+			${WRKSRC}/doc/Makefile.am
 .endif
 
-pre-configure:
-	${RM} -f ${WRKSRC}/config.cache
+pre-install:
+	@${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' \
+	${WRKSRC}/bin/sgmldiff
 
 .include <bsd.port.mk>
diff -ruN docbook-utils.orig/pkg-plist docbook-utils/pkg-plist
--- docbook-utils.orig/pkg-plist	2014-01-22 17:16:56.000000000 +0200
+++ docbook-utils/pkg-plist	2014-02-05 15:40:15.000000000 +0200
@@ -9,6 +9,33 @@
 bin/docbook2txt
 bin/jw
 bin/sgmldiff
+man/man1/docbook2dvi.1.gz
+man/man1/docbook2html.1.gz
+man/man1/docbook2man-spec.pl.1.gz
+man/man1/docbook2man.1.gz
+man/man1/docbook2pdf.1.gz
+man/man1/docbook2ps.1.gz
+man/man1/docbook2rtf.1.gz
+man/man1/docbook2tex.1.gz
+man/man1/docbook2texi-spec.pl.1.gz
+man/man1/docbook2texi.1.gz
+man/man1/jw.1.gz
+man/man1/sgmldiff.1.gz
+man/man7/backend-spec.7.gz
+man/man7/frontend-spec.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/html/api.html
+%%PORTDOCS%%%%DOCSDIR%%/html/backend-spec.html
+%%PORTDOCS%%%%DOCSDIR%%/html/docbook2man.html
+%%PORTDOCS%%%%DOCSDIR%%/html/docbook2texi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fdl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/frontend-spec.html
+%%PORTDOCS%%%%DOCSDIR%%/html/helpers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/intro-jw.html
+%%PORTDOCS%%%%DOCSDIR%%/html/intro-sgmldiff.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jw.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sgmldiff.html
 share/sgml/docbook/utils-0.6.14/backends/dvi
 share/sgml/docbook/utils-0.6.14/backends/html
 share/sgml/docbook/utils-0.6.14/backends/man
@@ -18,12 +45,14 @@
 share/sgml/docbook/utils-0.6.14/backends/tex
 share/sgml/docbook/utils-0.6.14/backends/texi
 share/sgml/docbook/utils-0.6.14/backends/txt
+share/sgml/docbook/utils-0.6.14/docbook-utils.dsl
 share/sgml/docbook/utils-0.6.14/frontends/docbook
 share/sgml/docbook/utils-0.6.14/helpers/docbook2man-spec.pl
 share/sgml/docbook/utils-0.6.14/helpers/docbook2texi-spec.pl
-share/sgml/docbook/utils-0.6.14/docbook-utils.dsl
- at dirrm share/sgml/docbook/utils-0.6.14/backends
- at dirrm share/sgml/docbook/utils-0.6.14/frontends
- at dirrm share/sgml/docbook/utils-0.6.14/helpers
- at dirrm share/sgml/docbook/utils-0.6.14
+ at dirrmtry share/sgml/docbook/utils-0.6.14/helpers
+ at dirrmtry share/sgml/docbook/utils-0.6.14/frontends
+ at dirrmtry share/sgml/docbook/utils-0.6.14/backends
+ at dirrmtry share/sgml/docbook/utils-0.6.14
 @dirrmtry share/sgml/docbook
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list