Merge branch 'master' into change_default_path

NEWS

@@ -5,13 +5,18 @@ For a more comprehensive changelog of the latest experimental code, see:
 | fink HEAD
 \-------------
 
-	* Fix finding cups headers on 10.14+
 	* Move default install path to /opt/sw
 
 /-------------
 | fink 0.45.x
 \-------------
 
+0.45.1 "Fumarole" (2020-03-28)
+
+	* Fix finding cups headers on 10.14+
+	* Support 10.15.2 - 10.15.4
+	* Support user shells running zsh
+
 0.45.0 "Funicular" (2019-08-05)
 	* Support 10.14.5, 10.14.6, and 10.15
 	* Fully support .app bundles on APFS systems
@@ -797,7 +802,7 @@ Bug fixes
 
 0.24.22 "Lupus" (2006-06-27)
 
-0.24.21 "Bo�tes" (2006-06-23)
+0.24.21 "Boötes" (2006-06-23)
 
 0.24.20 (2006-06-23)
 	again quickly replaced

pathsetup.sh.in

@@ -2,7 +2,7 @@
 #
 # Shell script for preparing the user's shell startup scripts for Fink.
 # Copyright (c) 2003-2005 Martin Costabel
-# Copyright (c) 2003-2016 The Fink Package Manager Team
+# Copyright (c) 2003-2020 The Fink Package Manager Team
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -20,7 +20,7 @@
 #
 
 
-# This version is tested for csh type user login shells and for bash, 
+# This version is tested for csh type user login shells, for bash, and for zsh.
 # for other sh type shells it does nothing.
 
 # Function declarations:
@@ -278,8 +278,29 @@ else
 	esac
 	display_choose_do
     ;;
+    zsh)
+    # Only zsh here; other sh type shells are not supported
+        SOURCECMD="test -r @PREFIX@/bin/init.sh && . @PREFIX@/bin/init.sh"
+        if [ -f $HOME/.zprofile ]; then
+	    RC=.zprofile
+        elif [ -f $HOME/.zlogin ]; then
+	    RC=.zlogin
+	else
+	    RC=new
+	fi
+	case $RC in
+	  new)
+	    RC=.zlogin
+	    MSG=msg_create
+	  ;;
+	  *)
+	    MSG=msg_append
+	  ;;
+	esac
+	display_choose_do
+    ;;
     *)
-    # Any shell except *csh and bash
+    # Any shell except *csh, bash, and zsh
 	Result="\n
 Since you have changed your login shell to $LOGINSHELL,
 I am confident that you know what you are doing.\n

perlmod/Fink/Bootstrap.pm

@@ -257,7 +257,7 @@ GCC_MSG
 			"of Mac OS X might work with Fink, but there are no " .
 			"guarantees.");
 		$distribution = "10.14.5";
-	} elsif ($host =~ /^i386-apple-darwin19\.[0]/) {
+	} elsif ($host =~ /^i386-apple-darwin19\.[0-6]/) {
 		&print_breaking("This system is supported and tested.");
 		$distribution = "10.15";
 	} elsif ($host =~ /^i386-apple-darwin19\./) {