From owner-svn-ports-head@FreeBSD.ORG Mon Dec 8 08:17:49 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C1E37A0; Mon, 8 Dec 2014 08:17:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18047B93; Mon, 8 Dec 2014 08:17:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB88Hmct058904; Mon, 8 Dec 2014 08:17:48 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB88HmSY058903; Mon, 8 Dec 2014 08:17:48 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201412080817.sB88HmSY058903@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 8 Dec 2014 08:17:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374237 - head/textproc/docproj X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 08:17:49 -0000 Author: hrs Date: Mon Dec 8 08:17:48 2014 New Revision: 374237 URL: https://svnweb.freebsd.org/changeset/ports/374237 QAT: https://qat.redports.org/buildarchive/r374237/ Log: - Fix dependency. - Use ${opt}_*_DEPENDS. - SVN off by default if svnlite is installed. - Fix USE_TEX[*] PR: 195340 [*] Modified: head/textproc/docproj/Makefile Modified: head/textproc/docproj/Makefile ============================================================================== --- head/textproc/docproj/Makefile Mon Dec 8 07:48:16 2014 (r374236) +++ head/textproc/docproj/Makefile Mon Dec 8 08:17:48 2014 (r374237) @@ -3,7 +3,7 @@ PORTNAME= docproj PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= # empty DISTFILES= # empty @@ -23,7 +23,7 @@ RUN_DEPENDS= links:${PORTSDIR}/www/links ${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \ docbook-xsl-ns>=1.78.1_4:${PORTSDIR}/textproc/docbook-xsl-ns \ ${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:${PORTSDIR}/textproc/iso-schematron-xslt \ - ${LOCALBASE}/share/xml/docbook/5.0:${PORTSDIR}/textproc/docbook-xml \ + ${LOCALBASE}/share/xml/docbook/catalog:${PORTSDIR}/textproc/docbook \ ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \ p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser \ zip:${PORTSDIR}/archivers/zip @@ -35,50 +35,39 @@ DEPENDS_ARGS+= BATCH=yes NO_BUILD= yes OPTIONS_DEFINE= X11 CJK SVN IGOR FOP JING DBLATEX -OPTIONS_DEFAULT= X11 CJK SVN IGOR -CJK_DESC= CJK (Simplified Chinese Language) support +OPTIONS_DEFAULT= X11 CJK IGOR +.if !exists(/usr/bin/svnlite) +OPTIONS_DEFAULT+= SVN +.endif +CJK_DESC= CJK support +CJK_RUN_DEPENDS= html2text:${PORTSDIR}/textproc/html2text SVN_DESC= Subversion support (required to check out sources) +SVN_RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion IGOR_DESC= Igor automated proofreader for documentation +IGOR_RUN_DEPENDS= igor:${PORTSDIR}/textproc/igor FOP_DESC= FOP PDF renderer (requires Java) +FOP_RUN_DEPENDS= fop:${PORTSDIR}/textproc/fop \ + ${FONTS} JING_DESC= Jing for advanced RELAX NG validation (optional) +JING_RUN_DEPENDS= jing:${PORTSDIR}/textproc/jing DBLATEX_DESC= dblatex PDF renderer (experimental, requires TeXLive) +DBLATEX_RUN_DEPENDS= dblatex:${PORTSDIR}/textproc/dblatex \ + ${FONTS} +DBLATEX_USE= TEX=xetex + +FONTS= ${LOCALBASE}/lib/X11/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \ + ${LOCALBASE}/lib/X11/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \ + ${LOCALBASE}/lib/X11/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \ + ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu +FONTS_CJK=${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \ + ${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa .include -.if ${PORT_OPTIONS:MSVN} -RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion -.endif - -.if ${PORT_OPTIONS:MIGOR} -RUN_DEPENDS+= igor:${PORTSDIR}/textproc/igor -.endif - -.if ${PORT_OPTIONS:MCJK} -RUN_DEPENDS+= html2text:${PORTSDIR}/textproc/html2text -.endif - -.if ${PORT_OPTIONS:MFOP} -RUN_DEPENDS+= fop:${PORTSDIR}/textproc/fop -.endif - -.if ${PORT_OPTIONS:MJING} -RUN_DEPENDS+= jing:${PORTSDIR}/textproc/jing -.endif - -.if ${PORT_OPTIONS:MDBLATEX} -USE_TEX= texlive xetex -RUN_DEPENDS+= dblatex:${PORTSDIR}/textproc/dblatex -.endif - .if ${PORT_OPTIONS:MFOP} || ${PORT_OPTIONS:MDBLATEX} ONLY_FOR_ARCHS= amd64 i386 -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit -RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu .if ${PORT_OPTIONS:MCJK} -RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf -RUN_DEPENDS+= ${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa +RUN_DEPENDS+= ${FONTS_CJK} .endif .endif