commit: a296a6e0fb0afca044415ecea3ad172b4726629e Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Jan 31 10:11:40 2018 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Jan 31 10:13:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a296a6e0
net-analyzer/nast: Remove file checks from configure (bug #646196 by Jan Psota). Package-Manager: Portage-2.3.20, Repoman-2.3.6 net-analyzer/nast/files/nast-0.2.0-gentoo.patch | 133 ++++++++++++++---------- net-analyzer/nast/nast-0.2.0-r2.ebuild | 41 ++++++++ 2 files changed, 120 insertions(+), 54 deletions(-) diff --git a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch index f8f05ab3a16..015354e5186 100644 --- a/net-analyzer/nast/files/nast-0.2.0-gentoo.patch +++ b/net-analyzer/nast/files/nast-0.2.0-gentoo.patch @@ -1,79 +1,104 @@ --- a/configure.ac +++ b/configure.ac -@@ -84,14 +84,14 @@ +@@ -83,22 +83,6 @@ + # -- libnet -- # - filechk="yes" +-filechk="yes" -AC_CHECK_FILE(/usr/lib/libnet.a,, filechk="no") -+AC_CHECK_FILE(/usr/lib/libnet.so,, filechk="no") - if test "$filechk" = "no"; then +-if test "$filechk" = "no"; then - AC_CHECK_FILE(/usr/local/lib/libnet.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include") -+ AC_CHECK_FILE(/usr/local/lib/libnet.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include") - fi - - if test "$filechk" = "no"; then AC_MSG_ERROR([ - +-fi +- +-if test "$filechk" = "no"; then AC_MSG_ERROR([ +- -Libnet archive file (libnet.a) not found in /usr or /usr/local! -+Libnet archive file (libnet.so) not found in /usr or /usr/local! - - Libnet-1.1.x Packet Shaping Library is required. - You can download it from official web site: http://www.packetfactory.net/libnet -@@ -111,14 +111,14 @@ +- +-Libnet-1.1.x Packet Shaping Library is required. +-You can download it from official web site: http://www.packetfactory.net/libnet +- +-]) +-fi +- + AC_CHECK_LIB(net, libnet_name2addr4,, AC_MSG_ERROR([ + + Libnet-1.1.x Packet Shaping Library not found! It's required. +@@ -110,22 +94,6 @@ + # -- libpcap -- # - filechk="yes" +-filechk="yes" -AC_CHECK_FILE(/usr/lib/libpcap.a,, filechk="no") -+AC_CHECK_FILE(/usr/lib/libpcap.so,, filechk="no") - if test "$filechk" = "no"; then +-if test "$filechk" = "no"; then - AC_CHECK_FILE(/usr/local/lib/libpcap.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include") -+ AC_CHECK_FILE(/usr/local/lib/libpcap.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include") - fi - - if test "$filechk" = "no"; then AC_MSG_ERROR([ - +-fi +- +-if test "$filechk" = "no"; then AC_MSG_ERROR([ +- -Libpcap archive file (libpcap.a) not found in /usr or /usr/local! -+Libpcap archive file (libpcap.so) not found in /usr or /usr/local! - - Libpcap-0.7.1 Packet Capture Library is required. - You can download it from official web site: http://www.tcpdump.org/#current -@@ -137,16 +137,18 @@ +- +-Libpcap-0.7.1 Packet Capture Library is required. +-You can download it from official web site: http://www.tcpdump.org/#current +- +-]) +-fi +- + AC_CHECK_LIB(pcap, pcap_dispatch,, AC_MSG_ERROR([ + + Libpcap-0.7.1 Packet Capture Library not found! It's required. +@@ -137,25 +105,7 @@ # -- libncurses support -- # -+PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],) -+ - filechk="yes" +-filechk="yes" -AC_CHECK_FILE(/usr/lib/libncurses.a,, filechk="no") -+AC_CHECK_FILE(/usr/lib/libncurses.so,, filechk="no") - if test "$filechk" = "no"; then +-if test "$filechk" = "no"; then - AC_CHECK_FILE(/usr/local/lib/libncurses.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include") -+ AC_CHECK_FILE(/usr/local/lib/libncurses.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include") - fi - - if test "$filechk" = "no"; - then AC_MSG_WARN([ - +-fi +- +-if test "$filechk" = "no"; +-then AC_MSG_WARN([ +- -Libncurses archive file (libncurses.a) not found in /usr or /usr/local! -+Libncurses archive file (libncurses.so) not found in /usr or /usr/local! +- +-Ncurses library (*) not found in your system. +-You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html +-(*): CRT screen handling and optimization package +- +-Building without ncurses menu support (-G flag will doesn't work) +- +-]) +-fi ++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],) - Ncurses library (*) not found in your system. - You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html -@@ -174,15 +176,15 @@ + ENABLE_NCRS="no" + AC_CHECK_LIB(ncurses, initscr, ENABLE_NCRS="yes"; NCURSES=ncurses/n_nast.o; LIBS="-lncurses $LIBS"; AC_DEFINE(HAVE_LIBNCURSES), AC_MSG_RESULT([ +@@ -173,28 +123,6 @@ + # --lmenu support-- # - filechk="yes" +-filechk="yes" -AC_CHECK_FILE(/usr/lib/libmenu.a,, filechk="no") -+AC_CHECK_FILE(/usr/lib/libmenu.so,, filechk="no") - if test "$filechk" = "no"; then +-if test "$filechk" = "no"; then - AC_CHECK_FILE(/usr/local/lib/libmenu.a, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include") -+ AC_CHECK_FILE(/usr/local/lib/libmenu.so, filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include") - fi - - if test "$filechk" = "no"; - then AC_MSG_WARN([ - +-fi +- +-if test "$filechk" = "no"; +-then AC_MSG_WARN([ +- -Menu archive file (libncurses.a) not found in /usr or /usr/local! -+Menu archive file (libncurses.so) not found in /usr or /usr/local! - +- +- +-Menu library (*) not found in your system. +-You can download it from official web site: http://www.gnu.org/software/ncurses/ncurses.html +-(*): CRT screen handling and optimization package +- +- +-Building without ncurses menu support (-G flag will doesn't work) +-]) +- +-fi +- + ENABLE_NCRS="no" + AC_CHECK_LIB(menu, menu_opts_off, ENABLE_NCRS="yes"; MENU=ncurses/n_menu.o; LIBS="-lmenu $LIBS"; AC_DEFINE(HAVE_LIBMENU), AC_MSG_RESULT([ - Menu library (*) not found in your system. diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild new file mode 100644 index 00000000000..a922979f560 --- /dev/null +++ b/net-analyzer/nast/nast-0.2.0-r2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools + +DESCRIPTION="NAST - Network Analyzer Sniffer Tool" +HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"; +SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="ncurses" + +RDEPEND=" + >=net-libs/libnet-1.1.1 + net-libs/libpcap + ncurses? ( >=sys-libs/ncurses-5.4 ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + +src_prepare() { + default + eautoreconf +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + dosbin nast + doman nast.8 + dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO +}
