version numbers, bug reporting

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

26 files changed, 98 insertions, 86 deletions

diff --git a/Build/source/texk/ps2pk/CHANGES.type1 b/Build/source/texk/ps2pk/CHANGES.type1
index 107a1e8100d..39047274df4 100644
--- a/Build/source/texk/ps2pk/CHANGES.type1
+++ b/Build/source/texk/ps2pk/CHANGES.type1
@@ -4,10 +4,10 @@ packed TeX fonts) a number of changes were needed (see Changelog).
 
 --Piet
 
-internet: rcpt@urc.tue.nl       | Piet Tutelaers
-bitnet:   rcpt@heitue5.BITNET   | Computer Center       Room  RC 1.90
-phone:    +31 (0)40 474541      | Eindhoven University of  Technology
-fax:      +31 (0)40 434438      | P.O. Box 513, 5600 MB Eindhoven, NL
+Piet Tutelaers
+Computer Center       Room  RC 1.90
+Eindhoven University of  Technology
+P.O. Box 513, 5600 MB Eindhoven, NL
 
 Changelog (the main-line):
 --------------------------
diff --git a/Build/source/texk/ps2pk/ChangeLog b/Build/source/texk/ps2pk/ChangeLog
index ff5681746af..667c2ca6932 100644
--- a/Build/source/texk/ps2pk/ChangeLog
+++ b/Build/source/texk/ps2pk/ChangeLog
@@ -1,4 +1,26 @@
-2016-01-31  Luigi Scarso  <uigi.scarso@gmail.com>
+2016-02-01  Karl Berry  <karl@tug.org>
+
+	* configure.ac
+	Version 1.8 (February 2016).
+	
+	* ps2pk.c: use PACKAGE_VERSION (from c-auto.h) instead
+	of hardwiring the number.
+	
+	* mag.c,
+	* pfb2pfa.c,
+	* pk2bm.c,
+	* pktest.c: report version number in usage as with ps2pk.
+	Also say "invalid" instead of "illegal".
+	
+	* *.1: uniformly use date in .TH line.
+	
+	* Remove version numbers from individual files.
+	
+	* Remove Piet's email address so he does not get unwanted mail,
+	since this package is maintained in TeX Live now.  Ask for reports
+	to go to tex-k.
+
+2016-01-31  Luigi Scarso  <luigi.scarso@gmail.com>
 
 	* pk2bm.c, pkin.c, pkin.h: Support charext.
 
diff --git a/Build/source/texk/ps2pk/README b/Build/source/texk/ps2pk/README
index 9b3d8a9ed6c..5e50a53b69c 100644
--- a/Build/source/texk/ps2pk/README
+++ b/Build/source/texk/ps2pk/README
@@ -147,10 +147,10 @@ I wish you a lot of fun with type1 fonts,
 
 --Piet
 
-internet: rcpt@urc.tue.nl       | Piet Tutelaers
-bitnet:   rcpt@heitue5.BITNET   | Computer Center       Room  RC 1.90
-phone:    +31 (0)40 474541      | Eindhoven University of  Technology
-fax:      +31 (0)40 434438      | P.O. Box 513, 5600 MB Eindhoven, NL
+Piet Tutelaers
+Computer Center       Room  RC 1.90
+Eindhoven University of  Technology
+P.O. Box 513, 5600 MB Eindhoven, NL
 
 
 For those who have used earlier versions of ps2pk next differences may be
diff --git a/Build/source/texk/ps2pk/basics.c b/Build/source/texk/ps2pk/basics.c
index a62827da9d1..6b1842d5eaa 100644
--- a/Build/source/texk/ps2pk/basics.c
+++ b/Build/source/texk/ps2pk/basics.c
@@ -1,7 +1,7 @@
 /* FILE:    basics.c
  * PURPOSE: basic functions
  * AUTHOR:  Piet Tutelaers
- * VERSION: 1.7 (December 2014)
+ * (see README for license)
  */
 
 #include "basics.h"
