clean and devfsd gets started by /sbin/init, so a rc-script not needed

11 files changed, 42 insertions, 294 deletions

diff --git a/sys-apps/devfsd/devfsd-1.3.11-r1.ebuild b/sys-apps/devfsd/devfsd-1.3.11-r1.ebuild
deleted file mode 100644
index 21fe0e6a6e3c..000000000000
--- a/sys-apps/devfsd/devfsd-1.3.11-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins et al <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.11-r1.ebuild,v 1.4 2001/07/09 20:55:12 achim Exp $
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Daemon for the Linux Device Filesystem"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
-HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-  	unpack ${A}
-	cd ${S}
-  	patch -p0 < ${FILESDIR}/${P}-GNUmakefile-gentoo.diff
-}
-
-src_compile() {
-    	try make
-}
-
-src_install () {
-  	try make DESTDIR=${D} install
- 	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/devfsd
- 	dodir /etc/devfs/shm
-	dodir /dev-state
-	insinto /etc
-	doins ${FILESDIR}/devfsd.conf
-}
-
-pkg_postinst () {
-  	rc-update add devfsd
-}
-
diff --git a/sys-apps/devfsd/devfsd-1.3.11-r2.ebuild b/sys-apps/devfsd/devfsd-1.3.11-r2.ebuild
deleted file mode 100644
index a37d914f25df..000000000000
--- a/sys-apps/devfsd/devfsd-1.3.11-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins et al <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.11-r2.ebuild,v 1.1 2001/08/05 22:58:06 pete Exp $
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Daemon for the Linux Device Filesystem"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
-HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-  	unpack ${A}
-	cd ${S}
-  	patch -p0 < ${FILESDIR}/${P}-GNUmakefile-gentoo.diff
-}
-
-src_compile() {
-    	try make
-}
-
-src_install () {
-  	try make DESTDIR=${D} install
- 	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/devfsd
- 	dodir /etc/devfs/shm
-	dodir /dev-state
-	insinto /etc
-	doins ${FILESDIR}/devfsd.conf
-	if [ -z "`use bootcd`" ]
-	then
-		rm -rf ${D}/usr
-	fi
-}
-
-pkg_postinst () {
-  	rc-update add devfsd
-}
-
diff --git a/sys-apps/devfsd/devfsd-1.3.16.ebuild b/sys-apps/devfsd/devfsd-1.3.16.ebuild
deleted file mode 100644
index 1999f9e38db6..000000000000
--- a/sys-apps/devfsd/devfsd-1.3.16.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins et al <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.16.ebuild,v 1.2 2001/08/19 05:03:17 drobbins Exp $
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Daemon for the Linux Device Filesystem"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
-HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-  	unpack ${A}
-	cd ${S}
-	cp GNUmakefile GNUmakefile.orig
-	sed -e "s:-O2:${CFLAGS}:g" -e 's:/usr/man:/usr/share/man:' -e '26,28d;6,7d;9d' GNUmakefile.orig > GNUmakefile
-}
-
-src_compile() {
-	make || die
-}
-
-src_install () {
-  	dodir /sbin /usr/share/man /etc
-	try make PREFIX=${D} install
- 	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/devfsd
-	dodir /dev-state
-	insinto /etc
-	doins ${FILESDIR}/devfsd.conf
-}
-
-pkg_postinst () {
-	rc-update add devfsd
-}
-
diff --git a/sys-apps/devfsd/devfsd-1.3.20.ebuild b/sys-apps/devfsd/devfsd-1.3.20.ebuild
index b8da2746627b..6aea58a6a8ef 100644
--- a/sys-apps/devfsd/devfsd-1.3.20.ebuild
+++ b/sys-apps/devfsd/devfsd-1.3.20.ebuild
@@ -1,31 +1,45 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins et al <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.20.ebuild,v 1.1 2001/12/02 03:25:51 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devfsd/devfsd-1.3.20.ebuild,v 1.2 2001/12/02 07:57:06 azarah Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Daemon for the Linux Device Filesystem"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
+
 DEPEND="virtual/glibc"
 
+
 src_unpack() {
+
   	unpack ${A}
+	
 	cd ${S}
 	cp GNUmakefile GNUmakefile.orig
-	sed -e "s:-O2:${CFLAGS}:g" -e 's:/usr/man:/usr/share/man:' -e '30,32d;8,12d;9d' -e '6c\' -e 'DEFINES	:= -DLIBNSL="\\"/lib/libnsl.so.1\\""' GNUmakefile.orig > GNUmakefile
+	sed -e "s:-O2:${CFLAGS}:g" \
+		-e 's:/usr/man:/usr/share/man:' \
+		-e '30,32d;8,12d;9d' -e '6c\' \
+		-e 'DEFINES	:= -DLIBNSL="\\"/lib/libnsl.so.1\\""' \
+		GNUmakefile.orig > GNUmakefile
 }
 
 src_compile() {
+
 	make || die
 }
 
