fix xtables-addons compile on non-linux systems

SVN-Revision: 16810

diff --git a/net/xtables-addons/patches/001-no_depmod.patch b/net/xtables-addons/patches/001-no_depmod.patch
index 417c139..be5d4ca 100644 (file)
--- a/net/xtables-addons/patches/001-no_depmod.patch
+++ b/net/xtables-addons/patches/001-no_depmod.patch
@@ -1,7 +1,6 @@
-diff -urN xtables-addons-1.17/Makefile.in xtables-addons-1.17.new/Makefile.in
---- xtables-addons-1.17/Makefile.in    2009-06-16 16:26:56.000000000 +0200
-+++ xtables-addons-1.17.new/Makefile.in        2009-06-18 15:24:34.000000000 +0200
-@@ -748,7 +748,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -748,7 +748,7 @@ install-dvi: install-dvi-recursive

  
  install-dvi-am:
  
  
  install-dvi-am:
  

diff --git a/net/xtables-addons/patches/002-portability.patch b/net/xtables-addons/patches/002-portability.patch
new file mode 100644 (file)
index 0000000..acd854d
--- /dev/null
+++ b/net/xtables-addons/patches/002-portability.patch
@@ -0,0 +1,26 @@
+--- a/extensions/GNUmakefile.in
++++ b/extensions/GNUmakefile.in
+@@ -2,8 +2,8 @@
+ 
+ top_srcdir      := @top_srcdir@
+ srcdir          := @srcdir@
+-abstop_srcdir   := $(shell readlink -f ${top_srcdir})
+-abssrcdir       := $(shell readlink -f ${srcdir})
++abstop_srcdir   := $(shell cd ${top_srcdir} && pwd)
++abssrcdir       := $(shell cd ${srcdir} && pwd)
+ 
+ ifeq (${abstop_srcdir},)
+ $(error Path resolution of ${top_srcdir} failed)
+--- a/extensions/ipset/GNUmakefile.in
++++ b/extensions/ipset/GNUmakefile.in
+@@ -3,8 +3,8 @@
+ top_srcdir      := @top_srcdir@
+ srcdir          := @srcdir@
+ datarootdir     := @datarootdir@
+-abstop_srcdir   := $(shell readlink -f ${top_srcdir})
+-abssrcdir       := $(shell readlink -f ${srcdir})
++abstop_srcdir   := $(shell cd ${top_srcdir} && pwd)
++abssrcdir       := $(shell cd ${srcdir} && pwd)
+ 
+ ifeq (${abstop_srcdir},)
+ $(error Path resolution of ${top_srcdir} failed)