diff --git a/Build/source/texk/ps2pk/basics.h b/Build/source/texk/ps2pk/basics.h
index 980de386b61..28c9c80831a 100644
--- a/Build/source/texk/ps2pk/basics.h
+++ b/Build/source/texk/ps2pk/basics.h
@@ -1,7 +1,7 @@
 /* FILE:    basics.h
  * PURPOSE: basic definitions
  * AUTHOR:  Piet Tutelaers
- * VERSION: 1.7 (December 2014)
+ * (see README for license)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/Build/source/texk/ps2pk/configure b/Build/source/texk/ps2pk/configure
index e80502e1591..5f5152582c0 100755
--- a/Build/source/texk/ps2pk/configure
+++ b/Build/source/texk/ps2pk/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ps2pkm (TeX Live) 1.7.
+# Generated by GNU Autoconf 2.69 for ps2pkm (TeX Live) 1.8.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ps2pkm (TeX Live)'
 PACKAGE_TARNAME='ps2pkm--tex-live-'
-PACKAGE_VERSION='1.7'
-PACKAGE_STRING='ps2pkm (TeX Live) 1.7'
+PACKAGE_VERSION='1.8'
+PACKAGE_STRING='ps2pkm (TeX Live) 1.8'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ps2pkm (TeX Live) 1.7 to adapt to many kinds of systems.
+\`configure' configures ps2pkm (TeX Live) 1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1399,7 +1399,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ps2pkm (TeX Live) 1.7:";;
+     short | recursive ) echo "Configuration of ps2pkm (TeX Live) 1.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1518,7 +1518,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ps2pkm (TeX Live) configure 1.7
+ps2pkm (TeX Live) configure 1.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2174,7 +2174,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ps2pkm (TeX Live) $as_me 1.7, which was
+It was created by ps2pkm (TeX Live) $as_me 1.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7859,7 +7859,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ps2pkm--tex-live-'
- VERSION='1.7'
+ VERSION='1.8'
 
 
 # Some tools Automake needs.
@@ -14190,7 +14190,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-ps2pkm (TeX Live) config.lt 1.7
+ps2pkm (TeX Live) config.lt 1.8
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15773,7 +15773,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ps2pkm (TeX Live) $as_me 1.7, which was
+This file was extended by ps2pkm (TeX Live) $as_me 1.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15839,7 +15839,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ps2pkm (TeX Live) config.status 1.7
+ps2pkm (TeX Live) config.status 1.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/ps2pk/configure.ac b/Build/source/texk/ps2pk/configure.ac
index 03c0c8eab0d..9d0f79dc682 100644
--- a/Build/source/texk/ps2pk/configure.ac
+++ b/Build/source/texk/ps2pk/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright 2009-2016 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([ps2pkm (TeX Live)], [1.7], [tex-k@tug.org])
+AC_INIT([ps2pkm (TeX Live)], [1.8], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([arith.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/ps2pk/encoding.c b/Build/source/texk/ps2pk/encoding.c
index 838019b11e7..e1d85fb0296 100644
--- a/Build/source/texk/ps2pk/encoding.c
+++ b/Build/source/texk/ps2pk/encoding.c
@@ -15,7 +15,7 @@
  * globals:    void fatal();
  *
  * Author:     Piet Tutelaers
- *             Version 1.7 (December 2014)
+ * (see README for license)
  */
 
 #include "types.h"
