pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/lsof Redo three patches to address build fail...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ba13d6c3ec7
branches:  trunk
changeset: 484812:8ba13d6c3ec7
user:      atatat <atatat%pkgsrc.org@localhost>
date:      Tue Nov 30 02:02:13 2004 +0000

description:
Redo three patches to address build failure on NetBSD <= 1.6ZC, to
change the reported node number for the master side of ptyfs devices,
and to deal more cleanly with some header files.

diffstat:

 sysutils/lsof/Makefile         |    3 +-
 sysutils/lsof/distinfo         |    8 +-
 sysutils/lsof/patches/patch-ab |   14 +-
 sysutils/lsof/patches/patch-ac |  297 ++++++++++++++++++++--------------------
 sysutils/lsof/patches/patch-ae |   60 +++++++-
 5 files changed, 216 insertions(+), 166 deletions(-)

diffs (truncated from 731 to 300 lines):

diff -r ae54204e02fb -r 8ba13d6c3ec7 sysutils/lsof/Makefile
--- a/sysutils/lsof/Makefile    Tue Nov 30 02:01:40 2004 +0000
+++ b/sysutils/lsof/Makefile    Tue Nov 30 02:02:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2004/11/28 22:39:07 atatat Exp $
+# $NetBSD: Makefile,v 1.80 2004/11/30 02:02:13 atatat Exp $
 #
 
 DISTNAME=              lsof_4.73
@@ -31,7 +31,6 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 USE_BUILDLINK3=                yes
-BUILDLINK_PASSTHRU_DIRS=       /usr/src/sys
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r ae54204e02fb -r 8ba13d6c3ec7 sysutils/lsof/distinfo
--- a/sysutils/lsof/distinfo    Tue Nov 30 02:01:40 2004 +0000
+++ b/sysutils/lsof/distinfo    Tue Nov 30 02:02:13 2004 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.46 2004/11/28 22:39:07 atatat Exp $
+$NetBSD: distinfo,v 1.47 2004/11/30 02:02:13 atatat Exp $
 
 SHA1 (lsof_4.73.tar.bz2) = 3e8112f854fc83f5e5dfdc9271c8d27d31aefc6c
 Size (lsof_4.73.tar.bz2) = 725530 bytes
 SHA1 (patch-aa) = 4878381537330258e9270c9d198d49a426283fab
-SHA1 (patch-ab) = f35db0c78d3b6a743d132900649d1bf31617ca63
-SHA1 (patch-ac) = e8388f7e6925c89b0a2264a35dd3e264f9d135e4
+SHA1 (patch-ab) = 96c7ec1b1b710b10182da370c0c13e741d4687d8
+SHA1 (patch-ac) = b844e10f4df066bb65bfc644bd387f0d13935726
 SHA1 (patch-ad) = 49f3d0899e8055815c8b25d304281f83e7b1a98d
-SHA1 (patch-ae) = fc314546f0b3769414939cf22894e69c13589f1e
+SHA1 (patch-ae) = 1c0b0f11351f7e3ab449ac210332a08a16042def
 SHA1 (patch-af) = 0a5ca7b243be925cba841b1358427e86b65ccde1
 SHA1 (patch-ag) = 06a5a07cf550136c8b58f82d4aa0f75d85378db0
 SHA1 (patch-ah) = 35dc2b9ec90a1f418d3cd103b951db46df19bf3c
diff -r ae54204e02fb -r 8ba13d6c3ec7 sysutils/lsof/patches/patch-ab
--- a/sysutils/lsof/patches/patch-ab    Tue Nov 30 02:01:40 2004 +0000
+++ b/sysutils/lsof/patches/patch-ab    Tue Nov 30 02:02:13 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.31 2004/11/28 22:39:07 atatat Exp $
+$NetBSD: patch-ab,v 1.32 2004/11/30 02:02:13 atatat Exp $
 
 Incorporate a patch from the author that widens the NETBSDV definition
 to account for new current versioning system, properly handles the
@@ -76,13 +76,19 @@
                   && __NetBSD_Version__<106060000 */
  #include <miscfs/nullfs/null.h>
  #undef        _KERNEL
