Respect LDFLAGS (bug #337309). Fix some missing includes/declarations.

Package-Manager: portage-2.2_rc81/cvs/Linux i686

4 files changed, 88 insertions, 22 deletions

diff --git a/net-analyzer/nbtscan/ChangeLog b/net-analyzer/nbtscan/ChangeLog
index f40453d49923..495e9c7aa9b4 100644
--- a/net-analyzer/nbtscan/ChangeLog
+++ b/net-analyzer/nbtscan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nbtscan
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/ChangeLog,v 1.29 2010/05/26 16:22:25 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/ChangeLog,v 1.30 2010/09/15 01:22:16 jer Exp $
+
+*nbtscan-1.5.1-r2 (15 Sep 2010)
+
+  15 Sep 2010; Jeroen Roovers <jer@gentoo.org> +nbtscan-1.5.1-r2.ebuild,
+  +files/nbtscan-1.5.1-includes-declarations.patch:
+  Respect LDFLAGS (bug #337309). Fix some missing includes/declarations.
 
   26 May 2010; Jonathan Callen <abcd@gentoo.org> nbtscan-1.5.1-r1.ebuild:
   Fix QA violations (quoting, use econf), add prefix keywords
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
index 0a82570a4fb6..8a68dcc95bc8 100644
--- a/net-analyzer/nbtscan/Manifest
+++ b/net-analyzer/nbtscan/Manifest
@@ -1,25 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX nbtscan-1.5.1-includes-declarations.patch 954 RMD160 09bab83ff4c9c54dd9f4dbf2474d8832b319c4ef SHA1 a95f2174e0f2233a06de14466e2969761db5b757 SHA256 71628668cb76191302e0e1fb9b8c96532b6190bd135332a755683c0c6fab3181
 AUX nbtscan-1.5.1-script-whitespace.patch 4023 RMD160 4123c615835c25b431aa2194dcc7ddd274d7363a SHA1 fb1285ded3b2519fb14251d6ad6e0096e3123be9 SHA256 9c0ba92f422c97e6203b1806bc04e02ad4000e3a914d121557912e15a86d6317
 DIST nbtscan-1.5.1.tar.gz 82107 RMD160 5130d9e6decd3346859281f45f8a179aa0286a42 SHA1 4041d8f6b592fa310b8d3c79c56a2d3263dba82f SHA256 f9f95d5555356c8d467a576e69d9d348bf2a821ded9a85f895b5e6d21e2aa7eb
 EBUILD nbtscan-1.5.1-r1.ebuild 812 RMD160 164d319ab57ab6d565735f775bb1ca4022f27822 SHA1 0548672d703c04a539e4f0eaffa2c0b3eefd0497 SHA256 77860d709e86f43c2839c5331b31ee71e0d28b52711ea432f2d79f36a48c50b5
-MISC ChangeLog 3564 RMD160 047f5e60905e8b2b9d1e61e1bbf19680e2fedffe SHA1 0b9650100057ff485ad16a62b1c9fa75a3e7c48b SHA256 7329bd62c19167a0cfa42cecbf36d4f15f48bef345d529a1931a6907128c687c
+EBUILD nbtscan-1.5.1-r2.ebuild 991 RMD160 6fbc31f162793c45b23ef8f9f9568eee12c7b216 SHA1 fc49c7ea54da7ec1ceaddf8556c8e67c9561a1c8 SHA256 bb7cd41b01ccdaa08356347e24c33463e195a37bc6c719863d9f03921a3d2338
+MISC ChangeLog 3795 RMD160 51a939a92dcce0fefafe192d8dc6bf5cba819117 SHA1 8f2b6da1409709920557c7bc8a30fca1d7b11349 SHA256 01583bae8dcf1cee40f99ea5e608331c0525dfdc44672d5ed2289108260d7d76
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBCAAGBQJL/UrLAAoJELHSF2kinlg4pDsP/0CP7T7JrpceNJX2LDKAD3KK
-apC8H/QZ6AHsjWflmq16G3i+PeFCKYX46puNwjQ5j5pE+bMfm4FOccy+LEfl/Rxr
-Yv+IHctN6sEKeQYPQjchCQ0uBA3X/3mndxXrHagDwZpO13b1csdHpBQq4CuniwB4
-zS6O+/h6wDeNxXyQojvuPbcPqNh5JWRE556yA7rGbwBBaT8cheJq63BunCGGgXdy
-rupbUXx08Pn6ADf6JBJLalVrHjqW/zCH+YFOjQiowl0fIlRDhoC23cQ9+urEcyX0
-YYpXMI6vsXCoX5ypNoC0xbvVAKb2BoKmWu9kX7rZNwmpmZw6/lZZKvFaxWcYMUYa
-Ifo8zU5C5KZ/z34tauiiS25V5rHDJm/JsX5qy6eYYC5OUcT4jxedA9W8XC6F5FD6
-wfrLc6iXr0MQqfVvBAMpVVbS+XAv8+2P3A3HPQ4/Eq0e2tBgOV5s5KYJeZAMidpv
-p9qKl9GQgjoked8vAY3fBTjjStCG4TWmAUgoF8jcmmaoouguqB6DSTn/5SORWYBC
-uO8s7tgOWwa/KgOrPKVowbTP+haf/N/weRwZx3jgOvh0GGhjKmLuPtXbVsFOn4HO
-tW5sgLoXEZTXtlR0BQ305Jk4RF6QUJEHWVTqUV9giGeGw2ZDl9TERKwJazV4Lc2u
-avqeJNXD92I0e8XwVOdH
-=+h9M
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch
new file mode 100644
index 000000000000..a585d4495fb5
--- /dev/null
+++ b/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch
@@ -0,0 +1,42 @@
+--- a/list.h
++++ b/list.h
+@@ -19,3 +19,5 @@
+ int compare(struct list_item* item1, struct list_item* item2);
+ 
+ int insert(struct list* lst, unsigned long content);
++
++int in_list(struct list* lst, unsigned long content);
+--- a/nbtscan.c
++++ b/nbtscan.c
+@@ -5,6 +5,8 @@
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <string.h>
++#include <ctype.h>
++#include <unistd.h>
+ #if HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
+--- a/statusq.h
++++ b/statusq.h
+@@ -103,4 +103,10 @@
+ 	char* service_name;
+ } nb_service_t ;
+ 
++char* getnbservicename(my_uint8_t service, int unique, char* name);
++
++struct nb_host_info* parse_response(char* buff, int buffsize);
++
++int send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base);
++
+ #endif /* STATUSQ_H */
+--- a/statusq.c
++++ b/statusq.c
+@@ -29,6 +29,7 @@
+ #include <sys/time.h>
+ #include "statusq.h"
+ #include <string.h>
++#include <ctype.h>
+ #include <stdio.h>
+ #include <stddef.h>
+ #include "errors.h"
diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1-r2.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..9a315bd5a1c0
--- /dev/null
+++ b/net-analyzer/nbtscan/nbtscan-1.5.1-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/nbtscan-1.5.1-r2.ebuild,v 1.1 2010/09/15 01:22:16 jer Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
+HOMEPAGE="http://www.inetcat.net/software/nbtscan.html"
+SRC_URI="http://www.sourcefiles.org/Networking/Tools/Miscellanenous/${P}.tar.gz"
+SRC_URI="http://www.inetcat.net/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${P}a
+
+src_prepare() {
+	sed -i Makefile.in \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		-e 's| \($(BINDIR)\)| $(DESTDIR)/\1|g' \
+		|| die "sed Makefile.in"
+	epatch \
+		"${FILESDIR}"/${P}-script-whitespace.patch \
+		"${FILESDIR}"/${P}-includes-declarations.patch
+}
+
+src_install () {
+	dobin ${PN} || die "dobin ${PN}"
+	dodoc ChangeLog README
+}