Do rest of splits, add symlinking for files defining multiple completions.

23 files changed, 957 insertions, 207 deletions

diff --git a/completions/.gitignore b/completions/.gitignore
new file mode 100644
index 00000000..c7e9660d
--- /dev/null
+++ b/completions/.gitignore
@@ -0,0 +1,191 @@
+a2x
+aclocal-1.11
+alpine
+alternatives
+animate
+apropos
+arch
+asciidoc.py
+autoheader
+automake-1.11
+autossh
+autoupdate
+btdownloadcurses.py
+btdownloadgui.py
+c++
+cc
+cdrecord
+change_pw
+check_db
+ci
+ciptool
+civclient
+civserver
+clone_member
+co
+compare
+compgen
+composite
+config_list
+conjure
+cowthink
+createdb
+dcop
+declare
+dfutool
+display
+dpkg-deb
+dpkg-reconfigure
+dropdb
+edquota
+filebucket
+find_member
+freeciv-sdl
+freeciv-xaw
+g++
+g4
+g77
+gcj
+gkrellm2
+gmake
+gmplayer
+gnumake
+gpc
+hciattach
+hciconfig
+host
+hping
+hping3
+identify
+ifdown
+ifstatus
+import
+inject
+javac
+javadoc
+kplayer
+l2ping
+lbzip2
+ldapadd
+ldapcompare
+ldapdelete
+ldapmodify
+ldapmodrdn
+ldappasswd
+ldapwhoami
+lintian-info
+list_admins
+list_members
+list_owners
+lvchange
+lvcreate
+lvdisplay
+lvextend
+lvmdiskscan
+lvreduce
+lvremove
+lvrename
+lvresize
+lvs
+lvscan
+mailsnarf
+mdecrypt
+mencoder
+mkisofs
+modinfo
+modprobe
+mogrify
+montage
+mplayer2
+msgsnarf
+muttng
+ncal
+newlist
+pbzip2
+pccardctl
+perldoc
+phing
+pidof
+pigz
+pinfo
+ping6
+pkg_deinstall
+pkg_info
+pkill
+pm-suspend
+pm-suspend-hybrid
+pmake
+postalias
+puppetca
+puppetd
+puppetdoc
+puppetmasterd
+puppetqd
+puppetrun
+pvchange
+pvcreate
+pvdisplay
+pvmove
+pvremove
+pvs
+pvscan
+pxz
+python2
+python3
+quotacheck
+quotaoff
+quotaon
+ralsh
+rcsdiff
+rdict
+remove_members
+repquota
+rfcomm
+rlog
+rmlist
+rpm2targz
+rpm2txz
+rpmbuild
+rpmbuild-md5
+sbcl-mt
+scp
+sdptool
+setquota
+sftp
+slogin
+smbcacls
+smbcquotas
+smbget
+smbpasswd
+smbtar
+smbtree
+spovray
+stream
+sync_members
+tightvncviewer
+tracepath6
+typeset
+umount
+vgcfgbackup
+vgcfgrestore
+vgchange
+vgck
+vgconvert
+vgdisplay
+vgexport
+vgextend
+vgimport
+vgmerge
+vgmknodes
+vgreduce
+vgremove
+vgrename
+vgs
+vgscan
+vgsplit
+vigr
+whatis
+withlist
+xpovray
+xvnc4viewer
+ypcat
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 2a8f3e1f..e0887d50 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -1,6 +1,7 @@
 bashcompdir = $(pkgdatadir)/completions
 bashcomp_DATA = abook \
 		aclocal \
+		add_members \
 		alias \
 		ant \
 		apache2ctl \
@@ -18,9 +19,7 @@ bashcomp_DATA = abook \
 		autorpm \
 		autoscan \
 		badblocks \
-		bind-utils \
 		bk \
-		bluez \
 		brctl \
 		btdownloadheadless.py \
 		bzip2 \
@@ -42,6 +41,7 @@ bashcomp_DATA = abook \
 		clisp \
 		complete \
 		configure \
+		convert \
 		cowsay \
 		cpan2dist \
 		cpio \
