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

@@ -141,6 +141,7 @@ Jesse Stockall
 Jim Allers
 Joerg Wassmer
 Joey Richey
+Johann Herunter
 John Sisson
 Jon Dickinson
 Jon S. Stevens

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
 =============================================
 

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>

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);
         }
 
         /**