a few typos, and such

5 files changed, 23 insertions, 15 deletions

diff --git a/net-fs/samba/samba-2.0.10-r6.ebuild b/net-fs/samba/samba-2.0.10-r6.ebuild
index 9d03f8c27b66..7f0f81c901ac 100644
--- a/net-fs/samba/samba-2.0.10-r6.ebuild
+++ b/net-fs/samba/samba-2.0.10-r6.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-r6.ebuild,v 1.1 2001/09/02 09:31:59 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.10-r6.ebuild,v 1.2 2001/09/02 11:21:31 woodchip Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -76,7 +76,7 @@ src_install() {
   docinto faq
   dodoc faq/*.txt
   docinto html/faq
-  odoc faq/*.html
+  dodoc faq/*.html
   docinto textdocs
   dodoc textdocs/*
 
@@ -88,9 +88,12 @@ src_install() {
 
 pkg_preinst() {
 
-  if [ "$ROOT" = "/" ] 	&& [ -e /etc/init.d/samba ] ; then
-	/etc/init.d/samba stop
+  if [ "$ROOT" = "/" ] && [ -e /etc/init.d/samba ] ; then
+	if [ -e /dev/shm/.init.d/started/samba ] ; then
+		/etc/init.d/samba stop
+  	fi
   fi
+  return 0
 }
 
 
diff --git a/net-fs/samba/samba-2.0.10.ebuild b/net-fs/samba/samba-2.0.10.ebuild
index 9d6465aca25a..9b466cc19857 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.3 2001/09/02 09:31:59 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.10.ebuild,v 1.4 2001/09/02 11:21:31 woodchip Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -76,7 +76,7 @@ src_install() {
   docinto faq
   dodoc faq/*.txt
   docinto html/faq
-  odoc faq/*.html
+  dodoc faq/*.html
   docinto textdocs
   dodoc textdocs/*
 
@@ -88,9 +88,10 @@ src_install() {
 
 pkg_preinst() {
 
-  if [ "$ROOT" = "/" ] 	&& [ -e /etc/rc.d/init.d/samba ] ; then
+  if [ "$ROOT" = "/" ] && [ -e /etc/rc.d/init.d/samba ] ; then
 	/etc/rc.d/init.d/samba stop
   fi
+  return 0
 }
 
 
diff --git a/net-fs/samba/samba-2.2.1a-r2.ebuild b/net-fs/samba/samba-2.2.1a-r2.ebuild
index ebaa9f3b5ce0..8204dd34d634 100644
--- a/net-fs/samba/samba-2.2.1a-r2.ebuild
+++ b/net-fs/samba/samba-2.2.1a-r2.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.2.1a-r2.ebuild,v 1.2 2001/09/02 09:31:59 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.1a-r2.ebuild,v 1.3 2001/09/02 11:21:31 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Samba :)"
@@ -101,8 +101,8 @@ src_install() {
   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/*
+  insinto /usr/share/sgml/docbook/dbsgml ; doins docs/docbook/dbsgml/*
+  insinto /usr/share/sgml/docbook/dbsgml/ent ; doins docs/docbook/dbsgml/ent/*
   dodoc COPYING Manifest README Roadmap WHATSNEW.txt
   cd ${S}/docs ; dodoc announce history samba.lsm THANKS
   docinto reg ; dodoc *.reg
@@ -131,6 +131,7 @@ pkg_preinst() {
   if [ "$ROOT" = "/" ] && [ -e /etc/rc.d/init.d/samba ] ; then
 	/etc/rc.d/init.d/samba stop
   fi
+  return 0
 }
 
 
diff --git a/net-fs/samba/samba-2.2.1a-r6.ebuild b/net-fs/samba/samba-2.2.1a-r6.ebuild
index 4fc8aa682eb2..85ea43e8fd3f 100644
--- a/net-fs/samba/samba-2.2.1a-r6.ebuild
+++ b/net-fs/samba/samba-2.2.1a-r6.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#
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.2.1a-r6.ebuild,v 1.3 2001/09/02 11:21:31 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Samba :)"
@@ -101,8 +101,8 @@ src_install() {
   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/*
+  insinto /usr/share/sgml/docbook/dbsgml ; doins docs/docbook/dbsgml/*
+  insinto /usr/share/sgml/docbook/dbsgml/ent ; doins docs/docbook/dbsgml/ent/*
   dodoc COPYING Manifest README Roadmap WHATSNEW.txt
   cd ${S}/docs ; dodoc announce history samba.lsm THANKS
   docinto reg ; dodoc *.reg
@@ -129,8 +129,11 @@ src_install() {
 pkg_preinst() {
 
   if [ "$ROOT" = "/" ] && [ -e /etc/init.d/samba ] ; then
-	/etc/init.d/samba stop
+	if [ -e /dev/shm/.init.d/started/samba ] ; then
+		/etc/init.d/samba stop
+  	fi
   fi
+  return 0
 }
 
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 2674ad0d5d0e..d0db4ea64abc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -88,7 +88,7 @@ app-editors/gtk-xemacs
 >=net-dialup/isdn4k-utils-3.1_p1-r2
 >=net-news/knews-1.0.1b
 >=net-www/konqueror-embedded-20010207
->=sys-apps/vcron-3.0_p1-r2
+#>=sys-apps/vcron-3.0_p1-r2
 >=media-video/mpeg2-movie-1.5
 >=media-gfx/autotrace-0.26