gcc4 patch for bug 107143

(Portage version: 2.0.52-r1)

5 files changed, 26 insertions, 20 deletions

diff --git a/net-analyzer/trafshow/ChangeLog b/net-analyzer/trafshow/ChangeLog
index 229d3941d77b..c8dfe8487370 100644
--- a/net-analyzer/trafshow/ChangeLog
+++ b/net-analyzer/trafshow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/trafshow
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/ChangeLog,v 1.20 2005/09/24 08:22:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/ChangeLog,v 1.21 2005/09/25 16:55:56 vanquirius Exp $
+
+  25 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/trafshow-3.1-gentoo.patch, +files/trafshow-5.2.1-gcc4.diff,
+  trafshow-5.2.1.ebuild:
+  Add gcc4 patch for bug 107143. Thanks to Anatoly Kamchatnov <rev@male.ru>.
 
   24 Sep 2005; Markus Rothe <corsair@gentoo.org> trafshow-5.2.1.ebuild:
   Stable on ppc64
diff --git a/net-analyzer/trafshow/Manifest b/net-analyzer/trafshow/Manifest
index ba7bf8e4effa..4841fc647004 100644
--- a/net-analyzer/trafshow/Manifest
+++ b/net-analyzer/trafshow/Manifest
@@ -1,9 +1,9 @@
+MD5 50cd4a11d444f16779355ec1d25d778c trafshow-4.0.ebuild 997
+MD5 c921405b80fa766aafb75752752139e2 trafshow-5.2.1.ebuild 1020
 MD5 c559f2290f226ad75d7ae234253817c0 ChangeLog 2422
 MD5 8e8b9393d38df263f07c394765553b01 metadata.xml 243
-MD5 50cd4a11d444f16779355ec1d25d778c trafshow-4.0.ebuild 997
-MD5 79e30cecd6bde84c06dfb89865761b7a trafshow-5.2.1.ebuild 977
 MD5 0eaa3123d4ab8173d4f7a1a4be4e1e0f files/digest-trafshow-4.0 60
-MD5 de937e07ac952efc66dbe67616befc58 files/trafshow-3.1-gentoo.patch 492
-MD5 18731bc84348a4cbb851177332ba3596 files/trafshow-4.0-gentoo.patch 745
 MD5 4425dfe640632b461cea181e62bbc704 files/digest-trafshow-5.2.1 63
 MD5 77204def98fa54e7c755e708b1e8cc99 files/trafshow-5.2.1-gentoo.patch 827
+MD5 2be46d4c1d01704fa3dd4ae5e7dc3796 files/trafshow-5.2.1-gcc4.diff 272
+MD5 18731bc84348a4cbb851177332ba3596 files/trafshow-4.0-gentoo.patch 745
diff --git a/net-analyzer/trafshow/files/trafshow-3.1-gentoo.patch b/net-analyzer/trafshow/files/trafshow-3.1-gentoo.patch
deleted file mode 100644
index 8c8fc5d999a7..000000000000
--- a/net-analyzer/trafshow/files/trafshow-3.1-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trafshow-3.1/Makefile.in.old	1998-08-24 00:54:16.000000000 -0400
-+++ trafshow-3.1/Makefile.in	2002-02-16 12:07:04.000000000 -0500
-@@ -70,7 +70,7 @@
- install: force
- 	./install-sh -c -s -m 550 -o bin -g @V_GROUP@ $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
- 	./install-sh -c -m 444 -o bin -g bin $(PROG).1 $(DESTDIR)$(MANDEST)/man1/$(PROG).1
--	./install-sh -c -o root -m 644 .trafshow /etc/$(PROG)
-+	./install-sh -c -o root -m 644 .trafshow $(DESTDIR)/etc/$(PROG)
- 
- clean:
- 	rm -f $(CLEANFILES)
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.1-gcc4.diff b/net-analyzer/trafshow/files/trafshow-5.2.1-gcc4.diff
new file mode 100644
index 000000000000..c0deaa08441e
--- /dev/null
+++ b/net-analyzer/trafshow/files/trafshow-5.2.1-gcc4.diff
@@ -0,0 +1,11 @@
+--- trafshow-5.2.1.orig/screen.c	2005-08-01 15:12:34.000000000 -0300
++++ trafshow-5.2.1/screen.c	2005-09-25 13:42:40.000000000 -0300
+@@ -41,8 +41,6 @@
+ int prompt_mode = 0;
+ double line_factor = 1;
+ 
+-extern int curs_dock_x, curs_dock_y;
+-
+ /*
+  * Initialize curses.
+  */
diff --git a/net-analyzer/trafshow/trafshow-5.2.1.ebuild b/net-analyzer/trafshow/trafshow-5.2.1.ebuild
index 41a1605c8dd6..7f9995d54afb 100644
--- a/net-analyzer/trafshow/trafshow-5.2.1.ebuild
+++ b/net-analyzer/trafshow/trafshow-5.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/trafshow-5.2.1.ebuild,v 1.3 2005/09/24 08:22:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/trafshow-5.2.1.ebuild,v 1.4 2005/09/25 16:55:56 vanquirius Exp $
 
 inherit eutils gnuconfig
 
@@ -17,8 +17,9 @@ DEPEND="virtual/libpcap
 	slang? ( >=sys-libs/slang-1.4.2 )"
 
 src_unpack() {
-	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	unpack ${A}; cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gcc4.diff"
 	use ppc64 && gnuconfig_update
 }
 
@@ -34,5 +35,5 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed"
+	make install DESTDIR="${D}" || die "make install failed"
 }