Sun Sep 9 19:26:39 2012 UTC ()
Fix detection of NetBSD, as suggested by Havard Eidnes.


(dholland)
diff -r1.13 -r1.14 pkgsrc/net/nocol/distinfo
diff -r1.3 -r1.4 pkgsrc/net/nocol/patches/patch-am
cvs diff -r1.13 -r1.14 pkgsrc/net/nocol/distinfo (expand / switch to unified diff)

--- pkgsrc/net/nocol/distinfo 2012/08/31 11:18:20 1.13
+++ pkgsrc/net/nocol/distinfo 2012/09/09 19:26:39 1.14
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.13 2012/08/31 11:18:20 he Exp $ 1$NetBSD: distinfo,v 1.14 2012/09/09 19:26:39 dholland Exp $
2 2
3SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325 3SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325
4RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8 4RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8
5Size (nocol-4.3.1.tar.gz) = 1117438 bytes 5Size (nocol-4.3.1.tar.gz) = 1117438 bytes
6SHA1 (patch-aa) = 217d15d5329d30032ee18a666e62cdefe5018445 6SHA1 (patch-aa) = 217d15d5329d30032ee18a666e62cdefe5018445
7SHA1 (patch-ab) = 5c49ef3bd58b84e0f1ea7ba319c574b86fa2aa3e 7SHA1 (patch-ab) = 5c49ef3bd58b84e0f1ea7ba319c574b86fa2aa3e
8SHA1 (patch-ac) = 3df358560f8f5773c14ddc6378dcbd4f8a19ee9b 8SHA1 (patch-ac) = 3df358560f8f5773c14ddc6378dcbd4f8a19ee9b
9SHA1 (patch-ad) = a64750ad0bfa40f8c01e3d6af49b40c525f13985 9SHA1 (patch-ad) = a64750ad0bfa40f8c01e3d6af49b40c525f13985
10SHA1 (patch-ae) = 57bfc3941aa765eda2a54da45122a5fde642ee3f 10SHA1 (patch-ae) = 57bfc3941aa765eda2a54da45122a5fde642ee3f
11SHA1 (patch-ah) = 14091c7a6c8de7dd451e4292f2d0121ab3643158 11SHA1 (patch-ah) = 14091c7a6c8de7dd451e4292f2d0121ab3643158
12SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d 12SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d
13SHA1 (patch-aj) = 0eb201f47864132b04702fab4d03e452c07c2e2a 13SHA1 (patch-aj) = 0eb201f47864132b04702fab4d03e452c07c2e2a
14SHA1 (patch-ak) = 8013fbe6dbff80749dbdc0d0fad391741e48a468 14SHA1 (patch-ak) = 8013fbe6dbff80749dbdc0d0fad391741e48a468
15SHA1 (patch-al) = aa4fa83d53c72e17ea9ffe2685f326ebbbde9132 15SHA1 (patch-al) = aa4fa83d53c72e17ea9ffe2685f326ebbbde9132
16SHA1 (patch-am) = 395a5c446ac24cedf90783fc504c8817405d8e37 16SHA1 (patch-am) = 3729dd89c58bc3fcd6bffe16cd7b275ba841be9d
17SHA1 (patch-an) = 1a869a8a2e4e0c5a29540bff7d1da76e4d8c74e9 17SHA1 (patch-an) = 1a869a8a2e4e0c5a29540bff7d1da76e4d8c74e9
18SHA1 (patch-ao) = 114ebcc55d00981cc6709095f3280509880d76eb 18SHA1 (patch-ao) = 114ebcc55d00981cc6709095f3280509880d76eb
19SHA1 (patch-ap) = 45f30a886adda7831df056cf0f7a136b97a7e17d 19SHA1 (patch-ap) = 45f30a886adda7831df056cf0f7a136b97a7e17d
20SHA1 (patch-aq) = 13697bbaed2c324851810d6df7677ff807844a6e 20SHA1 (patch-aq) = 13697bbaed2c324851810d6df7677ff807844a6e
21SHA1 (patch-ar) = cba8de7526efde9d8598b9119ca8d27e3c60279f 21SHA1 (patch-ar) = cba8de7526efde9d8598b9119ca8d27e3c60279f
22SHA1 (patch-as) = be1b999af6459b83fe7bfcab9e83b2e830198da6 22SHA1 (patch-as) = be1b999af6459b83fe7bfcab9e83b2e830198da6
23SHA1 (patch-at) = c49b96d1c2158d0a8f67228922f0e4bff5df2908 23SHA1 (patch-at) = c49b96d1c2158d0a8f67228922f0e4bff5df2908
24SHA1 (patch-au) = a8bbcb0eef41ac514bb1106c5feedb5bc087aac7 24SHA1 (patch-au) = a8bbcb0eef41ac514bb1106c5feedb5bc087aac7
25SHA1 (patch-strerror_c) = 566959a5784ea640c269b247cdd1ad5ad988882e 25SHA1 (patch-strerror_c) = 566959a5784ea640c269b247cdd1ad5ad988882e
cvs diff -r1.3 -r1.4 pkgsrc/net/nocol/patches/patch-am (expand / switch to unified diff)

