From owner-dev-commits-ports-all@freebsd.org Sun Jul 18 11:41:42 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 50A14669365; Sun, 18 Jul 2021 11:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GSNNk1jmXz3mhn; Sun, 18 Jul 2021 11:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 22D2F22678; Sun, 18 Jul 2021 11:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16IBfgX9041971; Sun, 18 Jul 2021 11:41:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16IBfgXv041970; Sun, 18 Jul 2021 11:41:42 GMT (envelope-from git) Date: Sun, 18 Jul 2021 11:41:42 GMT Message-Id: <202107181141.16IBfgXv041970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Danilo G. Baio" Subject: git: c3f97ed80607 - 2021Q3 - textproc/docproj: Remove legacy dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: c3f97ed8060755d07909ccd4bd232187a365bda5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 11:41:42 -0000 The branch 2021Q3 has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3f97ed8060755d07909ccd4bd232187a365bda5 commit c3f97ed8060755d07909ccd4bd232187a365bda5 Author: Danilo G. Baio AuthorDate: 2021-07-17 13:02:41 +0000 Commit: Danilo G. Baio CommitDate: 2021-07-18 11:40:23 +0000 textproc/docproj: Remove legacy dependencies Clean the current port for people just building the new documentation with Hugo/Asciidoctor. Keep the old dependencies list on a new port textproc/docproj-legacy. Reviewed by: hrs Approved by: doceng (with hat) Differential Revision: https://reviews.freebsd.org/D31019 (cherry picked from commit ffdb67aee0747f0465be6a2f0f897ddfac8ecaee) --- textproc/Makefile | 1 + textproc/docproj-legacy/Makefile | 73 +++++++++++++++++++++++++++++++++++++++ textproc/docproj-legacy/pkg-descr | 9 +++++ textproc/docproj/Makefile | 63 +++------------------------------ 4 files changed, 88 insertions(+), 58 deletions(-) diff --git a/textproc/Makefile b/textproc/Makefile index c7c6b3dc573a..fc8a74fff667 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -151,6 +151,7 @@ SUBDIR += docbook2odf SUBDIR += docbookrx SUBDIR += docproj + SUBDIR += docproj-legacy SUBDIR += dom4j SUBDIR += domc SUBDIR += dsssl-docbook-modular diff --git a/textproc/docproj-legacy/Makefile b/textproc/docproj-legacy/Makefile new file mode 100644 index 000000000000..3d16945b7ad5 --- /dev/null +++ b/textproc/docproj-legacy/Makefile @@ -0,0 +1,73 @@ +# Created by: Nik Clayton + +PORTNAME= docproj +PORTVERSION= 3.1 +CATEGORIES= textproc +PKGNAMESUFFIX= -legacy + +MAINTAINER= doceng@FreeBSD.org +COMMENT= Meta-port for the FreeBSD Legacy Documentation Project + +RUN_DEPENDS= ${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:textproc/xhtml \ + ${LOCALBASE}/share/xml/xmlcharent/catalog:textproc/xmlcharent \ + ${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:textproc/iso-schematron-xslt \ + docbook-xsl-ns>=1.78.1_4:textproc/docbook-xsl-ns \ + docbook>0:textproc/docbook \ + links:www/links1 \ + p5-XML-Parser>=2.41:textproc/p5-XML-Parser \ + peps:graphics/peps \ + pngtopnm:graphics/netpbm \ + scr2png:graphics/scr2png \ + scr2txt:textproc/scr2txt \ + xsltproc:textproc/libxslt \ + zip:archivers/zip + +USES= ghostscript:run metaport perl5 +USE_PERL5= run + +OPTIONS_DEFINE= CJK DBLATEX FOP GIT GROFF IGOR JING TRANSLATOR +OPTIONS_DEFAULT= CJK GIT GROFF IGOR TRANSLATOR + +CJK_DESC= CJK support +DBLATEX_DESC= dblatex PDF renderer (experimental, requires TeXLive) +FOP_DESC= FOP PDF renderer (requires Java) +GIT_DESC= Git support +GROFF_DESC= Groff support from ports +IGOR_DESC= Igor automated proofreader for documentation +JING_DESC= Jing for advanced RELAX NG validation +TRANSLATOR_DESC= Tools for translators + +CJK_RUN_DEPENDS= html2text:textproc/html2text +DBLATEX_RUN_DEPENDS= dblatex:textproc/dblatex +DBLATEX_USE= TEX=xetex +FOP_RUN_DEPENDS= ${_FONTS} \ + fop:textproc/fop +GIT_RUN_DEPENDS= git:devel/git +GROFF_USES= groff:run +IGOR_RUN_DEPENDS= igor:textproc/igor +JING_RUN_DEPENDS= jing:textproc/jing +TRANSLATOR_RUN_DEPENDS= itstool:textproc/itstool \ + msgcat:devel/gettext-tools + +_FONTS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:x11-fonts/dejavu \ + ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf \ + ${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-Regular.ttf:x11-fonts/gentium-plus \ + ${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:x11-fonts/lohit +_FONTS_CJK= ${LOCALBASE}/share/fonts/ipa/ipam.otf:japanese/font-ipa \ + ${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:korean/nanumfonts-ttf \ + ${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:chinese/arphicttf + +.include + +.if ${PORT_OPTIONS:MFOP} || ${PORT_OPTIONS:MDBLATEX} +ONLY_FOR_ARCHS= amd64 i386 +CJK_RUN_DEPENDS+= ${_FONTS_CJK} +.endif + +# generate MINIMALDOCPORTS for src/release/Makefile.inc.docports. +# (XXX: incomplete yet) +minimaldocports: + @${ECHO_CMD} "MINIMALDOCPORTS= \\" + @${MAKE} all-depends-list | ${SED} -e 's,^${PORTSDIR}/, ,' -e 's,$$, \\,' + +.include diff --git a/textproc/docproj-legacy/pkg-descr b/textproc/docproj-legacy/pkg-descr new file mode 100644 index 000000000000..35b52bfee1aa --- /dev/null +++ b/textproc/docproj-legacy/pkg-descr @@ -0,0 +1,9 @@ +The FreeBSD Documentation Project maintains the FAQ, Handbook and tutorials. + +This package does not contain anything by itself -- it is a +"meta-port" that depends on other text processing packages. Its sole +purpose is to require dependencies so users can install this package only +and have all the Documentation Project stuff pulled in by the port/package +dependency mechanism. + +WWW: https://www.freebsd.org/docproj diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile index f31a57b2c90f..b51aff598dcb 100644 --- a/textproc/docproj/Makefile +++ b/textproc/docproj/Makefile @@ -1,78 +1,25 @@ -# Created by: Nik Clayton - PORTNAME= docproj -PORTVERSION= 3.0 -PORTREVISION= 1 +PORTVERSION= 4.0 CATEGORIES= textproc MAINTAINER= doceng@FreeBSD.org COMMENT= Meta-port for the FreeBSD Documentation Project RUN_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \ - ${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:textproc/xhtml \ - ${LOCALBASE}/share/xml/xmlcharent/catalog:textproc/xmlcharent \ - ${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:textproc/iso-schematron-xslt \ - docbook-xsl-ns>=1.78.1_4:textproc/docbook-xsl-ns \ - docbook>0:textproc/docbook \ hugo:www/gohugo \ - links:www/links1 \ - p5-XML-Parser>=2.41:textproc/p5-XML-Parser \ - peps:graphics/peps \ - pngtopnm:graphics/netpbm \ rougify:textproc/rubygem-rouge \ - scr2png:graphics/scr2png \ - scr2txt:textproc/scr2txt \ - xsltproc:textproc/libxslt \ - zip:archivers/zip -USES= ghostscript:run metaport perl5 python:3.6+,run -USE_PERL5= run +USES= metaport python:3.6+,run -OPTIONS_DEFINE= CJK DBLATEX FOP GIT GROFF IGOR JING PDF TRANSLATOR -OPTIONS_DEFAULT= CJK GIT GROFF IGOR PDF TRANSLATOR +OPTIONS_DEFINE= GIT IGOR PDF TRANSLATOR +OPTIONS_DEFAULT= GIT IGOR PDF TRANSLATOR -CJK_DESC= CJK support -DBLATEX_DESC= dblatex PDF renderer (experimental, requires TeXLive) -FOP_DESC= FOP PDF renderer (requires Java) -GIT_DESC= Git support -GROFF_DESC= Groff support from ports IGOR_DESC= Igor automated proofreader for documentation -JING_DESC= Jing for advanced RELAX NG validation TRANSLATOR_DESC= Tools for translators -CJK_RUN_DEPENDS= html2text:textproc/html2text -DBLATEX_RUN_DEPENDS= dblatex:textproc/dblatex -DBLATEX_USE= TEX=xetex -FOP_RUN_DEPENDS= ${_FONTS} \ - fop:textproc/fop GIT_RUN_DEPENDS= git:devel/git -GROFF_USES= groff:run IGOR_RUN_DEPENDS= igor:textproc/igor -JING_RUN_DEPENDS= jing:textproc/jing PDF_RUN_DEPENDS= asciidoctor-pdf:textproc/rubygem-asciidoctor-pdf -TRANSLATOR_RUN_DEPENDS= itstool:textproc/itstool \ - msgcat:devel/gettext-tools \ - po4a>=0.63_1:textproc/po4a - -_FONTS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:x11-fonts/dejavu \ - ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf \ - ${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-Regular.ttf:x11-fonts/gentium-plus \ - ${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:x11-fonts/lohit -_FONTS_CJK= ${LOCALBASE}/share/fonts/ipa/ipam.otf:japanese/font-ipa \ - ${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:korean/nanumfonts-ttf \ - ${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:chinese/arphicttf - -.include - -.if ${PORT_OPTIONS:MFOP} || ${PORT_OPTIONS:MDBLATEX} -ONLY_FOR_ARCHS= amd64 i386 -CJK_RUN_DEPENDS+= ${_FONTS_CJK} -.endif - -# generate MINIMALDOCPORTS for src/release/Makefile.inc.docports. -# (XXX: incomplete yet) -minimaldocports: - @${ECHO_CMD} "MINIMALDOCPORTS= \\" - @${MAKE} all-depends-list | ${SED} -e 's,^${PORTSDIR}/, ,' -e 's,$$, \\,' +TRANSLATOR_RUN_DEPENDS= po4a>=0.63_1:textproc/po4a .include