Resolve conflicts, remove old files, merge local changes

1 files changed, 10 insertions, 3 deletions

diff --git a/gnu/usr.bin/perl/lib/newgetopt.pl b/gnu/usr.bin/perl/lib/newgetopt.pl
index 0b7eed8bfe9..95eef220fe7 100644
--- a/gnu/usr.bin/perl/lib/newgetopt.pl
+++ b/gnu/usr.bin/perl/lib/newgetopt.pl
@@ -1,6 +1,13 @@
-# newgetopt.pl -- new options parsing.
-# Now just a wrapper around the Getopt::Long module.
-# $Id: newgetopt.pl,v 1.17 1996-10-02 11:17:16+02 jv Exp $
+# $Id: newgetopt.pl,v 1.18 2001-09-21 15:34:59+02 jv Exp $
+
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+# It is now just a wrapper around the Getopt::Long module.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Getopt::Long
 
 {   package newgetopt;