-@@ -357,10 +365,20 @@ struct sockproto {
+@@ -357,10 +365,26 @@ struct sockproto {
  #define       Pstatus         PFSstatus
  #define       Pnote           PFSnote
  #define       Pnotepg         PFSnotepg
++#   if        defined(NetBSDV)
++#    if       NETBSDV>=2000000
 +#define       Pfd             PFSfd
++#    endif    /* NETBSDV>=2000000 */
++#    if       NETBSDV>=1006000
 +#define       Pmap            PFSmap
 +#define       Pmaps           PFSmaps
++#    endif    /* NETBSDV>=1006000 */
++#   endif     /* defined(NetBSDV) */
  #  endif      /* defined(HASPROCFS_PFSROOT) */
  #include <machine/reg.h>
  # endif       /* defined(HASPROCFS) */
@@ -97,7 +103,7 @@
  #define       KERNEL
  #define _KERNEL
  #include <sys/file.h>
-@@ -515,9 +533,9 @@ struct sfile {
+@@ -515,9 +539,9 @@ struct sfile {
   */
  
  # if     defined(HASNCACHE)
@@ -109,7 +115,7 @@
  
  #include <sys/uio.h>
  #include <sys/namei.h>
-@@ -527,15 +545,15 @@ struct sfile {
+@@ -527,15 +551,15 @@ struct sfile {
  #define       NCACHE_NODEADDR nc_vp           /* node address in NCACHE */
  #define       NCACHE_PARADDR  nc_dvp          /* parent node address in NCACHE */
  
diff -r ae54204e02fb -r 8ba13d6c3ec7 sysutils/lsof/patches/patch-ac
--- a/sysutils/lsof/patches/patch-ac    Tue Nov 30 02:01:40 2004 +0000
+++ b/sysutils/lsof/patches/patch-ac    Tue Nov 30 02:02:13 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.20 2004/11/28 22:39:07 atatat Exp $
+$NetBSD: patch-ac,v 1.21 2004/11/30 02:02:13 atatat Exp $
 
 Incorporate a patch from the author that widens the NETBSDV definition
 to account for new current versioning system, properly handles the
@@ -15,7 +15,7 @@
  LSOF_TSTXO=""
  LSOF_TSTXOC="${LSOF_TSTSUBD}/config.xobj"
  if test "X$LSOF_VERS" = "X"   # {
-@@ -2264,51 +2279,49 @@ return(0); }
+@@ -2264,51 +2265,49 @@ return(0); }
        # Validate the NetBSD version.
  
        case $LSOF_VSTR in      # {
@@ -82,7 +82,7 @@
        ;;
        esac    # }
      fi        # }
-@@ -2316,7 +2329,7 @@ return(0); }
+@@ -2316,7 +2315,7 @@ return(0); }
      # Test for legal NetBSD version.
  
      case $LSOF_VERS in        # {
@@ -91,21 +91,19 @@
        ;;
      *)
        echo "Unknown NetBSD version: $LSOF_VERS"
-@@ -2336,166 +2349,656 @@ return(0); }
+@@ -2336,166 +2335,637 @@ return(0); }
        fi      # }
      fi        # }
      LSOF_CFGF="$LSOF_CFGF $LSOF_TMP1"
 -    if test -r ${LSOF_INCLUDE}/nfs/nfsproto.h # {
 +    if test -r ${LSOF_INCLUDE}/kvm.h  # {
-     then
--      LSOF_CFGF="$LSOF_CFGF -DHASNFSPROTO"
++    then
 +      grep -q kvm_getproc2 ${LSOF_INCLUDE}/kvm.h
 +      if test $? -eq 0        # {
 +      then
 +          LSOF_CFGF="$LSOF_CFGF -DHASKVMGETPROC2"
 +      fi      # }
-     fi        # }
--    if test -r ${LSOF_INCLUDE}/netinet/ip6.h  # {
++    fi        # }
 +
 +  # Here begin the dual tests on header files that may be in $LSOF_INCLUDE
 +  # or $NETBSD_SYS.
@@ -115,14 +113,16 @@
 +
 +    LSOF_TMP1=0
 +    if test "X$NETBSD_SYS" = "X"      # {
-+    then
-+      if test -d /usr/src/sys # {
+     then
+-      LSOF_CFGF="$LSOF_CFGF -DHASNFSPROTO"
++      if test -d /usr/src     # {
 +      then
 +      NETBSD_SYS="/usr/src/sys"
 +      else
 +        NETBSD_SYS=$LSOF_INCLUDE
 +      fi      # }
-+    fi        # }
+     fi        # }
+-    if test -r ${LSOF_INCLUDE}/netinet/ip6.h  # {
 +    LSOF_TMP2="nfs/nfsproto.h"
 +    if test -r ${LSOF_INCLUDE}/$LSOF_TMP2     # {
 +    then
@@ -298,52 +298,22 @@
 +      fi      # }
 +    fi        # }
 +    LSOF_TMP2="sys/bufq.h"
++    LSOF_NBSD_BUFQH=0
 +    if test -r ${LSOF_INCLUDE}/$LSOF_TMP2     # {
 +    then
-+      LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2"
-+      LSOF_TMP4=0
++      LSOF_CFGF="$LSOF_CFGF -DHASBUFQ_H"
 +    else
 +      if test -r ${NETBSD_SYS}/$LSOF_TMP2     # {
        then
 -      LSOF_CFGF="$LSOF_CFGF -DHASPROCFS_PFSROOT"
 -      fi #    }
