summaryrefslogtreecommitdiff
path: root/devel/scmcvs
diff options
context:
space:
mode:
authortnn <tnn>2008-01-17 11:03:02 +0000
committertnn <tnn>2008-01-17 11:03:02 +0000
commit18223cab710ba2972d2f298ed75d3890e765a4d9 (patch)
tree34ed549cfbb91214963d06b83ab69c0ff5e23438 /devel/scmcvs
parent75d446feeaf8bf698d4dcd2519e07e402d3274f8 (diff)
downloadpkgsrc-18223cab710ba2972d2f298ed75d3890e765a4d9.tar.gz
Change default rsh to ssh(1). It's what cvs(1) in base does.
Should have been done years ago. Bump rev.
Diffstat (limited to 'devel/scmcvs')
-rw-r--r--devel/scmcvs/Makefile5
-rw-r--r--devel/scmcvs/distinfo4
-rw-r--r--devel/scmcvs/patches/patch-al17
3 files changed, 19 insertions, 7 deletions
diff --git a/devel/scmcvs/Makefile b/devel/scmcvs/Makefile
index 9f632a9fe4c..003e6f719ba 100644
--- a/devel/scmcvs/Makefile
+++ b/devel/scmcvs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/01/04 06:48:05 martti Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/17 11:03:02 tnn Exp $
#
DISTNAME= cvs-1.11.22
+PKGREVISION= 1
CATEGORIES= devel scm
MASTER_SITES= http://ftp.gnu.org/non-gnu/cvs/source/stable/1.11.22/
EXTRACT_SUFX= .tar.bz2
@@ -15,6 +16,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-rsh=ssh
+
CHECK_INTERPRETER_SKIP= share/cvs/contrib/*
.include "options.mk"
diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo
index 586af1c653e..c59e633bee8 100644
--- a/devel/scmcvs/distinfo
+++ b/devel/scmcvs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2008/01/04 06:48:06 martti Exp $
+$NetBSD: distinfo,v 1.3 2008/01/17 11:03:02 tnn Exp $
SHA1 (cvs-1.11.22.tar.bz2) = 5dfa11da84a890d7d61516fd450c001dc24bcc0d
RMD160 (cvs-1.11.22.tar.bz2) = 882e7cc4affc2bb78ac367b5d18b89468a26c570
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = 5dd358a7dbf5db402d3e56faf49e8748afdd05f2
SHA1 (patch-ah) = 47b9f55979ed65844efe22fb614b105ae247408d
SHA1 (patch-ai) = d51b3f1429e73156cbfb7e0480a34ac6ce7a208d
SHA1 (patch-ak) = 8be3a5014e9dce3ae5381bcdaaa4530349e6f58c
-SHA1 (patch-al) = 3212da07f9a9c151a20e3a39c44cebda60106a49
+SHA1 (patch-al) = 1e1ea24d3c7e124ae88f102fb5c16f408e964579
SHA1 (patch-am) = 76285476206efe60bdcaf3623ec3cec1cb13cb68
SHA1 (patch-an) = 3a72df42abde4749d1a15e54481845ba8337f863
SHA1 (patch-ao) = 035bdc8d83d88577e62602f2fb669f1d0c94f49b
diff --git a/devel/scmcvs/patches/patch-al b/devel/scmcvs/patches/patch-al
index 6d358348da4..a086d988734 100644
--- a/devel/scmcvs/patches/patch-al
+++ b/devel/scmcvs/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2008/01/04 06:48:06 martti Exp $
+$NetBSD: patch-al,v 1.3 2008/01/17 11:03:03 tnn Exp $
---- src/client.c.orig 2006-06-08 17:36:03.000000000 +0300
-+++ src/client.c 2008-01-02 14:44:23.000000000 +0200
-@@ -4497,6 +4497,16 @@
+--- src/client.c.orig 2006-06-08 16:36:03.000000000 +0200
++++ src/client.c
+@@ -4497,6 +4497,16 @@ start_server ()
error (1, 0,
"This server does not support the global -n option.");
}
@@ -19,3 +19,12 @@ $NetBSD: patch-al,v 1.2 2008/01/04 06:48:06 martti 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";
+