Minor cleanup

git-svn-id: svn://tug.org/texlive/trunk@36778 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 14 insertions, 60 deletions

diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog
index 2008d557d80..770cfb6f5bb 100644
--- a/Build/source/texk/chktex/ChangeLog
+++ b/Build/source/texk/chktex/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ChkTeX.pdf (new): Moved from chktex-1.7.2/ChkTeX.pdf to here.
+	(No longer distributed).
+
+2015-04-12  Karl Berry  <karl@tug.org>
+
+	* Import chktex-1.7.4.
+
 2015-03-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Drop check for strtol.
diff --git a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.pdf b/Build/source/texk/chktex/ChkTeX.pdf
index 246c2a502a1..246c2a502a1 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.pdf
+++ b/Build/source/texk/chktex/ChkTeX.pdf
diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am
index ee5179f8e31..58bd7512490 100644
--- a/Build/source/texk/chktex/Makefile.am
+++ b/Build/source/texk/chktex/Makefile.am
@@ -92,7 +92,7 @@ config_DATA = $(CHKTEX_TREE)/chktexrc
 # documentation
 pdfdocdir = $(datarootdir)/texmf-dist/doc/chktex
 
-dist_pdfdoc_DATA = $(CHKTEX_TREE)/ChkTeX.pdf
+dist_pdfdoc_DATA = ChkTeX.pdf
 
 CLEANFILES = $(nodist_bin_SCRIPTS)
 
diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in
index 319516ca7dc..b68af1cbfa3 100644
--- a/Build/source/texk/chktex/Makefile.in
+++ b/Build/source/texk/chktex/Makefile.in
@@ -625,7 +625,7 @@ config_DATA = $(CHKTEX_TREE)/chktexrc
 
 # documentation
 pdfdocdir = $(datarootdir)/texmf-dist/doc/chktex
-dist_pdfdoc_DATA = $(CHKTEX_TREE)/ChkTeX.pdf
+dist_pdfdoc_DATA = ChkTeX.pdf
 CLEANFILES = $(nodist_bin_SCRIPTS) chktest
 TESTS = chktex.test
 TESTS_ENVIRONMENT = CHKTEX_TREE=$(CHKTEX_TREE) TEXMFCNF=$(abs_srcdir)/../kpathsea
diff --git a/Build/source/texk/chktex/chktex-1.7.4-PATCHES/patch-03-late-decl b/Build/source/texk/chktex/chktex-1.7.4-PATCHES/patch-03-late-decl
index 242355ca17b..911c753a1d2 100644
--- a/Build/source/texk/chktex/chktex-1.7.4-PATCHES/patch-03-late-decl
+++ b/Build/source/texk/chktex/chktex-1.7.4-PATCHES/patch-03-late-decl
@@ -1,5 +1,6 @@
---- FindErrs.c.orig	Sat Apr 11 13:59:46 2015
-+++ FindErrs.c	Sat Apr 11 16:26:04 2015
+diff -ur chktex-1.7.4.orig/FindErrs.c chktex-1.7.4/FindErrs.c
+--- chktex-1.7.4.orig/FindErrs.c	2015-04-11 20:37:49.000000000 +0200
++++ chktex-1.7.4/FindErrs.c	2015-04-12 03:17:11.000000000 +0200
 @@ -1059,8 +1059,8 @@
                      {
                          if ( *e == '-' && 0 == strncmp( BufPtr, e, strlen(e) ) )
diff --git a/Build/source/texk/chktex/chktex-1.7.4/chktex.el b/Build/source/texk/chktex/chktex-1.7.4/chktex.el
deleted file mode 100644
index e61334796ca..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.4/chktex.el
+++ /dev/null
@@ -1,56 +0,0 @@
-;;; chktex.el --- quick hack to add ChkTeX capability to AUC-TeX mode
-;;
-;;
-;;  Keywords: LaTeX, AUC-TeX, ChkTeX
-;;
-;;  ChkTeX, quick hack to add ChkTeX in LaTeX menu.
-;;  Copyright (C) 1995-96 Jens T. Berger Thielemann
-;;
-;;  This program 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.
-;;
-;;  This program 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, write to the Free Software
-;;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;;
-;;  Contact the author at:
-;;              Jens Berger
-;;              Spektrumvn. 4
-;;              N-0666 Oslo
-;;              Norway
-;;              E-mail: <jensthi@ifi.uio.no>
-;;
-;;
-;;; Commentary:
-;;
-;;  This tiny hack will add a "ChkTeX" item to the command menu of
-;;  AUC-TeX, thus making the use of ChkTeX much more comfortable from
-;;  within AUC-TeX (`LaTeX-mode').
-;;
-;;  INSTALLATION
-;;
-;;  1. Put this file somewhere in your loading path.
-;;  2. Add the line
-;;        (require 'chktex)
-;;     to your .emacs file
-;;
-;;  It is doubtful whether byte-compiling this file gains anything.
-;;
-;;; Code:
-;;
-
-(eval-after-load 'tex
-  '(progn
-     (add-to-list 'TeX-command-list
-                  '("ChkTeX" "chktex -v6 %s" TeX-run-compile nil t))))
-
-(provide 'chktex)
-
-;;; chktex.el ends here