more cleanups, fully strip out svc, coupla notes

8 files changed, 242 insertions, 180 deletions

diff --git a/net-fs/samba/files/config-svc-smbd+nmbd b/net-fs/samba/files/config-svc-smbd+nmbd
index 69484276023b..6bc215da311c 100644
--- a/net-fs/samba/files/config-svc-smbd+nmbd
+++ b/net-fs/samba/files/config-svc-smbd+nmbd
@@ -1,4 +1,4 @@
-# this is an idea for maintaining trivial config file stubs
+# config-svc-smbd+nmbd
 config_install() {
 
 for x in smbd nmbd
diff --git a/net-fs/samba/files/digest-samba-2.0.10-r6 b/net-fs/samba/files/digest-samba-2.0.10-r6
new file mode 100644
index 000000000000..8d8066e60029
--- /dev/null
+++ b/net-fs/samba/files/digest-samba-2.0.10-r6
@@ -0,0 +1 @@
+MD5 54870482fe036b7e69dd48c90661eec6 samba-2.0.10.tar.gz
diff --git a/net-fs/samba/files/digest-samba-2.2.0a b/net-fs/samba/files/digest-samba-2.2.0a
deleted file mode 100644
index 92c590b96ae1..000000000000
--- a/net-fs/samba/files/digest-samba-2.2.0a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca15ab5c78d085176e1692374651c16d samba-2.2.0a.tar.gz
diff --git a/net-fs/samba/files/digest-samba-2.2.0a-r1 b/net-fs/samba/files/digest-samba-2.2.0a-r1
deleted file mode 100644
index 92c590b96ae1..000000000000
--- a/net-fs/samba/files/digest-samba-2.2.0a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca15ab5c78d085176e1692374651c16d samba-2.2.0a.tar.gz
diff --git a/net-fs/samba/samba-2.0.10-r6.ebuild b/net-fs/samba/samba-2.0.10-r6.ebuild
new file mode 100644
index 000000000000..9d03f8c27b66
--- /dev/null
+++ b/net-fs/samba/samba-2.0.10-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.10-r6.ebuild,v 1.1 2001/09/02 09:31:59 woodchip Exp $
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="Samba"
+SRC_URI="http://us1.samba.org/samba/ftp/${A}"
+HOMEPAGE="http://www.samba.org"
+
+DEPEND="virtual/glibc
+	>=sys-libs/pam-0.72"
+	#ssl support removed -- it doesn't work...
+
+
+src_compile() {
+
+  cd ${S}/source
+  ./configure --prefix=/usr --sysconfdir=/etc/smb --localstatedir=/var/log \
+	--libdir=/etc/smb --sbindir=/usr/sbin --with-automount --with-utmp \
+	--without-sambabook --with-netatalk --with-smbmount --with-profile \
+	--with-pam --with-privatedir=/etc/smb/private --with-lockdir=/var/run/smb \
+	--with-swatdir=/usr/share/swat
+  assert
+  make || die
+}
+
+
+src_install() {
+
+  cd ${S}/source
+  dodir /usr
+  dodir /etc/smb
+  dodir /usr/share/swat
+  dodir /usr/doc/${P}/html/book
+  dodir /var/log
+  dodir /var/run/smb
+
+  make install prefix=${D}/usr BASEDIR=${D}/usr LIBDIR=${D}/etc/smb VARDIR=${D}/var/log \
+	PRIVATEDIR=${D}/etc/smb/private SWATDIR=${D}/usr/share/swat \
+	LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin
+  assert
+
+  # we specified PRIVATEDIR=/etc/smb/private
+  rm -rf ${D}/usr/private
+  diropts -m0700
+  dodir /etc/smb/private
+
+  # move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs
+  # which allows it to work transparently with standard 'mount' command
+  diropts -m 0755 ; dodir /sbin
+  mv ${D}/usr/bin/smbmount ${D}/sbin/mount.smbfs
+
+  cd ${S}/source/script
+  exeinto /usr/sbin
+  doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh smbtar
+
+  prepman
+  into /usr
+  cd ${S}
+  cp -a examples ${D}/usr/doc/${PF}
+  cp examples/smb.conf.default ${D}/etc/smb/smb.conf.example
+  dodoc COPYING Manifest README README-smbmount Roadmap WHATSNEW.txt
+  cd ${S}/docs
+  dodoc announce history NT4-Locking.reg NT4-Locking.txt NT4_PlainPassword.reg
+  dodoc samba.lsm THANKS Win*
+  docinto html
+  dodoc htmldocs/*.html
+  docinto html/book
+  dodoc htmldocs/using_samba/*.html
+  docinto html/book/gifs
+  dodoc htmldocs/using_samba/gifs/*
+  docinto html/book/figs
+  dodoc htmldocs/using_samba/figs/*
+  docinto faq
+  dodoc faq/*.txt
+  docinto html/faq
+  odoc faq/*.html
+  docinto textdocs
+  dodoc textdocs/*
+
+  # install a standard, standalone-type init script
+  exeinto /etc/init.d
+  newexe ${FILESDIR}/samba.rc6 samba
+}
+
+
+pkg_preinst() {
+
+  if [ "$ROOT" = "/" ] 	&& [ -e /etc/init.d/samba ] ; then
+	/etc/init.d/samba stop
+  fi
+}
+
+
+pkg_postinst() {
+
+  # we touch ${D}/etc/smb/smb.conf so that people installing samba just to mount smb shares
+  # don't get annoying warnings all the time.
+  if [ ! -e ${ROOT}etc/smb/smb.conf ] ; then
+	touch ${ROOT}etc/smb/smb.conf
+  fi
+
+  echo " #"
+  echo " If you had samba running earlier, you'll need to start it again. Also, please note"
+  echo " that you must configure /etc/smb/smb.conf before samba (the server) will work properly."
+  echo " Mounting smb shares and the smbclient program should work immediately.  To accomplish"
+  echo " this there is an empty /etc/smb/smb.conf file installed."
+  echo
+  echo " To mount smb shares, type something like this. You will need kernel SMB support first:"
+  echo " % mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo"
+  echo " If you wish to allow normal users to mount smb shares, type the following as root:"
+  echo " % chmod u+s /usr/bin/smbmnt"
+  echo " #"
+}
diff --git a/net-fs/samba/samba-2.0.10.ebuild b/net-fs/samba/samba-2.0.10.ebuild
index fe00ae506003..9d6465aca25a 100644
--- a/net-fs/samba/samba-2.0.10.ebuild
+++ b/net-fs/samba/samba-2.0.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.10.ebuild,v 1.2 2001/08/18 22:26:13 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.10.ebuild,v 1.3 2001/09/02 09:31:59 woodchip Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,129 +11,109 @@ HOMEPAGE="http://www.samba.org"
 
 DEPEND="virtual/glibc
 	>=sys-libs/pam-0.72"
+	#ssl support removed -- it doesn't work...
 
-#ssl support removed -- it doesn't work...
 
-src_compile() { 
+src_compile() {
+
   cd ${S}/source
-  try ./configure --prefix=/usr \
-	--sysconfdir=/etc/smb --localstatedir=/var/log --libdir=/etc/smb --sbindir=/usr/sbin \
-	--with-automount --with-utmp --without-sambabook --with-netatalk --with-smbmount --with-pam \
-	--with-privatedir=/etc/smb/private --with-lockdir=/var/run/smb --with-swatdir=/usr/share/swat
-  try make
+  ./configure --prefix=/usr --sysconfdir=/etc/smb --localstatedir=/var/log \
+	--libdir=/etc/smb --sbindir=/usr/sbin --with-automount --with-utmp \
+	--without-sambabook --with-netatalk --with-smbmount --with-profile \
+	--with-pam --with-privatedir=/etc/smb/private --with-lockdir=/var/run/smb \
+	--with-swatdir=/usr/share/swat
+  assert
+  make || die
 }
 
-src_install() { 
-	cd ${S}/source
-	dodir /usr
-	dodir /etc/smb
-	dodir /usr/share/swat
-	dodir /usr/doc/${P}/html/book
-	dodir /var/log
-	dodir /var/run/smb
-	try make install prefix=${D}/usr BASEDIR=${D}/usr LIBDIR=${D}/etc/smb VARDIR=${D}/var/log \
-		PRIVATEDIR=${D}/etc/smb/private SWATDIR=${D}/usr/share/swat \
-		LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin
-	prepman
-	into /usr
-	cd ${S}
-	dodoc COPYING Manifest README README-smbmount Roadmap WHATSNEW.txt
-	cd ${S}/docs
-	dodoc announce history NT4-Locking.reg NT4-Locking.txt NT4_PlainPassword.reg
-	dodoc samba.lsm THANKS Win*
-	docinto html
-	dodoc htmldocs/*.html
-	docinto html/book
-	dodoc htmldocs/using_samba/*.html
-	docinto html/book/gifs
-	dodoc htmldocs/using_samba/gifs/*
-	docinto html/book/figs
-	dodoc htmldocs/using_samba/figs/*
-	docinto faq
-	dodoc faq/*.txt
-	docinto html/faq
-	dodoc faq/*.html
-	docinto textdocs
-	dodoc textdocs/*
-	cd ${S}
-	cp -a examples ${D}/usr/doc/${PF}
-	cp examples/smb.conf.default ${D}/etc/smb/smb.conf.example
-	
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/samba ${FILESDIR}/svc-samba
-	diropts -m0700
-	dodir /etc/smb/private
-
-	#now, we move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs
-	#this allows it to work perfectly with the standard Linux mount command
-	# :)
-
-	dodir /sbin
-	mv ${D}/usr/bin/smbmount ${D}/sbin/mount.smbfs
-
-
-	#supervise support
-	local x
-	for x in smbd nmbd
-	do
-		dodir /var/lib/supervise/services/${x}/log
-		chmod +t ${D}/var/lib/supervise/services/${x}
-		exeinto /var/lib/supervise/services/${x}
-		newexe ${FILESDIR}/${x}-run run
-		exeinto /var/lib/supervise/services/${x}/log
-		newexe ${FILESDIR}/${x}-log run
-	done
-
-	rm -rf ${D}/usr/private
-}
 
-pkg_preinst() {
-	if [ "$ROOT" = "/" ]
-	then
-		if [ -e /etc/rc.d/init.d/svc-samba ]
-		then
-			/etc/rc.d/init.d/svc-samba stop
-		fi
-		if [ -e /etc/rc.d/init.d/samba ]
-		then
-			/etc/rc.d/init.d/samba stop
-		fi
-	fi
-}
+src_install() {
 
-pkg_postinst() {
-	#touch ${D}/etc/smb/smb.conf to create a dummy file so that people installing samba
-	#just to mount smb shares don't get annoying warnings all the time
-
-	if [ ! -e ${ROOT}etc/smb/smb.conf ]
-	then
-		touch ${ROOT}etc/smb/smb.conf
-	fi
-	
-	echo "Samba installed.  To configure samba (the server) to start on boot, type:"
-	echo
-	echo "# rc-update add svc-samba    [ for high-availability supervised Samba -- recommended ]"
-	echo "# rc-update add samba		[ for normal non-supervised Samba ]"
-	echo 
-	echo "If you had samba running earlier, you'll need to start it again."
-	echo 
-	echo "Also, please note that you must configure /etc/smb/smb.conf before Samba (the server) will "
-	echo "work properly.  Mounting smb shares and the smbclient program should work immediately,"
-	echo "without any tweaking required."
-	echo
-	echo "To mount SMB shares, type something like this.  You'll need kernel SMB support to do this:"
-	echo "# mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo" 
-	echo
-	echo "An empty file exists at /etc/smb/smb.conf at this moment, so that mounting smb shares won't"
-	echo "produce an annoying warning message."
-	echo
-	echo "Another note.  If you want to allow normal users to mount smb shares, type the following as"
-	echo "root:"
-	echo "# chmod u+s /usr/bin/smbmnt"
+  cd ${S}/source
+  dodir /usr
+  dodir /etc/smb
+  dodir /usr/share/swat
+  dodir /usr/doc/${P}/html/book
+  dodir /var/log
+  dodir /var/run/smb
+
+  make install prefix=${D}/usr BASEDIR=${D}/usr LIBDIR=${D}/etc/smb VARDIR=${D}/var/log \
+	PRIVATEDIR=${D}/etc/smb/private SWATDIR=${D}/usr/share/swat \
+	LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin
+  assert
+
+  # we specified PRIVATEDIR=/etc/smb/private
+  rm -rf ${D}/usr/private
+  diropts -m0700
+  dodir /etc/smb/private
+
+  # move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs
+  # which allows it to work transparently with standard 'mount' command
+  diropts -m 0755 ; dodir /sbin
+  mv ${D}/usr/bin/smbmount ${D}/sbin/mount.smbfs
+
+  cd ${S}/source/script
+  exeinto /usr/sbin
+  doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh smbtar
+
+  prepman
+  into /usr
+  cd ${S}
+  cp -a examples ${D}/usr/doc/${PF}
+  cp examples/smb.conf.default ${D}/etc/smb/smb.conf.example
+  dodoc COPYING Manifest README README-smbmount Roadmap WHATSNEW.txt
+  cd ${S}/docs
+  dodoc announce history NT4-Locking.reg NT4-Locking.txt NT4_PlainPassword.reg
+  dodoc samba.lsm THANKS Win*
+  docinto html
+  dodoc htmldocs/*.html
+  docinto html/book
+  dodoc htmldocs/using_samba/*.html
+  docinto html/book/gifs
+  dodoc htmldocs/using_samba/gifs/*
+  docinto html/book/figs
+  dodoc htmldocs/using_samba/figs/*
+  docinto faq
+  dodoc faq/*.txt
+  docinto html/faq
+  odoc faq/*.html
+  docinto textdocs
+  dodoc textdocs/*
+
+  # install a standard, standalone-type init script
+  exeinto /etc/rc.d/init.d
+  newexe ${FILESDIR}/samba.rc5 samba
 }
 
 
+pkg_preinst() {
 
+  if [ "$ROOT" = "/" ] 	&& [ -e /etc/rc.d/init.d/samba ] ; then
+	/etc/rc.d/init.d/samba stop
+  fi
+}
 
 
+pkg_postinst() {
 
+  # we touch ${D}/etc/smb/smb.conf so that people installing samba just to mount smb shares
+  # don't get annoying warnings all the time.
+  if [ ! -e ${ROOT}etc/smb/smb.conf ] ; then
+	touch ${ROOT}etc/smb/smb.conf
+  fi
+
+  echo " #"
+  echo " To configure samba (the server) to start on boot, type:"
+  echo " % rc-update add samba     [ for normal standalone samba ]"
+  echo
+  echo " If you had samba running earlier, you'll need to start it again. Also, please note"
+  echo " that you must configure /etc/smb/smb.conf before samba (the server) will work properly."
+  echo " Mounting smb shares and the smbclient program should work immediately.  To accomplish"
+  echo " this there is an empty /etc/smb/smb.conf file installed."
+  echo
+  echo " To mount smb shares, type something like this. You will need kernel SMB support first:"
+  echo " % mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo"
+  echo " If you wish to allow normal users to mount smb shares, type the following as root:"
+  echo " % chmod u+s /usr/bin/smbmnt"
+  echo " #"
+}
diff --git a/net-fs/samba/samba-2.2.1a-r2.ebuild b/net-fs/samba/samba-2.2.1a-r2.ebuild
index 68fdf07c7e43..ebaa9f3b5ce0 100644
--- a/net-fs/samba/samba-2.2.1a-r2.ebuild
+++ b/net-fs/samba/samba-2.2.1a-r2.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>, Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.1a-r2.ebuild,v 1.1 2001/09/02 01:49:18 woodchip Exp $
-
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.1a-r2.ebuild,v 1.2 2001/09/02 09:31:59 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Samba :)"
@@ -25,17 +24,16 @@ RDEPEND="virtual/glibc cups? ( net-print/cups )"
 src_unpack() {
 
   unpack ${A}
-
   if [ "`use afs`" ]; then
     cd ${S}
-    cat ${FILESDIR}/patch.221a.10 | patch -p0
+    patch -p0 < ${FILESDIR}/patch.221a.10 || die
   fi
 
   if [ ! "`use cups`" ] ; then
     cd ${S}/source
     cp configure.in configure.in.orig
     sed -e "s:AC_CHECK_LIB(cups,httpConnect)::" configure.in.orig > configure.in
-    autoconf
+    autoconf || die
   fi
 }
 
@@ -59,14 +57,14 @@ src_compile() {
   
   cd ${S}/source
   # Disabled automout support, because it failed
-  # Added -lncurses for readline detection
   ./configure --prefix=/usr --sysconfdir=/etc/smb --localstatedir=/var/log \
 	--libdir=/etc/smb --sbindir=/usr/sbin --without-automount --with-utmp \
 	--without-sambabook --with-netatalk --with-privatedir=/etc/smb/private \
 	--with-smbmount --with-msdfs --with-vfs --with-spinlocks \
 	--with-lockdir=/var/run/smb --with-swatdir=/usr/share/swat \
-	--with-mandir=/usr/share/man --with-profile ${myconf} || die "bad configure"
-  make || die "couldn't compile"
+	--with-mandir=/usr/share/man --with-profile ${myconf}
+  assert
+  make || die
 }
 
 
@@ -79,14 +77,16 @@ src_install() {
   dodir /usr/share/doc/${PF}/html/book
   dodir /var/log
   dodir /var/run/smb
-  diropts -m 0700 ; dodir /etc/smb/private
 
   make install prefix=${D}/usr BASEDIR=${D}/usr PRIVATEDIR=${D}/etc/smb/private \
 	LIBDIR=${D}/etc/smb VARDIR=${D}/var/log SWATDIR=${D}/usr/share/swat \
-	LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man || die
+	LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man
+  assert
 
-  # buggy makefile? we specified PRIVATEDIR as /etc/smb/private already. bogus lint.
+  # we specified PRIVATEDIR=/etc/smb/private
   rm -rf ${D}/usr/private
+  diropts -m 0700
+  dodir /etc/smb/private
 
   # move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs
   # which allows it to work transparently with standard 'mount' command
@@ -97,14 +97,13 @@ src_install() {
   exeinto /usr/sbin
   doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh smbtar
 
-
   # docs. samba has some really good ones.
   cd ${S}
+  cp -a examples ${D}/usr/doc/${PF}
   insinto /etc/smb ; insopts -m 0644 ; newins examples/smb.conf.default smb.conf.eg
   insinto /usr/share/sgml/docbook/dbsgml ; doins docbook/dbsgml/*
   insinto /usr/share/sgml/docbook/dbsgml/ent ; doins docbook/dbsgml/ent/*
   dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-  docinto examples ; dodoc examples/*
   cd ${S}/docs ; dodoc announce history samba.lsm THANKS
   docinto reg ; dodoc *.reg
   docinto html ; dodoc htmldocs/*.html
@@ -121,31 +120,16 @@ src_install() {
   docinto sgml/docbook/manpages ; dodoc docbook/manpages/*.sgml
   docinto sgml/docbook/projdoc ; dodoc docbook/projdoc/*.sgml
 
-
   # install a standard, standalone-type init script
   exeinto /etc/rc.d/init.d ; exeopts -m 0755
   newexe ${FILESDIR}/samba.rc5 samba
-
-  # svc stuff should go away
-  svcdebug=0
-  if [ $svcdebug == 1 ] ; then
-	source ${FILESDIR}/config-svc-smbd+nmbd
-	config_install
-	exeinto /etc/rc.d/init.d ; exeopts -m 0755
-	newexe ${FILESDIR}/samba.svc.rc5 svc-samba
-  fi
 }
 
 
 pkg_preinst() {
 
-  if [ "$ROOT" = "/" ] ; then
-	if [ -e /etc/rc.d/init.d/svc-samba ] ; then
-		/etc/rc.d/init.d/svc-samba stop
-	fi
-	if [ -e /etc/rc.d/init.d/samba ] ; then
-		/etc/rc.d/init.d/samba stop
-	fi
+  if [ "$ROOT" = "/" ] && [ -e /etc/rc.d/init.d/samba ] ; then
+	/etc/rc.d/init.d/samba stop
   fi
 }
 
@@ -160,8 +144,7 @@ pkg_postinst() {
 
   echo " #"
   echo " To configure samba (the server) to start on boot, type:"
-  echo " % rc-update add svc-samba [ for high-availability supervised samba ]"
-  echo " % rc-update add samba     [ for normal non-supervised, standalone samba ]"
+  echo " % rc-update add samba     [ for normal standalone samba ]"
   echo
   echo " If you had samba running earlier, you'll need to start it again. Also, please note"
   echo " that you must configure /etc/smb/smb.conf before samba (the server) will work properly."
diff --git a/net-fs/samba/samba-2.2.1a-r6.ebuild b/net-fs/samba/samba-2.2.1a-r6.ebuild
index 9f9173a4c566..4fc8aa682eb2 100644
--- a/net-fs/samba/samba-2.2.1a-r6.ebuild
+++ b/net-fs/samba/samba-2.2.1a-r6.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>, Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.1a-r6.ebuild,v 1.1 2001/09/02 01:49:19 woodchip Exp $
-
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header#
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Samba :)"
@@ -25,17 +24,16 @@ RDEPEND="virtual/glibc cups? ( net-print/cups )"
 src_unpack() {
 
   unpack ${A}
-
   if [ "`use afs`" ]; then
     cd ${S}
-    cat ${FILESDIR}/patch.221a.10 | patch -p0
+    patch -p0 < ${FILESDIR}/patch.221a.10 || die
   fi
 
   if [ ! "`use cups`" ] ; then
     cd ${S}/source
     cp configure.in configure.in.orig
     sed -e "s:AC_CHECK_LIB(cups,httpConnect)::" configure.in.orig > configure.in
-    autoconf
+    autoconf || die
   fi
 }
 
@@ -59,14 +57,14 @@ src_compile() {
   
   cd ${S}/source
   # Disabled automout support, because it failed
-  # Added -lncurses for readline detection
   ./configure --prefix=/usr --sysconfdir=/etc/smb --localstatedir=/var/log \
 	--libdir=/etc/smb --sbindir=/usr/sbin --without-automount --with-utmp \
 	--without-sambabook --with-netatalk --with-privatedir=/etc/smb/private \
 	--with-smbmount --with-msdfs --with-vfs --with-spinlocks \
 	--with-lockdir=/var/run/smb --with-swatdir=/usr/share/swat \
-	--with-mandir=/usr/share/man --with-profile ${myconf} || die "bad configure"
-  make || die "couldn't compile"
+	--with-mandir=/usr/share/man --with-profile ${myconf}
+  assert
+  make || die
 }
 
 
@@ -79,14 +77,16 @@ src_install() {
   dodir /usr/share/doc/${PF}/html/book
   dodir /var/log
   dodir /var/run/smb
-  diropts -m 0700 ; dodir /etc/smb/private
 
   make install prefix=${D}/usr BASEDIR=${D}/usr PRIVATEDIR=${D}/etc/smb/private \
 	LIBDIR=${D}/etc/smb VARDIR=${D}/var/log SWATDIR=${D}/usr/share/swat \
-	LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man || die
+	LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man
+  assert
 
-  # buggy makefile? we specified PRIVATEDIR as /etc/smb/private already. bogus lint.
+  # we specified PRIVATEDIR=/etc/smb/private
   rm -rf ${D}/usr/private
+  diropts -m 0700
+  dodir /etc/smb/private
 
   # move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs
   # which allows it to work transparently with standard 'mount' command
@@ -97,14 +97,13 @@ src_install() {
   exeinto /usr/sbin
   doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh mksmbpasswd.sh smbtar
 
-
   # docs. samba has some really good ones.
   cd ${S}
+  cp -a examples ${D}/usr/doc/${PF}
   insinto /etc/smb ; insopts -m 0644 ; newins examples/smb.conf.default smb.conf.eg
   insinto /usr/share/sgml/docbook/dbsgml ; doins docbook/dbsgml/*
   insinto /usr/share/sgml/docbook/dbsgml/ent ; doins docbook/dbsgml/ent/*
   dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-  docinto examples ; dodoc examples/*
   cd ${S}/docs ; dodoc announce history samba.lsm THANKS
   docinto reg ; dodoc *.reg
   docinto html ; dodoc htmldocs/*.html
@@ -121,31 +120,16 @@ src_install() {
   docinto sgml/docbook/manpages ; dodoc docbook/manpages/*.sgml
   docinto sgml/docbook/projdoc ; dodoc docbook/projdoc/*.sgml
 
-
   # install a standard, standalone-type init script
   exeinto /etc/init.d ; exeopts -m 0755
   newexe ${FILESDIR}/samba.rc6 samba
-
-  # svc tools not in rc6
-  svcdebug=0
-  if [ $svcdebug == 1 ] ; then
-	source ${FILESDIR}/config-svc-smbd+nmbd
-	config_install
-	exeinto /etc/init.d ; exeopts -m 0755
-	newexe ${FILESDIR}/samba.svc.rc6 svc-samba
-  fi
 }
 
 
 pkg_preinst() {
 
-  if [ "$ROOT" = "/" ] ; then
-	#if [ -e /etc/init.d/svc-samba ] ; then
-	#	/etc/init.d/svc-samba stop
-	#fi
-	if [ -e /etc/init.d/samba ] ; then
-		/etc/init.d/samba stop
-	fi
+  if [ "$ROOT" = "/" ] && [ -e /etc/init.d/samba ] ; then
+	/etc/init.d/samba stop
   fi
 }