Fix compilation on (at least) alpha.

3 files changed, 44 insertions, 8 deletions

diff --git a/net/rumba/files/patch-sum b/net/rumba/files/patch-sum
index 92fd72f0452..670ae4e51db 100644
--- a/net/rumba/files/patch-sum
+++ b/net/rumba/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.3 2000/08/25 21:00:13 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/12/28 01:35:42 wiz Exp $
 
-MD5 (patch-aa) = 7e058b8bc38bc9a343ca3505015eb8bc
+MD5 (patch-aa) = 7a2b34a86d60e407460741debe33ee20
 MD5 (patch-ab) = d9e8bbf3fc231b36ce6c2bf63c86e0ad
 MD5 (patch-ac) = bea96514b66561818e9973aff7111161
 MD5 (patch-ad) = 23ec229a10d236ee4de41e717c8e2f9e
+MD5 (patch-ae) = e59497a657c886d4cdeeee54936dc3b3
diff --git a/net/rumba/patches/patch-aa b/net/rumba/patches/patch-aa
index c115bcdac31..823f31bf200 100644
--- a/net/rumba/patches/patch-aa
+++ b/net/rumba/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2000/08/22 19:49:13 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2000/12/28 01:35:42 wiz Exp $
 
---- Makefile.orig	Sun Mar 22 18:09:38 1998
-+++ Makefile	Tue Aug 22 15:38:02 2000
-@@ -14,10 +14,10 @@
+--- Makefile.orig	Mon Mar 23 00:09:38 1998
++++ Makefile
+@@ -13,12 +13,12 @@
+ ##############################################################################
  
  # For NEXTSTEP/OPENSTEP:
 -CFLAGS = -Wall -O2 -traditional-cpp -g
@@ -18,7 +19,9 @@ $NetBSD: patch-aa,v 1.4 2000/08/22 19:49:13 dmcmahill Exp $
 +#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
  
  # For Linux:
-@@ -33,8 +33,8 @@
+ #CFLAGS = -Wall -O2 -g
+@@ -32,10 +32,10 @@
+ #RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
  
  # For NetBsd
 -#CFLAGS = -Wall -O2 -DNETBSD
@@ -31,10 +34,22 @@ $NetBSD: patch-aa,v 1.4 2000/08/22 19:49:13 dmcmahill Exp $
 +RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
  
  # For HP-UX:
-@@ -68,5 +68,5 @@
+ # this "CFLAGS" line is for HP's cc, obviously. For gcc try "-Wall -O2"
+@@ -67,7 +67,7 @@
+ OFILES = proc.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o
  
  .c.o:
 -	$(CC) $(CFLAGS) $(ARCH) -c -o $*.o $<
 +	$(CC) $(CFLAGS) -c -o $*.o $<
  
  all: $(NAME)
+ 
+@@ -75,7 +75,7 @@
+ 	(cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(THE_CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)")
+ 
+ $(NAME): $(OFILES) nfs_dir
+-	$(CC) $(ARCH) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS)
++	$(CC) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS)
+ 
+ clean:
+ 	rm -f $(OFILES)
diff --git a/net/rumba/patches/patch-ae b/net/rumba/patches/patch-ae
new file mode 100644
index 00000000000..e361845161d
--- /dev/null
+++ b/net/rumba/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.3 2000/12/28 01:35:43 wiz Exp $
+
+--- nfs/Makefile.orig	Wed Dec 31 01:29:08 1997
++++ nfs/Makefile
+@@ -16,13 +16,13 @@
+ 
+ all: nfs.o
+ 
+-COMPILE = $(CC) $(ARCH) -c $(INCLUDES) $(CFLAGS)
++COMPILE = $(CC) -c $(INCLUDES) $(CFLAGS)
+ 
+ .c.o:
+ 	$(COMPILE) $<
+ 
+ nfs.o: $(OFILES)
+-	$(LD) $(ARCH) -r -o $@ $(OFILES)
++	$(LD) -r -o $@ $(OFILES)
+ 
+ # the purpose of the sed "s/char data/long long data/" hack is to ensure
+ # proper alignment. [Marc Boucher <marc@CAM.ORG>]