[groff] 01/01: groffer: remove perl_test.pl and HAVE_PERL and related parts.

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit 9038da1341eb1da73599db54eb3e7272c087b653
Author: Bernd Warken <address@hidden>
Date:   Wed Jun 18 12:26:40 2014 +0200

    groffer: remove perl_test.pl and HAVE_PERL and related parts.
---
 contrib/groffer/ChangeLog    |   16 +++++++++++--
 contrib/groffer/Makefile.sub |   48 +++++++++++++++++++++--------------------
 contrib/groffer/groffer.pl   |   11 +-------
 contrib/groffer/perl_test.pl |   35 ------------------------------
 contrib/groffer/version.sh   |    4 +-
 5 files changed, 42 insertions(+), 72 deletions(-)

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 6d3550f..ea60409 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,13 @@
+2014-06-18  Bernd Warken  <address@hidden>
+
+       * version.sh: Upgrade to version 2.1.3.
+
+       * perl_test.pl: Remove this file.
+
+       * Makefile.sub: Remove HAS_PERL.
+
+       * groffer.pl: Add `require' for Perl version.
+
 2014-06-11  Bernd Warken  <address@hidden>
 
        * func.pl, subs.pl: Rename `func.pl' to `subs.pl'.
@@ -42,7 +52,7 @@
 
        * Makefile.sub (GROFFER_PERL, GROFFER_REST): Don't use $(srcdir).
 
-2014-03-11  Ingo Schwarze  <address@hidden> (tiny change)
+2014-03-11  Ingo Schwarze  <address@hidden>  (tiny change)
 
        * Makefile.sub (clean): Don't remove checked-in file `groffer.man'.
 
@@ -335,8 +345,8 @@
 
        * ChangeLog: This file.  It contains information for `groffer'
        versions >= 1.0.0 with shell and Perl kinds.  For older `groffer'
-       versions, see `shell/ChangeLog.0' which contains information for the
-       shell only versions of groffer 0.*.
+       versions, see `shell/ChangeLog.0' which contains information for
+       the shell only versions of groffer 0.*.
 
        * Makefile.sub: The old `Makefile.sub' was extended to support the
        shell and the Perl version of `groffer' at the same time.  If the
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index 7f5eef3..d70c1e2 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -7,7 +7,7 @@
 # Written by Werner Lemberg <address@hidden> and
 # Bernd Warken <address@hidden>.
 
-# Last update: 11 Jun 2014
+# Last update: 18 Jun 2014
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -40,14 +40,13 @@ MAN1=groffer.n \
      roff2text.n \
      roff2x.n
 
-MOSTLYCLEANADD=groffer HAVE_PERL $(MAN1) $(ROFF2MAN) $(ROFF2PROGS)
+MOSTLYCLEANADD=groffer $(MAN1) $(ROFF2MAN) $(ROFF2PROGS)
 
 all: groffer
 
 GROFFER_PERL=subs.pl \
              main_subs.pl \
              man.pl \
-             perl_test.pl \
              split_env.sh
 GROFFER_REST=roff2.man \
              version.sh \
@@ -57,21 +56,17 @@ GROFFER_REST=roff2.man \
 
 groffer: $(GROFFER_PERL) \
                $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
-       if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \
-         : >HAVE_PERL; \
-         echo "Using perl version of groffer."; \
-         sed -f "$(SH_DEPS_SED_SCRIPT)" \
-             -e "s|@g@|$(g)|g" \
-             -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
-             -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
-             -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
-             -e "s|@VERSION@|$(version)$(revision)|g" \
-             -e "$(SH_SCRIPT_SED_CMD)" \
-             $(srcdir)/groffer.pl >$@; \
-         for f in $(ROFF2PROGS); do \
-           cp $(srcdir)/roff2.pl $$f; \
-         done; \
-       fi
+       sed -f "$(SH_DEPS_SED_SCRIPT)" \
+           -e "s|@g@|$(g)|g" \
+           -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
+           -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
+           -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
+           -e "s|@VERSION@|$(version)$(revision)|g" \
+           -e "$(SH_SCRIPT_SED_CMD)" \
+            $(srcdir)/groffer.pl >$@; \
+       for f in $(ROFF2PROGS); do \
+         cp $(srcdir)/roff2.pl $$f; \
+       done; \
        chmod +x $@
        for m in $(ROFF2MODES); do \
          cat $(srcdir)/roff2.man \
