- 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)

4 files changed, 167 insertions, 46 deletions

diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index e0eada575ed..3a172fabad5 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -16,11 +16,6 @@ DISTNAME=	cvsup-snap-${PORTVERSION}
 MAINTAINER=	jdp@FreeBSD.org
 COMMENT?=	General network file distribution system optimized for CVS (GUI version)
 
-PROCESSOR!=	/usr/bin/uname -p
-.if ${PROCESSOR} == "amd64"
-USE_BZIP2=	yes
-.endif
-
 ONLY_FOR_ARCHS=	alpha amd64 i386 sparc64
 
 .include <bsd.port.pre.mk>
@@ -32,33 +27,24 @@ BROKEN=		Not supported on versions earlier than 4.1-RELEASE
 .if ${ARCH} == "alpha"
 TARGET=		FBSD_ALPHA
 .elif ${ARCH} == "amd64"
-PORTREVISION=	2
-MASTER_SITE_SUBDIR=	bz
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-DISTNAME=	cvsup-without-gui.amd64
-NO_WRKSUBDIR=	yes
-USE_REINPLACE=	yes
-NO_BUILD=	binary-only
-MANCOMPRESSED=	yes
+MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
+TARGET=		FBSD_AMD64
+AMD64_PATCHES=	p-amd64-aa p-amd64-zlib
 .elif ${ARCH} == "i386"
 TARGET=		FreeBSD4
 .elif ${ARCH} == "sparc64"
 TARGET=		FBSD_SPARC64
 .endif
 
-.ifdef WITHOUT_X11
+.if defined(WITHOUT_X11) || ${ARCH} == "amd64"
 M3FLAGS+=	-DNOGUI
-.if ${ARCH} != "amd64"
 BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3
-.endif		# != amd64
 PKGNAMESUFFIX=	-without-gui
 COMMENT=	General network file distribution system optimized for CVS (non-GUI version)
 DESCR=		${PKGDIR}/pkg-descr.nogui
 .else
-.if ${ARCH} != "amd64"
 USE_XLIB=	yes
 BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/formsvbt/${TARGET}/libm3formsvbt.a:${PORTSDIR}/lang/ezm3
-.endif		# != amd64
 .endif
 
 MAKE_ARGS+=	PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}"
@@ -71,39 +57,28 @@ M3FLAGS+=	-DSTATIC
 
 pre-fetch:
 .ifndef WITHOUT_X11
-	@${ECHO_MSG} "*****************************************************"
 .if ${ARCH} == "amd64"
-	@${ECHO_MSG} "* CVSup with X11 not yet supported on amd64.        *"
-	@${ECHO_MSG} "* Will install non-X11 version. You might want      *"
-.endif
-	@${ECHO_MSG} "* To build CVSup without X11 (and without the GUI), *"
+	@${ECHO_MSG} "*****************************************************"
+	@${ECHO_MSG} "* CVSup with X11 is not yet supported on amd64.     *"
+	@${ECHO_MSG} "* I will build cvsup without X11 support now.       *"
+	@${ECHO_MSG} "*****************************************************"
+.else
+	@${ECHO_MSG} "*****************************************************"
+	@${ECHO_MSG} "* To build CVSup without X11 (and without the GUI)  *"
 	@${ECHO_MSG} "* use the \"net/cvsup-without-gui\" port.             *"
 	@${ECHO_MSG} "*****************************************************"
 .endif
-	@${TRUE}
+.endif
+
+pre-patch:
+.if ${ARCH} == "amd64"
+.for f in ${AMD64_PATCHES}
+	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/${f}
+.endfor
+.endif
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/cvsup
 	@${INSTALL_DATA} ${WRKSRC}/License ${PREFIX}/share/cvsup/License
 
