From b4bc4bb052ae4b730f3435c125e28b6101dfc494 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sun, 17 Apr 2011 11:32:52 +0000
Subject: main/collectd: use system libip4tc

---
 main/collectd/APKBUILD                         | 15 +++++++++------
 main/collectd/collectd-4.10.3-iptc-check.patch | 20 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 main/collectd/collectd-4.10.3-iptc-check.patch

(limited to 'main/collectd')

diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD
index f3bbdbe6039..524b6c74cc5 100644
--- a/main/collectd/APKBUILD
+++ b/main/collectd/APKBUILD
@@ -2,33 +2,35 @@
 # Maintainer: 
 pkgname=collectd
 pkgver=4.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The system statistics collection daemon"
 url="http://collectd.org"
 arch="all"
 license="GPL"
 depends=
 makedepends="pkgconfig curl-dev net-snmp-dev postgresql-dev perl-dev
-	libgcrypt-dev mysql-dev zlib-dev openssl-dev"
+	libgcrypt-dev mysql-dev zlib-dev openssl-dev iptables-dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp $pkgname-curl
 	$pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql
 	$pkgname-mysql $pkgname-network"
 
 source="http://collectd.org/files/collectd-$pkgver.tar.bz2
+	collectd-4.10.3-iptc-check.patch
 	collectd.initd"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
 	# we need -lm
 	sed -i -e 's/^collectd_LDADD = \(.*\)/collectd_LDADD = -lm \1/' \
 		-e 's/^collectd_nagios_LDADD = \(.*\)/collectd_nagios_LDADD = -lm \1/' src/Makefile.in
-	
-	# disable -Werror
-	sed -i -e 's/-Werror//' src/owniptc/Makefile.in
 
 }
 
@@ -82,4 +84,5 @@ mysql()		{ _plugin mysql; }
 network()	{ _plugin network; }
 
 md5sums="5f17bfd7342af4f97f78c608f1d1eb1d  collectd-4.10.3.tar.bz2
+38f2ac1754e0dc0fcc70a04574cc7437  collectd-4.10.3-iptc-check.patch
 13a36ae2f92634b5619ab94224e1b77d  collectd.initd"
diff --git a/main/collectd/collectd-4.10.3-iptc-check.patch b/main/collectd/collectd-4.10.3-iptc-check.patch
new file mode 100644
index 00000000000..4358e7f094a
--- /dev/null
+++ b/main/collectd/collectd-4.10.3-iptc-check.patch
@@ -0,0 +1,20 @@
+--- ./configure.orig	2011-03-26 17:09:34.000000000 +0100
++++ ./configure	2011-03-29 14:23:54.647074988 +0200
+@@ -36343,13 +36343,13 @@
+ # Check for the iptc_init symbol in the library.
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
+ then
+-	{ echo "$as_me:$LINENO: checking for iptc_init in -liptc" >&5
+-echo $ECHO_N "checking for iptc_init in -liptc... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_iptc_iptc_init+set}" = set; then
++	{ echo "$as_me:$LINENO: checking for iptc_init in -lip4tc" >&5
++echo $ECHO_N "checking for iptc_init in -lip4tc... $ECHO_C" >&6; }
++if test "${ac_cv_lib_ip4tc_iptc_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liptc  $LIBS"
++LIBS="-liptc -lip6tc -lip4tc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
-- 
cgit v1.2.3