Sun Jul 19 18:14:59 2009 UTC ()
#include <stdio.h> earlier so NULL gets defined before use
#include <iostream> instead of <iostream.h> (deprecated)
Fixes build on modern Linux.


(tnn)
diff -r1.31 -r1.32 pkgsrc/sysutils/fam/distinfo
diff -r1.5 -r1.6 pkgsrc/sysutils/fam/patches/patch-ah
diff -r1.1 -r1.2 pkgsrc/sysutils/fam/patches/patch-ba
diff -r0 -r1.1 pkgsrc/sysutils/fam/patches/patch-bf
diff -r0 -r1.1 pkgsrc/sysutils/fam/patches/patch-bg
cvs diff -r1.31 -r1.32 pkgsrc/sysutils/fam/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/fam/distinfo 2009/01/03 16:32:59 1.31
+++ pkgsrc/sysutils/fam/distinfo 2009/07/19 18:14:59 1.32
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1$NetBSD: distinfo,v 1.31 2009/01/03 16:32:59 schwarz Exp $ 1$NetBSD: distinfo,v 1.32 2009/07/19 18:14:59 tnn Exp $
2 2
3SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 3SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
4RMD160 (fam-2.7.0.tar.gz) = 1895b578d6a141c36d5bee4e3fbbc2a298a91430 4RMD160 (fam-2.7.0.tar.gz) = 1895b578d6a141c36d5bee4e3fbbc2a298a91430
5Size (fam-2.7.0.tar.gz) = 301974 bytes 5Size (fam-2.7.0.tar.gz) = 301974 bytes
6SHA1 (patch-aa) = d9dd9b6faf4ccd89c41404b74fb577ac327fed05 6SHA1 (patch-aa) = d9dd9b6faf4ccd89c41404b74fb577ac327fed05
7SHA1 (patch-ab) = dcc2820c754a6670c1c6da0380cac79c6b88f280 7SHA1 (patch-ab) = dcc2820c754a6670c1c6da0380cac79c6b88f280
8SHA1 (patch-ac) = 676966b0372780af4ee5536276132a04dd038863 8SHA1 (patch-ac) = 676966b0372780af4ee5536276132a04dd038863
9SHA1 (patch-ad) = 19364c8dd3f887a59f41556206c8c2d179577932 9SHA1 (patch-ad) = 19364c8dd3f887a59f41556206c8c2d179577932
10SHA1 (patch-ae) = aa8fed958555d6870367fd202a6117ddcb5a1da9 10SHA1 (patch-ae) = aa8fed958555d6870367fd202a6117ddcb5a1da9
11SHA1 (patch-af) = 5868f44d29c31533bdb012213022e814d3fc3995 11SHA1 (patch-af) = 5868f44d29c31533bdb012213022e814d3fc3995
12SHA1 (patch-ag) = 3300a1cd565f9edaea3c334a9e278185efbcb7a6 12SHA1 (patch-ag) = 3300a1cd565f9edaea3c334a9e278185efbcb7a6
13SHA1 (patch-ah) = dc8ec60631b57668fcef0b296efe3e271cb7fcae 13SHA1 (patch-ah) = b8a779216cc9a780a0616eeebed8555d8db96f9a
14SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5 14SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5
15SHA1 (patch-aj) = 39391961fd7929d6a5fb49ecb492585cb821afaa 15SHA1 (patch-aj) = 39391961fd7929d6a5fb49ecb492585cb821afaa
16SHA1 (patch-ak) = 48ddfcf9b7562832402a464437ca485249d371a1 16SHA1 (patch-ak) = 48ddfcf9b7562832402a464437ca485249d371a1
17SHA1 (patch-al) = e0b4c3ca447f42573def07e8b47209ec6e6ad016 17SHA1 (patch-al) = e0b4c3ca447f42573def07e8b47209ec6e6ad016
18SHA1 (patch-am) = 4fa488940675c5283806819288f7674f4634e038 18SHA1 (patch-am) = 4fa488940675c5283806819288f7674f4634e038
19SHA1 (patch-an) = 7aa54fb1f90e3b2eb767d41fd842f7f4a0561b81 19SHA1 (patch-an) = 7aa54fb1f90e3b2eb767d41fd842f7f4a0561b81
20SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62 20SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62
21SHA1 (patch-ap) = 07ea3a203943c9340851cc1f09db05a0c66d1eeb 21SHA1 (patch-ap) = 07ea3a203943c9340851cc1f09db05a0c66d1eeb
22SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28 22SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28
23SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a 23SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a
24SHA1 (patch-as) = d82bd15cfa04e52513e2b052f4e429d2133635f1 24SHA1 (patch-as) = d82bd15cfa04e52513e2b052f4e429d2133635f1
25SHA1 (patch-at) = 209f89cefac326e6c1b99bec4622ba0d6eabe1e4 25SHA1 (patch-at) = 209f89cefac326e6c1b99bec4622ba0d6eabe1e4
26SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b 26SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b
27SHA1 (patch-av) = e79813d88ec48a886688539da34150c5bd229a0a 27SHA1 (patch-av) = e79813d88ec48a886688539da34150c5bd229a0a
28SHA1 (patch-aw) = 9e5de9617e6cd59644294695d0ea79427b521ba0 28SHA1 (patch-aw) = 9e5de9617e6cd59644294695d0ea79427b521ba0
29SHA1 (patch-ax) = c63bf7f2bff7cb9e3bc4c1c6c474a398b01eafcc 29SHA1 (patch-ax) = c63bf7f2bff7cb9e3bc4c1c6c474a398b01eafcc
30SHA1 (patch-ay) = 081b4bc7cf25a8e30b3680b6df7599570ea0db86 30SHA1 (patch-ay) = 081b4bc7cf25a8e30b3680b6df7599570ea0db86
31SHA1 (patch-az) = 13901fdef8c13318d585e36820c5e0aa4c28f889 31SHA1 (patch-az) = 13901fdef8c13318d585e36820c5e0aa4c28f889
32SHA1 (patch-ba) = 2f41331994a56eb70364beab70d40ac0bbd1b050 32SHA1 (patch-ba) = 043e0fdc2286a74df76b207c9f1887901cd99030
33SHA1 (patch-bb) = aef31edd9715c8aa0be2f02ebe663bad30e0791a 33SHA1 (patch-bb) = aef31edd9715c8aa0be2f02ebe663bad30e0791a
34SHA1 (patch-bc) = 6265e9739013a5303aa98173a6792df924c4c964 34SHA1 (patch-bc) = 6265e9739013a5303aa98173a6792df924c4c964
35SHA1 (patch-bd) = 57aa687caedbadf021dade94f68f521ee06736e2 35SHA1 (patch-bd) = 57aa687caedbadf021dade94f68f521ee06736e2
36SHA1 (patch-be) = feba6d8090778e47467fbfed13e78bab2eacef42 36SHA1 (patch-be) = feba6d8090778e47467fbfed13e78bab2eacef42
 37SHA1 (patch-bf) = afb1c92194d2e32f78de6e48919ee18a6df6846d
 38SHA1 (patch-bg) = 54f5bbe575b2195a8dd1d8b350e68cdb5b8939fa
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/fam/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/sysutils/fam/patches/patch-ah 2004/11/19 12:35:22 1.5
+++ pkgsrc/sysutils/fam/patches/patch-ah 2009/07/19 18:14:59 1.6
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1$NetBSD: patch-ah,v 1.5 2004/11/19 12:35:22 sketch Exp $ 1$NetBSD: patch-ah,v 1.6 2009/07/19 18:14:59 tnn Exp $
2 2
3--- src/Interest.c++.orig 2003-01-18 08:18:12.000000000 -0600 3--- src/Interest.c++.orig 2003-01-18 15:18:12.000000000 +0100
4+++ src/Interest.c++ 4+++ src/Interest.c++
5@@ -23,7 +23,9 @@ 5@@ -20,10 +20,13 @@
 6 // with this program; if not, write the Free Software Foundation, Inc., 59
 7 // Temple Place - Suite 330, Boston MA 02111-1307, USA.
 8
 9+#include <stdio.h>
