Hi Ryan,

> This lsof distribution seems to be complete.
> 
> ===>  Patching for lsof-4.36
> ===>  Applying distribution patches for lsof-4.36
> ===>  Applying NetBSD patches for lsof-4.36
> 1 out of 2 hunks failed--saving rejects to dialects/n+obsd/dproc.c.rej
> *** Error code 1
> 
> Stop.
> *** Error code 1
> 
> Stop.
> *** Error code 1
> 
> Stop.
> brahms# uname -a
> NetBSD brahms 1.3H NetBSD 1.3H (BRAHMS) #1: Wed Sep  9 08:18:04 PDT 1998
> sammael@brahms:/usr/src/sys/arch/mac68k/compile/BRAHMS mac68k
> brahms# 

Works fine for me (/i386, 1.3F, but going to upgrade RSN).  I only
have patch-aa in the patches subdirectory. 

As an aside, if you set PKG_VERBOSE in the environment or /etc/mk.conf,
one of the things it's verbose about is patch files:

As you can see from the following, nothing in the fd_lookup_patch or
patch-aa tries to modify dproc.c

> Examining lib: OK
> Examining scripts: OK
> 
> This lsof distribution seems to be complete.
> 
> ===>  Patching for lsof-4.36
> ===>  Applying distribution patches for lsof-4.36
> ===>   Applying distribution patch fd_lookup_patch
> Hmm...  Looks like a new-style context diff to me...
> The text leading up to this was:
> --------------------------
> |*** /tmp/,RCSt1012175  Fri Aug  7 06:51:38 1998
> |--- lsof.h     Thu Aug  6 18:38:12 1998
> --------------------------
> Patching file lsof.h using Plan A...
> Hunk #1 succeeded at 335.
> Hmm...  The next patch looks like a new-style context diff to me...
> The text leading up to this was:
> --------------------------
> |*** /tmp/,RCSt1012175  Fri Aug  7 06:51:38 1998
> |--- arg.c      Fri Aug  7 06:49:47 1998
> --------------------------
> Patching file arg.c using Plan A...
> Hunk #1 succeeded at 40.
> Hunk #2 succeeded at 548.
> Hunk #3 succeeded at 559.
> Hmm...  The next patch looks like a new-style context diff to me...
> The text leading up to this was:
> --------------------------
> |*** /tmp/,RCSt1012175  Fri Aug  7 06:51:39 1998
> |--- proc.c     Thu Aug  6 19:25:12 1998
> --------------------------
> Patching file proc.c using Plan A...
> Hunk #1 succeeded at 67.
> Hunk #2 succeeded at 158.
> Hmm...  The next patch looks like a new-style context diff to me...
> The text leading up to this was:
> --------------------------
> |*** /tmp/,RCSt1012175  Fri Aug  7 06:51:40 1998
> |--- store.c    Thu Aug  6 18:37:49 1998
> --------------------------
> Patching file store.c using Plan A...
> Hunk #1 succeeded at 143.
> done
> ===>  Applying NetBSD patches for lsof-4.36
> ===>   Applying NetBSD patch /u/cvs/pkgsrc/sysutils/lsof/patches/patch-aa
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |$NetBSD: patch-aa,v 1.3 1998/08/07 11:14:05 agc Exp $
> |
> |--- Configure.orig     Fri May 22 20:58:12 1998
> |+++ Configure  Thu Jun 11 17:15:28 1998
> --------------------------
> Patching file Configure using Plan A...
> Hunk #1 succeeded at 1576 (offset 49 lines).
> done
> ===>  Configuring for lsof-4.36
> rm -f ddev.c dfile.c dlsof.h dmnt.c dnode*.c dproc.c dproto.h dsock.c dstore.c kernelbase.h machine.h machine.h.old new_machine.h __lseek.s Makefile
> ln -s dialects/n+obsd/dlsof.h dlsof.h
> ln -s dialects/n+obsd/dmnt.c dmnt.c
> ln -s dialects/n+obsd/dnode.c dnode.c
> ln -s dialects/n+obsd/dnode1.c dnode1.c
> ln -s dialects/n+obsd/dproc.c dproc.c
> ln -s dialects/n+obsd/dproto.h dproto.h
> ln -s dialects/n+obsd/dsock.c dsock.c
> ln -s dialects/n+obsd/dstore.c dstore.c
> ln -s dialects/n+obsd/machine.h machine.h
> Makefile and lib/Makefile created.
> ===>  Building for lsof-4.36
> (cd lib; make DEBUG="-O")
> gcc -O  -DNETBSDV=1030 -DHASNFSPROTO -DHASFDESCFS -DHASPROCFS -DHAS9660FS -DHASKERNFS -DHASNCVPID -DHASI_FFS -DHASEXT2FS -DHASI_E2FS -DHASNFSVATTRP -DN_UNIXV=/netbsd -DLSOF_VSTR=\"1.3F\" -I/usr/include -I/sys  -c ckkv.c