Update to 2.0.1.

This commit follows a previous one that I'd cancelled partway through, so
it should get through to the cvs list, and should finish the upgrade.
That's why the Makefile is not included in this commit.

PR:		20509
Submitted by:	maintainer

4 files changed, 16 insertions, 40 deletions

diff --git a/devel/cons/distinfo b/devel/cons/distinfo
index 7b3c72bbbaaa..149d89569154 100644
--- a/devel/cons/distinfo
+++ b/devel/cons/distinfo
@@ -1 +1 @@
-MD5 (cons-1.8-dev.tgz) = a43e1b2ca804ecbaec28006e2b8ff85d
+MD5 (cons-2.0.1.tgz) = a17b12394995cbe4debe64651078e64c
diff --git a/devel/cons/pkg-descr b/devel/cons/pkg-descr
index d9ef4bd9064e..eec6adcae6af 100644
--- a/devel/cons/pkg-descr
+++ b/devel/cons/pkg-descr
@@ -10,26 +10,4 @@ easy to create build scripts that are simple, understandable and
 maintainable. Cons ensures that complex software is easily and
 accurately reproducible.
 
-`Cons' uses a number of techniques to accomplish all of this.
-Construction scripts are just Perl scripts, making them both easy
-to comprehend and very flexible. Global scoping of variables is
-replaced with an import/export mechanism for sharing information
-between scripts, significantly improving the readability and
-maintainability of each script. `Construction environments' are
-introduced: these are Perl objects that capture the information
-required for controlling the build process. Multiple environments
-are used when different semantics are required for generating
-products in the build tree. Cons implements automatic dependency
-analysis and uses this to globally sequence the entire build.
-Variant builds are easily produced from a single source tree.
-Intelligent build subsetting is possible, when working on localized
-changes. Overrides can be setup to easily override build instructions
-without modifying any scripts. MD5 cryptographic `signatures' are
-associated with derived files, and are used to accurately determine
-whether a given file needs to be rebuilt.
-
-While offering all of the above, and more, Cons remains simple and
-easy to use. This will, hopefully, become clear as you read the
-remainder of the man page.
-
 WWW: http://www.dsmit.com/cons/
diff --git a/devel/cons/pkg-message b/devel/cons/pkg-message
index 290aa536a25a..88d9768ad4f3 100644
--- a/devel/cons/pkg-message
+++ b/devel/cons/pkg-message
@@ -1,18 +1,16 @@
-Copyright (c) 1996-2000 FORE Systems, Inc.	 All rights reserved.
+Copyright (C) 1996-2000 Free Software Foundation, Inc.
 
-Permission to use, copy, modify and distribute this software and
-its documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of FORE Systems, Inc.
-("FORE Systems") not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
+Cons is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-FORE SYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ANY WARRANTIES REGARDING INTELLECTUAL PROPERTY RIGHTS AND
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  IN NO EVENT SHALL FORE SYSTEMS BE LIABLE FOR ANY SPECIAL,
-INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Cons is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
diff --git a/devel/cons/pkg-plist b/devel/cons/pkg-plist
index 8fb3846265e3..d231b0a72766 100644
--- a/devel/cons/pkg-plist
+++ b/devel/cons/pkg-plist
@@ -1,5 +1,6 @@
 bin/cons
 share/doc/cons-%%CONS_VER%%/CHANGES
+share/doc/cons-%%CONS_VER%%/COPYING
 share/doc/cons-%%CONS_VER%%/COPYRIGHT
 share/doc/cons-%%CONS_VER%%/INSTALL
 share/doc/cons-%%CONS_VER%%/MANIFEST
@@ -7,5 +8,4 @@ share/doc/cons-%%CONS_VER%%/README
 share/doc/cons-%%CONS_VER%%/RELEASE
 share/doc/cons-%%CONS_VER%%/TODO
 share/doc/cons-%%CONS_VER%%/cons.html
-share/doc/cons-%%CONS_VER%%/test.log
 @dirrm share/doc/cons-%%CONS_VER%%