Joerg Sonnenberger: 21252: Dragonfly BSD support

13 files changed, 35 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 50c001974..b57652ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-11  Oliver Kiddle  <opk@zsh.org>
+
+	* Joerg Sonnenberger: 21252: configure.ac, Src/Modules/zpty.c,
+	Completion/BSD/Command/_chflags, Completion/Unix/Command/_apm,
+	Completion/Unix/Command/_cvs, Completion/Unix/Command/_ifconfig,
+	Completion/Unix/Command/_mount, Completion/Unix/Command/_mt,
+	Completion/Unix/Command/_sysctl, Completion/Unix/Type/_file_systems,
+	Completion/Unix/Type/_net_interfaces: Dragonfly BSD support
+
 2005-05-10  Oliver Kiddle  <opk@zsh.org>
 
 	* 21248: Doc/Zsh/mod_socket.yo: avoid use of subsection within
diff --git a/Completion/BSD/Command/_chflags b/Completion/BSD/Command/_chflags
index 569326b53..d6bcfe4b3 100644
--- a/Completion/BSD/Command/_chflags
+++ b/Completion/BSD/Command/_chflags
@@ -25,7 +25,7 @@ if (( ! EUID )); then
   unset own
 fi
 
-if [[ $OSTYPE = freebsd* ]]; then
+if [[ $OSTYPE = (freebsd|dragonfly)* ]]; then
   flags=( $flags[@]
     '(nouunlnk)uunlnk[set the user undeletable flag]'
     '(uunlnk)nouunlnk[unset the user undeletable flag]'
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index bb30d0e94..498ffdcaa 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -3,17 +3,18 @@ DISTFILES_SRC='
 _a2ps           _aap            _ant            _antiword       _apachectl      
 _apm            _arp            _arping         _attr           
 _baz	        _bison          _bittorrent     _bogofilter     _bzip2
-_cal            _cdcd           _cdrecord       _chkconfig      _chmod          
-_chown          _compress       _configure      _cpio           _cvs            
+_cal            _ccal           _cdcd           _cdrecord       _chkconfig
+_chmod          _chown          _compress       _configure      _cpio
+_cvs
 _darcs          _dd             _dict           _diff           _du             
 _dvi            _ecasound       _elinks         _elm            _enscript       
 _fakeroot       _fetchmail      _figlet         _find           _finger         
-_flex           _fsh            
+_flex           _fortune        _fsh            _fuser
 _gcc            _gdb            _getconf        _getent         _global         
 _gnu_generic    _gpg            _gphoto2        _gprof          _grep           
-_gs             _gzip           
+_groff          _gs             _gzip           
 _iconv          _ifconfig       _imagemagick    _init_d         _irssi          
-_ispell         _java           _joe            _killall         
+_ispell         _java           _joe            _killall        _knock 
 _last           _less           _links          _loadkeys       _look           
 _lp             _ls             _lsof           _lynx           _lzop           
 _mail           _make           _man            _mencal         _mh             
@@ -26,9 +27,9 @@ _printenv       _psutils        _python
 _raggle         _rar            _rcs            _renice         _rlogin         
 _rsync          _ruby           
 _sablotron      _samba          _sccs           _screen         _sed            
-_sh             _slrn           _socket         _spamassassin   _ssh            
-_strip          _stty           _su             _subversion     _sudo           
-_sysctl         
+_sh             _showmount      _slrn           _socket         _spamassassin
+_ssh            _strip          _stty           _su             _subversion
+_sudo           _surfraw        _sysctl         
 _tar            _telnet         _texinfo        _tidy           _tiff           
 _tin            _tla            
 _unace          _uniq           _user_admin     _vorbis         _vux            
diff --git a/Completion/Unix/Command/_apm b/Completion/Unix/Command/_apm
index efe50d713..e6179d676 100644
--- a/Completion/Unix/Command/_apm
+++ b/Completion/Unix/Command/_apm
@@ -11,7 +11,7 @@ if [[ $OSTYPE == linux* ]]; then
     '(-n --noignore)'{-n,--noignore}'[tell the system not to ignore system-generated APM message]' \
     '(-i --ignore)'{-i,--ignore}'[tell the system to ignore system-generated APM message]' && return
 
-elif [[ $OSTYPE == freebsd* ]]; then
+elif [[ $OSTYPE == (freebsd|dragonfly)* ]]; then
 
   _arguments \
     '-a[display AC line status]' \
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index 33d543945..3a8775c5e 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -7,7 +7,7 @@ _cvs() {
 
   # "+Qqrwtnlvb:T:e:d:Hfz:s:xa"
   case $OSTYPE in
-  freebsd*|openbsd*)
+  freebsd*|openbsd*|dragonfly*)
     extra='-R[read only access]'
     ;;
   esac
diff --git a/Completion/Unix/Command/_ifconfig b/Completion/Unix/Command/_ifconfig
index 977f99221..49b018841 100644
--- a/Completion/Unix/Command/_ifconfig
+++ b/Completion/Unix/Command/_ifconfig
@@ -19,7 +19,7 @@ case $OSTYPE in
       {,-}trailers {,-}link{0,1,2}
     )
   ;;
