From a2a15ee30d755f199d96d2dfcc28963eb10307ce Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 31 Jul 2000 17:02:24 +0000 Subject: Use normal patch files instead of custom "do-patch" target. --- net/wmnet/Makefile | 5 +---- net/wmnet/files/patch-sum | 7 +++++++ net/wmnet/patches/patch-aa | 23 +++++++++++++++++++++++ net/wmnet/patches/patch-ab | 10 ++++++++++ net/wmnet/patches/patch-ac | 22 ++++++++++++++++++++++ net/wmnet/patches/patch-ad | 13 +++++++++++++ net/wmnet/patches/patch-ae | 17 +++++++++++++++++ 7 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 net/wmnet/files/patch-sum create mode 100644 net/wmnet/patches/patch-aa create mode 100644 net/wmnet/patches/patch-ab create mode 100644 net/wmnet/patches/patch-ac create mode 100644 net/wmnet/patches/patch-ad create mode 100644 net/wmnet/patches/patch-ae (limited to 'net/wmnet') diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile index b3cf9617eb8..433f755603a 100644 --- a/net/wmnet/Makefile +++ b/net/wmnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/07/30 20:08:52 tron Exp $ +# $NetBSD: Makefile,v 1.2 2000/07/31 17:02:24 tron Exp $ DISTNAME= wmnet-1.06 CATEGORIES= net x11 @@ -9,7 +9,4 @@ HOMEPAGE= http://www.digitalkaos.net/linux/wmnet/ USE_IMAKE= YES -do-patch: - cd ${WRKSRC}; for i in *; do ${GREP} -q OpenBSD $$i && ${SED} s/OpenBSD/NetBSD/g $$i > temp && ${MV} temp $$i; done - .include "../../mk/bsd.pkg.mk" diff --git a/net/wmnet/files/patch-sum b/net/wmnet/files/patch-sum new file mode 100644 index 00000000000..ab6d860ae30 --- /dev/null +++ b/net/wmnet/files/patch-sum @@ -0,0 +1,7 @@ +$NetBSD: patch-sum,v 1.1 2000/07/31 17:02:25 tron Exp $ + +MD5 (patch-aa) = 09c8fa68a42f5e5327d2a81b0accd2dd +MD5 (patch-ab) = f11280e94428dceb98e3c630893cbe9d +MD5 (patch-ac) = 4b3d443856d66e984ccb2ca0de4b918f +MD5 (patch-ad) = 76eec32cdb7edbd7d6e23f5b0a6e00a3 +MD5 (patch-ae) = 2f23ec3b91aa9e356280984b60163647 diff --git a/net/wmnet/patches/patch-aa b/net/wmnet/patches/patch-aa new file mode 100644 index 00000000000..9c012b14b87 --- /dev/null +++ b/net/wmnet/patches/patch-aa @@ -0,0 +1,23 @@ +$NetBSD: patch-aa,v 1.1 2000/07/31 17:02:25 tron Exp $ + +--- Imakefile.orig Fri May 5 02:34:29 2000 ++++ Imakefile Mon Jul 31 19:01:24 2000 +@@ -10,14 +10,16 @@ + LOCAL_LIBRARIES = $(XLIB) -lm + #endif + +-#if defined (FreeBSDArchitecture) || defined (OpenBSDArchitecture) ++#if defined (FreeBSDArchitecture) || defined (OpenBSDArchitecture) || \ ++ defined (NetBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -lm -lkvm + INSTPGMFLAGS = -s -g kmem -m 2755 + #endif + + LINTLIBS = $(LINTXLIB) + +-#if defined (FreeBSDArchitecture) || defined (OpenBSDArchitecture) ++#if defined (FreeBSDArchitecture) || defined (OpenBSDArchitecture) || \ ++ defined (NetBSDArchitecture) + SRCS = wmnet.c drivers.c getopt.c getopt1.c + OBJS = wmnet.o drivers.o getopt.o getopt1.o + #else diff --git a/net/wmnet/patches/patch-ab b/net/wmnet/patches/patch-ab new file mode 100644 index 00000000000..b143f017ea6 --- /dev/null +++ b/net/wmnet/patches/patch-ab @@ -0,0 +1,10 @@ +$NetBSD: patch-ab,v 1.1 2000/07/31 17:02:25 tron Exp $ + +--- config.h.orig Fri May 5 02:34:29 2000 ++++ config.h Mon Jul 31 19:00:30 2000 +@@ -1,4 +1,4 @@ +-#if defined (__FreeBSD__) || defined (__OpenBSD__) ++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) + + /* Our only FreeBSD driver, this goes straight into kernel memory + * and reads the raw structures from right underneath the kernel using the diff --git a/net/wmnet/patches/patch-ac b/net/wmnet/patches/patch-ac new file mode 100644 index 00000000000..ac658bf9d2b --- /dev/null +++ b/net/wmnet/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2000/07/31 17:02:25 tron Exp $ + +--- drivers.c.orig Fri May 5 02:34:29 2000 ++++ drivers.c Mon Jul 31 19:00:30 2000 +@@ -457,7 +457,7 @@ + int flag = 0; + while (ifnet_addr && flag != (ACCOUNT_IN_FOUND|ACCOUNT_OUT_FOUND)) { + kvm_read(kvmfd, ifnet_addr, buffer, sizeof(struct ifnet)); +-#ifdef __OpenBSD__ ++#if defined(__OpenBSD__) || defined(__NetBSD__) + snprintf(devname, 15, "%s", ifnet->if_xname); + #else + kvm_read(kvmfd, (unsigned long)ifnet->if_name, devname, 15); +@@ -487,7 +487,7 @@ + flag = (ACCOUNT_IN_FOUND|ACCOUNT_OUT_FOUND); + + } else { +-#ifdef __OpenBSD__ ++#if defined(__OpenBSD__) || defined(__NetBSD__) + ifnet_addr = (unsigned long)ifnet->if_list.tqe_next; + #else + ifnet_addr = (unsigned long)ifnet->if_next; diff --git a/net/wmnet/patches/patch-ad b/net/wmnet/patches/patch-ad new file mode 100644 index 00000000000..f7a2405c162 --- /dev/null +++ b/net/wmnet/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2000/07/31 17:02:25 tron Exp $ + +--- wmnet.c.orig Fri May 5 03:01:14 2000 ++++ wmnet.c Mon Jul 31 19:00:30 2000 +@@ -55,7 +55,7 @@ + #include + #include + #include +-#if defined (__FreeBSD__) || defined (__OpenBSD__) ++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) + # include + # include"getopt.h" + #else diff --git a/net/wmnet/patches/patch-ae b/net/wmnet/patches/patch-ae new file mode 100644 index 00000000000..f3994063e38 --- /dev/null +++ b/net/wmnet/patches/patch-ae @@ -0,0 +1,17 @@ +$NetBSD: patch-ae,v 1.1 2000/07/31 17:02:25 tron Exp $ + +--- wmnet.man.orig Fri May 5 02:43:35 2000 ++++ wmnet.man Mon Jul 31 19:00:30 2000 +@@ -147,9 +147,9 @@ + Otherwise, the kernel will not collect the stats we need. + .TP + .B kmem +-this driver is available on FreeBSD and OpenBSD systems and must be passed +-a device through the \fI--device\fP option. By default, it uses ec0 but +-will accept any valid device name. ++this driver is available on FreeBSD, OpenBSD and NetBSD systems and must be ++passed a device through the \fI--device\fP option. By default, it uses ec0 ++Dbut will accept any valid device name. + .SH FILES + .TP + .I /proc/net/ip_acct /proc/net/dev /proc/net/ipchains -- cgit v1.2.3