diff options
-rw-r--r-- | comms/plp/Makefile | 3 | ||||
-rw-r--r-- | comms/plp/distinfo | 25 | ||||
-rw-r--r-- | comms/plp/patches/patch-ag | 23 | ||||
-rw-r--r-- | comms/plp/patches/patch-ah | 25 | ||||
-rw-r--r-- | comms/plp/patches/patch-ai | 18 | ||||
-rw-r--r-- | comms/plp/patches/patch-aj | 22 | ||||
-rw-r--r-- | comms/plp/patches/patch-al | 17 | ||||
-rw-r--r-- | comms/plp/patches/patch-ap | 16 | ||||
-rw-r--r-- | comms/plp/patches/patch-aq | 11 | ||||
-rw-r--r-- | comms/plp/patches/patch-ncp_channel.cc | 15 | ||||
-rw-r--r-- | comms/plp/patches/patch-ncp_linkchan.cc | 16 | ||||
-rw-r--r-- | comms/plp/patches/patch-ncp_main.cc | 16 | ||||
-rw-r--r-- | comms/plp/patches/patch-ncp_psiemul.cc | 14 | ||||
-rw-r--r-- | comms/plp/patches/patch-ncp_psiemul.h | 15 | ||||
-rw-r--r-- | comms/plp/patches/patch-rfsv_ftp.cc | 16 | ||||
-rw-r--r-- | comms/plp/patches/patch-rfsv_main.cc | 16 | ||||
-rw-r--r-- | comms/plp/patches/patch-utils_bufferstore.cc | 17 | ||||
-rw-r--r-- | comms/plp/patches/patch-utils_iowatch.cc | 14 |
18 files changed, 262 insertions, 37 deletions
diff --git a/comms/plp/Makefile b/comms/plp/Makefile index 3d7b509a9ef..b341ebfbab1 100644 --- a/comms/plp/Makefile +++ b/comms/plp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2008/03/03 05:33:32 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2011/12/19 13:44:07 wiz Exp $ DISTNAME= plp_1_8 PKGNAME= plp-1.8 @@ -15,6 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ USE_TOOLS+= gmake USE_LIBTOOL= yes +MAKE_JOBS_SAFE= no INSTALLATION_DIRS= bin lib diff --git a/comms/plp/distinfo b/comms/plp/distinfo index c075f1cb2bd..d68aa686b01 100644 --- a/comms/plp/distinfo +++ b/comms/plp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2009/03/11 12:16:21 hasso Exp $ +$NetBSD: distinfo,v 1.16 2011/12/19 13:44:07 wiz Exp $ SHA1 (plp_1_8.tar.gz) = cad586353091895b6efc556d2cb5fa16891a3749 RMD160 (plp_1_8.tar.gz) = 1a29209fd7def352c9a1c6671b1a90efcd276456 @@ -9,16 +9,25 @@ SHA1 (patch-ac) = 9f196ba3c236629c6ed1b59842fb6de2716917a6 SHA1 (patch-ad) = 4a6421d7256498df6293011bafc76e75cc5512e6 SHA1 (patch-ae) = 29b0cde6353c257a01a1630981f229c6673bbe73 SHA1 (patch-af) = 0ab78ff48fbd42b45bd59468eb24297f44802ef5 -SHA1 (patch-ag) = c6610f91ba3216aaca6fbf74620e64b1657e711e -SHA1 (patch-ah) = bd381b9d8bbd68e985e6323c775324093fe7fbfe -SHA1 (patch-ai) = 82b2a9af4d88bb27ea8c196f1b2ecdc39d7c9d24 -SHA1 (patch-aj) = 4973bd796ce661c6a4dcf11c8a774e0d6450480b +SHA1 (patch-ag) = a8c2760b8153813acb221c486b2164cd2c982f81 +SHA1 (patch-ah) = eacad8ac9edd80b01b7ae8b945bb2ba1385c8b61 +SHA1 (patch-ai) = 443f28f1abc75dfc3372c7441fca34e20fefbd48 +SHA1 (patch-aj) = bcd8ec18f0b73399dea10e126fbf9bfaa9626583 SHA1 (patch-ak) = 28ca61ae1f6b1a02f349bf57f5f351c55c3b7575 -SHA1 (patch-al) = c8dc10319e174159efc6d838928a39bdb0446feb +SHA1 (patch-al) = 38ac0f658723bed15a69a0c4b5ca74f9da9e9ecb SHA1 (patch-am) = b3453d4cfb48a6daeae9aea896b261cae7db489f SHA1 (patch-ao) = eabe7562e75c3ab9900a889ffe14813a9faad01b -SHA1 (patch-ap) = c104fcff93c6a20da75dcfa63ad814da43bbc718 -SHA1 (patch-aq) = 706c2518c92c1b9ce3098839e5b282933f7904f0 +SHA1 (patch-ap) = 852649f18942bbb9ae4d705f4ed16bde6a512b71 +SHA1 (patch-aq) = 9da03a6397a76d317642363ee82c5da0bbee7405 SHA1 (patch-ar) = 25ec84057553840bb071706ecf143189f7591fc9 SHA1 (patch-as) = 696b46a9f173cc81083a0c4efa2ffdd8df2d0f19 SHA1 (patch-at) = d5196efa3423c0d3e897806325ff712dec7f05c2 +SHA1 (patch-ncp_channel.cc) = 8e23d082652aaec48a8e3a78be79b964c813830d +SHA1 (patch-ncp_linkchan.cc) = 599ed3ec1a86a653620bf0fb3b74793034561f2c +SHA1 (patch-ncp_main.cc) = 141a13d3b82769630735f506b3e9c40d136db523 +SHA1 (patch-ncp_psiemul.cc) = c343d5eadc21f0f49062617cdc0a8b2f1b7d5e92 +SHA1 (patch-ncp_psiemul.h) = 315e07b43f075c98bbd2cb16750eebb170ca99ef +SHA1 (patch-rfsv_ftp.cc) = 64fa434d73f3bbe5340ff9fd57de7e103b63578e +SHA1 (patch-rfsv_main.cc) = 275ea36dccc70e93d213490871be42d52dffd854 +SHA1 (patch-utils_bufferstore.cc) = 2e734886f9619812319546e450df05f2ed8f117b +SHA1 (patch-utils_iowatch.cc) = 520096aef79ed8ea8490e6426e2b2b59d8ee27a8 diff --git a/comms/plp/patches/patch-ag b/comms/plp/patches/patch-ag index a87163a3669..502244ba21f 100644 --- a/comms/plp/patches/patch-ag +++ b/comms/plp/patches/patch-ag @@ -1,8 +1,23 @@ -$NetBSD: patch-ag,v 1.2 2004/09/08 12:47:39 wiz Exp $ +$NetBSD: patch-ag,v 1.3 2011/12/19 13:44:07 wiz Exp $ ---- rfsv/rfsv16.cc.orig 1999-11-02 23:01:01.000000000 +0100 +--- rfsv/rfsv16.cc.orig 1999-11-02 22:01:01.000000000 +0000 +++ rfsv/rfsv16.cc -@@ -113,7 +113,7 @@ int rfsv16::dir(const char* dirName, buf +@@ -19,10 +19,11 @@ + // + // e-mail philip.proudman@btinternet.com + +-#include <stream.h> ++#include <iostream> ++using namespace std; + #include <stdlib.h> +-#include <fstream.h> +-#include <iomanip.h> ++#include <fstream> ++#include <iomanip> + #include <time.h> + #include <string.h> + +@@ -113,7 +114,7 @@ int rfsv16::dir(const char* dirName, buf if (version != 2) return 1; int status = a.getWord(2); long size = a.getDWord(4); @@ -11,7 +26,7 @@ $NetBSD: patch-ag,v 1.2 2004/09/08 12:47:39 wiz Exp $ const char *s = a.getString(16); a.discardFirstBytes(17+strlen(s)); -@@ -238,7 +238,7 @@ int rfsv16::write(const char* localName, +@@ -238,7 +239,7 @@ int rfsv16::write(const char* localName, } unsigned char * buff = new unsigned char [RFSV_SENDLEN]; while (ip &&!ip.eof()) { diff --git a/comms/plp/patches/patch-ah b/comms/plp/patches/patch-ah index c49a1f1e5d9..c50742ba550 100644 --- a/comms/plp/patches/patch-ah +++ b/comms/plp/patches/patch-ah @@ -1,8 +1,23 @@ -$NetBSD: patch-ah,v 1.2 2004/09/08 12:47:39 wiz Exp $ +$NetBSD: patch-ah,v 1.3 2011/12/19 13:44:07 wiz Exp $ ---- rfsv/rfsv32.cc.orig 1999-11-02 22:12:47.000000000 +0100 +--- rfsv/rfsv32.cc.orig 1999-11-02 21:12:47.000000000 +0000 +++ rfsv/rfsv32.cc -@@ -183,7 +183,7 @@ int rfsv32::dir(const char* dirName, buf +@@ -19,10 +19,11 @@ + // + // e-mail philip.proudman@btinternet.com + +-#include <stream.h> ++#include <iostream> ++using namespace std; + #include <stdlib.h> +-#include <fstream.h> +-#include <iomanip.h> ++#include <fstream> ++#include <iomanip> + #include <time.h> + #include <string.h> + +@@ -183,7 +184,7 @@ int rfsv32::dir(const char* dirName, buf us += modLow; us /= 1000000; us -= (1970*365 + 490)*60*60*24; @@ -11,7 +26,7 @@ $NetBSD: patch-ah,v 1.2 2004/09/08 12:47:39 wiz Exp $ char dateBuff[100]; struct tm *t; t = gmtime(&date); -@@ -275,10 +275,10 @@ void rfsv32::opErr(long status) { +@@ -275,10 +276,10 @@ void rfsv32::opErr(long status) { case BAD_HANDLE: cerr << "BAD_HANDLE"; break; @@ -24,7 +39,7 @@ $NetBSD: patch-ah,v 1.2 2004/09/08 12:47:39 wiz Exp $ cerr << "UNDERFLOW"; break; case ALREADY_EXISTS: -@@ -455,7 +455,7 @@ int rfsv32::write(const char* localName, +@@ -455,7 +456,7 @@ int rfsv32::write(const char* localName, } unsigned char * buff = new unsigned char [RFSV_SENDLEN]; while (ip &&!ip.eof()) { diff --git a/comms/plp/patches/patch-ai b/comms/plp/patches/patch-ai index 6f767ecc8d7..bd5150fc5e3 100644 --- a/comms/plp/patches/patch-ai +++ b/comms/plp/patches/patch-ai @@ -1,8 +1,18 @@ -$NetBSD: patch-ai,v 1.2 2004/09/08 12:47:39 wiz Exp $ +$NetBSD: patch-ai,v 1.3 2011/12/19 13:44:07 wiz Exp $ ---- utils/ppsocket.cc.orig 1999-04-12 23:17:08.000000000 +0200 +--- utils/ppsocket.cc.orig 1999-04-12 21:17:08.000000000 +0000 +++ utils/ppsocket.cc -@@ -198,7 +198,7 @@ bool ppsocket::listen(char* Host, int Po +@@ -24,7 +24,8 @@ + #include <string.h> + #include <stdlib.h> + #include <stdarg.h> +-#include <iostream.h> ++#include <iostream> ++using namespace std; + #include <fcntl.h> + #include <unistd.h> + #include <sys/time.h> +@@ -198,7 +199,7 @@ bool ppsocket::listen(char* Host, int Po ppsocket* ppsocket::accept(char* Peer, int MaxLen) { @@ -11,7 +21,7 @@ $NetBSD: patch-ai,v 1.2 2004/09/08 12:47:39 wiz Exp $ ppsocket* accepted; char* peer; -@@ -421,7 +421,7 @@ bool ppsocket::sputc(char c) +@@ -421,7 +422,7 @@ bool ppsocket::sputc(char c) { int i; diff --git a/comms/plp/patches/patch-aj b/comms/plp/patches/patch-aj index 25000402909..e0891da0824 100644 --- a/comms/plp/patches/patch-aj +++ b/comms/plp/patches/patch-aj @@ -1,8 +1,20 @@ -$NetBSD: patch-aj,v 1.1 2004/09/08 12:47:39 wiz Exp $ +$NetBSD: patch-aj,v 1.2 2011/12/19 13:44:07 wiz Exp $ ---- ncp/link.cc.orig 1999-04-12 23:49:12.000000000 +0200 +--- ncp/link.cc.orig 1999-04-12 21:49:12.000000000 +0000 +++ ncp/link.cc -@@ -30,7 +30,7 @@ +@@ -19,9 +19,10 @@ + // + // e-mail philip.proudman@btinternet.com + +-#include <stream.h> + #include <stdlib.h> + #include <stdio.h> ++#include <iostream> ++using namespace std; + + #include "bool.h" + #include "../defaults.h" +@@ -30,7 +31,7 @@ #include "bufferstore.h" #include "bufferarray.h" @@ -11,7 +23,7 @@ $NetBSD: patch-aj,v 1.1 2004/09/08 12:47:39 wiz Exp $ s5(_s5) { p = new packet(fname, baud, iow, PACKET_LAYER_DIAGNOSTICS); -@@ -43,16 +43,16 @@ link::link(const char *fname, int baud, +@@ -43,16 +44,16 @@ link::link(const char *fname, int baud, failed = false; } @@ -31,7 +43,7 @@ $NetBSD: patch-aj,v 1.1 2004/09/08 12:47:39 wiz Exp $ bufferArray ret; bufferStore buff; unsigned char type; -@@ -145,10 +145,10 @@ bufferArray link::poll() { +@@ -145,10 +146,10 @@ bufferArray link::poll() { return ret; } diff --git a/comms/plp/patches/patch-al b/comms/plp/patches/patch-al index 79379816277..9564952e086 100644 --- a/comms/plp/patches/patch-al +++ b/comms/plp/patches/patch-al @@ -1,8 +1,19 @@ -$NetBSD: patch-al,v 1.1 2004/09/08 12:47:39 wiz Exp $ +$NetBSD: patch-al,v 1.2 2011/12/19 13:44:07 wiz Exp $ ---- ncp/ncp.cc.orig 1999-04-12 23:27:06.000000000 +0200 +--- ncp/ncp.cc.orig 1999-04-12 21:27:06.000000000 +0000 +++ ncp/ncp.cc -@@ -33,7 +33,7 @@ +@@ -19,8 +19,9 @@ + // + // e-mail philip.proudman@btinternet.com + +-#include <stream.h> + #include <string.h> ++#include <iostream> ++using namespace std; + + #include "bool.h" + #include "../defaults.h" +@@ -33,7 +34,7 @@ ncp::ncp(const char *fname, int baud, IOWatch &iow, bool _s5) : s5(_s5) { diff --git a/comms/plp/patches/patch-ap b/comms/plp/patches/patch-ap index 0be5aed6b78..b29e8541379 100644 --- a/comms/plp/patches/patch-ap +++ b/comms/plp/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.1 2007/08/01 20:19:21 joerg Exp $ +$NetBSD: patch-ap,v 1.2 2011/12/19 13:44:07 wiz Exp $ ---- ncp/packet.cc.orig 2007-08-01 20:00:44.000000000 +0000 +--- ncp/packet.cc.orig 1999-04-12 21:16:58.000000000 +0000 +++ ncp/packet.cc -@@ -21,7 +21,7 @@ +@@ -21,13 +21,15 @@ #include <stdio.h> @@ -11,3 +11,13 @@ $NetBSD: patch-ap,v 1.1 2007/08/01 20:19:21 joerg Exp $ #include <unistd.h> #include <sys/time.h> #include <sys/types.h> + #include <string.h> +-#include <fstream.h> +-#include <iomanip.h> ++#include <fstream> ++#include <iomanip> ++#include <iostream> ++using namespace std; + + #include "bool.h" + #include "mp_serial.h" diff --git a/comms/plp/patches/patch-aq b/comms/plp/patches/patch-aq index 9a47e284d10..04e9d65b3b3 100644 --- a/comms/plp/patches/patch-aq +++ b/comms/plp/patches/patch-aq @@ -1,14 +1,17 @@ -$NetBSD: patch-aq,v 1.1 2007/08/01 20:19:21 joerg Exp $ +$NetBSD: patch-aq,v 1.2 2011/12/19 13:44:07 wiz Exp $ ---- ncp/socketchan.cc.orig 2007-08-01 20:00:46.000000000 +0000 +--- ncp/socketchan.cc.orig 1999-04-12 21:17:00.000000000 +0000 +++ ncp/socketchan.cc -@@ -20,9 +20,9 @@ +@@ -19,10 +19,11 @@ + // // e-mail philip.proudman@btinternet.com - #include <stream.h> +-#include <stream.h> -#include "stdio.h" -#include "string.h" -#include "malloc.h" ++#include <iostream> ++using namespace std; +#include <stdio.h> +#include <string.h> +#include <stdlib.h> diff --git a/comms/plp/patches/patch-ncp_channel.cc b/comms/plp/patches/patch-ncp_channel.cc new file mode 100644 index 00000000000..b42790baa56 --- /dev/null +++ b/comms/plp/patches/patch-ncp_channel.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-ncp_channel.cc,v 1.1 2011/12/19 13:44:07 wiz Exp $ + +Remove unnecessary header. + +--- ncp/channel.cc.orig 1999-04-12 21:16:50.000000000 +0000 ++++ ncp/channel.cc +@@ -20,8 +20,6 @@ + // e-mail philip.proudman@btinternet.com + + +-#include <stream.h> +- + #include "bool.h" + #include "channel.h" + #include "ncp.h" diff --git a/comms/plp/patches/patch-ncp_linkchan.cc b/comms/plp/patches/patch-ncp_linkchan.cc new file mode 100644 index 00000000000..3d3e007a372 --- /dev/null +++ b/comms/plp/patches/patch-ncp_linkchan.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-ncp_linkchan.cc,v 1.1 2011/12/19 13:44:07 wiz Exp $ + +Update for C++ changes. + +--- ncp/linkchan.cc.orig 1999-04-12 21:16:52.000000000 +0000 ++++ ncp/linkchan.cc +@@ -19,7 +19,8 @@ + // + // e-mail philip.proudman@btinternet.com + +-#include <stream.h> ++#include <iostream> ++using namespace std; + + #include "linkchan.h" + #include "bufferstore.h" diff --git a/comms/plp/patches/patch-ncp_main.cc b/comms/plp/patches/patch-ncp_main.cc new file mode 100644 index 00000000000..e317acbc0e3 --- /dev/null +++ b/comms/plp/patches/patch-ncp_main.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-ncp_main.cc,v 1.1 2011/12/19 13:44:07 wiz Exp $ + +Update for C++ changes. + +--- ncp/main.cc.orig 1999-04-12 21:38:15.000000000 +0000 ++++ ncp/main.cc +@@ -21,7 +21,8 @@ + + #include <stdio.h> + #include <string.h> +-#include <stream.h> ++#include <iostream> ++using namespace std; + #include <stdlib.h> + + #include "../defaults.h" diff --git a/comms/plp/patches/patch-ncp_psiemul.cc b/comms/plp/patches/patch-ncp_psiemul.cc new file mode 100644 index 00000000000..062e4416400 --- /dev/null +++ b/comms/plp/patches/patch-ncp_psiemul.cc @@ -0,0 +1,14 @@ +$NetBSD: patch-ncp_psiemul.cc,v 1.1 2011/12/19 13:44:07 wiz Exp $ + +Remove unnecessary header. + +--- ncp/psiemul.cc.orig 1999-04-12 21:16:59.000000000 +0000 ++++ ncp/psiemul.cc +@@ -23,7 +23,6 @@ + // The following code does NOT emulate a psion, but it persists "conversations" + // with a psion. This is probably only useful for my debugging only. + +-#include <iostream.h> + #include <stdlib.h> + + #include "psiemul.h" diff --git a/comms/plp/patches/patch-ncp_psiemul.h b/comms/plp/patches/patch-ncp_psiemul.h new file mode 100644 index 00000000000..4ec674920b8 --- /dev/null +++ b/comms/plp/patches/patch-ncp_psiemul.h @@ -0,0 +1,15 @@ +$NetBSD: patch-ncp_psiemul.h,v 1.1 2011/12/19 13:44:07 wiz Exp $ + +Update for C++ changes. + +--- ncp/psiemul.h.orig 1999-04-12 21:16:59.000000000 +0000 ++++ ncp/psiemul.h +@@ -1,6 +1,8 @@ + #ifndef _pisemul_h_ + #define _pisemul_h_ + ++#include <iostream> ++using namespace std; + #include "bool.h" + + // The following code does NOT emulate a psion, but it persists "conversations" diff --git a/comms/plp/patches/patch-rfsv_ftp.cc b/comms/plp/patches/patch-rfsv_ftp.cc new file mode 100644 index 00000000000..3ebc1ee30bc --- /dev/null +++ b/comms/plp/patches/patch-rfsv_ftp.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-rfsv_ftp.cc,v 1.1 2011/12/19 13:44:07 wiz Exp $ + +Update for C++ changes. + +--- rfsv/ftp.cc.orig 1999-11-02 22:47:15.000000000 +0000 ++++ rfsv/ftp.cc +@@ -21,7 +21,8 @@ + + #include <sys/types.h> + #include <dirent.h> +-#include <stream.h> ++#include <iostream> ++using namespace std; + #include <string.h> + #include <ctype.h> + #include <stdlib.h> diff --git a/comms/plp/patches/patch-rfsv_main.cc b/comms/plp/patches/patch-rfsv_main.cc new file mode 100644 index 00000000000..bd7902670f2 --- /dev/null +++ b/comms/plp/patches/patch-rfsv_main.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-rfsv_main.cc,v 1.1 2011/12/19 13:44:07 wiz Exp $ + +Update for C++ changes. + +--- rfsv/main.cc.orig 1999-04-12 21:32:31.000000000 +0000 ++++ rfsv/main.cc +@@ -19,7 +19,8 @@ + // + // e-mail philip.proudman@btinternet.com + +-#include <stream.h> ++#include <iostream> ++using namespace std; + #include <string.h> + #include <stdlib.h> + #include <stdio.h> diff --git a/comms/plp/patches/patch-utils_bufferstore.cc b/comms/plp/patches/patch-utils_bufferstore.cc new file mode 100644 index 00000000000..1f2e9ba55a7 --- /dev/null +++ b/comms/plp/patches/patch-utils_bufferstore.cc @@ -0,0 +1,17 @@ +$NetBSD: patch-utils_bufferstore.cc,v 1.1 2011/12/19 13:44:07 wiz Exp $ + +Update for C++ changes. + +--- utils/bufferstore.cc.orig 1999-04-12 21:17:03.000000000 +0000 ++++ utils/bufferstore.cc +@@ -19,8 +19,8 @@ + // + // e-mail philip.proudman@btinternet.com + +-#include <stream.h> +-#include <iomanip.h> ++#include <iomanip> ++using namespace std; + #include <string.h> + + #include "bufferstore.h" diff --git a/comms/plp/patches/patch-utils_iowatch.cc b/comms/plp/patches/patch-utils_iowatch.cc new file mode 100644 index 00000000000..c8972e1ba29 --- /dev/null +++ b/comms/plp/patches/patch-utils_iowatch.cc @@ -0,0 +1,14 @@ +$NetBSD: patch-utils_iowatch.cc,v 1.1 2011/12/19 13:44:08 wiz Exp $ + +Remove unnecessary header. + +--- utils/iowatch.cc.orig 1999-04-12 21:17:04.000000000 +0000 ++++ utils/iowatch.cc +@@ -23,7 +23,6 @@ + #include <stdio.h> + #include <sys/time.h> + #include <sys/types.h> +-#include <stream.h> + #include <memory.h> + + #include "bool.h" |