The following diff cleans up some glitches found in the lsof ports.

Ciao, 
David

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/lsof/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile    26 Jul 2010 07:25:40 -0000      1.71
+++ Makefile    26 Jul 2010 11:51:14 -0000
@@ -5,6 +5,7 @@ COMMENT=        list information about open fil
 VERSION=       4.83
 DISTNAME=      lsof_${VERSION}
 PKGNAME=       ${DISTNAME:S/_/-/}
+REVISION=      0
 CATEGORIES=    sysutils
 MASTER_SITES=  ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \
                ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ \
Index: patches/patch-Configure
===================================================================
RCS file: /cvs/ports/sysutils/lsof/patches/patch-Configure,v
retrieving revision 1.28
diff -u -p -r1.28 patch-Configure
--- patches/patch-Configure     24 Jul 2010 23:01:56 -0000      1.28
+++ patches/patch-Configure     26 Jul 2010 11:51:14 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Configure,v 1.28 2010/07/24 23:01:56 naddy Exp $
---- Configure.orig     Wed Mar 25 13:24:01 2009
-+++ Configure  Sat Jul 24 16:50:36 2010
-@@ -3694,12 +3694,6 @@ return(0); }
+--- Configure.orig     Mon Jan 18 20:01:14 2010
++++ Configure  Mon Jul 26 09:44:21 2010
+@@ -3738,12 +3738,6 @@ return(0); }
        LSOF_TSTBIGF=" "
        LSOF_VERS=2090
        ;;
@@ -14,7 +14,7 @@ $OpenBSD: patch-Configure,v 1.28 2010/07
        3.0*)
        LSOF_TSTBIGF=" "
        LSOF_VERS=3000
-@@ -3740,16 +3734,52 @@ return(0); }
+@@ -3784,16 +3778,52 @@ return(0); }
        LSOF_TSTBIGF=" "
        LSOF_VERS=3090
        ;;
@@ -73,7 +73,7 @@ $OpenBSD: patch-Configure,v 1.28 2010/07
        ;;
        esac    # }
      fi        # }
-@@ -3757,7 +3787,7 @@ return(0); }
+@@ -3801,7 +3831,7 @@ return(0); }
      # Test for legal OpenBSD version.
  
      case $LSOF_VERS in        # {
Index: patches/patch-dialects_n+obsd_dlsof_h
===================================================================
RCS file: /cvs/ports/sysutils/lsof/patches/patch-dialects_n+obsd_dlsof_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-dialects_n+obsd_dlsof_h
--- patches/patch-dialects_n+obsd_dlsof_h       23 Feb 2008 23:45:23 -0000      
1.3
+++ patches/patch-dialects_n+obsd_dlsof_h       26 Jul 2010 11:51:14 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-dialects_n+obsd_dlsof_h,v 1.3 2008/02/23 23:45:23 sturm Exp $
---- dialects/n+obsd/dlsof.h.orig       Fri Feb 22 22:18:35 2008
-+++ dialects/n+obsd/dlsof.h    Fri Feb 22 22:19:24 2008
+--- dialects/n+obsd/dlsof.h.orig       Tue Mar 28 23:54:15 2006
++++ dialects/n+obsd/dlsof.h    Mon Jul 26 13:22:11 2010
 @@ -150,6 +150,7 @@ struct uio;        /* dummy for function prototype in 
<sys/bu
  struct nameidata;     /* to satisfy a function prototype in msdosfsmount.h */
  #include <msdosfs/msdosfsmount.h>
@@ -9,3 +9,20 @@ $OpenBSD: patch-dialects_n+obsd_dlsof_h,
  #include <msdosfs/direntry.h>
  #include <msdosfs/denode.h>
  # endif       /* defined(HASMSDOSFS) */
+@@ -162,6 +163,7 @@ struct nameidata;  /* to satisfy a function prototype i
+ #include <sys/un.h>
+ #include <sys/unpcb.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/ip.h>
+ 
+@@ -417,7 +419,7 @@ struct vop_advlock_args;
+ # if  defined(UVM)
+ #  if defined(OPENBSDV)
+ #define       _UVM_UVM_FAULT_I_H_     1               /* avoid OpenBSD's
+-                                              /* <uvm/uvm_fault_i.h */
++                                                 <uvm/uvm_fault_i.h */
+ #  endif      /* defined(OPENBSDV) */
+ #define       FALSE   0
+ #define       TRUE    1
Index: patches/patch-dialects_n+obsd_dnode_c
===================================================================
RCS file: patches/patch-dialects_n+obsd_dnode_c
diff -N patches/patch-dialects_n+obsd_dnode_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-dialects_n+obsd_dnode_c       26 Jul 2010 11:51:14 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dialects/n+obsd/dnode.c.orig       Tue Apr 24 18:22:06 2007
++++ dialects/n+obsd/dnode.c    Mon Jul 26 10:28:44 2010
+@@ -1420,7 +1420,7 @@ process_pipe(pa)
+ 
+       if (!pa || kread((KA_T)pa, (char *)&p, sizeof(p))) {
+           (void) snpf(Namech, Namechl,
+-              "can't read DTYPE_PIPE pipe struct: %#s",
++              "can't read DTYPE_PIPE pipe struct: %s",
+               print_kptr(pa, (char *)NULL, 0));
+           enter_nm(Namech);
+           return;
Index: patches/patch-dialects_n+obsd_dproc_c
===================================================================
RCS file: patches/patch-dialects_n+obsd_dproc_c
diff -N patches/patch-dialects_n+obsd_dproc_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-dialects_n+obsd_dproc_c       26 Jul 2010 11:51:14 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dialects/n+obsd/dproc.c.orig       Mon Jul 26 09:52:00 2010
++++ dialects/n+obsd/dproc.c    Mon Jul 26 09:52:31 2010
+@@ -187,7 +187,7 @@ gather_proc_info()
+       P = kvm_getproc2(Kd, KERN_PROC_ALL, 0, KVMPROCSZ2, &Np);
+ #else /* !defined(HASKVMGETPROC2) */
+       P = kvm_getprocs(Kd, KERN_PROC_ALL, 0, &Np);
+-#endif        /* defined(HASKVMGETPROC2) &/
++#endif        /* defined(HASKVMGETPROC2) */
+ 
+       if (!P) {
+           (void) fprintf(stderr, "%s: can't read process table: %s\n",
Index: patches/patch-dialects_n+obsd_dproto_h
===================================================================
RCS file: patches/patch-dialects_n+obsd_dproto_h
diff -N patches/patch-dialects_n+obsd_dproto_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-dialects_n+obsd_dproto_h      26 Jul 2010 11:51:14 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dialects/n+obsd/dproto.h.orig      Mon Aug  8 21:53:34 2005
++++ dialects/n+obsd/dproto.h   Mon Jul 26 13:45:43 2010
+@@ -44,7 +44,7 @@ _PROTOTYPE(extern char *get_nlist_path,(int ap));
+ _PROTOTYPE(extern int is_file_named,(char *p, int cd));
+ _PROTOTYPE(extern struct l_vfs *readvfs,(KA_T vm));
+ 
+-#if   defined(HAS_SYS_PIPE_H)
++#if   defined(HAS_SYS_PIPEH)
+ _PROTOTYPE(extern void process_pipe,(KA_T pa));
+ #endif        /* defined(HAS_SYS_PIPEH) */
+ 

Reply via email to