Fix some C++ issues that gcc 3.3 complains on.

6 files changed, 89 insertions, 1 deletions

diff --git a/comms/plptools/distinfo b/comms/plptools/distinfo
index 27242ea778b..295a10db135 100644
--- a/comms/plptools/distinfo
+++ b/comms/plptools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/06/28 19:05:22 agc Exp $
+$NetBSD: distinfo,v 1.7 2004/05/24 16:09:35 kristerw Exp $
 
 SHA1 (plptools-0.6.tar.gz) = 99280368116018a10469ea7e1b86985cf551eae5
 Size (plptools-0.6.tar.gz) = 197770 bytes
@@ -9,3 +9,8 @@ SHA1 (patch-ad) = de550f23304b6205f0d4a6b40cc32307c41a509f
 SHA1 (patch-ae) = 46b1d9714397c7b9d6b3fb5d053cda44fc5f10fd
 SHA1 (patch-af) = 41f937ef89ba41d79b531ffc57fd77dee0608a93
 SHA1 (patch-ag) = 536521b46cfea9d17c78ee212f693fd32b50ba5f
+SHA1 (patch-ah) = 9a4a9c6b33d2e5244a9da61307cf6367eaf87d55
+SHA1 (patch-ai) = 56a423124e444b481e34070cb33797b34d4d5aa0
+SHA1 (patch-aj) = 06802ebe102b02ffec36829cdb84d0d1bd87c04f
+SHA1 (patch-ak) = ca5bd31e37104f0a05f4ece8a27933692b5ce446
+SHA1 (patch-al) = 85c7cf6b413a866fbb292c0fe4007bb656907eb1
diff --git a/comms/plptools/patches/patch-ah b/comms/plptools/patches/patch-ah
new file mode 100644
index 00000000000..22820f2ade8
--- /dev/null
+++ b/comms/plptools/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/ppsocket.cc.orig	2004-05-24 12:38:15.000000000 +0200
++++ lib/ppsocket.cc	2004-05-24 17:42:47.000000000 +0200
+@@ -389,7 +389,7 @@
+ {
+ 	int i;
+ 
+-	cout << hex << (int) c << endl;
++	cout << std::hex << (int) c << endl;
+ 	i = writeTimeout(&c, 1, 0);
+ 	if (i == SOCKET_ERROR || i == 0)
+ 		return (false);
diff --git a/comms/plptools/patches/patch-ai b/comms/plptools/patches/patch-ai
new file mode 100644
index 00000000000..76926d74c74
--- /dev/null
+++ b/comms/plptools/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/rpcsfactory.cc.orig	2004-05-24 17:48:59.000000000 +0200
++++ lib/rpcsfactory.cc	2004-05-24 17:49:16.000000000 +0200
+@@ -73,7 +73,7 @@
+ 			return NULL;
+ 		}
+ 		// Invalid protocol version
+-		cerr << "rpcsfactory::create received odd protocol version from
++		cerr << "rpcsfactory::create received odd protocol version from \
+ ncpd! (" << a << ")" << endl;
+ 	} else {
+ 		cerr << "rpcsfactory::create sent, response not 1" << endl;
diff --git a/comms/plptools/patches/patch-aj b/comms/plptools/patches/patch-aj
new file mode 100644
index 00000000000..57d872a4ed7
--- /dev/null
+++ b/comms/plptools/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/rfsvfactory.cc.orig	2004-05-24 17:47:30.000000000 +0200
++++ lib/rfsvfactory.cc	2004-05-24 17:48:20.000000000 +0200
+@@ -74,7 +74,7 @@
+ 			return NULL;
+ 		}
+ 		// Invalid protocol version
+-		cerr << "rfsvfactory::create received odd protocol version from
++		cerr << "rfsvfactory::create received odd protocol version from \
+ ncpd! (" << a << ")" << endl;
+ 	} else {
+ 		cerr << "rfsvfactory::create sent, response not 1" << endl;
diff --git a/comms/plptools/patches/patch-ak b/comms/plptools/patches/patch-ak
new file mode 100644
index 00000000000..8d033e690f6
--- /dev/null
+++ b/comms/plptools/patches/patch-ak
@@ -0,0 +1,22 @@
+$NetBSD: patch-ak,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/rfsv16.cc.orig	2004-05-24 17:43:42.000000000 +0200
++++ lib/rfsv16.cc	2004-05-24 17:45:56.000000000 +0200
+@@ -670,7 +670,7 @@
+ 	do {
+ 		unsigned char buf[2000];
+ 		if ((len = fread(handle, buf, sizeof(buf))) > 0)
+-			op.write(buf, len);
++			op.write((char*)buf, len);
+ 		if (cb) {
+ 			if (!cb(len)) {
+ 				len = E_PSI_FILE_CANCEL;
+@@ -703,7 +703,7 @@
+ 	unsigned char *buff = new unsigned char[RFSV_SENDLEN];
+ 	int total = 0;
+ 	while (ip && !ip.eof()) {
+-		ip.read(buff, RFSV_SENDLEN);
++		ip.read((char*)buff, RFSV_SENDLEN);
+ 		bufferStore tmp(buff, ip.gcount());
+ 		int len = tmp.getLen();
+ 		total += len;
diff --git a/comms/plptools/patches/patch-al b/comms/plptools/patches/patch-al
new file mode 100644
index 00000000000..b65cf9f306f
--- /dev/null
+++ b/comms/plptools/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/rfsv32.cc.orig	2004-05-24 17:46:31.000000000 +0200
++++ lib/rfsv32.cc	2004-05-24 17:46:59.000000000 +0200
+@@ -577,7 +577,7 @@
+ 	unsigned char *buff = new unsigned char[RFSV_SENDLEN];
+ 	do {
+ 		if ((len = fread(handle, buff, RFSV_SENDLEN)) > 0)
+-			op.write(buff, len);
++			op.write((char*)buff, len);
+ 		if (cb) {
+ 			if (!cb(len)) {
+ 				len = E_PSI_FILE_CANCEL;
+@@ -609,7 +609,7 @@
+ 	unsigned char *buff = new unsigned char[RFSV_SENDLEN];
+ 	int total = 0;
+ 	while (ip && !ip.eof()) {
+-		ip.read(buff, RFSV_SENDLEN);
++		ip.read((char*)buff, RFSV_SENDLEN);
+ 		bufferStore tmp(buff, ip.gcount());
+ 		int len = tmp.getLen();
+ 		total += len;