dvipng: Use kpse_program_basename()

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

5 files changed, 69 insertions, 82 deletions

diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
index a60eb1bc448..07e405b4cd7 100644
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
@@ -1,3 +1,12 @@
+2013-07-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* COPYING.gd (new): From libgd-2.1.0/COPYING, with '@' => '@@'.
+	* patch-01-gd-copyright: Refer to COPYING.gd instead of
+	including it into dvipng.texi.
+
+	* patch-04-dvigif (removed): Merged into patch-03-programname.
+	* patch-03-programname: Use kpse_program_basename().
+
 2012-08-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-06-WIN32: Avoid warning when redefining pipe.
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/TL-Changes b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/TL-Changes
index 2ca3f07dfc0..d082d0662f5 100644
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/TL-Changes
+++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/TL-Changes
@@ -6,10 +6,13 @@ Removed:
 	install-sh
 	mkinstalldirs
 
+Added libgd-2.1.0/COPYING as COPYING.gd, replacing '@' => '@@'.
+
 Created Autoconf macro files ../m4/gs-device.m4 and ../m4/makeinfo.m4
 	adapting code in aclocal.m4.
 
 Copied these files to ../doc/:
+	COPYING.gd
 	dvipng.texi
 	install.texi
 	macros.texi
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-01-gd-copyright b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-01-gd-copyright
index 3777c5c9037..53e8509ad16 100644
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-01-gd-copyright
+++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-01-gd-copyright
@@ -1,9 +1,9 @@
-	Include full gd copyright notice; seems the safe thing to do.
+	Add libgd-2.1.0/COPYING as COPYING.gd, replacing '@' => '@@'.
 
-diff -ur dvipng-1.14.orig/dvipng.texi dvipng-1.14/dvipng.texi
+diff -ur -x COPYING.gd dvipng-1.14.orig/dvipng.texi dvipng-1.14/dvipng.texi
 --- dvipng-1.14.orig/dvipng.texi	2010-12-06 21:07:18.000000000 +0100
-+++ dvipng-1.14/dvipng.texi	2010-12-15 15:34:12.000000000 +0100
-@@ -954,6 +954,41 @@
++++ dvipng-1.14/dvipng.texi	2013-07-09 10:01:11.000000000 +0200
+@@ -954,6 +954,13 @@
  Smith, Jason Riedy, Wolfram Krause, Reinhard Kotucha, Takeshi Abe, and
  Waldeck Schutzer.
  
@@ -11,35 +11,7 @@ diff -ur dvipng-1.14.orig/dvipng.texi dvipng-1.14/dvipng.texi
 +copyright notice, which applies to the @code{gd} library:
 +
 +@quotation
-+Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 by Cold Spring Harbor Laboratory. Funded under Grant P41-RR02188 by the National Institutes of Health.
-+
-+Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 by Boutell.Com, Inc.
-+
-+Portions relating to GD2 format copyright 1999, 2000, 2001, 2002, 2003, 2004 Philip Warner.
-+
-+Portions relating to PNG copyright 1999, 2000, 2001, 2002, 2003, 2004 Greg Roelofs.
-+
-+Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002, 2003, 2004 John Ellson (ellson@@graphviz.org).
-+
-+Portions relating to gdft.c copyright 2001, 2002, 2003, 2004 John Ellson (ellson@@graphviz.org).
-+
-+Portions relating to JPEG and to color quantization copyright 2000, 2001, 2002, 2003, 2004, Doug Becker and copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Thomas G. Lane. This software is based in part on the work of the Independent JPEG Group. See the file README-JPEG.TXT for more information.
-+
-+Portions relating to GIF compression copyright 1989 by Jef Poskanzer and David Rowley, with modifications for thread safety by Thomas Boutell.
-+
-+Portions relating to GIF decompression copyright 1990, 1991, 1993 by David Koblas, with modifications for thread safety by Thomas Boutell.
-+
-+Portions relating to WBMP copyright 2000, 2001, 2002, 2003, 2004 Maurice Szmurlo and Johan Van den Brande.
-+
-+Portions relating to GIF animations copyright 2004 Jaakko Hyv@"adtti (jaakko.hyvatti@@iki.fi)
-+
-+Permission has been granted to copy, distribute and modify gd in any context without fee, including a commercial application, provided that this notice is present in user-accessible supporting documentation.
-+
-+This does not affect your ownership of the derived work itself, and the intent is to assure proper credit for the authors of gd, not to interfere with your productive use of gd. If you have questions, ask. "Derived works" includes all programs that utilize the library. Credit must be given in user-accessible documentation.
-+
-+This software is provided "AS IS." The copyright holders disclaim all warranties, either express or implied, including but not limited to implied warranties of merchantability and fitness for a particular purpose, with respect to this code and accompanying documentation.
-+
-+Although their code does not appear in the current release, the authors also wish to thank Hutchison Avenue Software Corporation for their prior contributions. 
++@include COPYING.gd
 +@end quotation
 +
  @ifset man
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-03-programname b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-03-programname
index f80ff0a5e40..2a1d4467340 100644
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-03-programname
+++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-03-programname
@@ -1,32 +1,62 @@
-diff -ur dvipng-1.14.orig/misc.c dvipng-1.14/misc.c
+diff -ur -x COPYING.gd dvipng-1.14.orig/misc.c dvipng-1.14/misc.c
 --- dvipng-1.14.orig/misc.c	2010-09-30 12:13:40.000000000 +0200
