aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Polstra <jdp@FreeBSD.org>2005-03-25 21:38:06 +0000
committerJohn Polstra <jdp@FreeBSD.org>2005-03-25 21:38:06 +0000
commitbdaf18c2ebaecf3a823f568436d2bca1867e5de5 (patch)
treeba3aa3087378a3489b9367c20e5ade6195f09d08
parent98b89f99c5afc00e9972973e557999b90812b47b (diff)
downloadports-bdaf18c2ebaecf3a823f568436d2bca1867e5de5.tar.gz
ports-bdaf18c2ebaecf3a823f568436d2bca1867e5de5.zip
Notes
-rw-r--r--net/cvsup/Makefile2
-rw-r--r--net/cvsup/files/patch-ae43
2 files changed, 44 insertions, 1 deletions
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index fa7641ae8d43..1300a186f1e9 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cvsup
PORTVERSION?= 16.1h
-PORTREVISION?= 0
+PORTREVISION?= 2
CATEGORIES= net devel
MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG}
MASTER_SITE_SUBDIR=development/CVSup/snapshots
diff --git a/net/cvsup/files/patch-ae b/net/cvsup/files/patch-ae
new file mode 100644
index 000000000000..85462dcd5745
--- /dev/null
+++ b/net/cvsup/files/patch-ae
@@ -0,0 +1,43 @@
+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 =>