Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Jul 2018 18:53:21 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r474031 - head/textproc/docproj
Message-ID:  <201807061853.w66IrL68054418@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <driesm.michiels@gmail.com>

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



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