Date: Wed, 26 Jul 2017 05:02:41 +0000 (UTC) From: Vasil Dimov <vd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446640 - head/ftp/wget Message-ID: <201707260502.v6Q52fSP085887@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vd Date: Wed Jul 26 05:02:41 2017 New Revision: 446640 URL: https://svnweb.freebsd.org/changeset/ports/446640 Log: ftp/wget: Tweak docs options * Add a separate option to control whether man page is to be installed * Handle wgetrc.sample with @sample, according to https://www.freebsd.org/doc/en/books/porters-handbook/plist-config.html and https://www.freebsd.org/doc/en/books/porters-handbook/plist-keywords.html#plist-keywords-sample * Now the DOCS option only controls whether an info page is installed or not Submitted by: jkim Modified: head/ftp/wget/Makefile head/ftp/wget/pkg-plist Modified: head/ftp/wget/Makefile ============================================================================== --- head/ftp/wget/Makefile Wed Jul 26 04:51:26 2017 (r446639) +++ head/ftp/wget/Makefile Wed Jul 26 05:02:41 2017 (r446640) @@ -3,6 +3,7 @@ PORTNAME= wget DISTVERSION= 1.19.1 +PORTREVISION= 1 CATEGORIES= ftp www ipv6 MASTER_SITES= GNU @@ -22,13 +23,13 @@ OPTIONS_SUB= yes OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL=GNUTLS OPENSSL -OPTIONS_DEFINE= DOCS IDN IPV6 METALINK NLS PCRE PSL -OPTIONS_DEFAULT=DOCS IDN OPENSSL +OPTIONS_DEFINE= DOCS IDN IPV6 MANPAGES METALINK NLS PCRE PSL +OPTIONS_DEFAULT=DOCS IDN IPV6 MANPAGES NLS OPENSSL -DOCS_DESC= Install sample config file, info page and man page +DOCS_DESC= Install info page +DOCS_CONFIGURE_ENV= MAKEINFO="${LOCALBASE}/bin/makeinfo" DOCS_INFO= wget -DOCS_USE= PERL5=build -DOCS_USES= makeinfo perl5 +DOCS_USES= makeinfo IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring @@ -41,6 +42,10 @@ IDN_CONFIGURE_OFF= --with-included-libunistring IPV6_CONFIGURE_ENABLE= ipv6 +MANPAGES_CONFIGURE_ENV_OFF= ac_cv_path_POD2MAN=no +MANPAGES_USE= PERL5=build +MANPAGES_USES= perl5 + METALINK_CONFIGURE_WITH=metalink METALINK_LIB_DEPENDS= libmetalink.so:misc/libmetalink @@ -77,16 +82,20 @@ CONFIGURE_ARGS+=--without-ssl TEST_TARGET= check -post-patch-DOCS-off: - ${REINPLACE_CMD} -e '/^SUBDIRS = / s/ doc / /' ${WRKSRC}/Makefile.in - -post-patch-DOCS-on: +# Executed regardless of whether DOCS is ON or OFF. +post-patch: ${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.info \ ${WRKSRC}/doc/wget.texi + +post-patch-DOCS-off: + ${REINPLACE_CMD} \ + -e '/^all: wget.info/ s,wget.info,,' \ + -e '/^all-am:/ s, $$(INFO_DEPS),,' \ + -e '/^install-data-am:/ s, install-info-am,,' \ + ${WRKSRC}/doc/Makefile.in .include <bsd.port.pre.mk> Modified: head/ftp/wget/pkg-plist ============================================================================== --- head/ftp/wget/pkg-plist Wed Jul 26 04:51:26 2017 (r446639) +++ head/ftp/wget/pkg-plist Wed Jul 26 05:02:41 2017 (r446640) @@ -1,6 +1,4 @@ -bin/wget -%%DOCS%%etc/wgetrc.sample -%%DOCS%%man/man1/wget.1.gz +%%MANPAGES%%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 @@ -40,3 +38,5 @@ bin/wget %%NLS%%share/locale/vi/LC_MESSAGES/wget.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/wget.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/wget.mo +@sample etc/wgetrc.sample +bin/wget
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707260502.v6Q52fSP085887>