-.if ${ARCH} == "amd64"
-do-patch:
-	@${TRUE}
-
-do-configure:
-	@${TOUCH} ${WRKSRC}/License
-	@${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE}
-	@${TRUE}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/cvpasswd ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/cvsup ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/sbin/cvsupd ${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/man/man1/cvpasswd.1.gz ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/man/man1/cvsup.1.gz ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/man/man8/cvsupd.8.gz ${PREFIX}/man/man8/
-	${MKDIR} ${PREFIX}/share/cvsup
-	${MV} ${WRKSRC}/share/cvsup/License ${WRKSRC}/License
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net/cvsup/distinfo b/net/cvsup/distinfo
index d41bb83b3ce..fa722752ed8 100644
--- a/net/cvsup/distinfo
+++ b/net/cvsup/distinfo
@@ -1,4 +1,2 @@
 MD5 (cvsup-snap-16.1h.tar.gz) = b100ace98a41aa9f3d3e75b0d3c245b0
 SIZE (cvsup-snap-16.1h.tar.gz) = 430951
-MD5 (cvsup-without-gui.amd64.tar.bz2) = ced3a5ccca76550d239f1ec09e3822d4
-SIZE (cvsup-without-gui.amd64.tar.bz2) = 964594
diff --git a/net/cvsup/files/p-amd64-aa b/net/cvsup/files/p-amd64-aa
new file mode 100644
index 00000000000..6845cdf8023
--- /dev/null
+++ b/net/cvsup/files/p-amd64-aa
@@ -0,0 +1,92 @@
+#
+# This should not be needed.  The amd64 port of ezm3 has
+# compiler bugs that manifest as sorting problems.  Once that
+# is fixed, this can go away.
+#
+--- suplib/src/ChannelMux.m3	Sun Oct 26 11:09:31 2003
++++ suplib/src/ChannelMux.m3	Tue Mar  4 11:26:19 2003
+@@ -778,5 +778,5 @@
+ PROCEDURE ChanPut(self: Channel;
+                   READONLY arr: ARRAY OF CHAR)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   VAR
+     pos := 0;
+--- suplib/src/EscapedWr.m3	Sun Oct 26 11:10:20 2003
++++ suplib/src/EscapedWr.m3	Tue Mar  4 11:26:20 2003
+@@ -46,5 +46,5 @@
+ 
+ PROCEDURE Close(self: T)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   BEGIN
+     TRY
+@@ -63,5 +63,5 @@
+ 
+ PROCEDURE Flush(self: T)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   BEGIN
+     Seek(self, self.cur);
+@@ -91,5 +91,5 @@
+ 
+ PROCEDURE Seek(self: T; n: CARDINAL)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   VAR
+     ch: CHAR;
+--- suplib/src/GzipWr.m3	Sun Oct 26 11:11:22 2003
++++ suplib/src/GzipWr.m3	Tue Mar  4 11:26:23 2003
+@@ -58,5 +58,5 @@
+ 
+ PROCEDURE Close(self: T)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   VAR
+     status: INTEGER;
+@@ -112,5 +112,5 @@
+ 
+ PROCEDURE Flush(self: T)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   VAR
+     status: INTEGER;
+@@ -170,5 +170,5 @@
+ 
+ PROCEDURE Seek(self: T; n: CARDINAL)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   VAR
+     oldLo: CARDINAL;
+--- suplib/src/MD5Wr.m3	Sun Oct 26 11:10:48 2003
++++ suplib/src/MD5Wr.m3	Tue Mar  4 11:26:24 2003
+@@ -48,5 +48,5 @@
+ 
+ PROCEDURE Close(self: T)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   BEGIN
+     IF self.closeChild THEN
+@@ -56,5 +56,5 @@
+ 
+ PROCEDURE Flush(self: T)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   BEGIN
+     Seek(self, self.cur);
+@@ -96,5 +96,5 @@
+ 
+ PROCEDURE Seek(self: T; n: CARDINAL)
++  RAISES {Wr.Failure, Thread.Alerted} =
+-  RAISES {Thread.Alerted, Wr.Failure} =
+   BEGIN
+     <* ASSERT n = self.cur *>
+--- suptcp/src/POSIX/SupTCP.m3	Sun Oct 26 11:08:21 2003
++++ suptcp/src/POSIX/SupTCP.m3	Sun Apr  6 16:48:58 2003
+@@ -289,5 +289,5 @@
+ PROCEDURE GetBytesFD(
+     t: T; VAR arr: ARRAY OF CHAR; timeout: LONGREAL) : CARDINAL
++    RAISES {Rd.Failure, Thread.Alerted, ConnFD.TimedOut} =
+-    RAISES {Rd.Failure, ConnFD.TimedOut, Thread.Alerted} =
+   VAR 
+     len: INTEGER;  
diff --git a/net/cvsup/files/p-amd64-zlib b/net/cvsup/files/p-amd64-zlib
new file mode 100644
index 00000000000..f00ec4917e8
--- /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;