args.pl, oop_fh.pl: Remove 1st line calling `perl'.

subs.pl: Remove 1st line calling `perl'.  Remove sub
&perl_version'.  Adjust sub `&usage'.

glilypond.pl: Keep 1st line, which will be reset by running
`make'.  Remove all parts of Perl testing.

perl_test.pl: Remove this file.

README.txt: Add information about needed Perl version.

Makefile.sub: Corrections for removing Perl test.  Use `$<'.

8 files changed, 35 insertions, 100 deletions

diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 2c3906bf..8eb2e75f 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,5 +1,21 @@
 2013-04-24  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* args.pl, oop_fh.pl: Remove 1st line calling `perl'.
+
+	* subs.pl: Remove 1st line calling `perl'.  Remove sub
+	`&perl_version'.  Adjust sub `&usage'.
+
+	* glilypond.pl: Keep 1st line, which will be reset by running
+	`make'.  Remove all parts of Perl testing.
+
+	* perl_test.pl: Remove this file.
+
+	* README.txt: Add information about needed Perl version.
+
+	* Makefile.sub: Corrections for removing Perl test.  Use `$<'.
+
+2013-04-24  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* Makefile.sub: Remove Perl test.
 
 2013-04-12  Bernd Warken  <groff-bernd.warken-72@web.de>
diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub
index 32a5dfa0..650c71b6 100644
--- a/contrib/glilypond/Makefile.sub
+++ b/contrib/glilypond/Makefile.sub
@@ -28,7 +28,7 @@
 
 MAN1=glilypond.n
 
-MOSTLYCLEANADD=glilypond HAVE_PERL $(MAN1)
+MOSTLYCLEANADD=glilypond $(MAN1)
 
 # not all make programs have $(RM) predefined.
 RM=rm -f
@@ -38,8 +38,7 @@ all: glilypond
 GLILYPOND=$(srcdir)/glilypond.pl \
 	$(srcdir)/subs.pl \
 	$(srcdir)/oop_fh.pl \
-	$(srcdir)/args.pl \
-	$(srcdir)/perl_test.pl
+	$(srcdir)/args.pl
 
 GLILYPOND_=`echo $(GLILYPOND) | sed 's|$(srcdir)/||g'`
 
@@ -51,28 +50,28 @@ glilypond: $(GLILYPOND)
 		-e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
 		-e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \
 		-e "s|@VERSION@|$(version)$(revision)|g" \
-		$(srcdir)/glilypond.pl >$@; \
+		$(srcdir)/glilypond.pl >$@
 	chmod +x $@
 
 install_data: glilypond