-+++ dvipng-1.14/misc.c	2010-12-30 17:41:20.000000000 +0100
-@@ -34,7 +34,7 @@
- #endif
- #include <sys/stat.h>
- 
--static char *programname;
-+static const char *programname = PACKAGE_NAME; /* just in case */
++++ dvipng-1.14/misc.c	2013-07-09 11:49:56.600160931 +0200
+@@ -47,24 +47,43 @@
+   int32_t number;            /* Temporary storage for numeric parameter */
+   char *dviname=NULL;        /* Name of dvi file               */
+   char *outname=NULL;        /* Name of output file            */
++  char *base;                /* basename of argv[0]            */
  
- /*-->DecodeArgs*/
- /*********************************************************************/
-@@ -50,17 +50,13 @@
- 
-   if (argv[0]) {
+-  if (argv[0]) {
++#ifdef HAVE_LIBKPATHSEA
++  /* we certainly don't want to modify argv[0].  */
++  programname = xstrdup (argv[0] ? argv[0] : PACKAGE_NAME);
++# ifdef HAVE_KPSE_PROGRAM_BASENAME
++  base = kpse_program_basename (programname);
++# else
++  base = xstrdup (xbasename (programname));
++  {
++    char *dot = strrchr (base, '.');
++    if (dot && FILESTRCASEEQ (dot, ".exe"))
++      *dot = 0;
++  }
++# endif
++#else
++  /* we certainly don't want to modify argv[0].  */
++  programname = strdup (argv[0] ? argv[0] : PACKAGE_NAME);
++  base = strrchr (programname, '/');
++  if (base)
++    base++;
++  else
++    base = programname;
++#endif
  #ifdef HAVE_GDIMAGEGIF
 -    programname=strrchr(argv[0],'/');
 -    if (programname!=NULL)
 -      programname++;
 -    else
 -      programname=argv[0];
-+    programname=basename(argv[0]);
-     if (strncmp(programname,"dvigif",6)==0)
-       option_flags |= GIF_OUTPUT;
+-    if (strncmp(programname,"dvigif",6)==0)
+-      option_flags |= GIF_OUTPUT;
++# ifdef HAVE_LIBKPATHSEA
++  if (FILESTRCASEEQ (base, "dvigif"))
++# else
++  if (strncmp(programname,"dvigif",6)==0)
++# endif
++    option_flags |= GIF_OUTPUT;
  #endif
-     programname=argv[0];
-     Message(BE_NONQUIET,"This is %s",programname);
+-    programname=argv[0];
+-    Message(BE_NONQUIET,"This is %s",programname);
 -    if (strcmp(basename(programname),PACKAGE_NAME)!=0)
-+    if (strcmp(basename(argv[0]),PACKAGE_NAME)!=0)
-       Message(BE_NONQUIET," (%s)", PACKAGE_NAME);
-     Message(BE_NONQUIET," %s Copyright 2002-2010 Jan-Ake Larsson\n",
- 	    PACKAGE_VERSION);
+-      Message(BE_NONQUIET," (%s)", PACKAGE_NAME);
+-    Message(BE_NONQUIET," %s Copyright 2002-2010 Jan-Ake Larsson\n",
+-	    PACKAGE_VERSION);
+-  }
++  Message(BE_NONQUIET,"This is %s",programname);
++  if (strcmp(base,PACKAGE_NAME)!=0)
++    Message(BE_NONQUIET," (%s)", PACKAGE_NAME);
++  Message(BE_NONQUIET," %s Copyright 2002-2010 Jan-Ake Larsson\n",
++	  PACKAGE_VERSION);
+ 
+   for (i=1; i<argc; i++) {
+     if (*argv[i]=='-') {
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-04-dvigif b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-04-dvigif
deleted file mode 100644
index d60569ada86..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-04-dvigif
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur dvipng-1.14.orig/configure.ac dvipng-1.14/configure.ac
---- dvipng-1.14.orig/configure.ac	2010-10-22 20:15:24.000000000 +0200
-+++ dvipng-1.14/configure.ac	2010-12-30 18:18:32.000000000 +0100
-@@ -127,7 +127,7 @@
- AC_FUNC_MMAP
- AC_FUNC_STRTOD
- AC_FUNC_VPRINTF
--AC_CHECK_FUNCS([dup2 memset munmap pow putenv strchr strrchr strtol strstr])
-+AC_CHECK_FUNCS([dup2 memset munmap pow putenv strcasecmp strchr strrchr strtol strstr])
- if test "$enable_timing" = "yes"; then
-   AC_CHECK_FUNCS([ftime gettimeofday])
- fi
-diff -ur dvipng-1.14.orig/misc.c dvipng-1.14/misc.c
---- dvipng-1.14.orig/misc.c	2010-12-30 17:41:20.000000000 +0100
-+++ dvipng-1.14/misc.c	2010-12-30 18:26:39.000000000 +0100
-@@ -51,7 +51,11 @@
-   if (argv[0]) {
- #ifdef HAVE_GDIMAGEGIF
-     programname=basename(argv[0]);
-+# if defined(HAVE_STRCASECMP) || defined(HAVE_LIBKPATHSEA)
-+    if (!strcmp(programname,"dvigif") || !strcasecmp(programname,"dvigif.exe"))
-+# else
-     if (strncmp(programname,"dvigif",6)==0)
-+# endif
-       option_flags |= GIF_OUTPUT;
- #endif
-     programname=argv[0];