6 #include "Interest.h" 10 #include "Interest.h"
7  11
8 #include <sys/param.h> 12 #include <sys/param.h>
9+#if HAVE_SYS_SYSMACROS_H 13+#if HAVE_SYS_SYSMACROS_H
10 #include <sys/sysmacros.h> 14 #include <sys/sysmacros.h>
11+#endif 15+#endif
12  16
13 #include <errno.h> 17 #include <errno.h>
14 #include <string.h> 18 #include <string.h>
15@@ -46,7 +48,7 @@ 19@@ -46,7 +49,7 @@
16 #include "Pollster.h" 20 #include "Pollster.h"
17 #include "timeval.h" 21 #include "timeval.h"
18  22
19-Interest *Interest::hashtable[]; 23-Interest *Interest::hashtable[];
20+Interest *Interest::hashtable[HASHSIZE]; 24+Interest *Interest::hashtable[HASHSIZE];
21 IMon Interest::imon(imon_handler); 25 IMon Interest::imon(imon_handler);
22 bool Interest::xtab_verification = true; 26 bool Interest::xtab_verification = true;
23  27
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/fam/patches/patch-ba (expand / switch to unified diff)

--- pkgsrc/sysutils/fam/patches/patch-ba 2005/01/25 03:30:40 1.1
+++ pkgsrc/sysutils/fam/patches/patch-ba 2009/07/19 18:14:59 1.2
@@ -1,12 +1,21 @@ @@ -1,12 +1,21 @@
1$NetBSD: patch-ba,v 1.1 2005/01/25 03:30:40 tv Exp $ 1$NetBSD: patch-ba,v 1.2 2009/07/19 18:14:59 tnn Exp $
2 2
3--- lib/Client.c++.orig 2005-01-24 22:29:27.000000000 -0500 3--- lib/Client.c++.orig 2003-01-18 15:18:12.000000000 +0100
4+++ lib/Client.c++ 4+++ lib/Client.c++
5@@ -24,6 +24,7 @@ 5@@ -24,6 +24,7 @@
6 #include <stdlib.h> 6 #include <stdlib.h>
7 #include <unistd.h> 7 #include <unistd.h>
8 #include <netinet/in.h> 8 #include <netinet/in.h>
9+#include <arpa/inet.h> 9+#include <arpa/inet.h>
10 #include <sys/un.h> 10 #include <sys/un.h>
11 #include <sys/socket.h> 11 #include <sys/socket.h>
12 #include <rpc/rpc.h> 12 #include <rpc/rpc.h>
 13@@ -34,7 +35,7 @@
 14 #include <syslog.h>
 15 #include <errno.h>
 16
 17-#include <iostream.h>
 18+#include <iostream>
 19
 20 #include "fam.h"
 21 #include "Client.h"
File Added: pkgsrc/sysutils/fam/patches/patch-bf
$NetBSD: patch-bf,v 1.1 2009/07/19 18:14:59 tnn Exp $

--- src/DirEntry.c++.orig	2003-01-18 15:18:12.000000000 +0100
+++ src/DirEntry.c++
@@ -20,12 +20,11 @@
 //  with this program; if not, write the Free Software Foundation, Inc., 59
 //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
 
-#include "DirEntry.h"
-
 #include <assert.h>
 #include <stdio.h>
 #include <sys/param.h>
 
+#include "DirEntry.h"
 #include "Directory.h"
 
 // A DirEntry may be polled iff its parent is not polled.
File Added: pkgsrc/sysutils/fam/patches/patch-bg
$NetBSD: patch-bg,v 1.1 2009/07/19 18:14:59 tnn Exp $

--- src/TCP_Client.c++.orig	2003-01-18 15:18:12.000000000 +0100
+++ src/TCP_Client.c++
@@ -20,8 +20,6 @@
 //  with this program; if not, write the Free Software Foundation, Inc., 59
 //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
 
-#include "TCP_Client.h"
-
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -29,6 +27,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "TCP_Client.h"
+
 #include "Cred.h"
 #include "Event.h"
 #include "Interest.h"