-	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); \
-	$(RM) $(DESTDIR)$(bindir)/glilypond; \
-	$(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond; \
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(RM) $(DESTDIR)$(bindir)/$<
+	$(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/$<
 	-test -d $(DESTDIR)$(glilypond_dir) \
-		|| $(mkinstalldirs) $(DESTDIR)$(glilypond_dir); \
+		|| $(mkinstalldirs) $(DESTDIR)$(glilypond_dir)
 	for f in $(GLILYPOND_); do \
 		$(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
-	done; \
+	done
 	for f in $(GLILYPOND_); do \
 		$(INSTALL_SCRIPT) $(srcdir)/$$f \
 		$(DESTDIR)$(glilypond_dir)/$$f; \
 	done
 
 uninstall_sub:
-	$(RM) $(DESTDIR)$(bindir)/glilypond; \
+	$(RM) $(DESTDIR)$(bindir)/glilypond;
 	for f in $(GLILYPOND_); do \
 		$(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
-	done; \
+	done
 	test -d $(DESTDIR)$(libdir)/groff/glilypond \
 		&& rmdir $(DESTDIR)$(libdir)/groff/glilypond
 
diff --git a/contrib/glilypond/README.txt b/contrib/glilypond/README.txt
index 489f9e8c..148dc139 100644
--- a/contrib/glilypond/README.txt
+++ b/contrib/glilypond/README.txt
@@ -3,7 +3,7 @@
 
     Written by Bernd Warken <groff-bernd.warken-72@web.de>
 
-    Last update: 28 Mar 2013
+    Last update: 24 Apr 2013
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
@@ -11,6 +11,13 @@
 
     This file is part of `glilypond', which is part of `groff'.
 
+
+########################################################################
+
+In order to run `glilypond', your system must have installed Perl of at
+least version `v5.6'.
+
+
 ########################################################################
 
 In order to have this program installed by `make', the creation of a
diff --git a/contrib/glilypond/args.pl b/contrib/glilypond/args.pl
index 919725a3..8b2fc0e2 100644
--- a/contrib/glilypond/args.pl
+++ b/contrib/glilypond/args.pl
@@ -1,4 +1,3 @@
-#! /usr/bin/env perl
 my $License = q*
 ########################################################################
 # Legalese
diff --git a/contrib/glilypond/glilypond.pl b/contrib/glilypond/glilypond.pl
index 0b91bb98..72f45613 100755
--- a/contrib/glilypond/glilypond.pl
+++ b/contrib/glilypond/glilypond.pl
@@ -88,8 +88,6 @@ BEGIN {
     {
      'before_make' => FALSE,
      'groff_version' => EMPTYSTRING,
-     'perl_test_file' => EMPTYSTRING,
-     'perl_version' => EMPTYSTRING,
      'prog' => EMPTYSTRING,
     };
 
@@ -135,14 +133,6 @@ BEGIN {
 
     unshift(@INC, $glilypond_libdir);
 
-    # test perl on suitable version
-    $file_test_pl = File::Spec->catfile($glilypond_libdir,
-					'perl_test.pl');
-    die "$file_test_pl does not exist;" unless -f "$file_test_pl";
-    do "$file_test_pl" or die "Perl test: $@";
-
-    $Globals->{'perl_test_file'} = $file_test_pl;
-
     umask 0077; # octal output: `printf "%03o", umask;'
   }
 
diff --git a/contrib/glilypond/oop_fh.pl b/contrib/glilypond/oop_fh.pl
index 9c294047..2fbee5e6 100644
--- a/contrib/glilypond/oop_fh.pl
+++ b/contrib/glilypond/oop_fh.pl
@@ -1,4 +1,3 @@
-#! /usr/bin/env perl
 my $License = q*
 ########################################################################
 # Legalese
diff --git a/contrib/glilypond/perl_test.pl b/contrib/glilypond/perl_test.pl
deleted file mode 100644
index 337c052a..00000000
--- a/contrib/glilypond/perl_test.pl
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env perl
-
-# glilypond - transform `lilypond' parts into `groff' language
-
-# Source file position: <groff-source>/contrib/groffer/perl/perl_test.sh
-# Installed position: <prefix>/lib/groff/groffer/perl_test.sh
-
-# Copyright (C) 2013
-#   Free Software Foundation, Inc.
-# Written by Bernd Warken <groff-bernd.warken-72@web.de>.
-
-# Last update: 12 Apr 2013
-
-# This file is part of `glilypond', which is part of `groff'.
-
-# `groff' 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 3 of the License, or
-# (at your option) any later version.
-
-# `groff' 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. If not, see <http://www.gnu.org/licenses/>.
-
-########################################################################
-
-# This file tests whether perl has a suitable version.  It is used by
-# glilypond.pl and Makefile.sub.
-
-# former: require v5.9.4; # for `state' in `subs.pl'
-require v5.6; # analogously to `groffer'
-
-########################################################################
-### Emacs settings
-# Local Variables:
-# mode: CPerl
-# End:
diff --git a/contrib/glilypond/subs.pl b/contrib/glilypond/subs.pl
index d193534c..d90d9f39 100644
--- a/contrib/glilypond/subs.pl
+++ b/contrib/glilypond/subs.pl
@@ -1,4 +1,3 @@
-#! /usr/bin/env perl
 my $License = q*
 ########################################################################
 # Legalese
@@ -12,7 +11,7 @@ Installed position: `<prefix>/lib7groff/lilypond/subs.pl'
 Copyright (C) 2013 Free Software Foundation, Inc.
   Written by Bernd Warken <groff-bernd.warken-72@web.de>
 
-Last update: 12 Apr 2013
+  Last update: 24 Apr 2013
 
 This file is part of `glilypond', which is part of `GNU groff'.
 
@@ -325,36 +324,6 @@ sub path2abs {
 } # end sub path2abs()
 
 
-sub perl_version {
-  our ( $Globals, $Args );
-
-  my $pv = $Globals->{'perl_version'};
-  return $pv if ( $pv );
-
-  my $fh = new FH_READ_FILE( $Globals->{'perl_test_file'} );
-  $fh->open();
-
-  while ( defined( $_ = $fh->read_line() ) ) {
-    next unless ( /
-		    ^
-		    \s*
-		    require
-		    \s+
-		    (
-		      [v0-9.]+
-		    )
-		  /x );
-    $pv = $1; # Perl version
-    $fh->close();
-    $Globals->{'perl_version'} = $pv;
-    return $pv;
-  }
-
-  $fh->close();
-  return 'unknown version for Perl';
-} # end sub perl_version()
-
-
 sub run_lilypond {
   # arg is the options collection for `lilypond' to run
   # either from ly or pdf
@@ -467,9 +436,6 @@ The directories set are created when they do not exist.
   # --keep_files       -k: do not delete any temporary files
   # --file_prefix=...  -p: start for the names of temporary files
 
-  my $pv = &perl_version();
-  $usage .=  "\n" . 'Perl version ' . $pv . ' needed.' if ( $pv );
-
   $main::stdout->print( $usage );
 } # end sub usage()