From 040b2807adc98a09a7de2c3ea566fe5a9e5fdc0d Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 12 Jul 2009 13:55:18 +0000
Subject: [PATCH] fix xtables-addons compile on non-linux systems

git-svn-id: svn://svn.openwrt.org/openwrt/packages@16810 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/xtables-addons/patches/001-no_depmod.patch   |  7 +++----
 net/xtables-addons/patches/002-portability.patch | 26 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 net/xtables-addons/patches/002-portability.patch

diff --git a/net/xtables-addons/patches/001-no_depmod.patch b/net/xtables-addons/patches/001-no_depmod.patch
index 417c13927..be5d4caae 100644
--- 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:
  
diff --git a/net/xtables-addons/patches/002-portability.patch b/net/xtables-addons/patches/002-portability.patch
new file mode 100644
index 000000000..acd854d42
--- /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)
-- 
2.11.0