Remove unstaged lang/ezm3 and three cvsup* ports as casualties

14 files changed, 0 insertions, 383 deletions

diff --git a/net/Makefile b/net/Makefile
index 7a97b272f5f3..940de08fa5b8 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -73,10 +73,7 @@
     SUBDIR += csocks
     SUBDIR += csync2
     SUBDIR += ctrace
-    SUBDIR += cvsup
     SUBDIR += cvsup-static
-    SUBDIR += cvsup-without-gui
-    SUBDIR += cvsupchk
     SUBDIR += cvsync
     SUBDIR += cyphesis
     SUBDIR += czmq
diff --git a/net/cvsup-without-gui/Makefile b/net/cvsup-without-gui/Makefile
deleted file mode 100644
index 0157464cddd5..000000000000
--- a/net/cvsup-without-gui/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Created by: jdp
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../cvsup
-OPTIONS_EXCLUDE=	X11
-.include "${MASTERDIR}/Makefile"
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
deleted file mode 100644
index 7efe710279d7..000000000000
--- a/net/cvsup/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# Created by: asami
-# $FreeBSD$
-
-PORTNAME=	cvsup
-PORTVERSION=	16.1h
-PORTREVISION=	7
-CATEGORIES=	net devel
-MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
-MASTER_SITE_SUBDIR=development/CVSup/snapshots
-DISTNAME=	cvsup-snap-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	File distribution system optimized for CVS
-
-ONLY_FOR_ARCHS=	amd64 i386 sparc64
-
-OPTIONS_DEFINE=	X11 STATIC
-OPTIONS_DEFAULT=X11
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MSTATIC}
-WITH_STATIC=	yes
-M3FLAGS+=	-DSTATIC
-.endif
-
-.if ${ARCH} == "amd64"
-TARGET=		FBSD_AMD64
-AMD64_PATCHES=	p-amd64-aa p-amd64-zlib
-.elif ${ARCH} == "i386"
-TARGET=		FreeBSD4
-.elif ${ARCH} == "sparc64"
-TARGET=		FBSD_SPARC64
-.endif
-
-.if ! ${PORT_OPTIONS:MX11}
-M3FLAGS+=	-DNOGUI
-BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3
-PKGNAMESUFFIX=	-without-gui
-COMMENT+=	(non-GUI version)
-DESCR=		${PKGDIR}/pkg-descr.nogui
-CONFLICTS=	cvsup-[0-9]*
-.else
-.if ${ARCH} == amd64
-IGNORE=		does not support GUI on amd64, please disable X11 option or use net/cvsup-without-gui instead
-.else
-USE_XORG+=	oldx dmx pixman xaw 
-COMMENT+=	(GUI version)
-BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/formsvbt/${TARGET}/libm3formsvbt.a:${PORTSDIR}/lang/ezm3
-CONFLICTS=	cvsup-without-gui-[0-9]*
-.endif
-.endif
-
-MAKE_ARGS+=	PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}"
-INSTALL_TARGET=	install BINDIR=${STAGEDIR}${PREFIX}/bin MANDIR=${STAGEDIR}${MANPREFIX}/man
-
-pre-patch:
-.if ${ARCH} == "amd64"
-.for f in ${AMD64_PATCHES}
-	@(cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/${f})
-.endfor
-.endif
-
-post-install:
-	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/cvsupd ${STAGEDIR}${PREFIX}/sbin
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/cvsup
-	${INSTALL_DATA} ${WRKSRC}/License ${STAGEDIR}${PREFIX}/share/cvsup/License
-
-.include <bsd.port.post.mk>
diff --git a/net/cvsup/distinfo b/net/cvsup/distinfo
deleted file mode 100644
index 0886574d7c56..000000000000
--- a/net/cvsup/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cvsup-snap-16.1h.tar.gz) = 34b10f38d730fd13257676725869aaa7c55246997c42ee4236282f648176381c
-SIZE (cvsup-snap-16.1h.tar.gz) = 430951
diff --git a/net/cvsup/files/p-amd64-aa b/net/cvsup/files/p-amd64-aa
deleted file mode 100644
index 6845cdf8023b..000000000000
--- a/net/cvsup/files/p-amd64-aa
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# 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
deleted file mode 100644
index f00ec4917e89..000000000000
--- a/net/cvsup/files/p-amd64-zlib
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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;
diff --git a/net/cvsup/files/patch-ae b/net/cvsup/files/patch-ae
deleted file mode 100644
index 85462dcd5745..000000000000
--- a/net/cvsup/files/patch-ae
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: server/src/TreeComp.m3
-===================================================================
-RCS file: /home/cvsupcvs/cvsup/server/src/TreeComp.m3,v
-retrieving revision 1.76
-diff -u -r1.76 TreeComp.m3
---- server/src/TreeComp.m3	4 Mar 2003 19:26:17 -0000	1.76
-+++ server/src/TreeComp.m3	25 Mar 2005 19:34:43 -0000
-@@ -662,21 +662,20 @@
- 		type := FileInfo.Type.Live);
- 	    END;
- 	| CVTree.FileType.AtticFile =>
--	    WITH atticPath = SupMisc.AtticName(path) DO
--	      IF attr.fileType = FileAttr.FileType.File
--	      AND SupMisc.IsRCS(path) THEN
--		IF m.sfr.fileFilter.test(atticPath) THEN
--		  RETURN NEW(FileInfo.T,
--		    name := path,
--		    attr := attr,
--		    type := FileInfo.Type.Dead);
--		END;
--	      ELSE  (* Non-RCS file in the Attic?! *)
--		WITH fullPath = SupMisc.CatPath(m.sfr.serverPrefix, atticPath)
--		DO
--		  Warning(m.treeComp,
--		    "Non-RCS file \"" & fullPath & "\" in Attic");
--		END;
-+	    IF attr.fileType = FileAttr.FileType.File
-+	    AND SupMisc.IsRCS(path) THEN
-+	      IF m.sfr.fileFilter.test(path) THEN
-+		RETURN NEW(FileInfo.T,
-+		  name := path,
-+		  attr := attr,
-+		  type := FileInfo.Type.Dead);
-+	      END;
-+	    ELSE  (* Non-RCS file in the Attic?! *)
-+	      WITH fullPath = SupMisc.CatPath(m.sfr.serverPrefix,
-+		SupMisc.AtticName(path))
-+	      DO
-+		Warning(m.treeComp,
-+		  "Non-RCS file \"" & fullPath & "\" in Attic");
- 	      END;
- 	    END;
- 	| CVTree.FileType.DirUp =>
diff --git a/net/cvsup/pkg-descr b/net/cvsup/pkg-descr
deleted file mode 100644
index 89b933571343..000000000000
--- a/net/cvsup/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-CVSup is a software package for distributing and updating collections
-of files across a network.  It can efficiently and accurately mirror
-all types of files, including sources, binaries, hard links, symbolic
-links, and even device nodes.  CVSup's streaming communication
-protocol and multithreaded architecture make it most likely the
-fastest mirroring tool in existence today.  In addition to being
-a great general-purpose mirroring tool, CVSup includes special
-features and optimizations specifically tailored to CVS repositories.
-
-This port of CVSup includes the GUI and requires X11.  For a version
-that does not include the GUI, use the "net/cvsup-without-gui" port.
-
-WWW: http://www.cvsup.org/
diff --git a/net/cvsup/pkg-descr.nogui b/net/cvsup/pkg-descr.nogui
deleted file mode 100644
index 636551717b01..000000000000
--- a/net/cvsup/pkg-descr.nogui
+++ /dev/null
@@ -1,15 +0,0 @@
-CVSup is a software package for distributing and updating collections
-of files across a network.  It can efficiently and accurately mirror
-all types of files, including sources, binaries, hard links, symbolic
-links, and even device nodes.  CVSup's streaming communication
-protocol and multithreaded architecture make it most likely the
-fastest mirroring tool in existence today.  In addition to being
-a great general-purpose mirroring tool, CVSup includes special
-features and optimizations specifically tailored to CVS repositories.
-
-This port of CVSup omits the GUI and does not require X11.  For a
-version that includes the GUI, use the "net/cvsup" port.
-
-WWW: http://www.cvsup.org/
-
-jdp@polstra.com
diff --git a/net/cvsup/pkg-plist b/net/cvsup/pkg-plist
deleted file mode 100644
index 042bffd64a7c..000000000000
--- a/net/cvsup/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/cvpasswd
-bin/cvsup
-man/man1/cvpasswd.1.gz
-man/man1/cvsup.1.gz
-man/man8/cvsupd.8.gz
-sbin/cvsupd
-share/cvsup/License
-@dirrm share/cvsup
diff --git a/net/cvsup/scripts/configure b/net/cvsup/scripts/configure
deleted file mode 100644
index 1f234e91e79b..000000000000
--- a/net/cvsup/scripts/configure
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-
-cd ${WRKSRC}
-
-files_to_patch="\
-    Makefile \
-    client/src/cvsup.1 \
-    server/src/cvsupd.8 \
-    suplib/src/SupMisc.i3 \
-    suplib/src/m3makefile"
-
-for i in ${files_to_patch}; do
-    rm -f ${i}.new
-    sed -e "s|/usr/local|${PREFIX}|g" ${i} >${i}.new || exit 1
-    mv -f ${i}.new ${i} || exit 1
-done
diff --git a/net/cvsupchk/Makefile b/net/cvsupchk/Makefile
deleted file mode 100644
index 249735ffb14c..000000000000
--- a/net/cvsupchk/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by: matthias.andree@gmx.de
-# $FreeBSD$
-
-PORTNAME=	cvsupchk
-PORTVERSION=	19990209
-PORTREVISION=	2
-CATEGORIES=	net
-DISTFILES=
-
-MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	Check a CVSup directory hierarchy against the checkouts file
-
-EXTRACT_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/cvsup-without-gui:extract
-FETCH_DEPENDS:=	${EXTRACT_DEPENDS}
-
-PLIST_FILES=	bin/cvsupchk
-PORTDOCS=	*
-
-USE_PYTHON=	yes
-NO_BUILD=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.pre.mk>
-
-get_src=	${MAKE} -C ${PORTSDIR}/net/cvsup-without-gui -V WRKSRC
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-	${SED} 's:^#!/usr/local/bin/python:#!${PYTHON_CMD}:' <$$(${get_src})/contrib/cvsupchk/cvsupchk >${WRKSRC}/cvsupchk
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cvsupchk ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} $$(${get_src})/contrib/cvsupchk/README ${STAGEDIR}${DOCSDIR}/
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/cvsupchk/files/patch-spaces-in-filenames b/net/cvsupchk/files/patch-spaces-in-filenames
deleted file mode 100644
index 3a09f90371f7..000000000000
--- a/net/cvsupchk/files/patch-spaces-in-filenames
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch by Rudolf Cejka aims to fix cvsupchk for names
-that contain spaces. -- Matthias Andree, 2006-11-07
-
---- cvsupchk.orig	Tue Oct 31 14:51:57 2006
-+++ cvsupchk	Tue Oct 31 14:57:47 2006
-@@ -396,6 +396,8 @@
-     
-     c = string.split(l)
- 
-+    c[1] = string.replace(c[1], "\_", " ")
-+
-     if c[0] not in [ 'C', 'c', 'D', 'F', 'U', 'V', 'v' ]:
-       diag_fatal('Unrecognized line: "%s"' % l[0:-1])
- 
diff --git a/net/cvsupchk/pkg-descr b/net/cvsupchk/pkg-descr
deleted file mode 100644
index bae2f56f769d..000000000000
--- a/net/cvsupchk/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-cvsupchk is a python script that checks a CVSup maintained directory hierarchy
-against the corresponding CVSup checkouts file. It looks for a number of
-anomalies: missing checked out files, deleted files being present, extra RCS
-files, 'dead' directories being present and so on.