Index: head/sysutils/xosview/Makefile
===================================================================
--- head/sysutils/xosview/Makefile	(revision 488802)
+++ head/sysutils/xosview/Makefile	(revision 488803)
@@ -1,37 +1,35 @@
 # Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
 
 PORTNAME=	xosview
-DISTVERSION=	1.20
+DISTVERSION=	1.21
 CATEGORIES=	sysutils
 
 MAINTAINER=	otacilio.neto@bsd.com.br
 COMMENT=	Graphical performance meter
 
 LICENSE=	BSD4CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-BROKEN_FreeBSD_12=	Due to changes in sys/vmmeter.h (r328134)
-BROKEN_FreeBSD_13=	Due to changes in sys/vmmeter.h (r328134)
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	uses x86-specific hardware resources
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	hills
 
 USE_XORG=	x11 xpm
 MAKE_ENV=	OPTFLAGS="" PLATFORM=bsd MANDIR=${MANPREFIX}/man
 ALL_TARGET=	xosview
 
 DESKTOP_ENTRIES="XOsview" "" "" "xosview" "" ""
 
 do-configure:
 	@${SED} -e '/CXX/s|^|#|' -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/targets/freebsd > ${WRKSRC}/.config
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${CP} ${WRKSRC}/Xdefaults ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XOsview
 
 .include <bsd.port.mk>
Index: head/sysutils/xosview/distinfo
===================================================================
--- head/sysutils/xosview/distinfo	(revision 488802)
+++ head/sysutils/xosview/distinfo	(revision 488803)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533352666
-SHA256 (hills-xosview-1.20_GH0.tar.gz) = 1af6e984ca4d67139143307983a843eb8fcec78b960979180719ddc01417562a
-SIZE (hills-xosview-1.20_GH0.tar.gz) = 147425
+TIMESTAMP = 1546270995
+SHA256 (hills-xosview-1.21_GH0.tar.gz) = 7b7e2964526baf40c9bd59a6f414c42487187f6eaf1882c6d12ced4c80e7bbd5
+SIZE (hills-xosview-1.21_GH0.tar.gz) = 147486
Index: head/sysutils/xosview/files/patch-bsd_kernel.cc
===================================================================
--- head/sysutils/xosview/files/patch-bsd_kernel.cc	(revision 488802)
+++ head/sysutils/xosview/files/patch-bsd_kernel.cc	(revision 488803)
@@ -1,65 +1,32 @@
---- bsd/kernel.cc.orig	2017-11-04 15:05:59 UTC
+--- bsd/kernel.cc.orig	2018-09-12 13:52:23 UTC
 +++ bsd/kernel.cc
-@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVM
+@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVMEXP2 };
  static int mib_uvm[2] = { CTL_VM, VM_UVMEXP };
  #endif
  #else
 +#if defined(XOSVIEW_FREEBSD)
 +#define _WANT_VMMETER
 +#endif
  #include <sys/vmmeter.h>
  #endif
  
-@@ -320,7 +323,22 @@ BSDGetPageStats(uint64_t *meminfo, uint6
- 		pageinfo[1] = (uint64_t)uvm.pgswapout;
- 	}
- #else  /* HAVE_UVM */
--	struct vmmeter vm;
-+	/*
-+	 * Temporal patch from:
-+	 * https://github.com/hills/xosview/commit/0b4861c9fed2dc8450edf2dff7988ebd784a520b.patch
-+	 */
-+	struct vmmeter_fbsd {
-+		u_int v_active_count;
-+		u_int v_inactive_count;
-+		u_int v_wire_count;
-+		u_int v_cache_count;
-+		u_int v_free_count;
-+		u_int v_page_size;
-+		u_int v_vnodepgsin;
-+		u_int v_vnodepgsout;
-+		u_int v_swappgsin;
-+		u_int v_swappgsout;
-+	} vm;
- #if defined(XOSVIEW_FREEBSD)
- 	size_t size = sizeof(unsigned int);
- #define	GET_VM_STATS(name) \
-@@ -328,7 +346,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6
+@@ -339,7 +342,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo)
  	GET_VM_STATS(v_active_count);
  	GET_VM_STATS(v_inactive_count);
  	GET_VM_STATS(v_wire_count);
 +#if __FreeBSD_version < 1200017
  	GET_VM_STATS(v_cache_count);
 +#endif
  	GET_VM_STATS(v_free_count);
  	GET_VM_STATS(v_page_size);
  	GET_VM_STATS(v_vnodepgsin);
-@@ -350,7 +370,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6
+@@ -361,7 +366,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo)
  		meminfo[0] = (uint64_t)vm.v_active_count * vm.v_page_size;
  		meminfo[1] = (uint64_t)vm.v_inactive_count * vm.v_page_size;
  		meminfo[2] = (uint64_t)vm.v_wire_count * vm.v_page_size;
 +#if __FreeBSD_version < 1200017
  		meminfo[3] = (uint64_t)vm.v_cache_count * vm.v_page_size;
 +#endif
  		meminfo[4] = (uint64_t)vm.v_free_count * vm.v_page_size;
  #else  /* XOSVIEW_DFBSD */
  		meminfo[0] = (uint64_t)vms.v_active_count * vms.v_page_size;
-@@ -654,7 +676,7 @@ DevStat_Init(void) {
- 
- uint64_t
- DevStat_Get(uint64_t *read_bytes, uint64_t *write_bytes) {
--	register int dn;
-+	int dn;
- 	long double busy_seconds;
- 	uint64_t reads, writes, total_bytes = 0;
- 	struct devinfo *tmp_dinfo;