Index: head/sysutils/procenv/Makefile
===================================================================
--- head/sysutils/procenv/Makefile	(revision 546905)
+++ head/sysutils/procenv/Makefile	(revision 546906)
@@ -1,39 +1,39 @@
 # Created by: James Hunt <james.hunt@ubuntu.com>
 # $FreeBSD$
 
 PORTNAME=	procenv
 PORTVERSION=	0.51
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to show process environment
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xmlwf:textproc/expat2
 
-USES=		autoreconf gmake perl5
+#USES=		autoreconf gmake perl5
+USES=		autoreconf perl5
 USE_PERL5=	build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jamesodhunt
 
 GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 
 PLIST_FILES=	bin/procenv \
 		man/man1/procenv.1.gz
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^PKG_/d' ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e 's|sys/capability.h|sys/capsicum.h|' ${WRKSRC}/src/platform-headers.h ${WRKSRC}/src/platform/freebsd/platform-freebsd.h
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/procenv/files/patch-configure.ac
===================================================================
--- head/sysutils/procenv/files/patch-configure.ac	(nonexistent)
+++ head/sysutils/procenv/files/patch-configure.ac	(revision 546906)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2019-08-02 20:40:49 UTC
++++ configure.ac
+@@ -58,7 +58,7 @@ AC_CHECK_HEADERS([numa.h])
+ # FreeBSD 9+ with appropriately configured kernel
+ # (enabled by default in FreeBSD 10)
+ AC_SEARCH_LIBS([cap_getmode], [c])
+-AC_CHECK_HEADERS([sys/capability.h])
++AC_CHECK_HEADERS([sys/capsicum.h])
+ 
+ AC_SEARCH_LIBS([cap_init], [cap],
+                [HAVE_LIBCAP=yes],

Property changes on: head/sysutils/procenv/files/patch-configure.ac
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/procenv/files/patch-src_platform-headers.h
===================================================================
--- head/sysutils/procenv/files/patch-src_platform-headers.h	(nonexistent)
+++ head/sysutils/procenv/files/patch-src_platform-headers.h	(revision 546906)
@@ -0,0 +1,20 @@
+--- src/platform-headers.h.orig	2019-08-02 20:40:49 UTC
++++ src/platform-headers.h
+@@ -98,7 +98,7 @@ typedef struct statfs procenv_mnt_type;
+ #endif
+ 
+ #if defined (HAVE_SYS_CAPABILITY_H)
+-#include <sys/capability.h>
++#include <sys/capsicum.h>
+ #endif
+ 
+ #if defined (__GLIBC__)
+@@ -263,7 +263,7 @@ typedef struct statfs procenv_mnt_type;
+ #include <link.h>
+ 
+ #if defined (HAVE_SYS_CAPABILITY_H)
+-#include <sys/capability.h>
++#include <sys/capsicum.h>
+ #endif
+ 
+ #define PROCENV_CPU_TYPE     int

Property changes on: head/sysutils/procenv/files/patch-src_platform-headers.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+files/patch-src_platform_freebsd_platform-freebsd.h
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/procenv/files/patch-src_platform_freebsd_platform-freebsd.h
===================================================================
--- head/sysutils/procenv/files/patch-src_platform_freebsd_platform-freebsd.h	(nonexistent)
+++ head/sysutils/procenv/files/patch-src_platform_freebsd_platform-freebsd.h	(revision 546906)
@@ -0,0 +1,13 @@
+--- src/platform/freebsd/platform-freebsd.h.orig	2019-08-02 20:40:49 UTC
++++ src/platform/freebsd/platform-freebsd.h
+@@ -22,8 +22,8 @@
+ #include "platform.h"
+ #include "util.h"
+ 
+-#if defined (HAVE_SYS_CAPABILITY_H)
+-#include <sys/capability.h>
++#if defined (HAVE_SYS_CAPSICUM_H)
++#include <sys/capsicum.h>
+ 
+ #if __FreeBSD__ == 9
+ 

Property changes on: head/sysutils/procenv/files/patch-src_platform_freebsd_platform-freebsd.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+patch-configure.ac
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/procenv/files/patch-src_tests_show__compiler__details
===================================================================
--- head/sysutils/procenv/files/patch-src_tests_show__compiler__details	(nonexistent)
+++ head/sysutils/procenv/files/patch-src_tests_show__compiler__details	(revision 546906)
@@ -0,0 +1,17 @@
+--- src/tests/show_compiler_details.orig	2019-08-02 20:40:49 UTC
++++ src/tests/show_compiler_details
+@@ -9,8 +9,12 @@ CPP=${CPP:-cpp}
+ LD=${LD:-ld}
+ 
+ # handle strange environments
+-command -v gcpp >/dev/null 2>&1 && CPP=gcpp
+-command -v gcc >/dev/null 2>&1 && CC=gcc
++if ! command -v $CPP; then
++	command -v gcpp && CPP=gcpp
++fi >/dev/null 2>&1
++if ! command -v $CC; then
++	command -v gcc && CC=gcc
++fi >/dev/null 2>&1
+ 
+ echo "XXX:--------------------------------------------------"
+ echo "XXX: $0: preprocessor ('$CPP') version"

Property changes on: head/sysutils/procenv/files/patch-src_tests_show__compiler__details
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+patch-configure.ac
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property