-  freebsd*)
+  freebsd*|dragonfly*)
     args=( -s $updown
       '(-a -l -u -d -m -L 1 *)-C[list interface cloners]'
       '(-l -C)-m[list supported media]'
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index 5d5f50163..302584122 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*)
+  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*)
+  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*)
+    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*)
+  freebsd*|dragonfly*)
     while read mline; do 
       case $mline[(w)1] in
 	\#* )
diff --git a/Completion/Unix/Command/_mt b/Completion/Unix/Command/_mt
index 738c63abf..01b27634f 100644
--- a/Completion/Unix/Command/_mt
+++ b/Completion/Unix/Command/_mt
@@ -44,7 +44,7 @@ if _pick_variant gnu=GNU unix --version; then
     'densities:explain some common density codes'
     'datcompression:enquire or set compression status'
   )
-elif [[ $OSTYPE = freebsd* ]]; then
+elif [[ $OSTYPE = (freebsd|dragonfly)* ]]; then
   cmds=( ${cmds:#(asf|eof):*}
     'smk:write specified number of setmarks at current position'
     'fss:forward space by specified number of setmarks'
diff --git a/Completion/Unix/Command/_sysctl b/Completion/Unix/Command/_sysctl
index b42c0bb23..99870b405 100644
--- a/Completion/Unix/Command/_sysctl
+++ b/Completion/Unix/Command/_sysctl
@@ -13,7 +13,7 @@ case $OSTYPE in
       '(-o)-x[show opaques as well (entire values)]' \
       '(-a)*:sysctl variable:_multi_parts -i . sysctlvars'
   ;;
-  freebsd[0-4].*|darwin*)
+  freebsd[0-4].*|darwin*|dragonfly*)
     : ${(A)_cache_sysctlvars:=${${$(sysctl -A 2>/dev/null):#[^a-z]*}%%:*}}
     _arguments -s -A "-*" \
       '(-w -X *)-a[list all]' \
diff --git a/Completion/Unix/Type/_file_systems b/Completion/Unix/Type/_file_systems
index 4c08dec01..d541fac15 100644
--- a/Completion/Unix/Type/_file_systems
+++ b/Completion/Unix/Type/_file_systems
@@ -16,9 +16,9 @@ case $OSTYPE in
   ;;
   osf*) fss=( advfs ufs nfs mfs cdfs ) ;;
   solaris*) fss=( ufs nfs hsfs s5fs pcfs cachefs tmpfs ) ;;
-  freebsd*)
+  freebsd*|dragonfly*)
     fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdos nfs 
-          ntfs null nwfs portal procfs std ufs umap union )
+          ntfs null nwfs portal procfs std udf ufs umap union )
   ;;
   *)
     # default for all other systems
diff --git a/Completion/Unix/Type/_net_interfaces b/Completion/Unix/Type/_net_interfaces
index 8897d427f..dc7898c3d 100644
--- a/Completion/Unix/Type/_net_interfaces
+++ b/Completion/Unix/Type/_net_interfaces
@@ -12,7 +12,7 @@ case $OSTYPE in
       disp=(-ld list)
     fi
   ;;
-  darwin*|freebsd*) intf=( $(ifconfig -l) ) ;;
+  darwin*|freebsd*|dragonfly*) intf=( $(ifconfig -l) ) ;;
   irix*) intf=( ${${${(f)"$(/usr/etc/netstat -i)"}%% *}[2,-1]} ) ;;
   linux*) intf=( /proc/sys/net/ipv4/conf/*~*(all|default)(N:t) ) ;;
   *) intf=( $(ifconfig -a|sed -n 's/^\([^ 	:]*\).*/\1/p') ) ;;
diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c
index fce09a02a..637d3e62f 100644
--- a/Src/Modules/zpty.c
+++ b/Src/Modules/zpty.c
@@ -246,15 +246,13 @@ get_pty(int master, int *retfd)
 #ifdef __linux
     static char char1[] = "abcdefghijklmnopqrstuvwxyz";
     static char char2[] = "0123456789abcdef";
-#else /* __linux */
-# ifdef __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
     static char char1[] = "pqrsPQRS";
     static char char2[] = "0123456789abcdefghijklmnopqrstuv";
-# else /* __FreeBSD__ */
+#else /* __FreeBSD__ || __DragonFly__ */
     static char char1[] = "pqrstuvwxyzPQRST";
     static char char2[] = "0123456789abcdef";
-# endif /* __FreeBSD__ */
-#endif /* __linux */
+#endif
 
     static char name[11];
     static int mfd, sfd;
diff --git a/configure.ac b/configure.ac
index 81d5fb2e4..11e119673 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2178,7 +2178,7 @@ char *argv[];
     esac
   fi
   case "$host_os" in
-    freebsd*|linux*|irix*|osf*|gnu*) 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}" ;;