1 |
jer 14/06/09 03:18:36 |
2 |
|
3 |
Modified: ChangeLog nsat-1.5-r1.ebuild |
4 |
Log: |
5 |
Clean up. |
6 |
|
7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
8 |
|
9 |
Revision Changes Path |
10 |
1.22 net-analyzer/nsat/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/ChangeLog?rev=1.22&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/ChangeLog?rev=1.22&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/ChangeLog?r1=1.21&r2=1.22 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v |
19 |
retrieving revision 1.21 |
20 |
retrieving revision 1.22 |
21 |
diff -u -r1.21 -r1.22 |
22 |
--- ChangeLog 6 Oct 2012 19:00:44 -0000 1.21 |
23 |
+++ ChangeLog 9 Jun 2014 03:18:36 -0000 1.22 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for net-analyzer/nsat |
26 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.21 2012/10/06 19:00:44 pinkbyte Exp $ |
28 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.22 2014/06/09 03:18:36 jer Exp $ |
30 |
+ |
31 |
+ 09 Jun 2014; Jeroen Roovers <jer@g.o> nsat-1.5-r1.ebuild: |
32 |
+ Clean up. |
33 |
|
34 |
06 Oct 2012; Sergey Popov <pinkbyte@g.o> nsat-1.5-r1.ebuild: |
35 |
Respect LDFLAGS wrt bug #335951 |
36 |
|
37 |
|
38 |
|
39 |
1.5 net-analyzer/nsat/nsat-1.5-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild?rev=1.5&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild?rev=1.5&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild?r1=1.4&r2=1.5 |
44 |
|
45 |
Index: nsat-1.5-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild,v |
48 |
retrieving revision 1.4 |
49 |
retrieving revision 1.5 |
50 |
diff -u -r1.4 -r1.5 |
51 |
--- nsat-1.5-r1.ebuild 6 Oct 2012 19:00:44 -0000 1.4 |
52 |
+++ nsat-1.5-r1.ebuild 9 Jun 2014 03:18:36 -0000 1.5 |
53 |
@@ -1,9 +1,8 @@ |
54 |
-# Copyright 1999-2012 Gentoo Foundation |
55 |
+# Copyright 1999-2014 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild,v 1.4 2012/10/06 19:00:44 pinkbyte Exp $ |
58 |
- |
59 |
-EAPI=2 |
60 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5-r1.ebuild,v 1.5 2014/06/09 03:18:36 jer Exp $ |
61 |
|
62 |
+EAPI=5 |
63 |
inherit eutils autotools |
64 |
|
65 |
DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner" |
66 |
@@ -15,11 +14,14 @@ |
67 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
68 |
IUSE="X" |
69 |
|
70 |
-RDEPEND="X? ( x11-libs/libX11 |
71 |
- dev-lang/tk ) |
72 |
- net-libs/libpcap" |
73 |
- |
74 |
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58" |
75 |
+RDEPEND=" |
76 |
+ X? ( |
77 |
+ x11-libs/libX11 |
78 |
+ dev-lang/tk |
79 |
+ ) |
80 |
+ net-libs/libpcap |
81 |
+" |
82 |
+DEPEND="$RDEPEND" |
83 |
|
84 |
S="${WORKDIR}/${PN}" |
85 |
|
86 |
@@ -32,28 +34,28 @@ |
87 |
use amd64 && epatch "${FILESDIR}"/${P}-amd64-compat.patch |
88 |
|
89 |
# Respect LDFLAGS |
90 |
- sed -i -e '/..\/nsat/,+1s/${CFLAGS}/${CFLAGS} ${LDFLAGS}/' \ |
91 |
- src/Makefile.in || die 'first sed for respecting LDFLAGS failed' |
92 |
- sed -i -e '/@$(CC)/s/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' \ |
93 |
- src/smb/Makefile.in || die 'second sed for respecting LDFLAGS failed' |
94 |
+ sed -i \ |
95 |
+ -e '/..\/nsat/,+1s/${CFLAGS}/${CFLAGS} ${LDFLAGS}/' \ |
96 |
+ src/Makefile.in || die |
97 |
+ sed -i \ |
98 |
+ -e '/@$(CC)/s/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' \ |
99 |
+ src/smb/Makefile.in || die |
100 |
|
101 |
- sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \ |
102 |
+ sed -i \ |
103 |
+ -e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \ |
104 |
nsat.conf || die "sed on nsat.conf failed" |
105 |
- sed -i "s:/usr/local:/usr:g" Makefile.in || die "sed on Makefile.in failed" |
106 |
- sed -i "s:/usr/local:/usr:g" tools/xnsat || die "sed on tools/xnsat failed" |
107 |
- sed -i -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \ |
108 |
+ sed -i -e "s:/usr/local:/usr:g" Makefile.in || die |
109 |
+ sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die |
110 |
+ sed -i \ |
111 |
+ -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \ |
112 |
-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \ |
113 |
- src/lang.h || die "sed on src/lang.h failed" |
114 |
+ src/lang.h || die |
115 |
|
116 |
eautoreconf |
117 |
} |
118 |
|
119 |
src_configure() { |
120 |
- econf $(use_with X x) || die "configuration failed" |
121 |
-} |
122 |
- |
123 |
-src_compile() { |
124 |
- make|| die "compile problem" |
125 |
+ econf $(use_with X x) |
126 |
} |
127 |
|
128 |
src_install () { |