Changed ebuilds to use 'sed -i ...' instead of 'sed ... < file > file.new' syntax.

9 files changed, 42 insertions, 36 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 100f549b8679..6da9a690347d 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.34 2004/03/09 00:55:52 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.35 2004/03/16 01:51:07 mboman Exp $
+
+  16 Mar 2004; Michael Boman <mboman@gentoo.org> snort-2.0.0.ebuild,
+  snort-2.0.1-r1.ebuild, snort-2.0.2.ebuild, snort-2.0.5-r1.ebuild,
+  snort-2.0.5.ebuild, snort-2.1.0.ebuild, snort-2.1.1.ebuild:
+  Changed ebuilds to use 'sed -i ...' instead of 'sed ... < file > file.new'
+  syntax.
 
 *snort-2.1.1 (09 Mar 2004)
 
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index f2e54750d600..2447e3a4655e 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,16 +1,16 @@
-MD5 135b214128e11b7487bbb853a1a85e74 ChangeLog 7256
-MD5 9c6b611339af7149d67f677a96d398db metadata.xml 930
+MD5 1dcd1e92046328722245bc123117be9e ChangeLog 7543
+MD5 f629e6b9c8a922659de794d67f0cd115 metadata.xml 928
+MD5 03c287fe6ca2ab40814f12608b76d96a snort-2.0.0.ebuild 3035
+MD5 d0243fa346143e030c5fe251ca78e6d8 snort-2.0.1-r1.ebuild 2722
+MD5 07a597c9eb16d5d35587bd93bde7f9f7 snort-2.0.2.ebuild 2638
+MD5 c692e9896d16b7cb8693287a03db20a6 snort-2.0.5-r1.ebuild 2998
 MD5 6b8e74b31bd8b33a1abf5099637de1f1 snort-1.9.1-r3.ebuild 2280
-MD5 8d46f6a0e861639987d7340b883c0e9f snort-2.0.0.ebuild 3047
-MD5 0c4f28771a4096a1dc044f13ea500bff snort-2.0.1-r1.ebuild 2734
-MD5 02c960da9a74fdb00a4dfbccccb5cdc2 snort-2.0.2.ebuild 2650
-MD5 ab7b8bc6bdd9ab9e2ddec0598f26a9f0 snort-2.0.5-r1.ebuild 3010
+MD5 d668166df3d6facc2279cdd681c108ae snort-2.0.5.ebuild 2638
 MD5 f80a28eb514d54c97e9962eebf935123 snort-2.0.5-r2.ebuild 3146
-MD5 98b1c38ace076a3c4ba465a3bfac1693 snort-2.0.5.ebuild 2650
 MD5 6b11ef1508669652a616528841ab6204 snort-2.0.6.ebuild 3141
+MD5 38f50d2214776f9d9919c8dbcf742bc5 snort-2.1.0.ebuild 3475
+MD5 8522823778cefcf81edaeebca8fb7c25 snort-2.1.1.ebuild 3475
 MD5 51ee9de48d3300ec9fd8cae6a3a9f254 snort-2.1.0-r1.ebuild 3677
-MD5 014d046c5d18051acd026b58b67807e3 snort-2.1.0.ebuild 3487
-MD5 7414a84d7fa6a516dcdc1926ce05e747 snort-2.1.1.ebuild 3487
 MD5 a45c40b1fd8165ed1e9616808d8f4d41 files/1.9.1-libnet-1.0.patch 2907
 MD5 79f3f73bc2f906d80d46bbb2e5816c81 files/2.0.0-libnet-1.0.patch 2679
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.0.1-libnet-1.0.patch 2753
diff --git a/net-analyzer/snort/snort-2.0.0.ebuild b/net-analyzer/snort/snort-2.0.0.ebuild
index 2c288ad7635a..e876c9d91031 100644
--- a/net-analyzer/snort/snort-2.0.0.ebuild
+++ b/net-analyzer/snort/snort-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.0.ebuild,v 1.8 2003/12/17 00:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.0.ebuild,v 1.9 2004/03/16 01:51:07 mboman Exp $
 
 inherit eutils
 
@@ -43,7 +43,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
 
-	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
 }
 
 src_compile() {
@@ -87,7 +87,7 @@ src_install () {
 
 	insinto /etc/snort
 	doins etc/reference.config etc/classification.config rules/*.rules
-	doins etc/snort.conf.distrib
+	newins etc/snort.conf snort.conf.distrib
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
 	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
diff --git a/net-analyzer/snort/snort-2.0.1-r1.ebuild b/net-analyzer/snort/snort-2.0.1-r1.ebuild
index f36b26fe0bb9..3a03dcefee43 100644
--- a/net-analyzer/snort/snort-2.0.1-r1.ebuild
+++ b/net-analyzer/snort/snort-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.1-r1.ebuild,v 1.4 2003/11/24 15:40:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.1-r1.ebuild,v 1.5 2004/03/16 01:51:07 mboman Exp $
 
 inherit eutils
 
@@ -45,7 +45,7 @@ src_unpack() {
 	#is this needed in 2.0? -Method
 	#use alpha && epatch ${FILESDIR}/${P}-alpha.patch
 
-	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
 
 	use prelude && epatch ../${P}+prelude.patch
 }
@@ -81,7 +81,7 @@ src_install() {
 
 	insinto /etc/snort
 	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map
-	doins etc/snort.conf.distrib
+	newins etc/snort.conf snort.conf.distrib
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
 	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
diff --git a/net-analyzer/snort/snort-2.0.2.ebuild b/net-analyzer/snort/snort-2.0.2.ebuild
index 78c5f9a1f2dd..4535f7a95c7a 100644
--- a/net-analyzer/snort/snort-2.0.2.ebuild
+++ b/net-analyzer/snort/snort-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.2.ebuild,v 1.5 2003/11/24 15:40:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.2.ebuild,v 1.6 2004/03/16 01:51:07 mboman Exp $
 
 inherit eutils
 
@@ -43,7 +43,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gcc3.patch
 
-	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
 
 	use prelude && epatch ../${P/.2/.1}+prelude.patch
 }
@@ -79,7 +79,7 @@ src_install() {
 
 	insinto /etc/snort
 	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map
-	doins etc/snort.conf.distrib
+	newins etc/snort.conf snort.conf.distrib
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
 	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
diff --git a/net-analyzer/snort/snort-2.0.5-r1.ebuild b/net-analyzer/snort/snort-2.0.5-r1.ebuild
index 3fe805bb7200..cd5a9599fea8 100644
--- a/net-analyzer/snort/snort-2.0.5-r1.ebuild
+++ b/net-analyzer/snort/snort-2.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.5-r1.ebuild,v 1.1 2003/11/28 08:02:00 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.5-r1.ebuild,v 1.2 2004/03/16 01:51:07 mboman Exp $
 
 inherit eutils
 
@@ -44,7 +44,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gcc3.patch
 
-	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
 
 	use prelude && epatch ../${P/.5/.2}-prelude.diff
 }
@@ -83,7 +83,7 @@ src_install() {
 
 	insinto /etc/snort
 	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map
-	doins etc/snort.conf.distrib
+	newins etc/snort.conf snort.conf.distrib
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
 	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
diff --git a/net-analyzer/snort/snort-2.0.5.ebuild b/net-analyzer/snort/snort-2.0.5.ebuild
index 0848c410d120..f31ffd3be1ea 100644
--- a/net-analyzer/snort/snort-2.0.5.ebuild
+++ b/net-analyzer/snort/snort-2.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.5.ebuild,v 1.2 2003/11/24 15:40:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.0.5.ebuild,v 1.3 2004/03/16 01:51:07 mboman Exp $
 
 inherit eutils
 
@@ -43,7 +43,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gcc3.patch
 
-	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
 
 	use prelude && epatch ../${P/.5/.1}+prelude.patch
 }
@@ -79,7 +79,7 @@ src_install() {
 
 	insinto /etc/snort
 	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map
-	doins etc/snort.conf.distrib
+	newins etc/snort.conf snort.conf.distrib
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
 	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
diff --git a/net-analyzer/snort/snort-2.1.0.ebuild b/net-analyzer/snort/snort-2.1.0.ebuild
index efe7b2ec2799..8a016a4946b5 100644
--- a/net-analyzer/snort/snort-2.1.0.ebuild
+++ b/net-analyzer/snort/snort-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.1.0.ebuild,v 1.2 2004/01/07 08:23:54 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.1.0.ebuild,v 1.3 2004/03/16 01:51:07 mboman Exp $
 
 inherit eutils
 
@@ -53,7 +53,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/snort-drop-calculation.diff
 
-	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
 
 	# Prelude patch currently not compatible with 2.1.0
 	#use prelude && (
@@ -97,7 +97,7 @@ src_install() {
 	insinto /etc/snort
 	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map etc/threshold.conf
 	#use prelude && doins etc/prelude-classification.config
-	doins etc/snort.conf.distrib
+	newins etc/snort.conf snort.conf.distrib
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
 	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort
diff --git a/net-analyzer/snort/snort-2.1.1.ebuild b/net-analyzer/snort/snort-2.1.1.ebuild
index d1436f8de111..fd319bda0ac3 100644
--- a/net-analyzer/snort/snort-2.1.1.ebuild
+++ b/net-analyzer/snort/snort-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.1.1.ebuild,v 1.1 2004/03/09 00:55:52 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.1.1.ebuild,v 1.2 2004/03/16 01:51:07 mboman Exp $
 
 inherit eutils
 
@@ -53,7 +53,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/snort-drop-calculation.diff
 
-	sed "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" < etc/snort.conf > etc/snort.conf.distrib
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" etc/snort.conf
 
 	# Prelude patch currently not compatible with 2.1.0
 	#use prelude && (
@@ -97,7 +97,7 @@ src_install() {
 	insinto /etc/snort
 	doins etc/reference.config etc/classification.config rules/*.rules etc/*.map etc/threshold.conf
 	#use prelude && doins etc/prelude-classification.config
-	doins etc/snort.conf.distrib
+	newins etc/snort.conf snort.conf.distrib
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/snort.rc6 snort
 	insinto /etc/conf.d ; newins ${FILESDIR}/snort.confd snort