From owner-svn-ports-all@freebsd.org Fri Jul 6 18:53:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CA1F104521A; Fri, 6 Jul 2018 18:53:23 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E7B390F80; Fri, 6 Jul 2018 18:53:21 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7DD74B94; Fri, 6 Jul 2018 18:53:21 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w66IrLTL054419; Fri, 6 Jul 2018 18:53:21 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w66IrL68054418; Fri, 6 Jul 2018 18:53:21 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201807061853.w66IrL68054418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 6 Jul 2018 18:53:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474031 - head/textproc/docproj X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: head/textproc/docproj X-SVN-Commit-Revision: 474031 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jul 2018 18:53:23 -0000 Author: swills Date: Fri Jul 6 18:53:21 2018 New Revision: 474031 URL: https://svnweb.freebsd.org/changeset/ports/474031 Log: textproc/docproj: fix dependency check with groff Make using groff from ports an option that's forced on if groff isn't present in base. While here, sort options. PR: 229566 Submitted by: Dries Michiels Modified: head/textproc/docproj/Makefile (contents, props changed) Modified: head/textproc/docproj/Makefile ============================================================================== --- head/textproc/docproj/Makefile Fri Jul 6 18:53:15 2018 (r474030) +++ head/textproc/docproj/Makefile Fri Jul 6 18:53:21 2018 (r474031) @@ -3,7 +3,7 @@ PORTNAME= docproj PORTVERSION= 2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= textproc MAINTAINER= doceng@FreeBSD.org @@ -21,32 +21,36 @@ RUN_DEPENDS= links:www/links1 \ docbook>0:textproc/docbook \ ${LOCALBASE}/share/xml/xmlcharent/catalog:textproc/xmlcharent \ p5-XML-Parser>=2.41:textproc/p5-XML-Parser \ - zip:archivers/zip \ - groff:textproc/groff + zip:archivers/zip USES= ghostscript:run metaport perl5 USE_PERL5= run -OPTIONS_DEFINE= DBLATEX CJK FOP IGOR JING SVN TRANSLATOR -OPTIONS_DEFAULT= CJK IGOR TRANSLATOR +OPTIONS_DEFINE= CJK DBLATEX FOP GROFF IGOR JING SVN TRANSLATOR +OPTIONS_DEFAULT= CJK IGOR TRANSLATOR +.if !exists(/usr/bin/groff) +OPTIONS_DEFAULT+= GROFF +.endif .if !exists(/usr/bin/svnlite) OPTIONS_DEFAULT+= SVN .endif + CJK_DESC= CJK support CJK_RUN_DEPENDS= html2text:textproc/html2text -SVN_DESC= Subversion support (required to check out sources) -SVN_RUN_DEPENDS= svn:devel/subversion -IGOR_DESC= Igor automated proofreader for documentation -IGOR_RUN_DEPENDS= igor:textproc/igor +DBLATEX_DESC= dblatex PDF renderer (experimental, requires TeXLive) +DBLATEX_RUN_DEPENDS= dblatex:textproc/dblatex \ +DBLATEX_USE= TEX=xetex FOP_DESC= FOP PDF renderer (requires Java) FOP_RUN_DEPENDS= fop:textproc/fop \ ${FONTS} +GROFF_DESC= Groff support from ports +GROFF_RUN_DEPENDS= ${LOCALBASE}/bin/groff:textproc/groff +IGOR_DESC= Igor automated proofreader for documentation +IGOR_RUN_DEPENDS= igor:textproc/igor JING_DESC= Jing for advanced RELAX NG validation JING_RUN_DEPENDS= jing:textproc/jing -DBLATEX_DESC= dblatex PDF renderer (experimental, requires TeXLive) -DBLATEX_RUN_DEPENDS= dblatex:textproc/dblatex \ - ${FONTS} -DBLATEX_USE= TEX=xetex +SVN_DESC= Subversion support from ports +SVN_RUN_DEPENDS= svn:devel/subversion TRANSLATOR_DESC= Tools for translators TRANSLATOR_RUN_DEPENDS= itstool:textproc/itstool \ msgcat:devel/gettext-tools