Update the cvsup port to build snap-16.1e. It is the best version

at this time, even though it is not called a "release".  Make the
necessary changes to the cvsup-devel port, which uses the cvsup port
as its MASTERDIR.

I intentionally left "PORTREVISION?=0" in cvsup/Makefile, as a reminder
that this setting needs to be overridable by the cvsup-devel port.

At this moment, the cvsup-devel port builds the same thing as the
cvsup port.  That situation probably won't last very long, so I am
leaving the cvsup-devel port in place.  It is mentioned in a lot
of documentation, so I don't want to remove it just because it is
temporarily the same as the cvsup port.

7 files changed, 14 insertions, 103 deletions

diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index 383f96031752..f438613847f6 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	cvsup
-PORTVERSION?=	16.1
-PORTREVISION?=	3
+PORTVERSION?=	16.1e
+PORTREVISION?=	0
 CATEGORIES=	net devel
-MASTER_SITES?=	ftp://ftp3.freebsd.org/pub/FreeBSD/development/CVSup/sources/ \
-		ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/sources/ \
-		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/sources/
+MASTER_SITES=	http://people.freebsd.org/~jdp/s1g/ \
+		ftp://ftp3.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
+		ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
+		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/snapshots/
+DISTNAME=	cvsup-snap-${PORTVERSION}
 
 MAINTAINER=	jdp@FreeBSD.org
 
@@ -82,4 +84,8 @@ pre-fetch:
 .endif
 	@${TRUE}
 
+post-install:
+	@${MKDIR} ${PREFIX}/share/cvsup
+	@${INSTALL_DATA} ${WRKSRC}/License ${PREFIX}/share/cvsup/License
+
 .include <bsd.port.post.mk>