@@ -66,6 +66,7 @@ bashcomp_DATA = abook \
 		e2label \
 		ether-wake \
 		evince \
+		explodepkg \
 		export \
 		faillog \
 		fbgs \
@@ -100,6 +101,7 @@ bashcomp_DATA = abook \
 		growisofs \
 		grpck \
 		gzip \
+		hcitool \
 		hddtemp \
 		hid2hci \
 		hping2 \
@@ -108,9 +110,9 @@ bashcomp_DATA = abook \
 		idn \
 		iftop \
 		ifup \
-		imagemagick \
 		info \
 		insmod \
+		installpkg \
 		invoke-rc.d \
 		ionice \
 		ip \
@@ -120,6 +122,10 @@ bashcomp_DATA = abook \
 		ipv6calc \
 		iscsiadm \
 		isql \
+		iwconfig \
+		iwlist \
+		iwpriv \
+		iwspy \
 		jar \
 		jarsigner \
 		java \
@@ -134,6 +140,7 @@ bashcomp_DATA = abook \
 		ktutil \
 		larch \
 		lastlog \
+		ldapsearch \
 		ldapvi \
 		lftp \
 		lftpget \
@@ -151,9 +158,9 @@ bashcomp_DATA = abook \
 		lzma \
 		lzop \
 		macof \
-		mailman \
 		mailmanctl \
 		make \
+		makepkg \
 		man \
 		mc \
 		mcrypt \
@@ -182,8 +189,8 @@ bashcomp_DATA = abook \
 		newgrp \
 		newusers \
 		nmap \
+		nslookup \
 		ntpdate \
-		openldap \
 		openssl \
 		p4 \
 		pack200 \
@@ -194,7 +201,7 @@ bashcomp_DATA = abook \
 		ping \
 		pkg-config \
 		pkg_delete \
-		pkgtools \
+		pkgtool \
 		pm-hibernate \
 		pm-is-supported \
 		pm-powersave \
@@ -203,12 +210,12 @@ bashcomp_DATA = abook \
 		postcat \
 		postconf \
 		postfix \
-		postgresql \
 		postmap \
 		postsuper \
 		povray \
 		prelink \
 		protoc \
+		psql \
 		puppet \
 		pwck \
 		pwdx \
@@ -218,9 +225,10 @@ bashcomp_DATA = abook \
 		qemu \
 		qrunner \
 		querybts \
-		quota-tools \
+		quota \
 		rcs \
 		rdesktop \
+		removepkg \
 		renice \
 		reptyr \
 		reportbug \
@@ -236,7 +244,6 @@ bashcomp_DATA = abook \
 		rrdtool \
 		rsync \
 		rtcwake \
-		samba \
 		sbcl \
 		sbopkg \
 		screen \
@@ -247,6 +254,7 @@ bashcomp_DATA = abook \
 		slapt-get \
 		slapt-src \
 		smartctl \
+		smbclient \
 		snownews \
 		sqlite3 \
 		ssh \
@@ -270,6 +278,7 @@ bashcomp_DATA = abook \
 		unshunt \
 		update-alternatives \
 		update-rc.d \
+		upgradepkg \
 		urlsnarf \
 		useradd \
 		userdel \
@@ -279,7 +288,6 @@ bashcomp_DATA = abook \
 		vpnc \
 		watch \
 		webmitm \
-		wireless-tools \
 		wodim \
 		wol \
 		wtf \
@@ -297,8 +305,493 @@ bashcomp_DATA = abook \
 		xsltproc \
 		xz \
 		xzdec \
-		yp-tools \
+		ypmatch \
 		yum-arch
 
 EXTRA_DIST = $(bashcomp_DATA) \
 	     _mock _modules _subversion _yum _yum-utils
