From de042c40a3fcb1226904097275345d926b0a708d Mon Sep 17 00:00:00 2001 From: skrll Date: Sun, 22 Apr 2001 17:43:18 +0000 Subject: Make patches work with pkgdiff. --- comms/plp/distinfo | 14 +++++++------- comms/plp/patches/patch-aa | 10 ++++++---- comms/plp/patches/patch-ab | 10 ++++++---- comms/plp/patches/patch-ac | 9 +++++---- comms/plp/patches/patch-ad | 9 +++++---- comms/plp/patches/patch-ae | 9 +++++---- comms/plp/patches/patch-af | 18 ++++++++++++------ 7 files changed, 46 insertions(+), 33 deletions(-) (limited to 'comms/plp') diff --git a/comms/plp/distinfo b/comms/plp/distinfo index 9b2d16d9c5d..ca9e8837f31 100644 --- a/comms/plp/distinfo +++ b/comms/plp/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 09:04:25 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/04/22 17:43:18 skrll Exp $ SHA1 (plp_1_8.tar.gz) = cad586353091895b6efc556d2cb5fa16891a3749 Size (plp_1_8.tar.gz) = 58424 bytes -SHA1 (patch-aa) = c63110d134d400cbb18e5ac12fb11d66e1d4300a -SHA1 (patch-ab) = 8f272d487b78508fe083b649f181b270a95e975f -SHA1 (patch-ac) = 1eaa86ad1e20aa1580c86c9bb52877004dd9ff89 -SHA1 (patch-ad) = 4083bd57bb74d11e50eb873997ecc56659c803fe -SHA1 (patch-ae) = bf71655dff0406c304ac7baafdb7acb960e70e99 -SHA1 (patch-af) = 979c46bbc833b74cc4303be05c9f0f7ffb776400 +SHA1 (patch-aa) = 0aa07f8542acbd9180cfbfb4230e50eb97e45cb9 +SHA1 (patch-ab) = 41314372a3f5f5723393c0cf42c20d4257b170b6 +SHA1 (patch-ac) = 794a00264cd61d31b61a2f05d81424e05f2e065e +SHA1 (patch-ad) = 5831a7043380f3cc1dcccc029e54874003475632 +SHA1 (patch-ae) = 4ed426d60618302fa5d996d45d2b5be69e3e7faf +SHA1 (patch-af) = 3397dbb6f1a9ef441db5d4ddc28a4e1bc9458f57 SHA1 (patch-ag) = 354183a25f00d951e5cbc25e64b11b1daac21939 SHA1 (patch-ah) = e0a90f7f8f70ab94f252af28d0d6ecbb878265df diff --git a/comms/plp/patches/patch-aa b/comms/plp/patches/patch-aa index 75189473b91..a03d0f196ee 100644 --- a/comms/plp/patches/patch-aa +++ b/comms/plp/patches/patch-aa @@ -1,11 +1,13 @@ -$NetBSD: patch-aa,v 1.2 1999/12/06 02:19:25 sakamoto Exp $ +$NetBSD: patch-aa,v 1.3 2001/04/22 17:43:19 skrll Exp $ ---- ./defaults.h.orig Wed Nov 3 05:51:01 1999 -+++ ./defaults.h Mon Dec 6 11:04:20 1999 -@@ -20,5 +20,5 @@ +--- defaults.h.orig Tue Nov 2 20:51:01 1999 ++++ defaults.h +@@ -19,7 +19,7 @@ + // This is the default device driver for the serial link // N.B. This was "/dev/cua1" in the previous release -#define DEFAULT_SERIAL_DEVICE "/dev/ttyS1" +#define DEFAULT_SERIAL_DEVICE "/dev/tty00" // This is the default drive to use on the psion + #define DEFAULT_DRIVE "C:\\" diff --git a/comms/plp/patches/patch-ab b/comms/plp/patches/patch-ab index f2b1caee772..f0a01424abe 100644 --- a/comms/plp/patches/patch-ab +++ b/comms/plp/patches/patch-ab @@ -1,8 +1,9 @@ -$NetBSD: patch-ab,v 1.2 1999/12/06 02:19:26 sakamoto Exp $ +$NetBSD: patch-ab,v 1.3 2001/04/22 17:43:19 skrll Exp $ ---- ./ncp/mp_serial.c.orig Wed Nov 3 05:47:06 1999 -+++ ./ncp/mp_serial.c Mon Dec 6 11:04:20 1999 -@@ -224,6 +224,6 @@ +--- ncp/mp_serial.c.orig Tue Nov 2 20:47:06 1999 ++++ ncp/mp_serial.c +@@ -223,8 +223,8 @@ + void ser_exit(int fd) { struct termios ti; - if(ioctl(fd, TCGETS, (caddr_t)&ti) < 0) { @@ -11,3 +12,4 @@ $NetBSD: patch-ab,v 1.2 1999/12/06 02:19:26 sakamoto Exp $ + perror("TIOCGETA"); } ti.c_cflag &= ~CRTSCTS; + if(tcsetattr(fd, TCSANOW, &ti) < 0) { diff --git a/comms/plp/patches/patch-ac b/comms/plp/patches/patch-ac index b744eb712f4..0665182d8d2 100644 --- a/comms/plp/patches/patch-ac +++ b/comms/plp/patches/patch-ac @@ -1,8 +1,9 @@ -$NetBSD: patch-ac,v 1.2 1999/12/06 02:19:26 sakamoto Exp $ +$NetBSD: patch-ac,v 1.3 2001/04/22 17:43:19 skrll Exp $ ---- ./ncp/Makefile.orig Tue Feb 2 21:16:05 1999 -+++ ./ncp/Makefile Mon Dec 6 11:04:20 1999 -@@ -4,13 +4,13 @@ +--- ncp/Makefile.orig Tue Feb 2 12:16:05 1999 ++++ ncp/Makefile +@@ -3,14 +3,14 @@ + OBJ=$(CCSOURCE:%.cc=%.o) $(CSOURCE:%.c=%.o) -../bin/ncp : $(OBJ) diff --git a/comms/plp/patches/patch-ad b/comms/plp/patches/patch-ad index a5cc84ebc47..c3bf8a69941 100644 --- a/comms/plp/patches/patch-ad +++ b/comms/plp/patches/patch-ad @@ -1,8 +1,9 @@ -$NetBSD: patch-ad,v 1.2 1999/12/06 02:19:26 sakamoto Exp $ +$NetBSD: patch-ad,v 1.3 2001/04/22 17:43:19 skrll Exp $ ---- ./rfsv/Makefile.orig Tue Feb 2 21:16:15 1999 -+++ ./rfsv/Makefile Mon Dec 6 11:04:20 1999 -@@ -4,13 +4,13 @@ +--- rfsv/Makefile.orig Tue Feb 2 12:16:15 1999 ++++ rfsv/Makefile +@@ -3,14 +3,14 @@ + OBJ=$(CCSOURCE:%.cc=%.o) $(CSOURCE:%.c=%.o) -../bin/rfsv : $(OBJ) diff --git a/comms/plp/patches/patch-ae b/comms/plp/patches/patch-ae index 8f75cd98635..fd2903b2fc4 100644 --- a/comms/plp/patches/patch-ae +++ b/comms/plp/patches/patch-ae @@ -1,8 +1,9 @@ -$NetBSD: patch-ae,v 1.2 1999/12/06 02:19:26 sakamoto Exp $ +$NetBSD: patch-ae,v 1.3 2001/04/22 17:43:19 skrll Exp $ ---- ./utils/Makefile.orig Mon Jan 18 01:22:40 1999 -+++ ./utils/Makefile Mon Dec 6 11:04:20 1999 -@@ -4,13 +4,13 @@ +--- utils/Makefile.orig Sun Jan 17 16:22:40 1999 ++++ utils/Makefile +@@ -3,14 +3,14 @@ + OBJ=$(CCSOURCE:%.cc=%.o) $(CSOURCE:%.c=%.o) -libutils.a : $(OBJ) diff --git a/comms/plp/patches/patch-af b/comms/plp/patches/patch-af index d9c726a2474..7147b76e464 100644 --- a/comms/plp/patches/patch-af +++ b/comms/plp/patches/patch-af @@ -1,8 +1,9 @@ -$NetBSD: patch-af,v 1.2 1999/12/06 02:19:27 sakamoto Exp $ +$NetBSD: patch-af,v 1.3 2001/04/22 17:43:19 skrll Exp $ ---- ./Makefile.orig Wed Nov 3 06:05:02 1999 -+++ ./Makefile Mon Dec 6 11:04:20 1999 -@@ -18,15 +18,9 @@ +--- Makefile.orig Tue Nov 2 21:05:02 1999 ++++ Makefile +@@ -17,17 +17,11 @@ + # Compiler & flags INCLUDE=-I../utils CFLAGS= -Wall -g -O2 -CC=g++ $(CFLAGS) $(INCLUDE) @@ -21,7 +22,9 @@ $NetBSD: patch-af,v 1.2 1999/12/06 02:19:27 sakamoto Exp $ +LD=$(LIBTOOL) --mode=link g++ ####################################### -@@ -39,18 +33,21 @@ + # You shouldn't need to look any further.. +@@ -38,20 +32,23 @@ + export LD export LIBS -all: bin/ncp bin/rfsv @@ -52,10 +55,13 @@ $NetBSD: patch-af,v 1.2 1999/12/06 02:19:27 sakamoto Exp $ + cp ncp/ncp /usr/local/bin/ncp clean: -@@ -60,5 +57,5 @@ + cd utils; $(MAKE) clean +@@ -59,7 +56,7 @@ + cd rfsv; $(MAKE) clean rm -f ncp.log *~ core -test: bin/ncp bin/rfsv +test: all PATH=`pwd`/bin:$${PATH}; export PATH;\ rfsv dir "C:/documents/" + @echo -- cgit v1.2.3