texlive[57636] Build/source/texk/ttf2pk2: ttf2pk2: Add TL version

[commits+takuji at tug.org]

Revision: 57636
          http://tug.org/svn/texlive?view=revision&revision=57636
Author:   takuji
Date:     2021-02-06 05:55:42 +0100 (Sat, 06 Feb 2021)
Log Message:
-----------
ttf2pk2: Add TL version number and bug report address in online help

Modified Paths:
--------------
    trunk/Build/source/texk/ttf2pk2/ChangeLog
    trunk/Build/source/texk/ttf2pk2/config.h.in
    trunk/Build/source/texk/ttf2pk2/configure
    trunk/Build/source/texk/ttf2pk2/configure.ac
    trunk/Build/source/texk/ttf2pk2/ttf2pk.c
    trunk/Build/source/texk/ttf2pk2/ttf2tfm.c

Modified: trunk/Build/source/texk/ttf2pk2/ChangeLog
===================================================================
--- trunk/Build/source/texk/ttf2pk2/ChangeLog	2021-02-06 04:50:56 UTC (rev 57635)
+++ trunk/Build/source/texk/ttf2pk2/ChangeLog	2021-02-06 04:55:42 UTC (rev 57636)
@@ -1,3 +1,9 @@
+2021-02-06  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* ttf2pk.c, ttf2tfm.c, configure.ac:
+	Show TeX Live version by version option.
+	Show bug report address in usage.
+
 2020-02-16  Karl Berry  <karl at tug.org>
 
 	* pklib.c (dpi): declare extern, as also defined in ftlib.c,

Modified: trunk/Build/source/texk/ttf2pk2/config.h.in
===================================================================
--- trunk/Build/source/texk/ttf2pk2/config.h.in	2021-02-06 04:50:56 UTC (rev 57635)
+++ trunk/Build/source/texk/ttf2pk2/config.h.in	2021-02-06 04:55:42 UTC (rev 57636)
@@ -124,6 +124,9 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define to the current TeX Live version string. */
+#undef TL_VERSION
+
 /* Define to 1 if <zlib.h> declares 'z_const'. */
 #undef ZLIB_CONST
 

Modified: trunk/Build/source/texk/ttf2pk2/configure
===================================================================
--- trunk/Build/source/texk/ttf2pk2/configure	2021-02-06 04:50:56 UTC (rev 57635)
+++ trunk/Build/source/texk/ttf2pk2/configure	2021-02-06 04:55:42 UTC (rev 57636)
@@ -13472,6 +13472,11 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
+
+
+$as_echo "#define TL_VERSION \"TeX Live 2021/dev\"" >>confdefs.h
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5
 $as_echo_n "checking for library containing floor... " >&6; }
 if ${ac_cv_search_floor+:} false; then :

Modified: trunk/Build/source/texk/ttf2pk2/configure.ac
===================================================================
--- trunk/Build/source/texk/ttf2pk2/configure.ac	2021-02-06 04:50:56 UTC (rev 57635)
+++ trunk/Build/source/texk/ttf2pk2/configure.ac	2021-02-06 04:55:42 UTC (rev 57636)
@@ -17,6 +17,10 @@
 
 AC_CONFIG_HEADERS([config.h])
 
+m4_include([../../version.ac])[] dnl define tex_live_version
+AC_DEFINE([TL_VERSION], ["TeX Live tex_live_version()"],
+          [Define to the current TeX Live version string.])
+
 AC_SEARCH_LIBS([floor], [m])
 
 KPSE_KPATHSEA_FLAGS

Modified: trunk/Build/source/texk/ttf2pk2/ttf2pk.c
===================================================================
--- trunk/Build/source/texk/ttf2pk2/ttf2pk.c	2021-02-06 04:50:56 UTC (rev 57635)
+++ trunk/Build/source/texk/ttf2pk2/ttf2pk.c	2021-02-06 04:55:42 UTC (rev 57636)
@@ -75,7 +75,7 @@
 --help              print this message and exit\n\
 --version           print version number and exit\n\
 \n\
-Report bugs to tex-k at tug.org.\n\
+Report bugs to " PACKAGE_BUGREPORT ".\n\
 "
 
 static void
@@ -109,7 +109,7 @@
 version(void)
 {
   fputs(ident, stdout);
-  fprintf(stdout, " (%s)\n", TeX_search_version());
+  fprintf(stdout, " (%s, %s)\n", TeX_search_version(), TL_VERSION);
   fputs(VERSION, stdout);
   exit(0);
 }

Modified: trunk/Build/source/texk/ttf2pk2/ttf2tfm.c
===================================================================
--- trunk/Build/source/texk/ttf2pk2/ttf2tfm.c	2021-02-06 04:50:56 UTC (rev 57635)
+++ trunk/Build/source/texk/ttf2pk2/ttf2tfm.c	2021-02-06 04:55:42 UTC (rev 57636)
@@ -293,7 +293,7 @@
 version(void)
 {
   fputs(ident, stdout);
-  fprintf(stdout, " (%s)\n", TeX_search_version());
+  fprintf(stdout, " (%s, %s)\n", TeX_search_version(), TL_VERSION);
   fputs(VERSION, stdout);
   exit(0);
 }
@@ -328,6 +328,8 @@
 -y REAL             move rotated glyphs down by a factor of REAL [0.25]\n\
 --help              print this message and exit\n\
 --version           print version number and exit\n\
+\n\
+Report bugs to " PACKAGE_BUGREPORT ".\n\
 "
 
 static void