diff --git a/Build/source/texk/ps2pk/filenames.c b/Build/source/texk/ps2pk/filenames.c
index e6b10aa16bc..8081233ef25 100644
--- a/Build/source/texk/ps2pk/filenames.c
+++ b/Build/source/texk/ps2pk/filenames.c
@@ -1,7 +1,7 @@
 /* FILE:    filenames.c
  * PURPOSE: some handy functions for working with TeXfiles
- * AUTHOR:  Piet Tutelaers (internet: rcpt@urc.tue.nl)
- * VERSION: 1.7 (December 2014)
+ * AUTHOR:  Piet Tutelaers
+ * (see README for license)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/Build/source/texk/ps2pk/filenames.h b/Build/source/texk/ps2pk/filenames.h
index 7ee9674cbf4..3eda4744dda 100644
--- a/Build/source/texk/ps2pk/filenames.h
+++ b/Build/source/texk/ps2pk/filenames.h
@@ -1,6 +1,5 @@
 /* FILE:	filenames.h
  * PURPOSE:	functions for handling file names
- * VERSION: 1.7 (December 2014)
  */
 
 /*
diff --git a/Build/source/texk/ps2pk/mag.1 b/Build/source/texk/ps2pk/mag.1
index 8d9f2d4a261..bf1c97ce7a0 100644
--- a/Build/source/texk/ps2pk/mag.1
+++ b/Build/source/texk/ps2pk/mag.1
@@ -1,5 +1,5 @@
 .\" e
-.TH MAG 1 UMFT
+.TH MAG 1 "1 Feb 2016"
 .de EX
 .sp
 .in +5
@@ -13,7 +13,7 @@
 .fi
 ..
 .SH NAME
-mag \- computes fontsizes and magsteps
+mag \- computes TeX fontsizes and magsteps
 .SH SYNOPSIS 
 .B
 mag
@@ -64,5 +64,5 @@ mag -r -R240 `mag -R240 -2 0 0.5 1`
 .nf
 Piet Tutelaers
 University of Technology Eindhoven
-<rcpt@urc.tue.nl>
-
+Maintained in TeX Live; please send bug reports or other correspondence
+to tex-k@tug.org (http://lists.tug.org/tex-k).
diff --git a/Build/source/texk/ps2pk/mag.c b/Build/source/texk/ps2pk/mag.c
index 2dd4715e8c8..96857286987 100644
--- a/Build/source/texk/ps2pk/mag.c
+++ b/Build/source/texk/ps2pk/mag.c
@@ -65,7 +65,6 @@
  *	.nf
  *	Piet Tutelaers
  *	University of Technology Eindhoven
- *	rcpt@urc.tue.nl
  */
 
 #include "basics.h"	/* fatal() */
@@ -109,12 +108,14 @@ int main(int argc, char *argv[]) {
 	    done = 1;
       	    break;
       	 default:
-      	    fatal("%s: %c illegal option\n", myname, c);
+      	    fatal("%s: %c invalid option\n", myname, c);
       	 }
       }
 
-   if (argc < 1)
+   if (argc < 1) {
+      msg  ("mag (ps2pk) version " PACKAGE_VERSION "\n");
       fatal("Usage: %s [-r] [-Rdpi] size . . .\n", myname);
+   }
    
 #ifdef WIN32
    setmode(fileno(stdout), _O_BINARY);
diff --git a/Build/source/texk/ps2pk/pfb2pfa.1 b/Build/source/texk/ps2pk/pfb2pfa.1
index f81abb8ed2f..b533d8f7ae1 100644
--- a/Build/source/texk/ps2pk/pfb2pfa.1
+++ b/Build/source/texk/ps2pk/pfb2pfa.1
@@ -1,4 +1,4 @@
-.TH PFB2PFA 1 TeX
+.TH PFB2PFA 1 "1 Feb 2016"
 .SH NAME
 pfb2pfa \- convert a type1 pfb file (binary MSDOS) into a pfa (ASCII) 
 .SH SYNOPSIS
@@ -14,6 +14,8 @@ With the -v option you get some information about what the
 program is doing.
 .SH AUTHOR
 .nf
