control, rules: Handle the 'pf' plugin.

Build-depend on kfreebsd-kernel-headers (kfreebsd-any only) and disable the
'pf' plugin on non-kfreebsd systems.

diff --git a/debian/changelog b/debian/changelog
index 68858710d26cf29f8802089adbda31103bea73cf..8918e5bc76572863026022e2ae981d76ca0f5e92 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ collectd (5.2.0-1) UNRELEASED; urgency=low
     New plugins:
     - Aggregate multiple values lists into one: aggregation
     - Query statistics from BSD's packet filter: pf (FreeBSD only)
+  * debian/control, debian/rules:
+    - Build-depend on kfreebsd-kernel-headers (kfreebsd-any only) and disable
+      the 'pf' plugin on non-kfreebsd systems.
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 11:35:22 +0100
 

diff --git a/debian/control b/debian/control
index 7d587f1f835a2b489d82d834eb329a179d925921..a2045dc0ea23dbe6c44755067260b4ef08885ce1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch,
  iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-any !hurd-any],
  iptables-dev (>= 1.4.3.2-2) [linux-any],
  javahelper,
+ kfreebsd-kernel-headers [kfreebsd-any],
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdbi0-dev,
  libesmtp-dev,

diff --git a/debian/rules b/debian/rules
index 8e186fca503f58161e68ce7b29f782fb6c85366e..1427934a796bd2d7173a6e33dcd84a097170f634 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -109,6 +109,12 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
                --disable-vserver
 endif
 
+# This plugin is FreeBSD-specific.
+ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+       confflags += \
+               --disable-pf
+endif
+
 # These plugins have not been ported to FreeBSD yet.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        # Work-around an incomplete check for kvm functionality