Index: head/sysutils/xosview/Makefile
===================================================================
--- head/sysutils/xosview/Makefile	(revision 477238)
+++ head/sysutils/xosview/Makefile	(revision 477239)
@@ -1,35 +1,36 @@
 # Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
 
 PORTNAME=	xosview
-PORTVERSION=	1.19
+DISTVERSION=	1.20
 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)
 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
-USES=		gmake
 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 477238)
+++ head/sysutils/xosview/distinfo	(revision 477239)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498958595
-SHA256 (hills-xosview-1.19_GH0.tar.gz) = 4bf31738c49f950b1f8b9574e9c850b3cb7448c5d600b560bd24a55ae4497a16
-SIZE (hills-xosview-1.19_GH0.tar.gz) = 144229
+TIMESTAMP = 1533352666
+SHA256 (hills-xosview-1.20_GH0.tar.gz) = 1af6e984ca4d67139143307983a843eb8fcec78b960979180719ddc01417562a
+SIZE (hills-xosview-1.20_GH0.tar.gz) = 147425
Index: head/sysutils/xosview/files/patch-bsd_kernel.cc
===================================================================
--- head/sysutils/xosview/files/patch-bsd_kernel.cc	(revision 477238)
+++ head/sysutils/xosview/files/patch-bsd_kernel.cc	(revision 477239)
@@ -1,32 +1,41 @@
---- bsd/kernel.cc.orig	2017-07-02 01:38:15 UTC
+--- bsd/kernel.cc.orig	2017-11-04 15:05:59 UTC
 +++ bsd/kernel.cc
-@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVMEXP2 };
+@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVM
  static int mib_uvm[2] = { CTL_VM, VM_UVMEXP };
  #endif
  #else
 +#if defined(XOSVIEW_FREEBSD)
 +#define _WANT_VMMETER
 +#endif
  #include <sys/vmmeter.h>
  #endif
  
-@@ -328,7 +331,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo)
+@@ -328,7 +331,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6
  	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 +355,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo)
+@@ -350,7 +355,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6
  		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 +661,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;
Index: head/sysutils/xosview/pkg-plist
===================================================================
--- head/sysutils/xosview/pkg-plist	(revision 477238)
+++ head/sysutils/xosview/pkg-plist	(revision 477239)
@@ -1,3 +1,4 @@
 @(,kmem,2555) bin/xosview
 lib/X11/app-defaults/XOsview
 man/man1/xosview.1.gz
+share/icons/hicolor/32x32/apps/xosview.png