-Piet Tutelaers <rcpt@urc.tue.nl>
+Piet Tutelaers
+Maintained in TeX Live; please send bug reports or other correspondence
+to tex-k@tug.org (http://lists.tug.org/tex-k).
 
 
diff --git a/Build/source/texk/ps2pk/pfb2pfa.c b/Build/source/texk/ps2pk/pfb2pfa.c
index ae9d74e264d..368d0a9b578 100644
--- a/Build/source/texk/ps2pk/pfb2pfa.c
+++ b/Build/source/texk/ps2pk/pfb2pfa.c
@@ -14,7 +14,7 @@
  *	With the -v option you get some information about what the 
  *	program is doing.
  * AUTHOR
- *	Piet Tutelaers (rcpt@urc.tue.nl)
+ *	Piet Tutelaers
  */
 
 #include "basics.h"	/* basic definitions and fatal() */
@@ -45,11 +45,14 @@ int main (int argc, char *argv[])
       	 case 'v':
       	    verbose = 1; break;
       	 default:
-      	    fatal("%s: %c illegal option\n", myname, c);
+      	    fatal("%s: %c invalid option\n", myname, c);
       	 }
       }
 
-   if (argc < 1) fatal("Usage: %s [-v] pfbfile [pfafile]\n", myname);
+   if (argc < 1) {
+     msg  ("pfb2pfa (ps2pk) version " PACKAGE_VERSION "\n");
+     fatal("Usage: %s [-v] pfbfile [pfafile]\n", myname);
+   }
    
    pfbname = argv[0]; argc--; argv++;
    if (argc < 1) pfaname = newname(pfbname, ".pfa");
diff --git a/Build/source/texk/ps2pk/pk2bm.1 b/Build/source/texk/ps2pk/pk2bm.1
index 5b9c6d599db..12155d08ef7 100644
--- a/Build/source/texk/ps2pk/pk2bm.1
+++ b/Build/source/texk/ps2pk/pk2bm.1
@@ -1,4 +1,4 @@
-.TH PK2BM 1 TeX
+.TH PK2BM 1 "1 Feb 2016"
 .SH NAME
 pk2bm \- create a bitmap from a TeX pkfont
 .SH SYNOPSIS:
@@ -35,5 +35,6 @@ ps2pk(1)
 
 .SH AUTHOR
 .nf
-Piet Tutelaers <rcpt@urc.tue.nl>
-
+Piet Tutelaers
+Maintained in TeX Live; please send bug reports or other correspondence
+to tex-k@tug.org (http://lists.tug.org/tex-k).
diff --git a/Build/source/texk/ps2pk/pk2bm.c b/Build/source/texk/ps2pk/pk2bm.c
index 3d241352232..715a380a115 100644
--- a/Build/source/texk/ps2pk/pk2bm.c
+++ b/Build/source/texk/ps2pk/pk2bm.c
@@ -28,7 +28,6 @@
  *	bitmap(X11), gftopk(TeX), pktype(TeX), ps2pk(1)
  * AUTHOR
  *	Piet Tutelaers
- *	rcpt@urc.tue.nl
  */
 
 #ifdef HAVE_CONFIG_H
@@ -93,12 +92,13 @@ int main(int argc, char *argv[])
       	    hexmap = 1;
       	    break;
       	 default:
-      	    printf("%s: %c illegal option\n", myname, c);
+      	    printf("%s: %c invalid option\n", myname, c);
       	    exit(1);
       	 }
    }
 
    if (argc == 0) {
+       msg  ("pk2bm (ps2pk) version " PACKAGE_VERSION "\n");
       printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
       exit(1);
    }
diff --git a/Build/source/texk/ps2pk/pkin.c b/Build/source/texk/ps2pk/pkin.c
index 5632b393441..be295a00b48 100644
--- a/Build/source/texk/ps2pk/pkin.c
+++ b/Build/source/texk/ps2pk/pkin.c
@@ -11,7 +11,6 @@
  *	get more modularity in the style of MODULA2.
  * REDESIGN
  *	Piet Tutelaers
- *	rcpt@urc.tue.nl
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/Build/source/texk/ps2pk/pkin.h b/Build/source/texk/ps2pk/pkin.h
index a646c24bea8..8ffae55e2da 100644
--- a/Build/source/texk/ps2pk/pkin.h
+++ b/Build/source/texk/ps2pk/pkin.h
@@ -33,7 +33,6 @@
  *	integers must be manipulated with %ld, be carefull!
  * AUTHORS
  *	Piet Tutelaers
