net-analyzer/nmap: Fix live ebuild (maybe bug #592490).

Package-Manager: portage-2.3.0

diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
index 30bb1e0c8669bb44bc975cc2367383b8204cde2f..21f0e1fa49dd1bb4c282b7cac1f488841de9d337 100644 (file)
--- a/net-analyzer/nmap/files/nmap-4.75-nolua.patch
+++ b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
@@ -1,6 +1,5 @@
-diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in
---- nmap-4.75-orig/Makefile.in 2008-09-05 07:32:06.000000000 +0200
-+++ nmap-4.75/Makefile.in      2008-09-09 16:34:38.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -258,5 +258,5 @@
        ./config.status --recheck
  

diff --git a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch
new file mode 100644 (file)
index 0000000..91caad1
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -477,7 +477,7 @@
+       ./docs/style/lua-format -i scripts/*.nse
+ 
+ makefile.dep:
+-      $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
++      $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
+ -include makefile.dep
+ 
+ # These the old names of scripts that have been renamed or deleted. Any

diff --git a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch
new file mode 100644 (file)
index 0000000..9296dab
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -522,7 +522,6 @@
+ 
+ # If we still don't have it, we use our own
+ if test $have_pcre != yes ; then
+-  AC_CONFIG_SUBDIRS( libpcre )
+   CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
+   LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
+   PCRE_BUILD="build-pcre"

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 83ebe8850a47b40e916dc5cd8f7d96ff7e089dde..ca472d603cc134d075e2817df36cb87ed6b93ae6 100644 (file)
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -61,14 +61,14 @@ pkg_setup() {
 
 src_prepare() {
        epatch \
-               "${FILESDIR}"/${PN}-4.75-nolua.patch \
                "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
                "${FILESDIR}"/${PN}-5.21-python.patch \
                "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
                "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
                "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
                "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
-               "${FILESDIR}"/${PN}-7.25-EC.patch
+               "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
+               "${FILESDIR}"/${PN}-7.25-libpcre.patch
 
        if use nls; then
                local lingua=''