Wed May 17 19:34:26 2023 UTC ()
mk: restore 'fetch' as first preferred tool


(wiz)
diff -r1.430 -r1.431 pkgsrc/mk/bsd.prefs.mk
cvs diff -r1.430 -r1.431 pkgsrc/mk/bsd.prefs.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.prefs.mk 2023/05/17 09:44:11 1.430
+++ pkgsrc/mk/bsd.prefs.mk 2023/05/17 19:34:26 1.431
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.430 2023/05/17 09:44:11 wiz Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.431 2023/05/17 19:34:26 wiz Exp $
2# 2#
3# This file includes the mk.conf file, which contains the user settings. 3# This file includes the mk.conf file, which contains the user settings.
4# 4#
5# Packages should include this file before any of the .if directives, as 5# Packages should include this file before any of the .if directives, as
6# well as before modifying variables like CFLAGS, LDFLAGS, and so on. 6# well as before modifying variables like CFLAGS, LDFLAGS, and so on.
7# Otherwise the behavior may be unexpected. 7# Otherwise the behavior may be unexpected.
8# 8#
9# When mk.conf is included by this file, the following variables are 9# When mk.conf is included by this file, the following variables are
10# defined: 10# defined:
11# 11#
12# ACCEPTABLE_LICENSES 12# ACCEPTABLE_LICENSES
13# This variable is set to the list of Open Source licenses. See 13# This variable is set to the list of Open Source licenses. See
14# mk/license.mk for details. 14# mk/license.mk for details.
@@ -691,27 +691,29 @@ USE_TOOLS+= [ awk dirname echo grep pwd  @@ -691,27 +691,29 @@ USE_TOOLS+= [ awk dirname echo grep pwd
691# should eventually be moved into those particular package Makefiles. 691# should eventually be moved into those particular package Makefiles.
692# 692#
693USE_TOOLS+= date tr 693USE_TOOLS+= date tr
694 694
695# These are tools used directly by bsd.prefs.mk and files included by 695# These are tools used directly by bsd.prefs.mk and files included by
696# bsd.prefs.mk. 696# bsd.prefs.mk.
697# 697#
698USE_TOOLS+= awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc \ 698USE_TOOLS+= awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc \
699 sed:pkgsrc tr:pkgsrc uname:pkgsrc 699 sed:pkgsrc tr:pkgsrc uname:pkgsrc
700 700
701.include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk" 701.include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
702 702
703.if ${FETCH_USING} == "auto" 703.if ${FETCH_USING} == "auto"
704. if defined(TOOLS_PLATFORM.ftp) 704. if defined(TOOLS_PLATFORM.fetch)
 705FETCH_USING= fetch
 706. elif defined(TOOLS_PLATFORM.ftp)
705FETCH_USING= ftp 707FETCH_USING= ftp
706. elif defined(TOOLS_PLATFORM.curl) 708. elif defined(TOOLS_PLATFORM.curl)
707FETCH_USING= curl 709FETCH_USING= curl
708. elif defined(TOOLS_PLATFORM.wget) 710. elif defined(TOOLS_PLATFORM.wget)
709FETCH_USING= wget 711FETCH_USING= wget
710. else 712. else
711FETCH_USING= fetch 713FETCH_USING= fetch
712. endif 714. endif
713.endif 715.endif
714 716
715.if !defined(_PKGSRCDIR) 717.if !defined(_PKGSRCDIR)
716_PKGSRCDIR!= cd ${_PKGSRC_TOPDIR} && ${PWD_CMD} 718_PKGSRCDIR!= cd ${_PKGSRC_TOPDIR} && ${PWD_CMD}
717MAKEFLAGS+= _PKGSRCDIR=${_PKGSRCDIR:Q} 719MAKEFLAGS+= _PKGSRCDIR=${_PKGSRCDIR:Q}