- *	rcpt@urc.tue.nl
  */
  
 #include <stdio.h>
diff --git a/Build/source/texk/ps2pk/pkout.c b/Build/source/texk/ps2pk/pkout.c
index 780b033f714..4d50fbe7bee 100644
--- a/Build/source/texk/ps2pk/pkout.c
+++ b/Build/source/texk/ps2pk/pkout.c
@@ -1,16 +1,13 @@
 /* FILE:    pkout.c
- *
  * PURPOSE: implementation of PK output functions
- *
  * COMMENT: functions are derived from `The GFtoPK processor' but
  *          presented in a modular fashion so they can be used in other
  *          programs. 
  *          (Porting `top-down' WEB code into modular readable C-code is
  *          not a trivial exercise.)
  *
- * VERSION: 1.7 (December 2014)
- *
- * AUTHOR:  Piet Tutelaers (rcpt@urc.tue.nl)
+ * AUTHOR:  Piet Tutelaers
+ * (see README for license)
  */
 
 /* Some constants */
diff --git a/Build/source/texk/ps2pk/pkout.h b/Build/source/texk/ps2pk/pkout.h
index 218fdd60a91..a22d9f90153 100644
--- a/Build/source/texk/ps2pk/pkout.h
+++ b/Build/source/texk/ps2pk/pkout.h
@@ -1,13 +1,7 @@
-/* 
- * FILE:    pkout.h
- *
+/* FILE:    pkout.h
  * PURPOSE: interface to te PK output functions (pkfile.c)
- *
  * COMMENT: See the pktest.c example program how to use the PK functions.
- *
- * VERSION: 1.7 (December 2014)
- *
- * AUTHOR:  Piet Tutelaers (rcpt@urc.tue.nl)
+ * (see README for license)
  */
 
 /* A function for opening a pk file */
diff --git a/Build/source/texk/ps2pk/pktest.c b/Build/source/texk/ps2pk/pktest.c
index 61ae6d59acd..2cc97f1c7c5 100644
--- a/Build/source/texk/ps2pk/pktest.c
+++ b/Build/source/texk/ps2pk/pktest.c
@@ -1,15 +1,10 @@
-/*
- * FILE:     pktest.c 
- *
+/* FILE:     pktest.c 
  * PURPOSE:  This program demonstrates how a PK file can be created from
  *           a single character bitmap.
- *
  * USAGE:    pktest -c<char_code> -W<with> -H<Height> pkname < test.bm
  *	     (test.bm contains the character from `The GFtoPK processor')
- *
- * VERSION:  1.7 (December 2014)
- *
- * AUTHOR:   Piet Tutelaers (rcpt@urc.tue.nl)
+ * AUTHOR:   Piet Tutelaers
+ * (see README for license)
  */
 
 int testing = 1;
@@ -49,12 +44,14 @@ int main(int argc, char *argv[])
 	    W = atoi(*argv); done = 1;
       	    break;
       	 default:
-      	    fatal("%s: %c illegal option\n", myname, c);
+      	    fatal("%s: %c invalid option\n", myname, c);
       	 }
    }
 
-   if (argc == 0 || C == 0 || W*H == 0)
+   if (argc == 0 || C == 0 || W*H == 0) {
+      msg  ("pktest (ps2pk) version " PACKAGE_VERSION "\n");
       fatal("Usage: %s -c<char> -W<width> -H<height> pkfile\n", myname);
+   }
 
    pkname = argv[0];
    pk_open(pkname);
diff --git a/Build/source/texk/ps2pk/ps2pk.1 b/Build/source/texk/ps2pk/ps2pk.1
index 1f12daf13e1..47cf209269b 100644
--- a/Build/source/texk/ps2pk/ps2pk.1
+++ b/Build/source/texk/ps2pk/ps2pk.1
@@ -1,4 +1,4 @@
-.TH PS2PK 1 TeX
+.TH PS2PK 1 "1 Feb 2016"
 .SH NAME
 ps2pk \- creates a TeX pkfont from a type1 PostScript font
 .SH SYNOPSIS
