- Switch cvsup to build binaries from sources on amd64 architecture instead

  of providing precompiled binary packages, using patches by Peter Wemm and
  Bjoern A. Zeeb. This gets up "good" cvsup for upcoming 6.0 release.
- Turn off X11 automatically on amd64 instead of erroring out
- Bjoern A. Zeeb agreed to take maintainership of this port for amd64 arch
  (read: help endusers solving their problems)

Based on:	bz's patches floating on mailing list
Approved by:	jdp (maintainer)

1 files changed, 56 insertions, 0 deletions

diff --git a/net/cvsup/files/p-amd64-zlib b/net/cvsup/files/p-amd64-zlib
new file mode 100644
index 000000000000..f00ec4917e89
--- /dev/null
+++ b/net/cvsup/files/p-amd64-zlib
@@ -0,0 +1,56 @@
+--- suplib/src/GzipWr.m3.orig	Tue Jun  1 21:09:44 2004
++++ suplib/src/GzipWr.m3	Wed Jun  2 08:59:02 2004
+@@ -32,7 +32,7 @@ UNSAFE MODULE GzipWr;
+ 
+ IMPORT
+   GzipError, OSError, StreamWrClass, Thread, Ugzip, Wr, WrClass;
+-FROM Ctypes IMPORT unsigned_char_star;
++FROM Ctypes IMPORT unsigned_char_star, int;
+ 
+ REVEAL
+   T = Public BRANDED OBJECT
+@@ -102,12 +102,15 @@ PROCEDURE Deflate(strmp: Ugzip.z_stream_
+ (* Call "Ugzip.deflate", making sure that pointers into the (traced)
+    input and output buffers are on the stack or in registers.  This
+    ensures that the collector will not move the buffers. *)
++  VAR
++    rc: int;
+   BEGIN
+     strmp.next_in := next_in;
+     strmp.avail_in := avail_in;
+     strmp.next_out := next_out;
+     strmp.avail_out := avail_out;
+-    RETURN Ugzip.deflate(strmp, flush);
++    rc := Ugzip.deflate(strmp, flush);
++    RETURN rc;
+   END Deflate;
+ 
+ PROCEDURE Flush(self: T)
+--- suplib/src/GzipRd.m3.orig	Tue Mar  4 19:26:22 2003
++++ suplib/src/GzipRd.m3	Wed Jun  2 08:59:22 2004
+@@ -32,7 +32,7 @@ UNSAFE MODULE GzipRd;
+ 
+ IMPORT
+   GzipError, OSError, Rd, RdClass, StreamRdClass, Thread, Ugzip;
+-FROM Ctypes IMPORT unsigned_char_star;
++FROM Ctypes IMPORT unsigned_char_star, int;
+ 
+ REVEAL
+   T = Public BRANDED OBJECT
+@@ -83,12 +83,15 @@ PROCEDURE Inflate(strmp: Ugzip.z_stream_
+ (* Call "Ugzip.inflate", making sure that pointers into the (traced)
+    input and output buffers are on the stack or in registers.  This
+    ensures that the collector will not move the buffers. *)
++  VAR
++    rc: int;
+   BEGIN
+     strmp.next_in := next_in;
+     strmp.avail_in := avail_in;
+     strmp.next_out := next_out;
+     strmp.avail_out := avail_out;
+-    RETURN Ugzip.inflate(strmp, flush);
++    rc := Ugzip.inflate(strmp, flush);
++    RETURN rc;
+   END Inflate;
+ 
+ PROCEDURE Init(self: T;