diff --git a/net/cvsup/distinfo b/net/cvsup/distinfo
index d8bf88446703..e0007d9d7fee 100644
--- a/net/cvsup/distinfo
+++ b/net/cvsup/distinfo
@@ -1 +1 @@
-MD5 (cvsup-16.1.tar.gz) = dc967a0e395722282485a9bec4dec190
+MD5 (cvsup-snap-16.1e.tar.gz) = 1fc0ce8660b7fdc350893d4ea2458ceb
diff --git a/net/cvsup/files/patch-aa b/net/cvsup/files/patch-aa
deleted file mode 100644
index be3f46268fe0..000000000000
--- a/net/cvsup/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- suplib/src/m3makefile.orig	Sat May 15 14:41:27 1999
-+++ suplib/src/m3makefile	Sun Feb 20 09:52:12 2000
-@@ -55,7 +55,8 @@
- end
- 
- if equal(TARGET, "FreeBSD2") or equal(TARGET, "FreeBSD2p")
--or equal(TARGET, "FreeBSD3") or equal(TARGET, "FBSD_ALPHA")
-+or equal(TARGET, "FreeBSD3") or equal(TARGET, "FreeBSD4")
-+or equal(TARGET, "FBSD_ALPHA")
-   include_dir("FreeBSD")
-   import_lib("md", "/usr/lib")
- else
diff --git a/net/cvsup/files/patch-ab b/net/cvsup/files/patch-ab
deleted file mode 100644
index 55dfefd8fee2..000000000000
--- a/net/cvsup/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
---- suplib/src/FileAttr.m3.orig	Mon Feb  1 14:44:53 1999
-+++ suplib/src/FileAttr.m3	Sun Sep  9 10:51:30 2001
-@@ -102,6 +102,7 @@
-     ELSE
-       fa.mask := fa.mask + AttrTypes{AttrType.FileType};  (* Always valid. *)
-     END;
-+    fa.mask := fa.mask * Supported[fa.fileType];
-     IF AttrType.ModTime IN fa.mask THEN
-       fa.stat.st_mtime := ScanInt(t, pos, ModTimeRadix, "modTime");
-     END;
-@@ -271,7 +272,7 @@
-       ch := Text.GetChar(t, pos);
-       INC(pos);
-       IF ch < '0' OR ch > '9' THEN EXIT END;
--      count := Word.Plus(Word.Times(val, 10), ORD(ch) - ORD('0'));
-+      count := Word.Plus(Word.Times(count, 10), ORD(ch) - ORD('0'));
-     END;
-     IF pos >= tLen OR ch # '#' THEN
-       RAISE TokScan.Error("Missing \"#\" in " & what);
diff --git a/net/cvsup/files/patch-ac b/net/cvsup/files/patch-ac
deleted file mode 100644
index 817a3747b159..000000000000
--- a/net/cvsup/files/patch-ac
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: client/src/Updater.m3
-===================================================================
-RCS file: /home/cvsupcvs/cvsup/client/src/Updater.m3,v
-retrieving revision 1.91
-diff -u -r1.91 Updater.m3
---- client/src/Updater.m3	1999/08/13 19:51:29	1.91
-+++ client/src/Updater.m3	2001/05/26 23:11:39
-@@ -712,7 +712,7 @@
-       IF SupFileRec.Option.KeepBadFiles IN sfr.options THEN
- 	Warn(self, "Bad version saved in " & tempPath);
-       ELSE
--	DeleteFile(tempPath);
-+	DeleteFile(self, tempPath);
-       END;
-     END;
-   END UpdateFile;
-@@ -1188,7 +1188,7 @@
-       IF NOT SupFileRec.Option.CheckoutMode IN sfr.options THEN
- 	(* Try the attic. *)
- 	WITH atticName = SupMisc.AtticName(destPath) DO
--	  DeleteFile(atticName);
-+	  DeleteFile(self, atticName);
- 	  (* We always delete the Attic directory when it becomes empty.
- 	     FIXME - Is that the right thing to do?. *)
- 	  TRY
-@@ -1196,7 +1196,7 @@
- 	  EXCEPT OSError.E => (* Ignore. *) END;
- 	END;
-       END;
--      DeleteFile(destPath);
-+      DeleteFile(self, destPath);
-       IF SupFileRec.Option.CheckoutMode IN sfr.options
-       OR NOT self.proto.v.dirsAreExplicit THEN
- 	(* Delete the directory automatically if it is now empty. *)
-@@ -1231,14 +1231,13 @@
-     END;
-   END MakeDirectories;
- 
--PROCEDURE DeleteFile(path: Pathname.T)
--  RAISES {Error} =
-+PROCEDURE DeleteFile(self: T; path: Pathname.T) =
-   BEGIN
-     TRY
-       FileAttr.Delete(path);
-     EXCEPT OSError.E(l) =>
-       IF l.head # EnoentAtom THEN
--	RAISE Error("Cannot delete \"" & path & "\": " &
-+	Warn(self, "Cannot delete \"" & path & "\": " &
- 	  ErrMsg.StrError(l));
-       END;
-     END;
diff --git a/net/cvsup/files/patch-ad b/net/cvsup/files/patch-ad
deleted file mode 100644
index 1a8f7d285a48..000000000000
--- a/net/cvsup/files/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
---- quake/cvsup.quake.orig	Sat Jan 16 15:47:58 1999
-+++ quake/cvsup.quake	Sat May 26 16:21:51 2001
-@@ -50,10 +50,10 @@
-     > tempname in
-       write("MODULE Version;", CR, CR, "BEGIN", CR, "  Name := ")
-     end
--    if equal("$Name: REL_16_1 $", "$" & "Name:  $")
-+    if equal("$Name: REL_16_1p3 $", "$" & "Name:  $")
-       cmd = "date -u +'\"U_%Y_%m_%d_%H_%M_%S\";'"
-     else
--      cmd = "echo '$Name: REL_16_1 $' | awk '{print \"\\\"\" $2 \"\\\"\";}'"
-+      cmd = "echo '$Name: REL_16_1p3 $' | awk '{print \"\\\"\" $2 \"\\\"\";}'"
-     end
-     cmd = cmd & " >> " & tempname
-     if defined("PM3")
diff --git a/net/cvsup/pkg-plist b/net/cvsup/pkg-plist
index ad815aafd5c7..bf4feacd4da8 100644
--- a/net/cvsup/pkg-plist
+++ b/net/cvsup/pkg-plist
@@ -1,3 +1,5 @@
 bin/cvpasswd
 bin/cvsup
 sbin/cvsupd
+share/cvsup/License
+@dirrm share/cvsup