Move the init.d script out of baselayout and touchup the manpage #81946.

(Portage version: 2.0.51-r15)

6 files changed, 116 insertions, 7 deletions

diff --git a/sys-apps/setserial/ChangeLog b/sys-apps/setserial/ChangeLog
index e02b592d3c90..416d8b05efaa 100644
--- a/sys-apps/setserial/ChangeLog
+++ b/sys-apps/setserial/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/setserial
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/ChangeLog,v 1.9 2004/07/01 21:39:10 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/ChangeLog,v 1.10 2005/02/21 15:53:03 vapier Exp $
+
+*setserial-2.17-r3 (21 Feb 2005)
+
+  21 Feb 2005; Mike Frysinger <vapier@gentoo.org> +files/serial,
+  +files/setserial-2.17-manpage-updates.patch,
+  +files/setserial-2.17-spelling.patch, -setserial-2.17-r2.ebuild,
+  +setserial-2.17-r3.ebuild:
+  Move the init.d script out of baselayout and touchup the manpage #81946.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   setserial-2.17-r2.ebuild:
diff --git a/sys-apps/setserial/files/digest-setserial-2.17-r2 b/sys-apps/setserial/files/digest-setserial-2.17-r3
index 5e0ac4b25833..5e0ac4b25833 100644
--- a/sys-apps/setserial/files/digest-setserial-2.17-r2
+++ b/sys-apps/setserial/files/digest-setserial-2.17-r3
diff --git a/sys-apps/setserial/files/serial b/sys-apps/setserial/files/serial
new file mode 100755
index 000000000000..d1b35dbf1c18
--- /dev/null
+++ b/sys-apps/setserial/files/serial
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/files/serial,v 1.1 2005/02/21 15:53:03 vapier Exp $
+
+depend() {
+	need localmount
+}
+
+moduleinserted() {
+	local res=$(grep 'serial' /proc/modules | cut -f1 -d" ")
+	[[ ${res} == "serial" ]] && return 1
+}
+
+setports() {
+	#if serial module exists, and it's not inserted, insert it permanently
+	if [[ -f /lib/modules/$(uname -r)/misc/serial.o ]] ; then
+		moduleinserted
+		if [[ $? -eq 0 ]] ; then
+			/sbin/insmod serial 1>&2
+		fi
+	fi
+
+	if [[ -e /etc/serial.conf ]] ; then
+		grep -v "^#\|^ \|^$" /etc/serial.conf | while read device args
+		do
+			ebegin "Setting $device to $args"
+			${SETSERIAL} -b $device $args 1>&2
+			if [[ $? -gt 0 ]] ; then
+				eend 1 "Error setting serial port $device $args"
+				no_errs=0
+			else
+				eend 0
+				done="${done} /dev/$1"
+			fi
+		done
+	fi
+}
+
+start() {
+	SETSERIAL="/bin/setserial"
+	no_errs=1
+	done=""
+	setports
+	return
+}
+
+
+# vim:ts=4
diff --git a/sys-apps/setserial/files/setserial-2.17-manpage-updates.patch b/sys-apps/setserial/files/setserial-2.17-manpage-updates.patch
new file mode 100644
index 000000000000..02f4a454a3d5
--- /dev/null
+++ b/sys-apps/setserial/files/setserial-2.17-manpage-updates.patch
@@ -0,0 +1,36 @@
+--- setserial-2.17/setserial.8.in
++++ setserial-2.17/setserial.8.in
+@@ -34,7 +34,7 @@
+ program should be used.  Typically it is called from an
+-.I rc.serial
++.I serial
+ script, which is usually run out of 
+-.IR /etc/rc.local .
++.IR /etc/init.d/ .
+ 
+ The
+ .I device
+@@ -78,7 +78,7 @@
+ .B \-b
+ When reporting the configuration of a serial device, print a summary
+ of the device's configuration, which might be suitable for printing
+-during the bootup process, during the /etc/rc script.
++during the bootup process, in the /etc/init.d/serial script.
+ .TP
+ .B \-G
+ Print out the configuration information of the serial port in a form which
+@@ -504,12 +504,9 @@
+ CAUTION: Configuring a serial port to use an incorrect I/O port 
+ can lock up your machine.
+ .SH FILES
+-.BR /etc/rc.local
+-.BR /etc/rc.serial
++.BR /etc/serial.conf
+ .SH "SEE ALSO"
+-.BR tty (4),
+-.BR ttys (4),
+-kernel/chr_drv/serial.c
++.BR tty (4)
+ .SH AUTHOR
+ The original version of setserial was written by Rick Sladkey
+ (jrs@world.std.com), and was modified by Michael K. Johnson
diff --git a/sys-apps/setserial/files/setserial-2.17-spelling.patch b/sys-apps/setserial/files/setserial-2.17-spelling.patch
new file mode 100644
index 000000000000..49ac5f41e72b
--- /dev/null
+++ b/sys-apps/setserial/files/setserial-2.17-spelling.patch
@@ -0,0 +1,7 @@
+Ripped from Fedora.
+
+--- setserial-2.17/setserial.c
++++ setserial-2.17/setserial.c
+@@ -710,1 +710,1 @@
+-	fprintf(stderr, "\t  spd_normal\tuse 38.4kb when a buad rate of 38.4kb is selected\n");
++	fprintf(stderr, "\t  spd_normal\tuse 38.4kb when a baud rate of 38.4kb is selected\n");
diff --git a/sys-apps/setserial/setserial-2.17-r2.ebuild b/sys-apps/setserial/setserial-2.17-r3.ebuild
index 88f122815dde..f022ade20bc7 100644
--- a/sys-apps/setserial/setserial-2.17-r2.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r2.ebuild,v 1.26 2004/11/15 18:59:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r3.ebuild,v 1.1 2005/02/21 15:53:03 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Configure your serial ports with it"
 HOMEPAGE="http://setserial.sourceforge.net/"
@@ -12,7 +14,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-spelling.patch
+	epatch "${FILESDIR}"/${P}-manpage-updates.patch
+}
 
 src_compile() {
 	econf || die
@@ -24,9 +31,11 @@ src_install() {
 	into /
 	dobin setserial || die
 
+	insinto /etc
+	doins serial.conf
+	doinitd "${FILESDIR}"/serial
+
 	dodoc README
 	docinto txt
 	dodoc Documentation/*
-	insinto /etc
-	doins serial.conf
 }