@@ -154,4 +154,6 @@ info kpathsea
 Piet Tutelaers,
 modified for ps2pkm by Pierre A. Mackay.
 This manpage was adapted to teTeX by Frank Kuester.
-Currently maintained as part of TeX Live (http://tug.org/texlive).
+.PP
+Maintained in TeX Live; please send bug reports or other correspondence
+to tex-k@tug.org (http://lists.tug.org/tex-k).
diff --git a/Build/source/texk/ps2pk/ps2pk.c b/Build/source/texk/ps2pk/ps2pk.c
index 1aabd6504df..40d99c578db 100644
--- a/Build/source/texk/ps2pk/ps2pk.c
+++ b/Build/source/texk/ps2pk/ps2pk.c
@@ -171,11 +171,8 @@
  *	mtpk(1)
  *	pk2bm(1)
  *	pkfonts(1)
- * VERSION
- *	1.7 (December 2014)
  * AUTHOR
  *	Piet Tutelaers
- *	rcpt@urc.tue.nl
  */
 
 #include "basics.h"	/* basic definitions and fatal() */
@@ -342,12 +339,12 @@ int main(int argc, char *argv[])
       	    verbose = 1;
 	    break;
       	 default:
-      	    fatal("%s: %c illegal option\n", myname, c);
+      	    fatal("%s: %c invalid option\n", myname, c);
       	 }
       }
 
    if (argc < 1 || argc >2) {
-      msg  ("Ps2pk: version 1.7 (1992-2014)\n");
+      msg  ("ps2pk version " PACKAGE_VERSION " (1992-2016)\n");
       msg  ("Usage: %s [options] type1font [pkname]\n", myname);
       msg  ("options: -d -v -e<enc> -X<xres> -E<expansion> -S<slant>\n");
       fatal("options: -O -P<pointsize> -Y<yres> -a<AFM> -R<baseres>\n");
diff --git a/Build/source/texk/ps2pk/psearch.c b/Build/source/texk/ps2pk/psearch.c
index 319eaa50233..0d81c57f447 100644
--- a/Build/source/texk/ps2pk/psearch.c
+++ b/Build/source/texk/ps2pk/psearch.c
@@ -1,8 +1,8 @@
-/*
- * FILE:    psearch.c
+/* FILE:    psearch.c
  * PURPOSE: PATH search module
  * VERSION: 1.7 (December 2014)
- * AUTHOR:  Piet Tutelaers (rcpt@urc.tue.nl)
+ * AUTHOR:  Piet Tutelaers
+ * (see README for license)
  */
 
 #define _POSIX_SOURCE 1
diff --git a/Build/source/texk/ps2pk/psearch.h b/Build/source/texk/ps2pk/psearch.h
index 5058d679258..333a679e00b 100644
--- a/Build/source/texk/ps2pk/psearch.h
+++ b/Build/source/texk/ps2pk/psearch.h
@@ -1,8 +1,8 @@
-/*
- * FILE:    psearch.h
+/* FILE:    psearch.h
  * PURPOSE: PATH search module
  * VERSION: 1.0 (Oct. 1995)
- * AUTHOR:  Piet Tutelaers (rcpt@urc.tue.nl)
+ * AUTHOR:  Piet Tutelaers
+ * (see README for license)
  */
 
 #include <sys/types.h>
diff --git a/Build/source/texk/ps2pk/types.h b/Build/source/texk/ps2pk/types.h
index aec3e3fedb8..f9e78c2f14d 100644
--- a/Build/source/texk/ps2pk/types.h
+++ b/Build/source/texk/ps2pk/types.h
@@ -1,9 +1,8 @@
-/*
- * File:    types.h
+/* File:    types.h
  * Purpose: define basic types so that program is portable to non 32 bits
  *          platforms
- * Version: 1.7 (December 2014)
  * Author:  Piet Tutelaers
+ * (see README for license)
  */
 
 #ifndef __PS2PK_TYPES__