-+      LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2"
-+      LSOF_TMP4=1
-+      else
-+      LSOF_TMP3=""
-+      fi      # }
-     fi        # }
--    if test -d ${NETBSD_SYS}/isofs/cd9660     # {
-+    if test "X$LSOF_TMP3" != "X"      # {
-+    then
-+      LSOF_CFGF="$LSOF_CFGF -DHASBUFQ_H"
-+      if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1    # {
-+      then
-+      LSOF_TMP1=1
-+      fi      # }
-+    fi # }
-+    LSOF_TMP2="fs/ptyfs/ptyfs.h"
-+    if test -r ${LSOF_INCLUDE}/$LSOF_TMP2     # {
-+    then
-+      LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2"
-+      LSOF_TMP4=0
-+    else
-+      if test -r ${NETBSD_SYS}/$LSOF_TMP2     # {
-+      then
-+      LSOF_TMP3="${NETBSD_SYS}/$LSOF_TMP2"
-+      LSOF_TMP4=1
-+      else
-+      LSOF_TMP3=""
++      if test $NETBSD_SYS != $LSOF_INCLUDE    # {
++      then
++          LSOF_CFGF="$LSOF_CFGF -DHASBUFQ_H"
++        LSOF_NBSD_BUFQH=1
++      fi      # }
 +      fi      # }
 +    fi        # }
-+    if test "X$LSOF_TMP3" != "X"      # {
-+    then
-+      LSOF_CFGF="$LSOF_CFGF -DHASPTYFS"
-+      if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1    # {
-+      then
-+      LSOF_TMP1=1
-+      fi      # }
-+    fi # }
 +    LSOF_TMP2="isofs/cd9660"
 +    if test -d ${LSOF_INCLUDE}/$LSOF_TMP2     # {
 +    then
@@ -357,7 +327,8 @@
 +      else
 +      LSOF_TMP3=""
 +      fi      # }
-+    fi        # }
+     fi        # }
+-    if test -d ${NETBSD_SYS}/isofs/cd9660     # {
 +    if test "X$LSOF_TMP3" != "X"      # {
      then
        LSOF_CFGF="$LSOF_CFGF -DHAS9660FS=1"
@@ -391,8 +362,9 @@
 +      then
 +        LSOF_TMP1=1
 +      fi      # }
-+      fi      # }
-+    fi        # }
+       fi      # }
+     fi        # }
+-    if test -d ${NETBSD_SYS}/msdosfs  # {
 +    LSOF_TMP2="msdosfs"
 +    if test -d ${LSOF_INCLUDE}/$LSOF_TMP2     # {
 +    then
@@ -405,9 +377,8 @@
 +      LSOF_TMP4=1
 +      else
 +      LSOF_TMP3=""
-       fi      # }
-     fi        # }
--    if test -d ${NETBSD_SYS}/msdosfs  # {
++      fi      # }
++    fi        # }
 +    if test "X$LSOF_TMP3" != "X"      # {
      then
        LSOF_CFGF="$LSOF_CFGF -DHASMSDOSFS=1"
@@ -441,13 +412,11 @@
 +      then
 +        LSOF_TMP1=1
 +      fi      # }
-       fi      # }
-     fi        # }
--    if test -r ${NETBSD_SYS}/miscfs/kernfs/kernfs.h   # {
++      fi      # }
++    fi        # }
 +    LSOF_TMP2="miscfs/kernfs/kernfs.h"
 +    if test -r ${LSOF_INCLUDE}/$LSOF_TMP2     # {
-     then
--      grep -q "kt_name;" ${NETBSD_SYS}/miscfs/kernfs/kernfs.h
++    then
 +      LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2"
 +      LSOF_TMP4=0
 +    else
@@ -457,10 +426,12 @@
 +      LSOF_TMP4=1
 +      else
 +      LSOF_TMP3=""
-+      fi      # }
-+    fi        # }
+       fi      # }
+     fi        # }
+-    if test -r ${NETBSD_SYS}/miscfs/kernfs/kernfs.h   # {
 +    if test "X$LSOF_TMP3" != "X"      # {
-+    then
+     then
+-      grep -q "kt_name;" ${NETBSD_SYS}/miscfs/kernfs/kernfs.h
 +      grep -q "kt_name;" $LSOF_TMP3
        if test $? -eq 0        # {
        then
@@ -554,10 +525,20 @@
 +          LSOF_TMP1=1
 +        fi    # }
 +      fi      # }
++      fi      # }
++      grep -q i_ffs_effnlink $LSOF_TMP3
++      if test $? -eq 0        # {
++      then
++      LSOF_CFGF="$LSOF_CFGF -DHASEFFNLINK=i_ffs_effnlink"
++      if test $LSOF_TMP1 -eq 0 -a $LSOF_TMP4 -eq 1    # {
++      then
++        LSOF_TMP1=1
++      fi      # }
        fi      # }
      fi        # }
 -    if test -r ${LSOF_INCLUDE}/nfs/nfsnode.h  # {



Home | Main Index | Thread Index | Old Index