From 1bc6747457b4afac2e10e1c67964711cb90e6e01 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Mon, 5 Dec 2005 14:22:52 +0000
Subject: 22050: fixes for Debian GNU/kfreebsd

---
 ChangeLog                       | 4 ++++
 Completion/Unix/Command/_mount  | 8 ++++----
 Completion/Unix/Command/_sysctl | 2 +-
 Completion/Unix/Type/_locales   | 2 +-
 configure.ac                    | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36f137b57..ef55dcf8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-05  Oliver Kiddle  <opk@zsh.org>
 
+	* 22050: configure.ac, Completion/Unix/Command/_mount,
+	Completion/Unix/Command/_sysctl, Completion/Unix/Type/_locales:
+	fixes for Debian GNU/kfreebsd
+
 	* 21712: Completion/Unix/Command/_date: include fallback for
 	where $OSTYPE is not matched
 
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index f19da0869..987838465 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -475,7 +475,7 @@ if (( ! $+_fs_any )); then
       'swidth[specify stripe width]:size'
     )
     ;;
-  freebsd*|dragonfly*)
+  *freebsd*|dragonfly*)
     _fs_any=(
       '(sync)async[do all I/O asynchronously]'
       'current[use current options on already mounted file system]'
@@ -630,7 +630,7 @@ if [[ "$service" = mount ]]; then
     deffs=hsfs
     typeops=-F
     ;;
-  freebsd*|dragonfly*)
+  *freebsd*|dragonfly*)
     args=( -s
       '(:)-a[mount all filesystems in fstab]'
       '-d[cause everything to be done except for the actual system call]'      
@@ -704,7 +704,7 @@ else
 	'*:dev or dir:->udevordir'
       )
     ;;
-    freebsd*|dragonfly*)
+    *freebsd*|dragonfly*)
       args=(
 	'(*)-a[unmount all mounted file systems]'
 	'-A[unmount all mounted file systems except the root]'
@@ -766,7 +766,7 @@ devordir)
   fi
 
   case "$OSTYPE" in
-  freebsd*|dragonfly*)
+  *freebsd*|dragonfly*)
     while read mline; do 
       case $mline[(w)1] in
 	\#* )
diff --git a/Completion/Unix/Command/_sysctl b/Completion/Unix/Command/_sysctl
index 99870b405..36b579bc7 100644
--- a/Completion/Unix/Command/_sysctl
+++ b/Completion/Unix/Command/_sysctl
@@ -1,7 +1,7 @@
 #compdef sysctl
 
 case $OSTYPE in
-  freebsd[5-9].*|freebsd4.[4-9]*)
+  *freebsd[5-9].*|freebsd4.[4-9]*)
     local -a sysctlvars
     sysctlvars=( $(sysctl -aN) )
     _arguments -s -A "-*" \
diff --git a/Completion/Unix/Type/_locales b/Completion/Unix/Type/_locales
index e809667d1..a449ebe16 100644
--- a/Completion/Unix/Type/_locales
+++ b/Completion/Unix/Type/_locales
@@ -4,7 +4,7 @@ local expl locales
 
 if (( $+commands[locale] )); then
   locales=( $(_call_program locales locale -a) )
-  [[ $OSTYPE = linux-gnu ]] && locales=( ${locales/utf8/UTF-8} )
+  [[ $OSTYPE = *-gnu ]] && locales=( ${locales/utf8/UTF-8} )
 else
   locales=( /usr/lib/locale/*(:t) )
 fi
diff --git a/configure.ac b/configure.ac
index 7510ce84b..7905ae42b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2261,7 +2261,7 @@ char *argv[];
     esac
   fi
   case "$host_os" in
-    freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
+    *freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
     sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
     sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
     netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
@@ -2285,7 +2285,7 @@ char *argv[];
   esac
   case "$host" in
     *-hpux*)  EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
-    *-freebsd[3-9]*|*-linux*|gnu*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
+    *-freebsd[3-9]*|*-kfreebsd*|*-linux*|gnu*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
     *openbsd*)
        if test $zsh_cv_sys_elf = yes; then
 	 EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}"
-- 
cgit 1.4.1