Sat Jan 12 03:27:21 2013 UTC ()
Teach this about NetBSD 5.1, 5.2, 6.0, and 6.99 to silence useless build
warnings.


(dholland)
diff -r1.81 -r1.82 pkgsrc/sysutils/lsof/distinfo
diff -r1.6 -r1.7 pkgsrc/sysutils/lsof/patches/patch-ag
cvs diff -r1.81 -r1.82 pkgsrc/sysutils/lsof/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/lsof/distinfo 2011/09/03 12:32:32 1.81
+++ pkgsrc/sysutils/lsof/distinfo 2013/01/12 03:27:21 1.82
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.81 2011/09/03 12:32:32 christos Exp $ 1$NetBSD: distinfo,v 1.82 2013/01/12 03:27:21 dholland Exp $
2 2
3SHA1 (lsof_4.84.tar.bz2) = b4fd6011fc183c0602bbba2116b8335a0c57917b 3SHA1 (lsof_4.84.tar.bz2) = b4fd6011fc183c0602bbba2116b8335a0c57917b
4RMD160 (lsof_4.84.tar.bz2) = c7df81cb9c83d4e03db395397912138953529510 4RMD160 (lsof_4.84.tar.bz2) = c7df81cb9c83d4e03db395397912138953529510
5Size (lsof_4.84.tar.bz2) = 758615 bytes 5Size (lsof_4.84.tar.bz2) = 758615 bytes
6SHA1 (patch-aa) = 4469a5fed540e3c5635b6082efedc477ea96a382 6SHA1 (patch-aa) = 4469a5fed540e3c5635b6082efedc477ea96a382
7SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4 7SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
8SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9 8SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9
9SHA1 (patch-ad) = 4bd73dea4770c7f5a43be0d096c26e7d6728dd2c 9SHA1 (patch-ad) = 4bd73dea4770c7f5a43be0d096c26e7d6728dd2c
10SHA1 (patch-ae) = 1d8c1c3baf9575631c23d3ced7b12fab1df95cd6 10SHA1 (patch-ae) = 1d8c1c3baf9575631c23d3ced7b12fab1df95cd6
11SHA1 (patch-af) = b52c15a507960ecf33a61a3cbd608a92ebac1188 11SHA1 (patch-af) = b52c15a507960ecf33a61a3cbd608a92ebac1188
12SHA1 (patch-ag) = 945d233d94a42510c47709554040534024f72926 12SHA1 (patch-ag) = 5a48b4036d65af7cb6da0a1c89e06f02ae921ac6
13SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59 13SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/lsof/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/sysutils/lsof/patches/patch-ag 2010/05/10 08:21:41 1.6
+++ pkgsrc/sysutils/lsof/patches/patch-ag 2013/01/12 03:27:21 1.7
@@ -1,133 +1,143 @@ @@ -1,133 +1,143 @@
1$NetBSD: patch-ag,v 1.6 2010/05/10 08:21:41 sbd Exp $ 1$NetBSD: patch-ag,v 1.7 2013/01/12 03:27:21 dholland Exp $
2 2
3--- Configure.orig 2010-01-18 19:01:14.000000000 +0000 3--- Configure.orig 2010-07-29 15:59:32.000000000 +0000
4+++ Configure 4+++ Configure
5@@ -105,6 +105,7 @@ LSOF_VF=version 5@@ -105,6 +105,7 @@ LSOF_VF=version
6 # $LSOF_LOCALSUFFIX local suffix for Makefile 6 # $LSOF_LOCALSUFFIX local suffix for Makefile
7 # $LSOF_NBSD_BUFQH NetBSD <sys/bufq.h> copy status 7 # $LSOF_NBSD_BUFQH NetBSD <sys/bufq.h> copy status
8 # $LSOF_NBSD_PTYFS NetBSD ${NETBSD_SYS}/sys/fs/ptyfs/ copy status 8 # $LSOF_NBSD_PTYFS NetBSD ${NETBSD_SYS}/sys/fs/ptyfs/ copy status
9+# $LSOF_NBSD_TMPFS NetBSD ${NETBSD_SYS}/sys/fs/tmpfs/ copy status 9+# $LSOF_NBSD_TMPFS NetBSD ${NETBSD_SYS}/sys/fs/tmpfs/ copy status
10 # $LSOF_N_UNIXV *BSD system's kernel file 10 # $LSOF_N_UNIXV *BSD system's kernel file
11 # $LSOF_PL patch level 11 # $LSOF_PL patch level
12 # $LSOF_RANLIB randomizing command for the lsof library 12 # $LSOF_RANLIB randomizing command for the lsof library
13@@ -2778,6 +2779,11 @@ return(0); } 13@@ -2782,6 +2783,11 @@ return(0); }
14 # Validate the NetBSD version. 14 # Validate the NetBSD version.
15  15
16 case $LSOF_VSTR in # { 16 case $LSOF_VSTR in # {
17+ 0*|1.[01]*) 17+ 0*|1.[01]*)
18+ LSOF_VERS="1006000" 18+ LSOF_VERS="1006000"
19+ echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" 19+ echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR"
20+ echo "!!!WARNING!!! Configuring for NetBSD 1.2" 20+ echo "!!!WARNING!!! Configuring for NetBSD 1.2"
21+ ;; 21+ ;;
22 1.2*) 22 1.2*)
23 LSOF_VERS="1002000" 23 LSOF_VERS="1002000"
24 ;; 24 ;;
25@@ -2834,10 +2840,36 @@ return(0); } 25@@ -2838,10 +2844,44 @@ return(0); }
26 echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" 26 echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR"
27 echo "!!!WARNING!!! Configuring for NetBSD 3.0" 27 echo "!!!WARNING!!! Configuring for NetBSD 3.0"
28 ;; 28 ;;
29+ 4.0*) 29+ 4.0*)
30+ LSOF_TSTBIGF=" " 30+ LSOF_TSTBIGF=" "
31+ LSOF_VERS="4000000" 31+ LSOF_VERS="4000000"
32+ ;; 32+ ;;
33+ 4.99.*) 33+ 4.99.*)
34+ LSOF_TSTBIGF=" " 34+ LSOF_TSTBIGF=" "
35+ LSOF_VERS="4099000" 35+ LSOF_VERS="4099000"
36+ ;; 36+ ;;
37+ 4*) 37+ 4*)
38+ LSOF_VERS="4000000" 38+ LSOF_VERS="4000000"
39+ echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" 39+ echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR"
40+ echo "!!!WARNING!!! Configuring for NetBSD 4.0" 40+ echo "!!!WARNING!!! Configuring for NetBSD 4.0"
41+ ;; 41+ ;;
42+ 5.0*) 42+ 5.[012]*)
43+ LSOF_TSTBIGF=" " 43+ LSOF_TSTBIGF=" "
44+ LSOF_VERS="5000000" 44+ LSOF_VERS="5000000"
45+ ;; 45+ ;;
46+ 5.99.*) 46+ 5.99.*)
47+ LSOF_TSTBIGF=" " 47+ LSOF_TSTBIGF=" "
48+ LSOF_VERS="5099000" 48+ LSOF_VERS="5099000"
49+ ;; 49+ ;;
50+ 5*) 50+ 5*)
51+ LSOF_VERS="5000000" 51+ LSOF_VERS="5000000"
52+ echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" 52+ echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR"
53+ echo "!!!WARNING!!! Configuring for NetBSD 5.0" 53+ echo "!!!WARNING!!! Configuring for NetBSD 5.0"
54+ ;; 54+ ;;
 55+ 6.0*)
 56+ LSOF_TSTBIGF=" "
 57+ LSOF_VERS="6000000"
 58+ ;;
 59+ 6.99.*)
 60+ LSOF_TSTBIGF=" "
 61+ LSOF_VERS="6099000"
 62+ ;;
