From owner-freebsd-commit  Sat Dec 23 13:33:00 1995
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id NAA01192
          for freebsd-commit-outgoing; Sat, 23 Dec 1995 13:33:00 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id NAA01184
          for cvs-all-outgoing; Sat, 23 Dec 1995 13:32:56 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id NAA01177
          for cvs-ports-outgoing; Sat, 23 Dec 1995 13:32:54 -0800 (PST)
Received: from jhome.DIALix.COM (root@jhome.DIALix.COM [192.203.228.69])
          by freefall.freebsd.org (8.7.3/8.7.3) with ESMTP id NAA01158
          Sat, 23 Dec 1995 13:32:30 -0800 (PST)
Received: (from peter@localhost) by jhome.DIALix.COM (8.7.3/8.7.3) id FAA09115; Sun, 24 Dec 1995 05:32:51 +0800 (WST)
Date: Sun, 24 Dec 1995 05:32:51 +0800 (WST)
From: Peter Wemm <peter@jhome.DIALix.COM>
To: Ollivier Robert <roberto@freefall.freebsd.org>
cc: CVS-committers@freefall.freebsd.org, cvs-ports@freefall.freebsd.org
Subject: Re: cvs commit: ports/sysutils/top/patches patch-aj
In-Reply-To: <199512231629.IAA17882@freefall.freebsd.org>
Message-ID: <Pine.BSF.3.91.951224052857.8905A-100000@jhome.DIALix.COM>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

On Sat, 23 Dec 1995, Ollivier Robert wrote:
> 
> roberto     95/12/23 08:29:56
> 
>   Added:       sysutils/top/patches  patch-aj
>   Log:
>   Add an #include <sys/vmmeter.h> in order to have this program compile and
>   run on -CURRENT.

This is wrong..  I dont know what is happening on your machine, but 
patch-af already does this:
*** machine/m_freebsd20.c       Sun Nov 19 08:14:55 1995
--- machine/m_freebsd20.c       Sat Nov 18 09:26:37 1995
***************
*** 46,51 ****
--- 46,54 ----
  #include <sys/dkstat.h>
  #include <sys/file.h>
  #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/user.h>
+ #include <sys/vmmeter.h>
  
  #ifdef USE_SWAP
  #include <stdlib.h>

And now, patch-aj:
--- machine/m_freebsd20.c~      Fri Dec 22 18:50:11 1995
+++ machine/m_freebsd20.c       Fri Dec 22 18:52:47 1995
@@ -49,4 +49,5 @@
 #include <sys/proc.h>
 #include <sys/user.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 
I'm suprised that the patch applies..  but it does.. check out this:
... work/machine/m_freebsd20.c ...
#include <sys/time.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/vmmeter.h>
#include <sys/vmmeter.h>	<<<< !!!!

#ifdef USE_SWAP
#include <stdlib.h>
#include <sys/rlist.h>

You should back out patch-aj and find out how your existing patches are 
out of date...

-Peter