7 files changed, 3 insertions, 68 deletions

diff --git a/security/bugs/Makefile b/security/bugs/Makefile
index 17cfef35fb42..18a0b1284542 100644
--- a/security/bugs/Makefile
+++ b/security/bugs/Makefile
@@ -53,12 +53,4 @@ post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077
-# chmod -R bug
-post-extract:
-	${CHMOD} +x ${WRKSRC}/lib/unix ${WRKSRC}/lib/windows
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/kickpass/Makefile b/security/kickpass/Makefile
index afa280bbd9eb..491eb7cd60fa 100644
--- a/security/kickpass/Makefile
+++ b/security/kickpass/Makefile
@@ -18,8 +18,6 @@ BUILD_DEPENDS=	checkmk:devel/check
 USES=		cmake
 USE_XORG=	x11
 
-BROKEN_FreeBSD_10=	requires reallocarray(3)
-
 PLIST_FILES=	bin/kickpass \
 		lib/libkickpass.so \
 		lib/libkickpass.so.0 \
diff --git a/security/libhijack/Makefile b/security/libhijack/Makefile
index 01f7c5fdadee..ff5cda48bbea 100644
--- a/security/libhijack/Makefile
+++ b/security/libhijack/Makefile
@@ -23,8 +23,6 @@ PLIST_FILES=	include/hijack.h \
 		lib/libhijack.so.1 \
 		sbin/hijack
 
-BROKEN_FreeBSD_10=	Designed for 11.0 and newer
-
 do-install: # the original install fails: https://github.com/SoldierX/libhijack/issues/6
 	${INSTALL_DATA} ${WRKSRC}/include/hijack.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_LIB} ${WRKSRC}/libhijack/obj/libhijack.so* ${STAGEDIR}${PREFIX}/lib
diff --git a/security/masscan/Makefile b/security/masscan/Makefile
index 18c3c385cc01..1f93aa68cef2 100644
--- a/security/masscan/Makefile
+++ b/security/masscan/Makefile
@@ -21,13 +21,6 @@ MAKE_ARGS=	SYS=freebsd CC="${CC}" CFLAGS="${CFLAGS}"
 
 PLIST_FILES=	bin/masscan man/man8/masscan.8.gz
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
-BUILD_DEPENDS+=	clang60:devel/llvm60
-CC=		clang60
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/masscan ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/masscan.8 ${STAGEDIR}${MANPREFIX}/man/man8
@@ -35,4 +28,4 @@ do-install:
 do-test:
 	${WRKSRC}/bin/masscan --selftest
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/trezord/Makefile b/security/trezord/Makefile
index af0963d031da..0e8f394f40c4 100644
--- a/security/trezord/Makefile
+++ b/security/trezord/Makefile
@@ -22,10 +22,4 @@ GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 PLIST_FILES=	bin/${GH_PROJECT}
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1102000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-usb_libusb.go
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/trezord/files/extra-patch-usb_libusb.go b/security/trezord/files/extra-patch-usb_libusb.go
deleted file mode 100644
index 9918e32c7c4c..000000000000
--- a/security/trezord/files/extra-patch-usb_libusb.go
+++ /dev/null
@@ -1,38 +0,0 @@
---- usb/libusb.go.orig	2018-10-01 19:43:54 UTC
-+++ usb/libusb.go
-@@ -3,6 +3,7 @@ package usb
- import (
- 	"encoding/hex"
- 	"fmt"
-+	"runtime"
- 	"strings"
- 	"sync"
- 	"sync/atomic"
-@@ -311,13 +312,21 @@ func (b *LibUSB) matchVidPid(vid uint16,
- }
- 
- func (b *LibUSB) identify(dev lowlevel.Device) string {
--	var ports [8]byte
--	p, err := lowlevel.Get_Port_Numbers(dev, ports[:])
--	if err != nil {
--		b.mw.Println(fmt.Sprintf("libusb - identify - error getting port numbers %s", err.Error()))
--		return ""
-+	var path string
-+	if runtime.GOOS != "freebsd" {
-+		var ports [8]byte
-+		p, err := lowlevel.Get_Port_Numbers(dev, ports[:])
-+		if err != nil {
-+			b.mw.Println(fmt.Sprintf("webusb - identify - error getting port numbers %s", err.Error()))
-+			return ""
-+		}
-+		path = hex.EncodeToString(p)
-+	} else {
-+		bn := lowlevel.Get_Bus_Number(dev)
-+		da := lowlevel.Get_Device_Address(dev)
-+		path = fmt.Sprintf("%02x%02x", bn, da)
- 	}
--	return libusbPrefix + hex.EncodeToString(p)
-+	return libusbPrefix + path
- }
- 
- type WUD struct {
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index f5990eb77ee5..0241a84956e5 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -61,11 +61,9 @@ CFLAGS+=	-DCISCO_PATCH_VERSION
 .endif
 
 post-patch:
-.if ${OSVERSION} >= 1100042
 	@${REINPLACE_CMD} \
 		-e 's|.*%%FREEBSD_IPLEN_FIX%%.*|#define NEED_IPLEN_FIX 1|' \
 		${WRKSRC}/sysdep.h
-.endif
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/config.c
 	@${REINPLACE_CMD} -e 's|\(/etc/vpnc\)|${PREFIX}\1|' \
 		${WRKSRC}/${MANPAGE8}.template