-src_install () {
+src_install() {
+
   	dodir /sbin /usr/share/man /etc
-	try make PREFIX=${D} install
- 	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/devfsd
+	make PREFIX=${D} install || die
+
+# It gets started by /sbin/init now ....
+# 	exeinto /etc/rc.d/init.d
+#	doexe ${FILESDIR}/devfsd
+
 	dodir /dev-state
+	
 	insinto /etc
 	doins ${FILESDIR}/devfsd.conf
 }
diff --git a/sys-apps/devfsd/files/devfsd-1.3.11-GNUmakefile-gentoo.diff b/sys-apps/devfsd/files/devfsd-1.3.11-GNUmakefile-gentoo.diff
deleted file mode 100644
index e992148bc674..000000000000
--- a/sys-apps/devfsd/files/devfsd-1.3.11-GNUmakefile-gentoo.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- GNUmakefile.orig	Tue Feb 27 16:53:23 2001
-+++ GNUmakefile	Tue Feb 27 16:53:43 2001
-@@ -1,4 +1,5 @@
- SBINDIR =     /sbin
-+MANDIR = /usr/share/man/man8
- CONFIG_FILE = /etc/devfsd.conf
- 
- nsl_libs := $(wildcard /lib/libnsl.*)
-@@ -12,25 +13,23 @@
- OBJECTS = devfsd.o expression.o compat_name.o
- 
- ifdef KERNEL_DIR
--CFLAGS = -O2 -I. -I$(KERNEL_DIR)/include -Wall $(CEXTRAS)
-+CFLAGS += -I. -I$(KERNEL_DIR)/include -Wall $(CEXTRAS)
- else
--CFLAGS = -O2 -I. -Wall $(CEXTRAS)
-+CFLAGS += -I. -Wall $(CEXTRAS)
- endif
- 
- devfsd:	$(OBJECTS)
--	cc -O2 -o devfsd $(OBJECTS) $(CFLAGS) -export-dynamic -ldl $(LIBS)
-+	cc -o devfsd $(OBJECTS) $(CFLAGS) -export-dynamic -ldl $(LIBS)
- 
- install: devfsd
--	@if fgrep -q "Generic section: do not change" /etc/modules.conf ; then\
--		echo "First remove the generic devfs entries from /etc/modules.conf"; exit 1; \
--	fi
--	rm -f $(SBINDIR)/devfsd
--	install -s devfsd $(SBINDIR)/devfsd
--	-rm -f /usr/man/*/devfsd.*
--	cp -p devfsd.8 /usr/man/man8
--	if [ ! -e $(CONFIG_FILE) ]; then cp -p devfsd.conf $(CONFIG_FILE); fi
-+	install -d $(DESTDIR)$(SBINDIR)
-+	install -d $(DESTDIR)$(MANDIR)
-+	install -d $(DESTDIR)/etc
-+	install -s devfsd $(DESTDIR)$(SBINDIR)/devfsd
-+	cp -p devfsd.8 $(DESTDIR)$(MANDIR)
-+	cp -p devfsd.conf $(DESTDIR)$(CONFIG_FILE)
- 	@echo "Installing /etc/modules.devfs"
--	@sed "s/DEVFSD-VERSION/`grep '#define DEVFSD_VERSION' version.h | cut -d'"' -f 2`/" modules.devfs > /etc/modules.devfs
-+	@sed "s/DEVFSD-VERSION/`grep '#define DEVFSD_VERSION' version.h | cut -d'"' -f 2`/" modules.devfs > $(DESTDIR)etc/modules.devfs
- 
- clean:
- 	-rm -f *~ *.o *.orig
diff --git a/sys-apps/devfsd/files/devfsd.conf b/sys-apps/devfsd/files/devfsd.conf
index f4f2162efec9..beb691a4e834 100644
--- a/sys-apps/devfsd/files/devfsd.conf
+++ b/sys-apps/devfsd/files/devfsd.conf
@@ -1,75 +1,41 @@
 # Sample /etc/devfsd.conf configuration file.
 # Richard Gooch  <rgooch@atnf.csiro.au>		3-JUL-2000
-# The Gentoo Linux Team - http://www.gentoo.org/
-#    Many fixes, etc
-
+#
 # Enable full compatibility mode for old device names. You may comment these
 # out if you don't use the old device names. Make sure you know what you're
 # doing!
-REGISTER	^.*		MKOLDCOMPAT
-UNREGISTER	^.*		RMOLDCOMPAT
+REGISTER	.*		MKOLDCOMPAT
+UNREGISTER	.*		RMOLDCOMPAT
 
 # You may comment out the above and uncomment the following if you've
 # configured your system to use the original "new" devfs names or the really
 # new names
-#REGISTER	^vc/.*		MKOLDCOMPAT
-#UNREGISTER	^vc/.*		RMOLDCOMPAT
-#REGISTER	^pty/.*		MKOLDCOMPAT
-#UNREGISTER	^pty/.*		RMOLDCOMPAT
-#REGISTER	^misc		MKOLDCOMPAT
-#UNREGISTER	^misc		RMOLDCOMPAT
+#REGISTER	vc/.*		MKOLDCOMPAT
+#UNREGISTER	vc/.*		RMOLDCOMPAT
+#REGISTER	pty/.*		MKOLDCOMPAT
+#UNREGISTER	pty/.*		RMOLDCOMPAT
+#REGISTER	misc		MKOLDCOMPAT
+#UNREGISTER	misc		RMOLDCOMPAT
 
 # You may comment these out if you don't use the original "new" names
-REGISTER	^.*		MKNEWCOMPAT
-UNREGISTER	^.*		RMNEWCOMPAT
+REGISTER	.*		MKNEWCOMPAT
+UNREGISTER	.*		RMNEWCOMPAT
 
 # Enable module autoloading. You may comment this out if you don't use
 # autoloading
-LOOKUP		^.*		MODLOAD
+LOOKUP		.*		MODLOAD
 
-#
 # Uncomment this if you want permissions to be saved and restored
-REGISTER	^.*		COPY	/dev-state/$devname $devpath
-CHANGE		^.*		COPY	$devpath /dev-state/$devname
-CREATE		^.*		COPY	$devpath /dev-state/$devname
+REGISTER        ^pt[sy]/.*      IGNORE
+CHANGE          ^pt[sy]/.*      IGNORE
+REGISTER        .*              COPY    /dev-state/$devname $devpath
+CHANGE          .*              COPY    $devpath /dev-state/$devname
+CREATE          .*              COPY    $devpath /dev-state/$devname
 
+LOOKUP ^cdrom$ CFUNCTION GLOBAL symlink ${mntpnt}/cdroms/cdrom0 $devpath
+REGISTER ^cdrom/cdrom0$  CFUNCTION GLOBAL symlink cdroms/cdrom0 cdrom
+UNREGISTER ^cdrom/cdrom0$  CFUNCTION GLOBAL unlink cdrom
 
-# You can force default like this :
-# PERMISSIONS owner_and_group access_mode
-
-# ALSA stuff
 LOOKUP snd MODLOAD ACTION snd
-REGISTER ^sound/.* PERMISSIONS root.audio 660
-REGISTER ^sound/* PERMISSIONS root.audio 660
-REGISTER ^snd/.* PERMISSIONS root.audio 660
-REGISTER ^snd/* PERMISSIONS root.audio 660
-
-# Give the cdrw group write permissions to /dev/sg0
-# This is done to have non root user use the burner (scan the scsi bus)
-#REGISTER ^sg0$ PERMISSIONS root.cdrw 660
-
-# Auto{load,save} of permissions & ownerships by devfsd is not compatible
-# with Unix98 ptys (/dev/pts)
-# The fix is :
-REGISTER	^pt[sy]/.*	IGNORE
-CHANGE		^pt[sy]/.*	IGNORE
-CREATE		^pt[sy]/.*	IGNORE
-
-# Create /dev/cdrom for the first cdrom drive 
-REGISTER ^cdroms/cdrom0$  CFUNCTION GLOBAL symlink $mntpnt/cdroms/cdrom0 cdrom
-UNREGISTER ^cdroms/cdrom0$  CFUNCTION GLOBAL unlink cdrom
-
-# Create /dev/dvd for the second cdrom drive
-# (change '^cdroms/cdrom1$' to suite your setup)
-#REGISTER ^cdroms/cdrom1$  CFUNCTION GLOBAL symlink $mntpnt/cdroms/cdrom1 dvd
-#UNREGISTER ^cdroms/cdrom1$  CFUNCTION GLOBAL unlink dvd
-
-# Create /dev/cdrw for the first cdrom on the scsi bus
-# (change '^sr0$' to suite your setup)
-#REGISTER ^sr0$  CFUNCTION GLOBAL symlink $mntpnt/sr0 cdrw
-#UNREGISTER ^sr0$  CFUNCTION GLOBAL unlink cdrw
-
-# Create /dev/mouse so that dumb rc-script for gpm can work
-REGISTER ^misc/psaux$ CFUNCTION GLOBAL symlink $mntpnt/misc/psaux mouse
-UNREGISTER ^misc/psaux$ CFUNCTION GLOBAL unlink mouse
-
+REGISTER sound/.* PERMISSIONS root.audio 660
+REGISTER snd/.* PERMISSIONS root.audio 660
diff --git a/sys-apps/devfsd/files/devfsd.conf.old b/sys-apps/devfsd/files/devfsd.conf.old
deleted file mode 100644
index beb691a4e834..000000000000
--- a/sys-apps/devfsd/files/devfsd.conf.old
+++ /dev/null
@@ -1,41 +0,0 @@
-# Sample /etc/devfsd.conf configuration file.
-# Richard Gooch  <rgooch@atnf.csiro.au>		3-JUL-2000
-#
-# Enable full compatibility mode for old device names. You may comment these
-# out if you don't use the old device names. Make sure you know what you're
-# doing!
-REGISTER	.*		MKOLDCOMPAT
-UNREGISTER	.*		RMOLDCOMPAT
-
-# You may comment out the above and uncomment the following if you've
-# configured your system to use the original "new" devfs names or the really
-# new names
-#REGISTER	vc/.*		MKOLDCOMPAT
-#UNREGISTER	vc/.*		RMOLDCOMPAT
-#REGISTER	pty/.*		MKOLDCOMPAT
-#UNREGISTER	pty/.*		RMOLDCOMPAT
-#REGISTER	misc		MKOLDCOMPAT
-#UNREGISTER	misc		RMOLDCOMPAT
-
-# You may comment these out if you don't use the original "new" names
-REGISTER	.*		MKNEWCOMPAT
-UNREGISTER	.*		RMNEWCOMPAT
-
-# Enable module autoloading. You may comment this out if you don't use
-# autoloading
-LOOKUP		.*		MODLOAD
-
-# Uncomment this if you want permissions to be saved and restored
-REGISTER        ^pt[sy]/.*      IGNORE
-CHANGE          ^pt[sy]/.*      IGNORE
-REGISTER        .*              COPY    /dev-state/$devname $devpath
-CHANGE          .*              COPY    $devpath /dev-state/$devname
-CREATE          .*              COPY    $devpath /dev-state/$devname
-
-LOOKUP ^cdrom$ CFUNCTION GLOBAL symlink ${mntpnt}/cdroms/cdrom0 $devpath
-REGISTER ^cdrom/cdrom0$  CFUNCTION GLOBAL symlink cdroms/cdrom0 cdrom
-UNREGISTER ^cdrom/cdrom0$  CFUNCTION GLOBAL unlink cdrom
-
-LOOKUP snd MODLOAD ACTION snd
-REGISTER sound/.* PERMISSIONS root.audio 660
-REGISTER snd/.* PERMISSIONS root.audio 660
diff --git a/sys-apps/devfsd/files/devfsd.h b/sys-apps/devfsd/files/devfsd.h
deleted file mode 100644
index 129f367d8d73..000000000000
--- a/sys-apps/devfsd/files/devfsd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  devfsd.h
-
-    Header file for  devfsd  (devfs daemon for Linux).
-
-    Copyright (C) 1998-2000  Richard Gooch
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    Richard Gooch may be reached by email at  rgooch@atnf.csiro.au
-    The postal address is:
-      Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
-*/
-
-#define SYSLOG(level, format, args...) \
-    {if (syslog_is_open) syslog (level, format, ##args); \
-     else fprintf (stderr, format, ## args);}
-
-
-/*  Public data  */
-extern flag syslog_is_open;  /*  File: devfsd.c  */
-
-#define RTLD_NEXT	((void *) -1l)
\ No newline at end of file
diff --git a/sys-apps/devfsd/files/digest-devfsd-1.3.11-r1 b/sys-apps/devfsd/files/digest-devfsd-1.3.11-r1
deleted file mode 100644
index 5928a744aa1b..000000000000
--- a/sys-apps/devfsd/files/digest-devfsd-1.3.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8bbd8558ee83a625a404c6069b66d4e0 devfsd-v1.3.11.tar.gz 28672
diff --git a/sys-apps/devfsd/files/digest-devfsd-1.3.11-r2 b/sys-apps/devfsd/files/digest-devfsd-1.3.11-r2
deleted file mode 100644
index 5928a744aa1b..000000000000
--- a/sys-apps/devfsd/files/digest-devfsd-1.3.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8bbd8558ee83a625a404c6069b66d4e0 devfsd-v1.3.11.tar.gz 28672
diff --git a/sys-apps/devfsd/files/digest-devfsd-1.3.16 b/sys-apps/devfsd/files/digest-devfsd-1.3.16
deleted file mode 100644
index 810496d986be..000000000000
--- a/sys-apps/devfsd/files/digest-devfsd-1.3.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97cee5d52bc6c20f73c39d392d85a5a5 devfsd-v1.3.16.tar.gz 40960