diff options
| -rw-r--r-- | devel/scmcvs/Makefile | 9 | ||||
| -rw-r--r-- | devel/scmcvs/distinfo | 16 | ||||
| -rw-r--r-- | devel/scmcvs/patches/patch-aa | 12 | ||||
| -rw-r--r-- | devel/scmcvs/patches/patch-ab | 16 | ||||
| -rw-r--r-- | devel/scmcvs/patches/patch-ac | 14 | ||||
| -rw-r--r-- | devel/scmcvs/patches/patch-al | 17 |
6 files changed, 37 insertions, 47 deletions
diff --git a/devel/scmcvs/Makefile b/devel/scmcvs/Makefile index 9e3db9ac012..d5fa2c58876 100644 --- a/devel/scmcvs/Makefile +++ b/devel/scmcvs/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.6 2008/06/12 02:14:29 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2009/04/25 11:41:59 sno Exp $ # -DISTNAME= cvs-1.11.22 -PKGREVISION= 1 +DISTNAME= cvs-1.11.23 CATEGORIES= devel scm -MASTER_SITES= http://ftp.gnu.org/non-gnu/cvs/source/stable/1.11.22/ +MASTER_SITES= http://ftp.gnu.org/non-gnu/cvs/source/stable/1.11.23/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://cvs.nongnu.org/ COMMENT= Concurrent Versions System -#LICENSE= gnu-gpl-v2 +LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo index c59e633bee8..ec7e7fd3923 100644 --- a/devel/scmcvs/distinfo +++ b/devel/scmcvs/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.3 2008/01/17 11:03:02 tnn Exp $ +$NetBSD: distinfo,v 1.4 2009/04/25 11:41:59 sno Exp $ -SHA1 (cvs-1.11.22.tar.bz2) = 5dfa11da84a890d7d61516fd450c001dc24bcc0d -RMD160 (cvs-1.11.22.tar.bz2) = 882e7cc4affc2bb78ac367b5d18b89468a26c570 -Size (cvs-1.11.22.tar.bz2) = 2939294 bytes -SHA1 (patch-aa) = 89df7b7ca8be1a0ed309ec14202363dd71830093 -SHA1 (patch-ab) = 6cfd62a5cb7ce2fdd92a07431b762958d047e49b -SHA1 (patch-ac) = c51ddc21f06a54b0c4707e724d4ee5ef1faf5582 +SHA1 (cvs-1.11.23.tar.bz2) = a51c531eebaff2dfdcc0fb6d94c8c6e509e06d7d +RMD160 (cvs-1.11.23.tar.bz2) = ff8c5c6777f1c12ee9134a3cf59e00c2ebaad279 +Size (cvs-1.11.23.tar.bz2) = 2942652 bytes +SHA1 (patch-aa) = 6053ea05fff9ec2221f5698be0fa29705db9d2fe +SHA1 (patch-ab) = 0d2b78b2e9414c871c6c4b8b1e7077231bc31037 +SHA1 (patch-ac) = 5aad5757f671c49fe6f151fb1b3db778399cfbe2 SHA1 (patch-ad) = da297e6f5f1a8ad4cf0c47f7b57f6bbb860ea64c SHA1 (patch-ae) = cb20f5a7cbdc2504c4d847618ef2e3c1d2e8e82a SHA1 (patch-af) = fe22f70e0d281822fb74e8b3c43715ca7f987e79 @@ -13,7 +13,7 @@ SHA1 (patch-ag) = 5dd358a7dbf5db402d3e56faf49e8748afdd05f2 SHA1 (patch-ah) = 47b9f55979ed65844efe22fb614b105ae247408d SHA1 (patch-ai) = d51b3f1429e73156cbfb7e0480a34ac6ce7a208d SHA1 (patch-ak) = 8be3a5014e9dce3ae5381bcdaaa4530349e6f58c -SHA1 (patch-al) = 1e1ea24d3c7e124ae88f102fb5c16f408e964579 +SHA1 (patch-al) = 1c28186b8a223fa8332427ca554733e04d60b4c1 SHA1 (patch-am) = 76285476206efe60bdcaf3623ec3cec1cb13cb68 SHA1 (patch-an) = 3a72df42abde4749d1a15e54481845ba8337f863 SHA1 (patch-ao) = 035bdc8d83d88577e62602f2fb669f1d0c94f49b diff --git a/devel/scmcvs/patches/patch-aa b/devel/scmcvs/patches/patch-aa index 5b997246374..62404d03439 100644 --- a/devel/scmcvs/patches/patch-aa +++ b/devel/scmcvs/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2008/01/04 06:48:06 martti Exp $ +$NetBSD: patch-aa,v 1.3 2009/04/25 11:41:59 sno Exp $ ---- Makefile.in.orig 2006-06-09 17:44:15.000000000 +0300 -+++ Makefile.in 2008-01-02 14:42:37.000000000 +0200 -@@ -65,7 +65,7 @@ - configure.lineno configure.status.lineno +--- Makefile.in.orig 2008-05-07 20:12:33.000000000 +0000 ++++ Makefile.in 2009-04-16 06:16:25.000000000 +0000 +@@ -61,7 +61,7 @@ + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2008/01/04 06:48:06 martti Exp $ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -@@ -184,7 +184,7 @@ +@@ -193,7 +193,7 @@ # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake diff --git a/devel/scmcvs/patches/patch-ab b/devel/scmcvs/patches/patch-ab index d8c8c65c06a..8f817a86407 100644 --- a/devel/scmcvs/patches/patch-ab +++ b/devel/scmcvs/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.2 2008/01/04 06:48:06 martti Exp $ +$NetBSD: patch-ab,v 1.3 2009/04/25 11:41:59 sno Exp $ ---- doc/cvs.texinfo.orig 2006-05-16 03:58:40.000000000 +0300 -+++ doc/cvs.texinfo 2008-01-02 14:42:58.000000000 +0200 -@@ -13596,6 +13596,11 @@ - - @xref{verifymsg}, for more information on how verifymsg - may be used. +--- doc/cvs.texinfo.orig 2008-05-07 01:15:46.000000000 +0000 ++++ doc/cvs.texinfo 2009-04-16 06:39:23.000000000 +0000 +@@ -12803,6 +12803,11 @@ + a file, or mail it to appropriate persons, or maybe + post it to a local newsgroup, or@dots{} Your + imagination is the limit! + +@cindex tag, in CVSROOT/config +@item tag=@var{value} @@ -13,4 +13,4 @@ $NetBSD: patch-ab,v 1.2 2008/01/04 06:48:06 martti Exp $ +any string is legal. @end table - @c --------------------------------------------------------------------- + @menu diff --git a/devel/scmcvs/patches/patch-ac b/devel/scmcvs/patches/patch-ac index 81cecd4940f..5303df4f21f 100644 --- a/devel/scmcvs/patches/patch-ac +++ b/devel/scmcvs/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2008/01/04 06:48:06 martti Exp $ +$NetBSD: patch-ac,v 1.3 2009/04/25 11:41:59 sno Exp $ ---- src/Makefile.in.orig 2006-06-09 17:44:11.000000000 +0300 -+++ src/Makefile.in 2008-01-02 14:43:16.000000000 +0200 -@@ -86,7 +86,7 @@ +--- src/Makefile.in.orig 2008-05-07 20:12:32.000000000 +0000 ++++ src/Makefile.in 2009-04-16 06:42:20.000000000 +0000 +@@ -82,7 +82,7 @@ version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \ wrapper.$(OBJEXT) zlib.$(OBJEXT) cvs_OBJECTS = $(am_cvs_OBJECTS) @@ -10,8 +10,8 @@ $NetBSD: patch-ac,v 1.2 2008/01/04 06:48:06 martti Exp $ +cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -200,7 +200,7 @@ + DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +@@ -206,7 +206,7 @@ # some namespace hackery going on that maybe shouldn't be. Long term fix is to # try and remove naming ocnflicts and fix Automake to allow particular includes # to be attached only to particular object files. Short term fix is either or. @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 2008/01/04 06:48:06 martti Exp $ bin_SCRIPTS = cvsbug # The cvs executable -@@ -279,7 +279,7 @@ +@@ -285,7 +285,7 @@ cvs_LDADD = \ ../diff/libdiff.a \ ../lib/libcvs.a \ diff --git a/devel/scmcvs/patches/patch-al b/devel/scmcvs/patches/patch-al index a086d988734..ead51272412 100644 --- a/devel/scmcvs/patches/patch-al +++ b/devel/scmcvs/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.3 2008/01/17 11:03:03 tnn Exp $ +$NetBSD: patch-al,v 1.4 2009/04/25 11:41:59 sno Exp $ ---- src/client.c.orig 2006-06-08 16:36:03.000000000 +0200 -+++ src/client.c -@@ -4497,6 +4497,16 @@ start_server () +--- src/client.c.orig 2008-05-07 15:57:34.000000000 +0000 ++++ src/client.c 2009-04-16 06:12:44.000000000 +0000 +@@ -4510,6 +4510,16 @@ error (1, 0, "This server does not support the global -n option."); } @@ -19,12 +19,3 @@ $NetBSD: patch-al,v 1.3 2008/01/17 11:03:03 tnn Exp $ if (quiet) { if (have_global) -@@ -4789,7 +4799,7 @@ start_rsh_server (root, to_server, from_ - int child_pid; - - if (!cvs_rsh) -- cvs_rsh = "rsh"; -+ cvs_rsh = RSH_DFLT; - if (!cvs_server) - cvs_server = "cvs"; - |