From 457592e1b0aad891a6a6321498a7cc1b631d4a9c Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Wed, 30 Jun 2021 19:23:31 +0000
Subject: Release 10.86.23

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@4115 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 buildtools/stamp-date      |  9 ++++++++-
 converter/other/pamtopng.c | 14 +++++++-------
 doc/HISTORY                | 12 +++++++++++-
 version.mk                 |  2 +-
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/buildtools/stamp-date b/buildtools/stamp-date
index 902c82e4..f867416d 100755
--- a/buildtools/stamp-date
+++ b/buildtools/stamp-date
@@ -14,7 +14,14 @@
 
 SOURCE_DATE_OR_NONE=${SOURCE_DATE_EPOCH:-NONE}
 
-BUILD_DATETIME=$(date +%s)
+NOW_FROM_DATE_PGM=$(date +%s)
+if [ "$NOW_FROM_DATE_PGM" = "%s" ]; then
+    # This system's 'date' doesn't know %s.  (Solaris 10 for example).
+    # Try Perl
+    BUILD_DATETIME=$(perl -e 'print time()')
+else
+    BUILD_DATETIME=$NOW_FROM_DATE_PGM
+fi
 
 LOGNAME_OR_UNKNOWN=${LOGNAME:-UNKNOWN}
 USER=${USER:-$LOGNAME_OR_UNKNOWN}
diff --git a/converter/other/pamtopng.c b/converter/other/pamtopng.c
index 761d303d..37ef9128 100644
--- a/converter/other/pamtopng.c
+++ b/converter/other/pamtopng.c
@@ -50,8 +50,8 @@ struct CmdlineInfo {
     const char * inputFileName;
     unsigned int verbose;
     unsigned int interlace;
-    unsigned int transparencySpec;
-    const char * transparency;
+    unsigned int transparentSpec;
+    const char * transparent;
     unsigned int chromaSpec;
     struct pngx_chroma chroma;
     unsigned int gammaSpec;
@@ -196,8 +196,8 @@ parseCommandLine (int                  argc,
             &cmdlineP->verbose,        0);
     OPTENT3(0,  "interlace",    OPT_FLAG,       NULL,
             &cmdlineP->interlace,      0);
-    OPTENT3(0,  "transparency", OPT_STRING,     &cmdlineP->transparency,
-            &cmdlineP->transparencySpec, 0);
+    OPTENT3(0,  "transparent", OPT_STRING,      &cmdlineP->transparent,
+            &cmdlineP->transparentSpec, 0);
     OPTENT3(0,  "chroma",       OPT_STRING,     &chroma,
             &cmdlineP->chromaSpec,     0);
     OPTENT3(0,  "gamma",        OPT_FLOAT,      &cmdlineP->gamma,
@@ -413,7 +413,7 @@ doTrnsChunk(const struct pam * const pamP,
     else {
         xelval const pngMaxval = pm_bitstomaxval(pngx_bitDepth(pngxP));
         png_color_16 const pngColor = parseAndScaleColor(trans, pngMaxval);
-            /* Transparency color from text format scaled from 16-bit to
+            /* Transparent color from text format scaled from 16-bit to
                maxval.
             */
 
@@ -816,8 +816,8 @@ addAncillaryChunks(struct pam *       const pamP,
 /*----------------------------------------------------------------------------
   Where requested, add ancillary chunks.
 -----------------------------------------------------------------------------*/
-    if (cmdline.transparencySpec)
-        doTrnsChunk(pamP, pngxP,cmdline.transparency);
+    if (cmdline.transparentSpec)
+        doTrnsChunk(pamP, pngxP,cmdline.transparent);
 
     if (cmdline.chromaSpec)
         doChrmChunk(pngxP, cmdline.chroma);
diff --git a/doc/HISTORY b/doc/HISTORY
index c7c87ef9..5e551964 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,16 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+21.06.30 BJH  Release 10.86.23
+
+              pamtopng: Fix -transparent option - program recognized
+              -transparency instead.  Always broken (pamtopng was new in
+              Netpbm 10.71 (June 2015)).
+
+              Build: make it work on systems that don't have date +%s.  Broken
+              in Netpbm 10.78 (March 2017).  Thanks Claes Nästén
+              (pekdon@gmail.com).
+
 21.05.15 BJH  Release 10.86.22
 
               pamtopng: Fix rejection of all BLACKANDWHITE_ALPHA images with
@@ -18,7 +28,7 @@ CHANGE HISTORY
               pamtopng: Fix: treats all tuple types that start with BLA as
               BLACKANDWHITE.  Always broken (pamtopng was new in Netpbm 10.71
               (June 2015)).
-              
+
               pamtogif: Fix failure with bogus message about wrong depth with
               grayscale and black and white PAM images with transparency.
               Always broken (pamtogif was new in Netpbm 10.37 (December 2006)).
diff --git a/version.mk b/version.mk
index 0ad3d4bc..d349cbbf 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 86
-NETPBM_POINT_RELEASE = 22
+NETPBM_POINT_RELEASE = 23
-- 
cgit 1.4.1