--- pkgsrc/net/nocol/patches/patch-am 2007/07/03 13:54:46 1.3
+++ pkgsrc/net/nocol/patches/patch-am 2012/09/09 19:26:38 1.4
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-am,v 1.3 2007/07/03 13:54:46 joerg Exp $ 1$NetBSD: patch-am,v 1.4 2012/09/09 19:26:38 dholland Exp $
2 2
3--- Configure.orig 2000-01-19 04:34:04.000000000 +0000 3--- Configure.orig 2000-01-19 04:34:04.000000000 +0000
4+++ Configure 4+++ Configure
5@@ -167,15 +167,7 @@ export PSFLAGS 5@@ -167,15 +167,7 @@ export PSFLAGS
6 (ps $PSFLAGS) 2>&1 | egrep -i '^usage' >/dev/null 2>&1 6 (ps $PSFLAGS) 2>&1 | egrep -i '^usage' >/dev/null 2>&1
7 if [ $? = 0 ]; then PSFLAGS='-ef' ; fi 7 if [ $? = 0 ]; then PSFLAGS='-ef' ; fi
8  8
9-LIBRESOLV="-lresolv" 9-LIBRESOLV="-lresolv"
10-ls /usr/lib/libresolv* >/dev/null 2>&1 10-ls /usr/lib/libresolv* >/dev/null 2>&1
11-if [ $? = 1 ]; then 11-if [ $? = 1 ]; then
12- ls /lib/libresolv* >/dev/null 2>&1 12- ls /lib/libresolv* >/dev/null 2>&1
13- if [ $? = 1 ]; then 13- if [ $? = 1 ]; then
14- ls /usr/lib/libbind* >/dev/null 2>&1 14- ls /usr/lib/libbind* >/dev/null 2>&1
15- if [ $? = 1 ]; then LIBRESOLV="" ; else LIBRESOLV="-lbind" ; fi 15- if [ $? = 1 ]; then LIBRESOLV="" ; else LIBRESOLV="-lbind" ; fi
16- fi 16- fi
17-fi 17-fi
18+LIBRESOLV="${RESOLV_LDFLAGS}" 18+LIBRESOLV="${RESOLV_LDFLAGS}"
19  19
20 # mainly for Solaris systems 20 # mainly for Solaris systems
21 WHOAMI="/usr/ucb/whoami" 21 WHOAMI="/usr/ucb/whoami"
22@@ -207,7 +199,7 @@ case "$OS" in 22@@ -207,7 +199,7 @@ case "$OS" in
23 OS_LIBS="${LIBRESOLV}" # -lcompat 23 OS_LIBS="${LIBRESOLV}" # -lcompat
24 PING=`which ping` # can do ping -c cnt host 24 PING=`which ping` # can do ping -c cnt host
25 ;;  25 ;;
26- FREEBSD|FreeBSD\ 2*|FreeBSD\ 3*|NETBSD|NetBSD\ 1*) 26- FREEBSD|FreeBSD\ 2*|FreeBSD\ 3*|NETBSD|NetBSD\ 1*)
27+ FREEBSD|FreeBSD\ 2*|FreeBSD\ 3*|NETBSD|NetBSD\ 1*|NetBSD\ 2*|NetBSD\ 3*| NetBSD\ 4*|DragonFly*) 27+ FREEBSD|FreeBSD\ 2*|FreeBSD\ 3*|NETBSD|NetBSD*|DragonFly*)
28 OS_CFLAGS="-DFREEBSD" 28 OS_CFLAGS="-DFREEBSD"
29 OS_LIBS="${LIBRESOLV} -lcrypt" # some hosts -lresolv not needed 29 OS_LIBS="${LIBRESOLV} -lcrypt" # some hosts -lresolv not needed
30 PING=`which ping` # can do ping -c cnt host 30 PING=`which ping` # can do ping -c cnt host