Date: Thu, 20 Jul 2017 06:23:00 -0600 From: Adam Weinberger <adamw@adamw.org> To: Vasil Dimov <vd@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r446255 - head/ftp/wget Message-ID: <DEAA35A0-1749-48AA-80A7-9080388106A2@adamw.org> In-Reply-To: <201707200959.v6K9xXZB054747@repo.freebsd.org> References: <201707200959.v6K9xXZB054747@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 20 Jul, 2017, at 3:59, Vasil Dimov <vd@FreeBSD.org> wrote: >=20 > Author: vd > Date: Thu Jul 20 09:59:33 2017 > New Revision: 446255 > URL: https://svnweb.freebsd.org/changeset/ports/446255 >=20 > Log: > ftp/wget: Make installing docs optional >=20 > Submitted by: jkim >=20 > Modified: > head/ftp/wget/Makefile > head/ftp/wget/pkg-plist >=20 > Modified: head/ftp/wget/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/ftp/wget/Makefile Thu Jul 20 09:39:07 2017 = (r446254) > +++ head/ftp/wget/Makefile Thu Jul 20 09:59:33 2017 = (r446255) > @@ -15,37 +15,41 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING > TEST_DEPENDS=3D p5-HTTP-Daemon>=3D0:www/p5-HTTP-Daemon \ > p5-IO-Socket-SSL>=3D0:security/p5-IO-Socket-SSL >=20 > -USES=3D charsetfix cpe iconv makeinfo perl5 tar:xz > -USE_PERL5=3D build > +USES=3D charsetfix cpe iconv tar:xz > CPE_VENDOR=3D gnu > GNU_CONFIGURE=3D yes > OPTIONS_SUB=3D yes >=20 > OPTIONS_RADIO=3D SSL > OPTIONS_RADIO_SSL=3DGNUTLS OPENSSL > -OPTIONS_DEFINE=3D IPV6 NLS IDN METALINK PCRE PSL > -OPTIONS_DEFAULT=3DOPENSSL IDN > +OPTIONS_DEFINE=3D DOCS IDN IPV6 METALINK NLS PCRE PSL > +OPTIONS_DEFAULT=3DDOCS IDN OPENSSL >=20 > -PCRE_DESC=3D Support Perl regular expressions in addition to POSIX > +DOCS_DESC=3D Install sample config file, info page and man page > +DOCS_INFO=3D wget > +DOCS_USE=3D PERL5=3Dbuild > +DOCS_USES=3D makeinfo perl5 >=20 > -IPV6_CONFIGURE_ENABLE=3D ipv6 > - > -NLS_USES=3D gettext > -NLS_CONFIGURE_ENABLE=3D nls > -NLS_CPPFLAGS=3D -I${LOCALBASE}/include > -NLS_LDFLAGS=3D -L${LOCALBASE}/lib > - > IDN_LIB_DEPENDS=3D libidn2.so:dns/libidn2 \ > libunistring.so:devel/libunistring > IDN_CPPFLAGS=3D -I${LOCALBASE}/include > IDN_LDFLAGS=3D -L${LOCALBASE}/lib > IDN_CONFIGURE_ENABLE=3D iri > -IDN_CONFIGURE_ON=3D --with-libidn=3D${LOCALBASE} = --with-libunistring-prefix=3D${LOCALBASE} > +IDN_CONFIGURE_ON=3D --with-libidn=3D${LOCALBASE} \ > + --with-libunistring-prefix=3D${LOCALBASE} > IDN_CONFIGURE_OFF=3D --with-included-libunistring >=20 > +IPV6_CONFIGURE_ENABLE=3D ipv6 > + > METALINK_CONFIGURE_WITH=3Dmetalink > METALINK_LIB_DEPENDS=3D libmetalink.so:misc/libmetalink >=20 > +NLS_USES=3D gettext > +NLS_CONFIGURE_ENABLE=3D nls > +NLS_CPPFLAGS=3D -I${LOCALBASE}/include > +NLS_LDFLAGS=3D -L${LOCALBASE}/lib > + > +PCRE_DESC=3D Support Perl regular expressions in addition to = POSIX > PCRE_LIB_DEPENDS=3D libpcre.so:devel/pcre > PCRE_CPPFLAGS=3D -I${LOCALBASE}/include > PCRE_LDFLAGS=3D -L${LOCALBASE}/lib > @@ -71,15 +75,18 @@ LDFLAGS+=3D -L${LOCALBASE}/lib > CONFIGURE_ARGS+=3D--without-ssl > .endif >=20 > -INFO=3D wget > - > TEST_TARGET=3D check >=20 > -post-patch: > +post-patch-DOCS-off: > + ${REINPLACE_CMD} -e '/^SUBDIRS =3D / s/ doc / /' = ${WRKSRC}/Makefile.in > + > +post-patch-DOCS-on: > ${REINPLACE_CMD} -e 's,WGETRC =3D = $$(sysconfdir)/wgetrc,&.sample,' \ > ${WRKSRC}/doc/Makefile.in > ${REINPLACE_CMD} -e = 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \ > - ${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi = ${WRKSRC}/doc/wget.info > + ${WRKSRC}/doc/sample.wgetrc* \ > + ${WRKSRC}/doc/wget.info \ > + ${WRKSRC}/doc/wget.texi >=20 > .include <bsd.port.pre.mk> >=20 >=20 > Modified: head/ftp/wget/pkg-plist > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/ftp/wget/pkg-plist Thu Jul 20 09:39:07 2017 = (r446254) > +++ head/ftp/wget/pkg-plist Thu Jul 20 09:59:33 2017 = (r446255) > @@ -1,6 +1,6 @@ > bin/wget > -etc/wgetrc.sample > -man/man1/wget.1.gz > +%%DOCS%%etc/wgetrc.sample > +%%DOCS%%man/man1/wget.1.gz Manpages should never be controlled by DOCS. The manage should be = installed unconditionally. # Adam --=20 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?DEAA35A0-1749-48AA-80A7-9080388106A2>