+
+CLEANFILES = \
+	a2x \
+	aclocal-1.11 \
+	alpine \
+	alternatives \
+	animate \
+	apropos \
+	arch \
+	asciidoc.py \
+	autoheader \
+	automake-1.11 \
+	autossh \
+	autoupdate \
+	btdownloadcurses.py \
+	btdownloadgui.py \
+	c++ \
+	cc \
+	cdrecord \
+	change_pw \
+	check_db \
+	ci \
+	ciptool \
+	civclient \
+	civserver \
+	clone_member \
+	co \
+	compare \
+	compgen \
+	composite \
+	config_list \
+	conjure \
+	cowthink \
+	createdb \
+	dcop \
+	declare \
+	dfutool \
+	display \
+	dpkg-deb \
+	dpkg-reconfigure \
+	dropdb \
+	edquota \
+	filebucket \
+	find_member \
+	freeciv-sdl \
+	freeciv-xaw \
+	g++ \
+	g4 \
+	g77 \
+	gcj \
+	gkrellm2 \
+	gmake \
+	gmplayer \
+	gnumake \
+	gpc \
+	hciattach \
+	hciconfig \
+	host \
+	hping \
+	hping3 \
+	identify \
+	ifdown \
+	ifstatus \
+	import \
+	inject \
+	javac \
+	javadoc \
+	kplayer \
+	l2ping \
+	lbzip2 \
+	ldapadd \
+	ldapcompare \
+	ldapdelete \
+	ldapmodify \
+	ldapmodrdn \
+	ldappasswd \
+	ldapwhoami \
+	lintian-info \
+	list_admins \
+	list_members \
+	list_owners \
+	lvchange \
+	lvcreate \
+	lvdisplay \
+	lvextend \
+	lvmdiskscan \
+	lvreduce \
+	lvremove \
+	lvrename \
+	lvresize \
+	lvs \
+	lvscan \
+	mailsnarf \
+	mdecrypt \
+	mencoder \
+	mkisofs \
+	modinfo \
+	modprobe \
+	mogrify \
+	montage \
+	mplayer2 \
+	msgsnarf \
+	muttng \
+	ncal \
+	newlist \
+	pbzip2 \
+	pccardctl \
+	perldoc \
+	phing \
+	pidof \
+	pigz \
+	pinfo \
+	ping6 \
+	pkg_deinstall \
+	pkg_info \
+	pkill \
+	pm-suspend \
+	pm-suspend-hybrid \
+	pmake \
+	postalias \
+	puppetca \
+	puppetd \
+	puppetdoc \
+	puppetmasterd \
+	puppetqd \
+	puppetrun \
+	pvchange \
+	pvcreate \
+	pvdisplay \
+	pvmove \
+	pvremove \
+	pvs \
+	pvscan \
+	pxz \
+	python2 \
+	python3 \
+	quotacheck \
+	quotaoff \
+	quotaon \
+	ralsh \
+	rcsdiff \
+	rdict \
+	remove_members \
+	repquota \
+	rfcomm \
+	rlog \
+	rmlist \
+	rpm2targz \
+	rpm2txz \
+	rpmbuild \
+	rpmbuild-md5 \
+	sbcl-mt \
+	scp \
+	sdptool \
+	setquota \
+	sftp \
+	slogin \
+	smbcacls \
+	smbcquotas \
+	smbget \
+	smbpasswd \
+	smbtar \
+	smbtree \
+	spovray \
+	stream \
+	sync_members \
+	tightvncviewer \
+	tracepath6 \
+	typeset \
+	umount \
+	vgcfgbackup \
+	vgcfgrestore \
+	vgchange \
+	vgck \
+	vgconvert \
+	vgdisplay \
+	vgexport \
+	vgextend \
+	vgimport \
+	vgmerge \
+	vgmknodes \
+	vgreduce \
+	vgremove \
+	vgrename \
+	vgs \
+	vgscan \
+	vgsplit \
+	vigr \
+	whatis \
+	withlist \
+	xpovray \
+	xvnc4viewer \
+	ypcat
+
+symlinks:
+	for file in aclocal-1.11 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) aclocal $(targetdir)/$$file ; \
+	done
+	for file in remove_members find_member clone_member sync_members \
+		list_admins list_owners list_members change_pw withlist \
+		newlist rmlist config_list arch inject check_db ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) add_members $(targetdir)/$$file ; \
+	done
+	for file in phing ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) ant $(targetdir)/$$file ; \
+	done
+	for file in a2x asciidoc.py ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) asciidoc $(targetdir)/$$file ; \
+	done
+	for file in automake-1.11 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) automake $(targetdir)/$$file ; \
+	done
+	for file in autoheader ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) autoreconf $(targetdir)/$$file ; \
+	done
+	for file in autoupdate ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) autoscan $(targetdir)/$$file ; \
+	done
+	for file in btdownloadcurses.py btdownloadgui.py ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) btdownloadheadless.py $(targetdir)/$$file ; \
+	done
+	for file in lbzip2 pbzip2 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) bzip2 $(targetdir)/$$file ; \
+	done
+	for file in ncal ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) cal $(targetdir)/$$file ; \
+	done
+	for file in pccardctl ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) cardctl $(targetdir)/$$file ; \
+	done
+	for file in compgen ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) complete $(targetdir)/$$file ; \
+	done
+	for file in mogrify display animate identify montage composite \
+		compare conjure import stream ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) convert $(targetdir)/$$file ; \
+	done
+	for file in cowthink ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) cowsay $(targetdir)/$$file ; \
+	done
+	for file in rdict ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) dict $(targetdir)/$$file ; \
+	done
+	for file in dpkg-deb dpkg-reconfigure ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) dpkg $(targetdir)/$$file ; \
+	done
+	for file in mailsnarf msgsnarf ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) filesnarf $(targetdir)/$$file ; \
+	done
+	for file in civclient freeciv-sdl freeciv-xaw ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) freeciv-gtk2 $(targetdir)/$$file ; \
+	done
+	for file in civserver ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) freeciv-server $(targetdir)/$$file ; \
+	done
+	for file in declare typeset ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) function $(targetdir)/$$file ; \
+	done
+	for file in g++ c++ g77 gcj gpc cc ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) gcc $(targetdir)/$$file ; \
+	done
+	for file in mkisofs ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) genisoimage $(targetdir)/$$file ; \
+	done
+	for file in gkrellm2 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) gkrellm $(targetdir)/$$file ; \
+	done
+	for file in pigz ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) gzip $(targetdir)/$$file ; \
+	done
+	for file in sdptool l2ping rfcomm ciptool dfutool hciconfig \
+		hciattach ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) hcitool $(targetdir)/$$file ; \
+	done
+	for file in hping hping3 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) hping2 $(targetdir)/$$file ; \
+	done
+	for file in ifdown ifstatus ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) ifup $(targetdir)/$$file ; \
+	done
+	for file in pinfo ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) info $(targetdir)/$$file ; \
+	done
+	for file in modprobe modinfo ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) insmod $(targetdir)/$$file ; \
+	done
+	for file in javac javadoc ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) java $(targetdir)/$$file ; \
+	done
+	for file in pkill ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) killall $(targetdir)/$$file ; \
+	done
+	for file in ldapadd ldapmodify ldapdelete ldapcompare ldapmodrdn \
+		ldapwhoami ldappasswd ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) ldapsearch $(targetdir)/$$file ; \
+	done
+	for file in lintian-info ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) lintian $(targetdir)/$$file ; \
+	done
+	for file in lvmdiskscan pvscan pvs pvdisplay pvchange pvcreate pvmove \
+		pvremove vgscan vgs vgdisplay vgchange vgremove vgrename \
+		vgreduce vgextend vgimport vgexport vgck vgconvert \
+		vgcfgbackup vgcfgrestore vgmerge vgsplit vgmknodes lvscan lvs \
+		lvdisplay lvchange lvcreate lvremove lvrename lvreduce \
+		lvresize lvextend ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) lvm $(targetdir)/$$file ; \
+	done
+	for file in gmake gnumake pmake ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) make $(targetdir)/$$file ; \
+	done
+	for file in apropos whatis ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) man $(targetdir)/$$file ; \
+	done
+	for file in mdecrypt ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) mcrypt $(targetdir)/$$file ; \
+	done
+	for file in umount ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) mount $(targetdir)/$$file ; \
+	done
+	for file in mplayer2 mencoder gmplayer kplayer ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) mplayer $(targetdir)/$$file ; \
+	done
+	for file in muttng ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) mutt $(targetdir)/$$file ; \
+	done
+	for file in host ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) nslookup $(targetdir)/$$file ; \
+	done
+	for file in g4 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) p4 $(targetdir)/$$file ; \
+	done
+	for file in perldoc ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) perl $(targetdir)/$$file ; \
+	done
+	for file in pidof ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) pgrep $(targetdir)/$$file ; \
+	done
+	for file in alpine ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) pine $(targetdir)/$$file ; \
+	done
+	for file in ping6 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) ping $(targetdir)/$$file ; \
+	done
+	for file in pkg_info pkg_deinstall ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) pkg_delete $(targetdir)/$$file ; \
+	done
+	for file in pm-suspend pm-suspend-hybrid ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) pm-hibernate $(targetdir)/$$file ; \
+	done
+	for file in createdb dropdb ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) psql $(targetdir)/$$file ; \
+	done
+	for file in postalias ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) postmap $(targetdir)/$$file ; \
+	done
+	for file in xpovray spovray ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) povray $(targetdir)/$$file ; \
+	done
+	for file in puppetmasterd puppetd puppetca ralsh puppetrun puppetqd \
+		filebucket puppetdoc ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) puppet $(targetdir)/$$file ; \
+	done
+	for file in python2 python3 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) python $(targetdir)/$$file ; \
+	done
+	for file in dcop ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) qdbus $(targetdir)/$$file ; \
+	done
+	for file in setquota edquota quotacheck repquota quotaon quotaoff ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) quota $(targetdir)/$$file ; \
+	done
+	for file in ci co rlog rcsdiff ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) rcs $(targetdir)/$$file ; \
+	done
+	for file in rpmbuild rpmbuild-md5 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) rpm $(targetdir)/$$file ; \
+	done
+	for file in rpm2txz rpm2targz ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) rpm2tgz $(targetdir)/$$file ; \
+	done
+	for file in smbget smbcacls smbcquotas smbpasswd smbtar smbtree ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) smbclient $(targetdir)/$$file ; \
+	done
+	for file in sbcl-mt ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) sbcl $(targetdir)/$$file ; \
+	done
+	for file in slogin autossh sftp scp ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) ssh $(targetdir)/$$file ; \
+	done
+	for file in tracepath6 ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) tracepath $(targetdir)/$$file ; \
+	done
+	for file in alternatives ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) update-alternatives $(targetdir)/$$file ; \
+	done
+	for file in vigr ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) vipw $(targetdir)/$$file ; \
+	done
+	for file in tightvncviewer xvnc4viewer ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) vncviewer $(targetdir)/$$file ; \
+	done
+	for file in cdrecord ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) wodim $(targetdir)/$$file ; \
+	done
+	for file in pxz ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) xz $(targetdir)/$$file ; \
+	done
+	for file in ypcat ; do \
+		rm -f $(targetdir)/$$file && \
+			$(LN_S) ypmatch $(targetdir)/$$file ; \
+	done
+.PHONY: symlinks
+
+all-local: targetdir = $(srcdir)
+all-local: symlinks
+
+install-data-local: targetdir = $(DESTDIR)$(bashcompdir)
+install-data-local: symlinks
diff --git a/completions/mailman b/completions/add_members
index 1f8aa951..1f8aa951 100644
--- a/completions/mailman
+++ b/completions/add_members
diff --git a/completions/imagemagick b/completions/convert
index 31792c3e..31792c3e 100644
--- a/completions/imagemagick
+++ b/completions/convert
diff --git a/completions/explodepkg b/completions/explodepkg
new file mode 100644
index 00000000..3806327e
--- /dev/null
+++ b/completions/explodepkg
@@ -0,0 +1,11 @@
+# Slackware Linux explodepkg completion
+
+complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/bluez b/completions/hcitool
index b763867b..b763867b 100644
--- a/completions/bluez
+++ b/completions/hcitool
diff --git a/completions/installpkg b/completions/installpkg
new file mode 100644
index 00000000..12997588
--- /dev/null
+++ b/completions/installpkg
@@ -0,0 +1,38 @@
+# Slackware Linux installpkg completion
+
+_installpkg()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case "$prev" in
+        --root)
+            _filedir -d
+            return 0
+            ;;
+        --priority)
+            COMPREPLY=( $( compgen -W 'ADD REC OPT SKP' -- "$cur" ) )
+            return 0
+            ;;
+        --tagfile)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '--warn --md5sum --root --infobox --terse \
+            --menu --ask --priority --tagfile' -- "$cur") )
+        return 0
+    fi
+
+    _filedir "t[bglx]z"
+} && complete -F _installpkg installpkg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/wireless-tools b/completions/iwconfig
index 00ad3959..247d648a 100644
--- a/completions/wireless-tools
+++ b/completions/iwconfig
@@ -1,6 +1,4 @@
-# bash completion for Linux wireless-tools
-
-[[ $OSTYPE == *linux* ]] || return 1
+# iwconfig completion
 
 _iwconfig()
 {
@@ -89,73 +87,6 @@ _iwconfig()
 } &&
 complete -F _iwconfig iwconfig
 
