From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 5 14:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5BE23C0 for ; Wed, 5 Feb 2014 14:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9EB4E1CD5 for ; Wed, 5 Feb 2014 14:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s15EA0OR006398 for ; Wed, 5 Feb 2014 14:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s15EA0dK006397; Wed, 5 Feb 2014 14:10:00 GMT (envelope-from gnats) Resent-Date: Wed, 5 Feb 2014 14:10:00 GMT Resent-Message-Id: <201402051410.s15EA0dK006397@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Eero Hänninen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2908C168 for ; Wed, 5 Feb 2014 14:04:38 +0000 (UTC) Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 01A0F1C9C for ; Wed, 5 Feb 2014 14:04:38 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s15E4boC094407 for ; Wed, 5 Feb 2014 14:04:37 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s15E4bhn094406; Wed, 5 Feb 2014 14:04:37 GMT (envelope-from nobody) Message-Id: <201402051404.s15E4bhn094406@oldred.freebsd.org> Date: Wed, 5 Feb 2014 14:04:37 GMT From: Eero Hänninen To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/186481: [PATCH] textproc/docbook-utils stage support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Feb 2014 14:10:00 -0000 >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@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@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 -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 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 -@dirrm share/sgml/docbook/utils-0.6.14/backends -@dirrm share/sgml/docbook/utils-0.6.14/frontends -@dirrm share/sgml/docbook/utils-0.6.14/helpers -@dirrm share/sgml/docbook/utils-0.6.14 +@dirrmtry share/sgml/docbook/utils-0.6.14/helpers +@dirrmtry share/sgml/docbook/utils-0.6.14/frontends +@dirrmtry share/sgml/docbook/utils-0.6.14/backends +@dirrmtry share/sgml/docbook/utils-0.6.14 @dirrmtry share/sgml/docbook +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: