check return of sed; fix HOMEPAGE and SRC_URI breakage by CISCO

3 files changed, 24 insertions, 18 deletions

diff --git a/net-analyzer/portsentry/ChangeLog b/net-analyzer/portsentry/ChangeLog
index efeddf751732..61bc0407e572 100644
--- a/net-analyzer/portsentry/ChangeLog
+++ b/net-analyzer/portsentry/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-analyzer/portsentry
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/ChangeLog,v 1.9 2003/04/23 00:02:57 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/ChangeLog,v 1.10 2003/06/09 21:25:11 msterret Exp $
+
+  09 Jun 2003; <msterret@gentoo.org> portsentry-1.1-r7.ebuild:
+  check return of sed; fix HOMEPAGE and SRC_URI breakage by CISCO
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
+
 *portsentry-1.1-r7 (27 Sept.  2002)
 
   22 Apr 2003; Brandon Low <lostlogic@gentoo.org> portsentry-1.1-r7.ebuild:
@@ -28,7 +31,7 @@
   moved to net-analyzer - added SLOT - added LICENSE
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-analyzer/portsentry/Manifest b/net-analyzer/portsentry/Manifest
index bc1418e52bed..271f80e18133 100644
--- a/net-analyzer/portsentry/Manifest
+++ b/net-analyzer/portsentry/Manifest
@@ -1,5 +1,5 @@
-MD5 043c8c32e80fdbdfc6ca8d84108fa4f7 portsentry-1.1-r7.ebuild 1602
-MD5 5736f386f7453a66d4329461bc0b2963 ChangeLog 1475
+MD5 275d0c3a7e2ea6649ee6671536638ad3 ChangeLog 1602
+MD5 b2530e8bf934901cce56e2586c7b129b portsentry-1.1-r7.ebuild 1731
+MD5 78771791b063cd2784d6b60d5ad9f89f files/digest-portsentry-1.1-r7 65
 MD5 cb697669e22866aafbfa76e941c21e37 files/portsentry.confd 90
 MD5 8bc2e5465021071443fbd1be780cb91d files/portsentry.rc6 980
-MD5 78771791b063cd2784d6b60d5ad9f89f files/digest-portsentry-1.1-r7 65
diff --git a/net-analyzer/portsentry/portsentry-1.1-r7.ebuild b/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
index 25ba7da70f29..6992a01f1169 100644
--- a/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
+++ b/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
@@ -1,34 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/portsentry-1.1-r7.ebuild,v 1.5 2003/04/23 00:02:57 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/portsentry-1.1-r7.ebuild,v 1.6 2003/06/09 21:25:11 msterret Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Automated port scan detector and response tool"
-HOMEPAGE="http://www.psionic.com/abacus/portsentry/"
-SRC_URI="http://www.psionic.com/tools/${P}.tar.gz"
+# Seems like CISCO took the site down?
+#HOMEPAGE="http://www.psionic.com/abacus/portsentry/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc "
 
-DEPEND="=sys-apps/sed-4*"
+DEPEND=">=sys-apps/sed-4"
 
 src_unpack() {
 
 	unpack ${A} ; cd ${S}
 
 	# Setting the portsentry.conf file location
-	sed -i -e 's:/usr/local/psionic/portsentry/portsentry.conf:/etc/portsentry/portsentry.conf:' \
-		portsentry_config.h
+	sed -i \
+		-e 's:/usr/local/psionic/portsentry/portsentry.conf:/etc/portsentry/portsentry.conf:' \
+		portsentry_config.h || die "sed portsentry_config.h failed"
 
 	# presetting the other file locations in portsentry.conf
-	sed -i -e 's:\(^IGNORE_FILE\).*:\1="/etc/portsentry/portsentry.ignore":g' \
+	sed -i \
+		-e 's:\(^IGNORE_FILE\).*:\1="/etc/portsentry/portsentry.ignore":g' \
 	    -e 's:^\(HISTORY_FILE\).*:\1="/etc/portsentry/portsentry.history":g' \
 	    -e 's:^\(BLOCKED_FILE\).*:\1="/etc/portsentry/portsentry.blocked":g' \
-		portsentry.conf
+		portsentry.conf || die "sed portsentry.conf failed"
 
-	sed -i "s:^set SENTRYDIR.*:set SENTRYDIR=/etc/portsentry:g" \
-		ignore.csh
+	sed -i \
+		-e "s:^set SENTRYDIR.*:set SENTRYDIR=/etc/portsentry:g" \
+		ignore.csh || die "sed ignore.csh failed"
 }
 
 src_compile() {
@@ -36,7 +39,7 @@ src_compile() {
 	make CFLAGS="${CFLAGS}" linux || die
 }
 
-src_install () {
+src_install() {
 
 	dobin portsentry ignore.csh
 	dodoc README* CHANGES LICENSE CREDITS