Subject: Re: CVS commit: pkgsrc/mk
To: None <pkgsrc-changes@NetBSD.org>
From: Jukka Salmi <j+nbsd@2004.salmi.ch>
List: pkgsrc-changes
Date: 12/05/2004 17:12:01
--TybLhxa8M7aNoW+V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Krister Walfridsson --> pkgsrc-changes (2004-12-05 14:03:10 +0100):
>
>
> On Sun, 5 Dec 2004, grant beattie wrote:
>
> >
> >Module Name: pkgsrc
> >Committed By: grant
> >Date: Sun Dec 5 09:20:48 UTC 2004
> >
> >Modified Files:
> > pkgsrc/mk: bsd.options.mk
> >
> >Log Message:
> >add show-options target which displays the options available, default,
> >and enabled for the current pkg, eg. mail/sendmail:
> >
> >available: db2 db4 inet6 ldap sasl sasl2 socketmap starttls tcpwrappers
> >default: canna esound gif idea inet6 inet6 sj3 tcpwrappers wnn4
> >enabled: inet6 tcpwrappers
>
> This change gives me 100+ warnings of the type
> make: "../../mk/../../mk/bsd.options.mk" line 186: warning: Couldn't read
> shell's output for "echo | /usr/bin/xargs -n 1 | /usr/bin/sort"
> when starting a bulk build (you can see this by e.g. make clean in
> audio/bmp)
>
> Please fix this.
The applied patch should fix the problem.
HTH, Jukka
--
bashian roulette:
$ ((RANDOM%6)) || rm -rf ~
--TybLhxa8M7aNoW+V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="show-options.patch"
--- bsd.options.mk.bak 2004-12-05 13:36:52.000000000 +0100
+++ bsd.options.mk 2004-12-05 15:48:38.000000000 +0100
@@ -176,13 +176,13 @@
END { if (length(line) > 0) print " "line } \
'
-.if !defined(_PKG_OPTIONS_AVAILABLE)
+.if !defined(_PKG_OPTIONS_AVAILABLE) && !empty(PKG_SUPPORTED_OPTIONS)
_PKG_OPTIONS_AVAILABLE!= ${ECHO} ${PKG_SUPPORTED_OPTIONS} | ${XARGS} -n 1 | ${SORT}
.endif
-.if !defined(_PKG_OPTIONS_DEFAULT)
+.if !defined(_PKG_OPTIONS_DEFAULT) && !empty(PKG_DEFAULT_OPTIONS)
_PKG_OPTIONS_DEFAULT!= ${ECHO} ${PKG_DEFAULT_OPTIONS} | ${XARGS} -n 1 | ${SORT}
.endif
-.if !defined(_PKG_OPTIONS_ENABLED)
+.if !defined(_PKG_OPTIONS_ENABLED) && !empty(PKG_OPTIONS)
_PKG_OPTIONS_ENABLED!= ${ECHO} ${PKG_OPTIONS} | ${XARGS} -n 1 | ${SORT}
.endif
--TybLhxa8M7aNoW+V--