55 *) 63 *)
56+ LSOF_VERS="5000000" 64+ LSOF_VERS="5000000"
57 echo "Unknown NetBSD release: $LSOF_VSTR" 65 echo "Unknown NetBSD release: $LSOF_VSTR"
58- echo Assuming NetBSD 1.6 66- echo Assuming NetBSD 1.6
59- LSOF_VERS="1006000" 67- LSOF_VERS="1006000"
60+ echo "!!!WARNING!!! Configuring for NetBSD 5.0" 68+ echo "!!!WARNING!!! Configuring for NetBSD 5.0"
61 ;; 69 ;;
62 esac # } 70 esac # }
63 fi # } 71 fi # }
64@@ -2851,6 +2883,10 @@ return(0); } 72@@ -2855,6 +2895,12 @@ return(0); }
65 ;; 73 ;;
66 3000000|3099000) 74 3000000|3099000)
67 ;; 75 ;;
68+ 4000000|4099000) 76+ 4000000|4099000)
69+ ;; 77+ ;;
70+ 5000000|5099000) 78+ 5000000|5099000)
71+ ;; 79+ ;;
 80+ 6000000|6099000)
 81+ ;;
72 *) 82 *)
73 echo "Unknown NetBSD version: $LSOF_VERS" 83 echo "Unknown NetBSD version: $LSOF_VERS"
74 rm -f $LSOF_HLP 84 rm -f $LSOF_HLP
75@@ -2859,7 +2895,10 @@ return(0); } 85@@ -2863,7 +2909,10 @@ return(0); }
76 esac # } 86 esac # }
77 LSOF_CFGF="$LSOF_CFGF -DNETBSDV=$LSOF_VERS" 87 LSOF_CFGF="$LSOF_CFGF -DNETBSDV=$LSOF_VERS"
78 LSOF_TMP1="-DN_UNIXV=/netbsd" 88 LSOF_TMP1="-DN_UNIXV=/netbsd"
79- if test -r ${LSOF_INCLUDE}/util.h # { 89- if test -r ${LSOF_INCLUDE}/util.h # {
80+ if test -r /dev/ksyms # { 90+ if test -r /dev/ksyms # {
81+ then 91+ then
82+ LSOF_TMP1="-DN_UNIXV=/dev/ksyms" 92+ LSOF_TMP1="-DN_UNIXV=/dev/ksyms"
83+ elif test -r ${LSOF_INCLUDE}/util.h # { 93+ elif test -r ${LSOF_INCLUDE}/util.h # {
84 then 94 then
85 grep -q getbootfile ${LSOF_INCLUDE}/util.h 95 grep -q getbootfile ${LSOF_INCLUDE}/util.h
86 if test $? -eq 0 # { 96 if test $? -eq 0 # {
87@@ -3258,6 +3297,7 @@ return(0); } 97@@ -3262,6 +3311,7 @@ return(0); }
88 fi # } 98 fi # }
89 LSOF_TMP2="sys/vnode.h" 99 LSOF_TMP2="sys/vnode.h"
90 LSOF_NBSD_PTYFS=0 100 LSOF_NBSD_PTYFS=0
91+ LSOF_NBSD_TMPFS=0 101+ LSOF_NBSD_TMPFS=0
92 if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { 102 if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # {
93 then 103 then
94 LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" 104 LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2"
95@@ -3335,6 +3375,24 @@ return(0); } 105@@ -3339,6 +3389,24 @@ return(0); }
96 fi # } 106 fi # }
97 fi # } 107 fi # }
98 fi # } 108 fi # }
99+ grep -q VT_TMPFS $LSOF_TMP3 109+ grep -q VT_TMPFS $LSOF_TMP3
100+ if test $? -eq 0 # { 110+ if test $? -eq 0 # {
101+ then 111+ then
102+ LSOF_TMP2="fs/tmpfs/tmpfs.h" 112+ LSOF_TMP2="fs/tmpfs/tmpfs.h"
103+ if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { 113+ if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # {
104+ then 114+ then
105+ LSOF_CFGF="$LSOF_CFGF -DHASTMPFS" 115+ LSOF_CFGF="$LSOF_CFGF -DHASTMPFS"
106+ else 116+ else
107+ if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { 117+ if test -r ${NETBSD_SYS}/$LSOF_TMP2 # {
108+ then 118+ then
109+ if test $NETBSD_SYS != $LSOF_INCLUDE # { 119+ if test $NETBSD_SYS != $LSOF_INCLUDE # {
110+ then 120+ then
111+ LSOF_CFGF="$LSOF_CFGF -DHASTMPFS" 121+ LSOF_CFGF="$LSOF_CFGF -DHASTMPFS"
112+ LSOF_NBSD_TMPFS=1 122+ LSOF_NBSD_TMPFS=1
113+ fi # } 123+ fi # }
114+ fi # } 124+ fi # }
115+ fi # } 125+ fi # }
116+ fi # } 126+ fi # }
117 if test "X$NETBSD_UVM" = "X" # { 127 if test "X$NETBSD_UVM" = "X" # {
118 then 128 then
119 grep -q UVM $LSOF_TMP3 129 grep -q UVM $LSOF_TMP3
120@@ -3620,6 +3678,28 @@ return(0); } 130@@ -3624,6 +3692,28 @@ return(0); }
121 LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include" 131 LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include"
122 fi # } 132 fi # }
123 fi # } 133 fi # }
124+ if test $LSOF_NBSD_TMPFS -eq 1 # { 134+ if test $LSOF_NBSD_TMPFS -eq 1 # {
125+ then 135+ then
126+ 136+
127+ # Make a local copy of $NETBSD_SYS/sys/fs/tmpfs/tmpfs.h. 137+ # Make a local copy of $NETBSD_SYS/sys/fs/tmpfs/tmpfs.h.
128+ 138+
129+ if test ! -d dialects/n+obsd/include # { 139+ if test ! -d dialects/n+obsd/include # {
130+ then 140+ then
131+ mkdir dialects/n+obsd/include 141+ mkdir dialects/n+obsd/include
132+ fi # } 142+ fi # }
133+ if test ! -d dialects/n+obsd/include/fs # { 143+ if test ! -d dialects/n+obsd/include/fs # {
@@ -136,22 +146,22 @@ $NetBSD: patch-ag,v 1.6 2010/05/10 08:21 @@ -136,22 +146,22 @@ $NetBSD: patch-ag,v 1.6 2010/05/10 08:21
136+ fi # } 146+ fi # }
137+ rm -rf dialects/n+obsd/include/fs/tmpfs 147+ rm -rf dialects/n+obsd/include/fs/tmpfs
138+ mkdir dialects/n+obsd/include/fs/tmpfs 148+ mkdir dialects/n+obsd/include/fs/tmpfs
139+ cp $NETBSD_SYS/fs/tmpfs/tmpfs.h dialects/n+obsd/include/fs/tmpfs 149+ cp $NETBSD_SYS/fs/tmpfs/tmpfs.h dialects/n+obsd/include/fs/tmpfs
140+ echo $LSOF_CFGF | grep /dialects/n+obsd/include > /dev/null 2>&1 150+ echo $LSOF_CFGF | grep /dialects/n+obsd/include > /dev/null 2>&1
141+ if test $? -ne 0 # { 151+ if test $? -ne 0 # {
142+ then 152+ then
143+ LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include" 153+ LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include"
144+ fi # } 154+ fi # }
145+ fi # } 155+ fi # }
146 LSOF_CFGL="$LSOF_CFGL -lkvm" 156 LSOF_CFGL="$LSOF_CFGL -lkvm"
147 LSOF_DIALECT_DIR=n+obsd 157 LSOF_DIALECT_DIR=n+obsd
148 ;; 158 ;;
149@@ -5300,7 +5380,7 @@ fi # } 159@@ -5309,7 +5399,7 @@ fi # }
150 echo "" >> $LSOF_MKFC 160 echo "" >> $LSOF_MKFC
151 if test "X$LSOF_DEBUG" = "X" # { 161 if test "X$LSOF_DEBUG" = "X" # {
152 then 162 then
153- LSOF_DEBUG="-O" 163- LSOF_DEBUG="-O"
154+ LSOF_DEBUG="" 164+ LSOF_DEBUG=""
155 else 165 else
156 if test "X$LSOF_DEBUG" = "XNo-O" # { 166 if test "X$LSOF_DEBUG" = "XNo-O" # {
157 then 167 then