From 23648b7d730bcb5cd0ed1bc061ac18387545f814 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 20 Sep 2016 15:13:15 +0000
Subject: [PATCH] bspatch: Remove backwards-compatibility sys/capability.h
 support

bspatch previously included sys/capability.h or sys/capsicum.h based
on __FreeBSD_version, as FreeBSD is the upstream for bsdiff and we may
see this file incorporated into other third-party software.

The Capsicum header is now installed as sys/capsicum.h in stable/10 and
FreeBSD 10.3, so we can just use sys/capsicum.h and simplify the logic.

Reviewed by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D7954
---
 usr.bin/bsdiff/bspatch/bspatch.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index 185814639a20..fc7c07de7b72 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -29,12 +29,9 @@ __FBSDID("$FreeBSD$");
 
 #if defined(__FreeBSD__)
 #include <sys/param.h>
-#if __FreeBSD_version >= 1100014
+#if __FreeBSD_version >= 1001511
 #include <sys/capsicum.h>
 #define HAVE_CAPSICUM
-#elif __FreeBSD_version >= 1000000
-#include <sys/capability.h>
-#define HAVE_CAPSICUM
 #endif
 #endif