Date: Fri, 27 Dec 2019 23:27:52 -0700 From: Adam Weinberger <adamw@adamw.org> To: Marius Strobl <marius@freebsd.org> Cc: ports-committers <ports-committers@freebsd.org>, svn-ports-all <svn-ports-all@freebsd.org>, svn-ports-head <svn-ports-head@freebsd.org> Subject: Re: svn commit: r521031 - head/devel/cvs Message-ID: <CAP7rwcjfY9%2BsX2P=HTe7c8vmL82rsxA8boM82v44h0KVrN9TNQ@mail.gmail.com> In-Reply-To: <201912272252.xBRMqUpA026584@repo.freebsd.org> References: <201912272252.xBRMqUpA026584@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Dec 27, 2019 at 3:52 PM Marius Strobl <marius@freebsd.org> wrote: > > Author: marius > Date: Fri Dec 27 22:52:29 2019 > New Revision: 521031 > URL: https://svnweb.freebsd.org/changeset/ports/521031 > > Log: > - Turn building and installation of cvs info documentation into an option > (default-on but allowing to get rid of indexinfo and texinfo dependencies). > - Pet portlint. > > Modified: > head/devel/cvs/Makefile > > Modified: head/devel/cvs/Makefile > ============================================================================== > --- head/devel/cvs/Makefile Fri Dec 27 22:24:05 2019 (r521030) > +++ head/devel/cvs/Makefile Fri Dec 27 22:52:29 2019 (r521031) > @@ -11,19 +11,22 @@ COMMENT?= Version control system > > LICENSE= GPLv2+ > > +USES= cpe shebangfix tar:xz uidfix > + > CONFLICTS_INSTALL?= cvs+ipv6-[12]* cvs-devel-[12]* > > -OPTIONS_DEFINE= IPV6 KERBEROS EXAMPLES > -OPTIONS_DEFAULT=KERBEROS > +OPTIONS_DEFINE= INFO IPV6 KERBEROS EXAMPLES > +OPTIONS_DEFAULT=INFO KERBEROS > .if !make(makesum) > OPTIONS_EXCLUDE?=IPV6 > .endif > > +INFO_INFO= cvs cvsclient > +INFO_USES= makeinfo > IPV6_PATCH_SITES= LOCAL/ume > IPV6_PATCHFILES= ${DISTNAME}-v6-20140105.diff.gz:-p1 > KERBEROS_MAKE_ARGS= KERBEROS_SUPPORT=yes > > -USES= cpe makeinfo shebangfix tar:xz uidfix > CPE_VENDOR= gnu > SHEBANG_FILES= contrib/clmerge contrib/cln_hist \ > contrib/commit_prep contrib/cvs_acls \ > @@ -32,7 +35,6 @@ SHEBANG_FILES= contrib/clmerge contrib/cln_hist \ > contrib/rcslock > PATCH_WRKSRC= ${WRKDIR}/call/cvs > WRKSRC= ${WRKDIR}/call/cvs-build > -INFO= cvs cvsclient > > # bsd.stage.makes sets the wrong value for DESTDIR > DESTDIRNAME= NADA Unless I'm misreading this, this will work in poudriere but not necessarily in ports. If texinfo is installed but INFO is off, the info files will be built and staged but not present in the plist. Is there a configure knob you could leverage to shut off info build/install? # Adam -- Adam Weinberger adamw@adamw.org https://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAP7rwcjfY9%2BsX2P=HTe7c8vmL82rsxA8boM82v44h0KVrN9TNQ>