-
-_iwlist()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    if [ $cword -eq 1 ]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--help --version' -- "$cur" ) )
-        else
-            _available_interfaces -w
-        fi
-    else
-        COMPREPLY=( $( compgen -W 'scan scanning freq frequency \
-            channel rate bit bitrate key enc encryption power \
-            txpower retry ap accesspoint peers event' -- "$cur" ) )
-    fi
-} &&
-complete -F _iwlist iwlist
-
-
-_iwspy()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    if [ $cword -eq 1 ]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--help --version' -- "$cur" ) )
-        else
-            _available_interfaces -w
-        fi
-    else
-        COMPREPLY=( $( compgen -W 'setthr getthr off' -- "$cur" ) )
-    fi
-} &&
-complete -F _iwspy iwspy
-
-
-_iwpriv()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    case $prev in
-        roam)
-            COMPREPLY=( $( compgen -W 'on off' -- "$cur" ) )
-            return 0
-            ;;
-        port)
-            COMPREPLY=( $( compgen -W 'ad-hoc managed' -- "$cur" ) )
-            return 0
-            ;;
-    esac
-
-    if [ $cword -eq 1 ]; then
-        if [[ "$cur" == -* ]]; then
-            COMPREPLY=( $( compgen -W '--help --version' -- "$cur" ) )
-        else
-            _available_interfaces -w
-        fi
-    else
-        COMPREPLY=( $( compgen -W '--all roam port' -- "$cur" ) )
-    fi
-} &&
-complete -F _iwpriv iwpriv
-
 # Local variables:
 # mode: shell-script
 # sh-basic-offset: 4
