From 0140d366bee84655d27d23f5c3b1af5cdbae0e7a Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 16 Oct 2008 12:41:52 +0000
Subject: [PATCH] Make port attribute work for some "non-standard" CVS clients.
  submitted by Johann Herunter.  PR 30124.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@705228 13f79535-47bb-0310-9956-ffa450edef68
---
 CONTRIBUTORS                                             | 1 +
 WHATSNEW                                                 | 5 +++++
 contributors.xml                                         | 8 ++++++++
 .../org/apache/tools/ant/taskdefs/AbstractCvsTask.java   | 9 ++++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cccf1286a..516394b4d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -141,6 +141,7 @@ Jesse Stockall
 Jim Allers
 Joerg Wassmer
 Joey Richey
+Johann Herunter
 John Sisson
 Jon Dickinson
 Jon S. Stevens
diff --git a/WHATSNEW b/WHATSNEW
index a5fff7862..bf9f85286 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -446,6 +446,11 @@ Other changes:
  * <cvsversion> is supposed to support CVSNT now.
    Bugzilla Report 31409.
 
+ * <cvs>' port attribute should now work for all clients that use the
+   environment variable CVS_PSERVER_PORT instead of the "official"
+   CVS_CLIENT_PORT.
+   Bugzilla Report 30124.
+
 Changes from Ant 1.7.0 TO Ant 1.7.1
 =============================================
 
diff --git a/contributors.xml b/contributors.xml
index c7fc71ce7..52b339594 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -592,6 +592,14 @@
     <first>Joey</first>
     <last>Richey</last>
   </name>
+  <name>
+    <first>Johann</first>
+    <last>Herunter</last>
+  </name>
+  <name>
+    <first>John</first>
+    <last>Sisson</last>
+  </name>
   <name>
     <first>Jon</first>
     <last>Dickinson</last>
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
index a9a5bc8c7..def0dfefc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
@@ -260,7 +260,7 @@ public abstract class AbstractCvsTask extends Task {
         // native CVS stuff around (SM)
 
         // We can't do it ourselves as jCVS is GPLed, a third party task
-        // outside of jakarta repositories would be possible though (SB).
+        // outside of Apache repositories would be possible though (SB).
 
         Environment env = new Environment();
 
@@ -269,6 +269,13 @@ public abstract class AbstractCvsTask extends Task {
             var.setKey("CVS_CLIENT_PORT");
             var.setValue(String.valueOf(port));
             env.addVariable(var);
+
+            // non-standard environment variable used by CVSNT, WinCVS
+            // and others
+            var = new Environment.Variable();
+            var.setKey("CVS_PSERVER_PORT");
+            var.setValue(String.valueOf(port));
+            env.addVariable(var);
         }
 
         /**