Use CFLAGS from environment (bug #240852). Use LDFLAGS and CC too. Do not strip. Use a patch instead of sed.

(Portage version: 2.2_rc40/cvs/Linux i686)

3 files changed, 75 insertions, 2 deletions

diff --git a/net-analyzer/fwlogwatch/ChangeLog b/net-analyzer/fwlogwatch/ChangeLog
index cdbb298824b3..abf678bb60ce 100644
--- a/net-analyzer/fwlogwatch/ChangeLog
+++ b/net-analyzer/fwlogwatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/fwlogwatch
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/ChangeLog,v 1.19 2009/01/02 21:30:36 bluebird Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/ChangeLog,v 1.20 2009/08/25 22:37:06 jer Exp $
+
+*fwlogwatch-1.1-r1 (25 Aug 2009)
+
+  25 Aug 2009; Jeroen Roovers <jer@gentoo.org> +fwlogwatch-1.1-r1.ebuild,
+  +files/fwlogwatch-1.1-make.patch:
+  Use CFLAGS from environment (bug #240852). Use LDFLAGS and CC too. Do not
+  strip. Use a patch instead of sed.
 
   02 Jan 2009; Friedrich Oslage <bluebird@gentoo.org> fwlogwatch-1.1.ebuild:
   Stable on sparc, bug #253290
diff --git a/net-analyzer/fwlogwatch/files/fwlogwatch-1.1-make.patch b/net-analyzer/fwlogwatch/files/fwlogwatch-1.1-make.patch
new file mode 100644
index 000000000000..697f36605eb8
--- /dev/null
+++ b/net-analyzer/fwlogwatch/files/fwlogwatch-1.1-make.patch
@@ -0,0 +1,22 @@
+--- Makefile.orig	2006-03-08 20:36:02.000000000 +0100
++++ Makefile	2009-08-26 00:34:02.000000000 +0200
+@@ -2,9 +2,7 @@
+ # $Id: fwlogwatch-1.1-make.patch,v 1.1 2009/08/25 22:37:06 jer Exp $
+ 
+ # Linux
+-CC = gcc
+-CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
+-LDFLAGS = #-g #-static -p
++CFLAGS += -DHAVE_ZLIB -DHAVE_GETTEXT
+ LIBS = -lcrypt -lz #-ladns #-lc_p
+ 
+ # Solaris
+@@ -39,7 +37,7 @@
+ LFLAGS = -B #-f #-p -p -d
+ 
+ INSTALL = install
+-INSTALL_PROGRAM = $(INSTALL) -s -m 0755
++INSTALL_PROGRAM = $(INSTALL) -m 0755
+ INSTALL_SCRIPT = $(INSTALL) -m 0755
+ INSTALL_DATA = $(INSTALL) -m 0644
+ INSTALL_DIR = /usr/local
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.1-r1.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.1-r1.ebuild
new file mode 100644
index 000000000000..261d6ba92e8b
--- /dev/null
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/fwlogwatch-1.1-r1.ebuild,v 1.1 2009/08/25 22:37:06 jer Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A packet filter and firewall log analyzer"
+HOMEPAGE="http://fwlogwatch.inside-security.de/"
+SRC_URI="http://www.kybs.de/boris/sw/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-1"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-make.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dosbin fwlogwatch
+	dosbin contrib/fwlw_notify
+	dosbin contrib/fwlw_respond
+	dodir /usr/share/fwlogwatch/contrib
+	insinto /usr/share/fwlogwatch/contrib
+
+	doins contrib/fwlogsummary.cgi
+	doins contrib/fwlogsummary_small.cgi
+	doins contrib/fwlogwatch.php
+	doins contrib
+	insinto /etc
+
+	doins fwlogwatch.config fwlogwatch.template
+
+	dodoc AUTHORS ChangeLog CREDITS README
+	doman fwlogwatch.8
+}