Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Jul 2017 20:45:32 +0800
From:      Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.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:  <CAMHz58TYqewdrDqXE1oVAhE=k0gxb-bjp6WWELhbomXjfShmbg@mail.gmail.com>
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 Thu, Jul 20, 2017 at 5:59 PM, Vasil Dimov <vd@freebsd.org> wrote:

> Author: vd
> Date: Thu Jul 20 09:59:33 2017
> New Revision: 446255
> URL: https://svnweb.freebsd.org/changeset/ports/446255
>
> Log:
>   ftp/wget: Make installing docs optional
>

Hi there,

Could you please use MANPAGES option instead of DOCS ?
Thanks!

% grep MANPAGES /usr/ports/Mk/bsd.options.desc.mk
MANPAGES_DESC?=         Build and/or install manual pages

Regards,
sunpot


>
>   Submitted by: jkim
>
> Modified:
>   head/ftp/wget/Makefile
>   head/ftp/wget/pkg-plist
>
> Modified: head/ftp/wget/Makefile
> ============================================================
> ==================
> --- 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=       ${WRKSRC}/COPYING
>  TEST_DEPENDS=  p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
>                 p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
>
> -USES=          charsetfix cpe iconv makeinfo perl5 tar:xz
> -USE_PERL5=     build
> +USES=          charsetfix cpe iconv tar:xz
>  CPE_VENDOR=    gnu
>  GNU_CONFIGURE= yes
>  OPTIONS_SUB=   yes
>
>  OPTIONS_RADIO= SSL
>  OPTIONS_RADIO_SSL=GNUTLS OPENSSL
> -OPTIONS_DEFINE=        IPV6 NLS IDN METALINK PCRE PSL
> -OPTIONS_DEFAULT=OPENSSL IDN
> +OPTIONS_DEFINE=        DOCS IDN IPV6 METALINK NLS PCRE PSL
> +OPTIONS_DEFAULT=DOCS IDN OPENSSL
>
> -PCRE_DESC=     Support Perl regular expressions in addition to POSIX
> +DOCS_DESC=     Install sample config file, info page and man page
> +DOCS_INFO=     wget
> +DOCS_USE=      PERL5=build
> +DOCS_USES=     makeinfo perl5
>
> -IPV6_CONFIGURE_ENABLE= ipv6
> -
> -NLS_USES=              gettext
> -NLS_CONFIGURE_ENABLE=  nls
> -NLS_CPPFLAGS=          -I${LOCALBASE}/include
> -NLS_LDFLAGS=           -L${LOCALBASE}/lib
> -
>  IDN_LIB_DEPENDS=       libidn2.so:dns/libidn2 \
>                         libunistring.so:devel/libunistring
>  IDN_CPPFLAGS=          -I${LOCALBASE}/include
>  IDN_LDFLAGS=           -L${LOCALBASE}/lib
>  IDN_CONFIGURE_ENABLE=  iri
> -IDN_CONFIGURE_ON=      --with-libidn=${LOCALBASE}
> --with-libunistring-prefix=${LOCALBASE}
> +IDN_CONFIGURE_ON=      --with-libidn=${LOCALBASE} \
> +                       --with-libunistring-prefix=${LOCALBASE}
>  IDN_CONFIGURE_OFF=     --with-included-libunistring
>
> +IPV6_CONFIGURE_ENABLE= ipv6
> +
>  METALINK_CONFIGURE_WITH=metalink
>  METALINK_LIB_DEPENDS=  libmetalink.so:misc/libmetalink
>
> +NLS_USES=              gettext
> +NLS_CONFIGURE_ENABLE=  nls
> +NLS_CPPFLAGS=          -I${LOCALBASE}/include
> +NLS_LDFLAGS=           -L${LOCALBASE}/lib
> +
> +PCRE_DESC=             Support Perl regular expressions in addition to
> POSIX
>  PCRE_LIB_DEPENDS=      libpcre.so:devel/pcre
>  PCRE_CPPFLAGS=         -I${LOCALBASE}/include
>  PCRE_LDFLAGS=          -L${LOCALBASE}/lib
> @@ -71,15 +75,18 @@ LDFLAGS+=   -L${LOCALBASE}/lib
>  CONFIGURE_ARGS+=--without-ssl
>  .endif
>
> -INFO=          wget
> -
>  TEST_TARGET=   check
>
> -post-patch:
> +post-patch-DOCS-off:
> +       ${REINPLACE_CMD} -e '/^SUBDIRS = / s/ doc / /'
> ${WRKSRC}/Makefile.in
> +
> +post-patch-DOCS-on:
>         ${REINPLACE_CMD} -e 's,WGETRC = $$(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
>
>  .include <bsd.port.pre.mk>
>
>
> Modified: head/ftp/wget/pkg-plist
> ============================================================
> ==================
> --- 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
>  %%NLS%%share/locale/be/LC_MESSAGES/wget.mo
>  %%NLS%%share/locale/bg/LC_MESSAGES/wget.mo
>  %%NLS%%share/locale/ca/LC_MESSAGES/wget.mo
> _______________________________________________
> svn-ports-all@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58TYqewdrDqXE1oVAhE=k0gxb-bjp6WWELhbomXjfShmbg>