diff --git a/completions/iwlist b/completions/iwlist
new file mode 100644
index 00000000..a68ad73a
--- /dev/null
+++ b/completions/iwlist
@@ -0,0 +1,28 @@
+# iwlist completion
+
+_iwlist()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    if [ $cword -eq 1 ]; then
+        if [[ "$cur" == -* ]]; then
+            COMPREPLY=( $( compgen -W '--help --version' -- "$cur" ) )
+        else
+            _available_interfaces -w
+        fi
+    else
+        COMPREPLY=( $( compgen -W 'scan scanning freq frequency \
+            channel rate bit bitrate key enc encryption power \
+            txpower retry ap accesspoint peers event' -- "$cur" ) )
+    fi
+} &&
+complete -F _iwlist iwlist
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iwpriv b/completions/iwpriv
new file mode 100644
index 00000000..45ffadbd
--- /dev/null
+++ b/completions/iwpriv
@@ -0,0 +1,37 @@
+# iwpriv completion
+
+_iwpriv()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        roam)
+            COMPREPLY=( $( compgen -W 'on off' -- "$cur" ) )
+            return 0
+            ;;
+        port)
+            COMPREPLY=( $( compgen -W 'ad-hoc managed' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    if [ $cword -eq 1 ]; then
+        if [[ "$cur" == -* ]]; then
+            COMPREPLY=( $( compgen -W '--help --version' -- "$cur" ) )
+        else
+            _available_interfaces -w
+        fi
+    else
+        COMPREPLY=( $( compgen -W '--all roam port' -- "$cur" ) )
+    fi
+} &&
+complete -F _iwpriv iwpriv
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/iwspy b/completions/iwspy
new file mode 100644
index 00000000..c5219b37
--- /dev/null
+++ b/completions/iwspy
@@ -0,0 +1,26 @@
+# iwspy completion
+
+_iwspy()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    if [ $cword -eq 1 ]; then
+        if [[ "$cur" == -* ]]; then
+            COMPREPLY=( $( compgen -W '--help --version' -- "$cur" ) )
+        else
+            _available_interfaces -w
+        fi
+    else
+        COMPREPLY=( $( compgen -W 'setthr getthr off' -- "$cur" ) )
+    fi
+} &&
+complete -F _iwspy iwspy
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/openldap b/completions/ldapsearch
index 7bdf29f4..7bdf29f4 100644
--- a/completions/openldap
+++ b/completions/ldapsearch
diff --git a/completions/makepkg b/completions/makepkg
new file mode 100644
index 00000000..f5003cad
--- /dev/null
+++ b/completions/makepkg
@@ -0,0 +1,30 @@
+# Slackware Linux makepkg completion
+
+_makepkg()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case "$prev" in
+        -l|--linkadd|-c|--chown)
+            COMPREPLY=( $( compgen -W 'y n' -- "$cur" ) )
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-l --linkadd -p --prepend \
+            -c --chown' -- "$cur") )
+        return 0
+    fi
+
+    _filedir
+} && complete -F _makepkg makepkg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/bind-utils b/completions/nslookup
index 787ceeb9..787ceeb9 100644
--- a/completions/bind-utils
+++ b/completions/nslookup
diff --git a/completions/pkgtool b/completions/pkgtool
new file mode 100644
index 00000000..d9e5815a
--- /dev/null
+++ b/completions/pkgtool
@@ -0,0 +1,42 @@
+# Slackware Linux pkgtool completion
+
+_pkgtool()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case "$prev" in
+        --source_dir|--target_dir)
+            _filedir -d
+            return 0
+            ;;
+        --sets)
+            # argument required but no completions available
+            return 0
+            ;;
+        --source_device)
+            COMPREPLY=( $( compgen -f -d -- "${cur:-/dev/}" ) )
+            return 0
+            ;;
+        --tagfile)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '--sets --ignore-tagfiles --tagfile \
+            --source-mounted --source_dir --target_dir --source_device' \
+            -- "$cur" ) )
+        return 0
+    fi
+} &&
+complete -F _pkgtool pkgtool
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/pkgtools b/completions/pkgtools
deleted file mode 100644
index 2c8e2ed7..00000000
--- a/completions/pkgtools
+++ /dev/null
@@ -1,126 +0,0 @@
-# bash completion for Slackware Linux pkgtools
-
-[ -f /etc/slackware-version ] || return 1
-
-_pkgtool()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    case "$prev" in
-        --source_dir|--target_dir)
-            _filedir -d
-            return 0
-            ;;
-        --sets)
-            # argument required but no completions available
-            return 0
-            ;;
-        --source_device)
-            COMPREPLY=( $( compgen -f -d -- "${cur:-/dev/}" ) )
-            return 0
-            ;;
-        --tagfile)
-            _filedir
-            return 0
-            ;;
-    esac
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--sets --ignore-tagfiles --tagfile \
-            --source-mounted --source_dir --target_dir --source_device' \
-            -- "$cur" ) )
-        return 0
-    fi
-} &&
-complete -F _pkgtool pkgtool
-
-_removepkg()
-{
-    local cur prev words cword
-    _init_completion || return
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-copy -keep -preserve -warn' \
-            -- "$cur" ) )
-        return 0
-    fi
-
-    local root=${ROOT:-/}
-    COMPREPLY=( $( cd "$root/var/log/packages" 2> /dev/null || return 1 ; \
-        compgen -f -- "$cur" ) )
-} &&
-complete -F _removepkg removepkg
-
-_upgradepkg()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--dry-run --install-new --reinstall \
-            --verbose' -- "$cur") )
-        return 0
-    fi
-
-    _filedir "t[bglx]z"
-} && complete -F _upgradepkg upgradepkg
-
-_installpkg()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    case "$prev" in
-        --root)
-            _filedir -d
-            return 0
-            ;;
-        --priority)
-            COMPREPLY=( $( compgen -W 'ADD REC OPT SKP' -- "$cur" ) )
-            return 0
-            ;;
-        --tagfile)
-            _filedir
-            return 0
-            ;;
-    esac
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '--warn --md5sum --root --infobox --terse \
-            --menu --ask --priority --tagfile' -- "$cur") )
-        return 0
-    fi
-
-    _filedir "t[bglx]z"
-} && complete -F _installpkg installpkg
-
-_makepkg()
-{
-    local cur prev words cword
-    _init_completion || return
-
-    case "$prev" in
-        -l|--linkadd|-c|--chown)
-            COMPREPLY=( $( compgen -W 'y n' -- "$cur" ) )
-            return 0
-            ;;
-    esac
-
-    if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-l --linkadd -p --prepend \
-            -c --chown' -- "$cur") )
-        return 0
-    fi
-
-    _filedir
-} && complete -F _makepkg makepkg
-
-complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
-
-# Local variables:
-# mode: shell-script
-# sh-basic-offset: 4
-# sh-indent-comment: t
-# indent-tabs-mode: nil
-# End:
-# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/postgresql b/completions/psql
index 6aeaf50c..6aeaf50c 100644
--- a/completions/postgresql
+++ b/completions/psql
diff --git a/completions/quota-tools b/completions/quota
index b95c386a..b95c386a 100644
--- a/completions/quota-tools
+++ b/completions/quota
diff --git a/completions/removepkg b/completions/removepkg
new file mode 100644
index 00000000..0152bfc3
--- /dev/null
+++ b/completions/removepkg
@@ -0,0 +1,25 @@
+# Slackware Linux removepkg completion
+
+_removepkg()
+{
+    local cur prev words cword
+    _init_completion || return
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-copy -keep -preserve -warn' \
+            -- "$cur" ) )
+        return 0
+    fi
+
+    local root=${ROOT:-/}
+    COMPREPLY=( $( cd "$root/var/log/packages" 2> /dev/null || return 1 ; \
+        compgen -f -- "$cur" ) )
+} &&
+complete -F _removepkg removepkg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/samba b/completions/smbclient
index 3f45ea79..3f45ea79 100644
--- a/completions/samba
+++ b/completions/smbclient
diff --git a/completions/upgradepkg b/completions/upgradepkg
new file mode 100644
index 00000000..e4a7d8ad
--- /dev/null
+++ b/completions/upgradepkg
@@ -0,0 +1,23 @@
+# Slackware Linux upgradepkg completion
+
+_upgradepkg()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '--dry-run --install-new --reinstall \
+            --verbose' -- "$cur") )
+        return 0
+    fi
+
+    _filedir "t[bglx]z"
+} && complete -F _upgradepkg upgradepkg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/completions/yp-tools b/completions/ypmatch
index a93a9ebf..a93a9ebf 100644
--- a/completions/yp-tools
+++ b/completions/ypmatch
diff --git a/configure.ac b/configure.ac
index 723a49d0..0e0c5168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_PREREQ([2.59])
 AC_INIT([bash-completion], [1.99])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall -Werror])
+AC_PROG_LN_S
 AC_SUBST(compatdir, $sysconfdir/bash_completion.d)
 AC_CONFIG_FILES([Makefile completions/Makefile helpers/Makefile test/Makefile bash-completion.pc])
 AC_OUTPUT