ports/53321: Update: comms/plp

[MURAMATSU Atsushi]

>Number:         53321
>Category:       ports
>Synopsis:       Update: comms/plp
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 14 08:00:31 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     MURAMATSU Atsushi
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
Kyoto University
>Environment:
>Description:
 >System: FreeBSD karei 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Tue Jun 10 04:28:59 JST 2003 root at karei:/usr/src/sys/i386/compile/KAREI i386
 Description:
 	To able to compile on 5.1-RELEASE
>How-To-Repeat:
	
>Fix:

--- plp.diff begins here ---
diff -uNr comms/plp.orig/Makefile comms/plp/Makefile
--- comms/plp.orig/Makefile	Thu Jun  5 07:43:22 2003
+++ comms/plp/Makefile	Sat Jun 14 23:44:51 2003
@@ -21,10 +21,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 pre-patch:
 .for files in packet.cc socketchan.cc
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/ncp/${files}
diff -uNr comms/plp.orig/files/patch-aa comms/plp/files/patch-aa
--- comms/plp.orig/files/patch-aa	Sat Jan 29 16:53:10 2000
+++ comms/plp/files/patch-aa	Sat Jun 14 23:44:51 2003
@@ -1,5 +1,14 @@
---- ncp/mp_serial.c.orig	Tue Nov  2 12:47:06 1999
-+++ ncp/mp_serial.c	Wed Jan 26 20:44:56 2000
+--- ncp/mp_serial.c.orig	Wed Nov  3 05:47:06 1999
++++ ncp/mp_serial.c	Sat Jun 14 22:49:08 2003
+@@ -37,7 +37,7 @@
+ #ifdef sun
+ # include <sys/ttold.h>	/* sun has TIOCEXCL there */
+ #endif
+-#if defined (__SVR4)
++#if defined (__SVR4) || defined(__FreeBSD__)
+ #include <stdlib.h>
+ #endif
+ 
 @@ -192,7 +192,7 @@
  #if defined(hpux) || defined(_IBMR2)
    ti.c_cflag = CS8 | HUPCL | clocal | CREAD;
diff -uNr comms/plp.orig/files/patch-ac comms/plp/files/patch-ac
--- comms/plp.orig/files/patch-ac	Sat Jan 29 16:53:10 2000
+++ comms/plp/files/patch-ac	Sat Jun 14 23:44:51 2003
@@ -1,6 +1,14 @@
---- utils/ppsocket.cc.orig	Wed Jan 26 20:45:31 2000
-+++ utils/ppsocket.cc	Wed Jan 26 20:45:54 2000
-@@ -198,7 +198,11 @@
+--- utils/ppsocket.cc.orig	Tue Apr 13 06:17:08 1999
++++ utils/ppsocket.cc	Sat Jun 14 22:46:32 2003
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <iostream.h>
++#include <iomanip.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+@@ -198,7 +199,11 @@
  
  ppsocket* ppsocket::accept(char* Peer, int MaxLen)
  { 
@@ -12,4 +20,4 @@
 +#endif
    ppsocket* accepted;
    char* peer;
-
+ 
diff -uNr comms/plp.orig/files/patch-af comms/plp/files/patch-af
--- comms/plp.orig/files/patch-af	Mon Feb 21 05:59:20 2000
+++ comms/plp/files/patch-af	Sat Jun 14 23:44:51 2003
@@ -1,5 +1,5 @@
---- rfsv/rfsv16.cc.orig	Sat Feb 19 21:10:24 2000
-+++ rfsv/rfsv16.cc	Sat Feb 19 21:11:09 2000
+--- rfsv/rfsv16.cc.orig	Wed Nov  3 07:01:01 1999
++++ rfsv/rfsv16.cc	Sat Jun 14 22:55:39 2003
 @@ -134,7 +134,7 @@
  	{
  	  char dateBuff[100];
@@ -9,3 +9,12 @@
  	  strftime(dateBuff, 100, "%d/%m/%y %H:%M:%S", t);
  	  cout << " " << dateBuff;
  	}
+@@ -238,7 +238,7 @@
+   }
+   unsigned char * buff = new unsigned char [RFSV_SENDLEN];
+   while (ip &&!ip.eof()) {
+-    ip.read(buff, RFSV_SENDLEN);
++    ip.read((char *)buff, RFSV_SENDLEN);
+     bufferStore tmp(buff, ip.gcount());
+     if (tmp.getLen() == 0) break;
+     bufferStore a;
diff -uNr comms/plp.orig/files/patch-ag comms/plp/files/patch-ag
--- comms/plp.orig/files/patch-ag	Mon Feb 21 05:59:20 2000
+++ comms/plp/files/patch-ag	Sat Jun 14 23:44:51 2003
@@ -1,5 +1,5 @@
---- rfsv/rfsv32.cc.orig	Sat Feb 19 21:12:22 2000
-+++ rfsv/rfsv32.cc	Sat Feb 19 21:12:35 2000
+--- rfsv/rfsv32.cc.orig	Wed Nov  3 06:12:47 1999
++++ rfsv/rfsv32.cc	Sat Jun 14 22:56:25 2003
 @@ -186,7 +186,7 @@
  	  long date = us;
  	  char dateBuff[100];
@@ -9,3 +9,25 @@
  	  strftime(dateBuff, 100, "%d/%m/%y %H:%M:%S", t);
  	  cout << " " << dateBuff;
  	}
+@@ -275,10 +275,10 @@
+   case BAD_HANDLE:
+     cerr << "BAD_HANDLE";
+     break;
+-  case OVERFLOW:
++  case RFSV_OVERFLOW:
+     cerr << "OVERFLOW";
+     break;
+-  case UNDERFLOW:
++  case RFSV_UNDERFLOW:
+     cerr << "UNDERFLOW";
+     break;
+   case ALREADY_EXISTS:
+@@ -455,7 +455,7 @@
+   }
+   unsigned char * buff = new unsigned char [RFSV_SENDLEN];
+   while (ip &&!ip.eof()) {
+-    ip.read(buff, RFSV_SENDLEN);
++    ip.read((char *)buff, RFSV_SENDLEN);
+     bufferStore tmp(buff, ip.gcount());
+     if (tmp.getLen() == 0) break;
+     bufferStore a;
diff -uNr comms/plp.orig/files/patch-ah comms/plp/files/patch-ah
--- comms/plp.orig/files/patch-ah	Thu Jan  1 09:00:00 1970
+++ comms/plp/files/patch-ah	Sat Jun 14 23:44:51 2003
@@ -0,0 +1,13 @@
+--- rfsv/rfsv32.h.orig	Tue Apr 13 06:17:21 1999
++++ rfsv/rfsv32.h	Sat Jun 14 22:53:50 2003
+@@ -83,8 +83,8 @@
+     ARGUMENT=-6,
+     TOTAL_LOSS_OF_PRECISION=-7,
+     BAD_HANDLE=-8,
+-    OVERFLOW=-9,
+-    UNDERFLOW=-10,
++    RFSV_OVERFLOW=-9,
++    RFSV_UNDERFLOW=-10,
+     ALREADY_EXISTS=-11,
+     PATH_NOT_FOUND=-12,
+     DIED=-13,
--- plp.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: