CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Oct 14 07:53:57 UTC 2024

Modified Files:
        pkgsrc/mk: bsd.prefs.mk

Log Message:
mk: Support mktool with FETCH_USING=auto.

Users no longer have to explicitly specify FETCH_USING=mktool, but can still
override either way if necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.451 -r1.452 pkgsrc/mk/bsd.prefs.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.451 pkgsrc/mk/bsd.prefs.mk:1.452
--- pkgsrc/mk/bsd.prefs.mk:1.451        Thu Jul 11 01:50:10 2024
+++ pkgsrc/mk/bsd.prefs.mk      Mon Oct 14 07:53:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.451 2024/07/11 01:50:10 riastradh Exp $
+# $NetBSD: bsd.prefs.mk,v 1.452 2024/10/14 07:53:56 jperkin Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -836,7 +836,9 @@ USE_TOOLS+= awk:pkgsrc cut:pkgsrc echo:p
 .include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
 
 .if ${FETCH_USING} == "auto"
-.  if defined(TOOLS_PLATFORM.fetch)
+.  if defined(TOOLS_PLATFORM.mktool)
+FETCH_USING=   mktool
+.  elif defined(TOOLS_PLATFORM.fetch)
 FETCH_USING=   fetch
 .  elif defined(TOOLS_PLATFORM.ftp)
 FETCH_USING=   ftp