diff options
author | seb <seb@pkgsrc.org> | 2004-10-18 18:49:39 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2004-10-18 18:49:39 +0000 |
commit | 7122b94921f38af3aaf96bfed703b2711f6582e9 (patch) | |
tree | 1729e6db3b063fe75c440f80794c346a878cfe16 | |
parent | e91ac2c19c18f499ca0dc9c21e0c69a6e8d4f78c (diff) | |
download | pkgsrc-7122b94921f38af3aaf96bfed703b2711f6582e9.tar.gz |
Update to version 1.00.
Changes since last packaged version (0.16alpha.pl0):
* We now support the "x" (make g-file executable) and "y"
(limit keyword expansion) SCCS file flags. These are SCO
OpenServer and Sun Solaris 8 extensions, respectively.
* We now support "sccs diffs -u", which of course produces
unified-format diffs. We also support the "-n" and "-w"
options to diff and the -a, -B, -d, -H, -p, -q, -s, -v ad
-y options to GNU diff.
* Some changes to support compilation with Sun CC 5.5.
(this was a suggestion by Thomas Duffy, who has just taken on
responsibility for the RPM and SRPM packages of CSSC).
* The "sccs -d /xxx print foo.txt" command now works;
previously, use of the "-d" flag would have generated an
error.
* Better handling of the archive bit on Windows systems.
-rw-r--r-- | devel/cssc/Makefile | 6 | ||||
-rw-r--r-- | devel/cssc/distinfo | 11 | ||||
-rw-r--r-- | devel/cssc/patches/patch-aa | 21 | ||||
-rw-r--r-- | devel/cssc/patches/patch-ab | 22 | ||||
-rw-r--r-- | devel/cssc/patches/patch-ac | 13 | ||||
-rw-r--r-- | devel/cssc/patches/patch-ad | 13 |
6 files changed, 40 insertions, 46 deletions
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile index e31d1fb0f1d..20fa4da69b0 100644 --- a/devel/cssc/Makefile +++ b/devel/cssc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2004/04/25 04:49:53 snj Exp $ +# $NetBSD: Makefile,v 1.15 2004/10/18 18:49:39 seb Exp $ # -DISTNAME= CSSC-0.16alpha.pl0 -PKGNAME= cssc-0.16a.0 +DISTNAME= CSSC-1.00 +PKGNAME= cssc-1.00 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cssc/} diff --git a/devel/cssc/distinfo b/devel/cssc/distinfo index c73ca00435c..67c833813ab 100644 --- a/devel/cssc/distinfo +++ b/devel/cssc/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.5 2004/06/12 02:50:46 grant Exp $ +$NetBSD: distinfo,v 1.6 2004/10/18 18:49:39 seb Exp $ -SHA1 (CSSC-0.16alpha.pl0.tar.gz) = 4b626cb329682208616e71dac35cf844e0eca6ff -Size (CSSC-0.16alpha.pl0.tar.gz) = 676634 bytes -SHA1 (patch-ab) = 648d6379637b791f6aea917e4d3c6379974f04f5 -SHA1 (patch-ac) = a0f30dc5bb23ece8c56b4b6141b8dd4579e4abe4 -SHA1 (patch-ad) = 2d1461a863cbb6f68c9e7fc19719c23bd2877951 +SHA1 (CSSC-1.00.tar.gz) = e7c34b2d2a85c44825029a7716c631f8b09b010d +Size (CSSC-1.00.tar.gz) = 695992 bytes +SHA1 (patch-aa) = 3f29e0b6835b85129088e36e3fd415a9535772df +SHA1 (patch-ab) = 5f77a20b1e54c4989a3770672c4fcc207dde4817 diff --git a/devel/cssc/patches/patch-aa b/devel/cssc/patches/patch-aa new file mode 100644 index 00000000000..674b9085ca8 --- /dev/null +++ b/devel/cssc/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.3 2004/10/18 18:49:39 seb Exp $ + +--- tests/admin/y-flag.sh.orig 2004-10-10 12:51:16.000000000 +0200 ++++ tests/admin/y-flag.sh +@@ -16,7 +16,7 @@ remove $s $g $z foo command.log last.com + remove expected.stderr got.stderr expected.stdout got.stdout + + # Figure out if we ahous expect the thing to work. +-if admin -n -i/dev/null -fyM ${s} >/dev/null 2>&1 || $TESTING_CSSC ++if ${admin} -n -i/dev/null -fyM ${s} >/dev/null 2>&1 || $TESTING_CSSC + then + echo "We are testing an SCCS implementation that supports the y flag. Good." + else +@@ -26,6 +26,7 @@ else + success + exit 0 + fi ++remove s.bar + + + remove foo diff --git a/devel/cssc/patches/patch-ab b/devel/cssc/patches/patch-ab index e788c164ed8..38a8ab09882 100644 --- a/devel/cssc/patches/patch-ab +++ b/devel/cssc/patches/patch-ab @@ -1,12 +1,12 @@ -$NetBSD: patch-ab,v 1.1 2003/05/30 23:51:25 seb Exp $ +$NetBSD: patch-ab,v 1.2 2004/10/18 18:49:39 seb Exp $ ---- tests/get/errorcases.sh.orig 2002-04-02 18:04:56.000000000 +0000 -+++ tests/get/errorcases.sh -@@ -8,7 +8,6 @@ - - ret_invalid_option=1 - --remove - - - g=foo +--- sccsfile.cc.orig 2004-10-18 15:45:45.000000000 +0200 ++++ sccsfile.cc +@@ -1256,6 +1256,7 @@ print_subsituted_flags_list(FILE *out, c + if (printf_failed(fprintf(out, "%c", members[i]))) + return false; + } ++ return true; + } + + bool sccs_file:: diff --git a/devel/cssc/patches/patch-ac b/devel/cssc/patches/patch-ac deleted file mode 100644 index c89504e9ea0..00000000000 --- a/devel/cssc/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/06/12 02:50:46 grant Exp $ - ---- my-getopt.cc.orig 2002-03-25 11:05:46.000000000 +1100 -+++ my-getopt.cc -@@ -104,7 +104,7 @@ CSSC_Options::next() - char c = *cindex++; - - // Look for the argument character in the option list. -- char *match = strchr(opts, c); -+ const char *match = strchr(opts, c); - - if (0 == c || 0 == match) - { diff --git a/devel/cssc/patches/patch-ad b/devel/cssc/patches/patch-ad deleted file mode 100644 index cfceef6ea6b..00000000000 --- a/devel/cssc/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2004/06/12 02:50:46 grant Exp $ - ---- sccsfile.cc.orig 2003-05-30 03:48:25.000000000 +1000 -+++ sccsfile.cc -@@ -447,7 +447,7 @@ sccs_file::read_delta() { - - start = plinebuf->c_str() + 3; - do { -- char *end = strchr(start, ' '); -+ char *end = (char *) strchr(start, ' '); - if (end != NULL) { - *end++ = '\0'; - } |