@@ -93,11 +88,9 @@ install_data: groffer
        for f in $(GROFFER_PERL); do \
          rm -f $(DESTDIR)$(groffer_dir)/$$f; \
        done
-       if test -f HAVE_PERL; then \
-         for f in $(GROFFER_PERL); do \
-           $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(groffer_dir)/$$f; \
-         done; \
-       fi
+       for f in $(GROFFER_PERL); do \
+         $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(groffer_dir)/$$f; \
+       done;
 
 uninstall_sub:
        rm -f $(DESTDIR)$(bindir)/groffer
@@ -106,3 +99,12 @@ uninstall_sub:
          rm -f $(DESTDIR)$(groffer_dir)/$$f;\
        done
        -rmdir $(DESTDIR)$(libdir)/groff/groffer
+
+
+########################################################################
+# Emacs settings
+########################################################################
+#
+# Local Variables:
+# mode: makefile
+# End:
diff --git a/contrib/groffer/groffer.pl b/contrib/groffer/groffer.pl
index e77ad70..26a8143 100755
--- a/contrib/groffer/groffer.pl
+++ b/contrib/groffer/groffer.pl
@@ -57,6 +57,8 @@ use FindBin;
 # system variables and exported variables
 ########################################################################
 
+require 5.6.1;
+
 our $Dev_Null;
 our $Umask;
 our @Path;
@@ -113,7 +115,6 @@ my $before_make;            # script before run of `make'
 }
 
 my %at_at;
-my $file_perl_test_pl;
 my $groffer_libdir;
 
 if ($before_make) {
@@ -122,8 +123,6 @@ if ($before_make) {
   $at_at{'G'} = '';
   $at_at{'LIBDIR'} = '';
   $groffer_libdir = $groffer_source_dir;
-  $file_perl_test_pl = File::Spec->catfile($groffer_source_dir,
-                                              'perl_test.pl');
   $File_version_sh = File::Spec->catfile($groffer_source_dir, 'version.sh');
   $Groff_Version = '';
 } else {
@@ -132,8 +131,6 @@ if ($before_make) {
   $at_at{'G'} = '@g@';
   $at_at{'LIBDIR'} = '@libdir@';
   $groffer_libdir = '@groffer_dir@';
-  $file_perl_test_pl = File::Spec->catfile($groffer_libdir,
-                                              'perl_test.pl');
   $File_version_sh = File::Spec->catfile($groffer_libdir, 'version.sh');
 }
 
@@ -145,10 +142,6 @@ unshift(@INC, $groffer_libdir);
 $File_split_env_sh = File::Spec->catfile($groffer_libdir, 'split_env.sh');
 die "$File_split_env_sh does not exist;" unless -f "$File_split_env_sh";
 
-# test perl on suitable version
-die "$file_perl_test_pl does not exist;" unless -f "$file_perl_test_pl";
-do "$file_perl_test_pl" or die "Perl test: $@";
-
 require 'subs.pl';
 require 'main_subs.pl';
 require 'man.pl';
diff --git a/contrib/groffer/perl_test.pl b/contrib/groffer/perl_test.pl
deleted file mode 100644
index 734c0cc..0000000
--- a/contrib/groffer/perl_test.pl
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/env perl
-
-# groffer - display groff files
-
-# Source file position: <groff-source>/contrib/groffer/perl_test.sh
-# Installed position: <prefix>/lib/groff/groffer/perl_test.sh
-
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
-# Written by Bernd Warken <address@hidden>.
-
-# Last update: 5 Jan 2009
-
-# This file is part of `groffer', 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 2 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/gpl-2.0.html>.
-
-########################################################################
-
-# This file tests whether perl has a suitable version.  It is used by
-# groffer.pl and Makefile.sub.
-
-# require 5.004_05;
-require v5.6.1;
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index 5b06dbd..f5b3d03 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -29,8 +29,8 @@
 export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
-_PROGRAM_VERSION='2.1.2';
-_LAST_UPDATE='11 Jun 2014';
+_PROGRAM_VERSION='2.1.3';
+_LAST_UPDATE='18 Jun 2014';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it, see groffer.sh.