Changeset 3015 for trunk/dports

Timestamp:

Jul 9, 2003, 5:34:09 AM (21 years ago)

Author:

landonf (Landon Fuller)

Message:

Update to 1.11.6

Location:

trunk/dports/devel/cvs-port

Files:

• Portfile (modified) (2 diffs)
• files/patch-client.c (modified) (5 diffs)

trunk/dports/devel/cvs-port/Portfile

@@ -1 @@
-# $Id: Portfile,v 1.4 2003/07/09 05:03:36 landonf Exp $
+# $Id: Portfile,v 1.5 2003/07/09 05:34:08 landonf Exp $
 PortSystem 1.0
 name                    cvs
-version                 1.11.5
-revision                1
+version                 1.11.6
 description             Concurrent Versions System
 long_description        CVS is the Concurrent Versions System, the dominant \
@@ -10 +9 @@
                         developers to large, distributed teams:
 maintainers             Landon Fuller <landonf@opendarwin.org>
-master_sites            http://ftp.gnu.org/non-gnu/cvs/
+master_sites            http://distfiles.opendarwin.org/ \
+                        http://www.cvshome.org/files/19/10/ \
+                        http://ftp.gnu.org/non-gnu/cvs/
 categories              devel net
-checksums               md5 b0b5e955c0d83b694c7835dc3e6f0b7d
+checksums               md5 06a5bbcd93a780a3bbec788deb1cf35b
+use_bzip2               yes
 
 # With certain servers (namely the one at work), cvs attempts to write a

trunk/dports/devel/cvs-port/files/patch-client.c

@@ -1 @@
-diff -rub cvs-1.11.5.orig/src/client.c cvs-1.11.5/src/client.c
---- src/client.c        Tue Jul  8 21:51:08 2003
-+++ src/client.c        Tue Jul  8 21:51:57 2003
-@@ -1431,7 +1431,8 @@
+diff -rub cvs-1.11.6.orig/src/client.c cvs-1.11.6/src/client.c
+--- src/client.c        Tue Jul  8 22:09:06 2003
++++ src/client.c        Tue Jul  8 22:15:32 2003
+@@ -1429,7 +1429,8 @@
     the contents of that file and write them to FILENAME.  FULLNAME is
     the name of the file for use in error messages.  FIXME-someday:
@@ -12 +12 @@
  read_counted_file (filename, fullname)
      char *filename;
-@@ -1450,7 +1451,7 @@
+@@ -1448,7 +1449,7 @@
      size_t nread;
      size_t nwrite;
@@ -21 +21 @@
      read_line (&size_string);
      if (size_string[0] == 'z')
-@@ -1471,9 +1472,12 @@
+@@ -1469,9 +1470,12 @@
         is binary or not.  I haven't carefully looked into whether
         CVS/Template files should use local text file conventions or
@@ -34 +34 @@
      nwrite = 0;
      pread = buf;
-@@ -1492,16 +1496,20 @@
+@@ -1490,16 +1494,20 @@
  
         if (nwrite > 0)
@@ -56 +56 @@
 
  /* OK, we want to swallow the "U foo.c" response and then output it only
-@@ -2529,9 +2537,15 @@
-     char *short_pathname;
-     char *filename;
- {
-+    char *output;
+@@ -2531,6 +2539,9 @@
+                          + strlen ( CVSADM_TEMPLATE )
+                          + 2 );
+     sprintf ( buf, "%s/%s", short_pathname, CVSADM_TEMPLATE );
 +    if (strcmp (command_name, "export") == 0)
-+           output = NULL;
++           read_counted_file ( NULL, buf );
 +    else
-+           output = CVSADM_TEMPLATE;
-+
-     /* FIXME: should be computing second argument from CVSADM_TEMPLATE
-        and short_pathname.  */
--    read_counted_file (CVSADM_TEMPLATE, "<CVS/Template file>");
-+    read_counted_file (output, "<CVS/Template file>");
+     read_counted_file ( CVSADM_TEMPLATE, buf );
+     free ( buf );
  }
- 
- static void handle_template PROTO ((char *, int));