From 352d7a0f37fb7a4801a6c38a9198a03db5e0376b Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Mon, 13 Oct 1997 12:47:44 +0000
Subject: Mark FreeBSD RCS Id as such.

Make this compile on NetBSD:
+ __FreeBSD__ -> (defined(BSD) && BSD >= 199306)
+ eliminate compiler warnings by working around unusual definition in
switch statement.
+ change the man directory location to reflect NetBSD reality.
---
 misc/team/Makefile        |  2 +-
 misc/team/patches/patch-a |  2 +-
 misc/team/patches/patch-d |  4 +--
 misc/team/patches/patch-e | 72 +++++++++++++++++++++++++++++++++++++----------
 4 files changed, 61 insertions(+), 19 deletions(-)

(limited to 'misc/team')

diff --git a/misc/team/Makefile b/misc/team/Makefile
index b3bdb72c206..9b049763550 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 July 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.1.1.1 1997/10/11 21:55:00 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.1.1.1 1997/10/11 21:55:00 hubertf Exp
 #
 
 DISTNAME=	team-3.1
diff --git a/misc/team/patches/patch-a b/misc/team/patches/patch-a
index 2a8bd311e97..951bfecb091 100644
--- a/misc/team/patches/patch-a
+++ b/misc/team/patches/patch-a
@@ -9,7 +9,7 @@ diff -u team-3.1/Makefile ./Makefile
 -INSTX		=install -m 0755 -s
 -INSTD		=install -m 0644
 +BINDIR=	${PREFIX}/bin
-+MANDIR=	${PREFIX}/man/man
++MANDIR=	${PREFIX}/man
  
 -DEST=		
 +CFLAGS+= -DHAVE_PARAM_H
diff --git a/misc/team/patches/patch-d b/misc/team/patches/patch-d
index 53b4698adb0..a01497f9f8d 100644
--- a/misc/team/patches/patch-d
+++ b/misc/team/patches/patch-d
@@ -3,14 +3,14 @@
 ***************
 *** 3,8 ****
   BINDIR=	${PREFIX}/bin
-  MANDIR=	${PREFIX}/man/man
+  MANDIR=	${PREFIX}/man
   
 ! CFLAGS+= -DHAVE_PARAM_H
   
   .include <bsd.prog.mk>
 --- 3,8 ----
   BINDIR=	${PREFIX}/bin
-  MANDIR=	${PREFIX}/man/man
+  MANDIR=	${PREFIX}/man
   
 ! CFLAGS+= -DHAVE_PARAM_H -DHAVE_WAIT_H
   
diff --git a/misc/team/patches/patch-e b/misc/team/patches/patch-e
index b54f83d040e..6e1387df060 100644
--- a/misc/team/patches/patch-e
+++ b/misc/team/patches/patch-e
@@ -1,15 +1,57 @@
-*** team.c.ORIG	Fri Dec 13 16:26:50 1996
---- team.c	Fri Dec 13 16:28:14 1996
-***************
-*** 94,99 ****
---- 94,103 ----
-  # undef F_SETLKW
-  #endif
-  
-+ #ifdef __FreeBSD__
-+ # undef F_SETLKW
-+ #endif
-+ 
-  #if (PCG)
-  # include "Extend.h"
-  # include "Here.h"
+--- team.c.orig	Mon Oct 13 13:29:41 1997
++++ team.c	Mon Oct 13 13:33:42 1997
+@@ -97,6 +97,10 @@
+ # undef F_SETLKW
+ #endif
+ 
++#if (defined(BSD) && BSD >= 199306)
++# undef F_SETLKW
++#endif
++
+ #if (PCG)
+ # include "Extend.h"
+ # include "Here.h"
+@@ -107,6 +111,7 @@
+ # define fast		register
+ # define global     	/* extern */
+ # define local		static
++# define When		case
+ # define when		break; case
+ # define otherwise	break; default
+ # define mode(which,name) typedef which name name; which name
+@@ -355,7 +360,7 @@
+ 
+   switch (fd->status)
+   {
+-  when FdEOF:     return 0;
++  When FdEOF:     return 0;
+   when FdERROR:   return -1;
+   when FdCLOSED:  return -1;
+ 
+@@ -396,7 +401,7 @@
+ 
+   switch (fd->status)
+   {
+-  when FdEOF:     return 0;
++  When FdEOF:     return 0;
+   when FdERROR:   return -1;
+   when FdCLOSED:  return -1;
+ 
+@@ -578,7 +583,7 @@
+   while ((received = GuyRECEIVE(guy,&token,&status,&done)) && token != TokenSTOP)
+   switch (token)
+   {
+-  when TokenREAD:
++  When TokenREAD:
+     FdIn.status = status;
+ 
+     Mesg(("GuyStart reading %d chars\n",bufsize));
+@@ -996,7 +1001,7 @@
+   while ((opt = getopt(argc,argv,"vri:o:")) != -1)
+     switch (opt)
+     {
+-    when 'i':
++    When 'i':
+       isize = atos(optarg);
+       if (isize < TeamLVOLSZ || isize > TeamHVOLSZ)
+       {
-- 
cgit v1.2.3