dvipng: Use kpse_program_basename()

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

21 files changed, 283 insertions, 225 deletions

diff --git a/Build/source/texk/dvipng/config.h.in b/Build/source/texk/dvipng/config.h.in
index e3d93dc7d1d..240ccb9b567 100644
--- a/Build/source/texk/dvipng/config.h.in
+++ b/Build/source/texk/dvipng/config.h.in
@@ -100,6 +100,9 @@
 /* Define to 1 if your kpathsea has kpse_enc_format. */
 #undef HAVE_KPSE_ENC_FORMATS
 
+/* Define to 1 if you have the `kpse_program_basename' function. */
+#undef HAVE_KPSE_PROGRAM_BASENAME
+
 /* Define to 1 if you have the `gd' library (-lgd). */
 #undef HAVE_LIBGD
 
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 50cf85a4fa1..752b6637acf 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -16404,6 +16404,18 @@ else
 fi
 
 
+for ac_func in kpse_program_basename
+do :
+  ac_fn_c_check_func "$LINENO" "kpse_program_basename" "ac_cv_func_kpse_program_basename"
+if test "x$ac_cv_func_kpse_program_basename" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_KPSE_PROGRAM_BASENAME 1
+_ACEOF
+
+fi
+done
+
+
 # We need enc, cmap, and sfd formats.
 # Introduced together with opentype format (Dec 2003).
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether kpathsea declares the kpse_opentype_format" >&5
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 4b736398873..5a42a748d86 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -132,6 +132,8 @@ AC_CHECK_FUNC([kpse_set_program_name],
                          [Define to 1 if you have the `kpathsea' library (-lkpathsea).])],
               [AC_MSG_ERROR([cannot find/use libkpathsea])])
 
+AC_CHECK_FUNCS([kpse_program_basename])
+
 # We need enc, cmap, and sfd formats.
 # Introduced together with opentype format (Dec 2003).
 KPSE_CHECK_KPSE_FORMAT([opentype],
diff --git a/Build/source/texk/dvipng/doc/COPYING.gd b/Build/source/texk/dvipng/doc/COPYING.gd
new file mode 100644
index 00000000000..4a91420256e
--- /dev/null
+++ b/Build/source/texk/dvipng/doc/COPYING.gd
@@ -0,0 +1,53 @@
+ 
+     Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+     2002 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 by
+     Boutell.Com, Inc. 
+
+     Portions relating to GD2 format copyright 1999, 2000, 2001, 2002
+     Philip Warner.
+     
+     Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg
+     Roelofs. 
+
+     Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John  
+     Ellson (ellson@@lucent.com).
+   
+     Portions relating to gdft.c copyright 2001, 2002 John Ellson  
+     (ellson@@lucent.com).  
+
+     Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+		 Pierre-Alain Joye (pierre@@libgd.org).  
+
+     Portions relating to JPEG and to color quantization copyright 2000,
+     2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997,
+     1998, 1999, 2000, 2001, 2002, 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 WBMP copyright 2000, 2001, 2002 Maurice
+     Szmurlo and Johan Van den Brande.
+
+     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 gd, the authors wish to thank
+     David Koblas, David Rowley, and Hutchison Avenue Software Corporation
+     for their prior contributions.
+
diff --git a/Build/source/texk/dvipng/doc/Makefile.am b/Build/source/texk/dvipng/doc/Makefile.am
index a0deb0c362c..6cf506627fc 100644
--- a/Build/source/texk/dvipng/doc/Makefile.am
+++ b/Build/source/texk/dvipng/doc/Makefile.am
@@ -1,15 +1,16 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipng/doc/
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 #
 info_TEXINFOS = \
 	dvipng.texi
 dvipng_TEXINFOS = \
-	readme.texi \
+	COPYING.gd \
+	dvipng.help \
 	install.texi \
 	macros.texi \
-	dvipng.help
+	readme.texi
 
 BUILT_SOURCES = doc-stamp
 
diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in
index ba8fc30f957..41b11163195 100644
--- a/Build/source/texk/dvipng/doc/Makefile.in
+++ b/Build/source/texk/dvipng/doc/Makefile.in
@@ -346,10 +346,11 @@ info_TEXINFOS = \
 	dvipng.texi
 
 dvipng_TEXINFOS = \
-	readme.texi \
+	COPYING.gd \
+	dvipng.help \
 	install.texi \
 	macros.texi \
-	dvipng.help
+	readme.texi
 
 BUILT_SOURCES = doc-stamp
 dist_noinst_SCRIPTS = texi2pod.pl
diff --git a/Build/source/texk/dvipng/doc/dvipng.1 b/Build/source/texk/dvipng/doc/dvipng.1
index 934a7c9aac5..e57ca8aa9ce 100644
--- a/Build/source/texk/dvipng/doc/dvipng.1
+++ b/Build/source/texk/dvipng/doc/dvipng.1
@@ -1,15 +1,7 @@
-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05)
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.20)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
 .de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
@@ -53,7 +45,7 @@
 .el       .ds Aq '
 .\"
 .\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
 .ie \nF \{\
@@ -132,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DVIPNG 1"
-.TH DVIPNG 1 "2010-12-15" "dvipng 1.14" "User commands"
+.TH DVIPNG 1 "2013-07-09" "dvipng (TeX Live) 1.14" "User commands"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/Build/source/texk/dvipng/doc/dvipng.help b/Build/source/texk/dvipng/doc/dvipng.help
index 207fa5cd592..251ab8823c1 100644
--- a/Build/source/texk/dvipng/doc/dvipng.help
+++ b/Build/source/texk/dvipng/doc/dvipng.help
@@ -1,4 +1,4 @@
-This is ./dvipng (dvipng (TeX Live)) 1.14 Copyright 2002-2010 Jan-Ake Larsson
+This is ./dvipng (TeX Live) 1.14 Copyright 2002-2010 Jan-Ake Larsson
 
 Usage: ./dvipng [OPTION]... FILENAME[.dvi]
 Options are chosen to be similar to dvips' options where possible:
diff --git a/Build/source/texk/dvipng/doc/dvipng.info b/Build/source/texk/dvipng/doc/dvipng.info
index 234afe9ff7a..c1062fb6d72 100644
--- a/Build/source/texk/dvipng/doc/dvipng.info
+++ b/Build/source/texk/dvipng/doc/dvipng.info
@@ -324,7 +324,7 @@ File: dvipng.info,  Node: Option summary,  Next: Option details,  Up: Command-li
 Here is a handy summary of the options; it is printed out when you run
 dvipng with no arguments or with the standard '--help' option.
 
-     This is ./dvipng (dvipng (TeX Live)) 1.14 Copyright 2002-2010 Jan-Ake Larsson
+     This is ./dvipng (TeX Live) 1.14 Copyright 2002-2010 Jan-Ake Larsson
 
      Usage: ./dvipng [OPTION]... FILENAME[.dvi]
      Options are chosen to be similar to dvips' options where possible:
@@ -991,44 +991,35 @@ Kotucha, Takeshi Abe, and Waldeck Schutzer.
 notice, which applies to the 'gd' library:
 
      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.
+     2002 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 copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 by
+     Boutell.Com, Inc.
 
-     Portions relating to GD2 format copyright 1999, 2000, 2001, 2002,
-     2003, 2004 Philip Warner.
+     Portions relating to GD2 format copyright 1999, 2000, 2001, 2002
+     Philip Warner.
 
-     Portions relating to PNG copyright 1999, 2000, 2001, 2002, 2003,
-     2004 Greg Roelofs.
+     Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg
+     Roelofs.
 
-     Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002,
-     2003, 2004 John Ellson (ellson@graphviz.org).
+     Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John
+     Ellson (ellson@lucent.com).
 
-     Portions relating to gdft.c copyright 2001, 2002, 2003, 2004 John
-     Ellson (ellson@graphviz.org).
+     Portions relating to gdft.c copyright 2001, 2002 John Ellson
+     (ellson@lucent.com).
 
-     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 copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Pierre-Alain Joye (pierre@libgd.org).
 
-     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 JPEG and to color quantization copyright 2000,
+     2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997,
+     1998, 1999, 2000, 2001, 2002, 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 animations copyright 2004 Jaakko Hyva"dtti
-     (jaakko.hyvatti@iki.fi)
+     Portions relating to WBMP copyright 2000, 2001, 2002 Maurice
+     Szmurlo and Johan Van den Brande.
 
      Permission has been granted to copy, distribute and modify gd in
      any context without fee, including a commercial application,
@@ -1047,9 +1038,9 @@ notice, which applies to the 'gd' library:
      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.
+     Although their code does not appear in gd, the authors wish to
+     thank David Koblas, David Rowley, and Hutchison Avenue Software
+     Corporation for their prior contributions.
 
 
 File: dvipng.info,  Node: Copying,  Next: Index,  Prev: Credits,  Up: Top
@@ -1172,19 +1163,19 @@ Node: Advice for non-privileged users9556
 Node: Basic usage10567
 Node: Command-line options11720
 Node: Option summary12143
-Node: Option details14535
-Node: Graphics30498
-Node: Encapsulated PostScript31253
-Node: Bitmapped graphics32603
-Node: Raw PostScript33831
-Node: Color36084
-Node: Color specifications36495
-Node: Color specials37598
-Node: Diagnosing problems39015
-Node: Contact information39499
-Node: Debug options40227
-Node: Credits41238
-Node: Copying45247
-Node: Index46028
+Node: Option details14526
+Node: Graphics30489
+Node: Encapsulated PostScript31244
+Node: Bitmapped graphics32594
+Node: Raw PostScript33822
+Node: Color36075
+Node: Color specifications36486
+Node: Color specials37589
+Node: Diagnosing problems39006
+Node: Contact information39490
+Node: Debug options40218
+Node: Credits41229
+Node: Copying44830
+Node: Index45611
 
 End Tag Table
diff --git a/Build/source/texk/dvipng/doc/dvipng.texi b/Build/source/texk/dvipng/doc/dvipng.texi
index 0ceb68b301f..0235c349b4b 100644
--- a/Build/source/texk/dvipng/doc/dvipng.texi
+++ b/Build/source/texk/dvipng/doc/dvipng.texi
@@ -958,35 +958,7 @@ Use of the @code{gd} library requires inclusion of the following
 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/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];
diff --git a/Build/source/texk/dvipng/dvipng-1.14/COPYING.gd b/Build/source/texk/dvipng/dvipng-1.14/COPYING.gd
new file mode 100644
index 00000000000..4a91420256e
--- /dev/null
+++ b/Build/source/texk/dvipng/dvipng-1.14/COPYING.gd
@@ -0,0 +1,53 @@
+ 
+     Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+     2002 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 by
+     Boutell.Com, Inc. 
+
+     Portions relating to GD2 format copyright 1999, 2000, 2001, 2002
+     Philip Warner.
+     
+     Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg
+     Roelofs. 
+
+     Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John  
+     Ellson (ellson@@lucent.com).
+   
+     Portions relating to gdft.c copyright 2001, 2002 John Ellson  
+     (ellson@@lucent.com).  
+
+     Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+		 Pierre-Alain Joye (pierre@@libgd.org).  
+
+     Portions relating to JPEG and to color quantization copyright 2000,
+     2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997,
+     1998, 1999, 2000, 2001, 2002, 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 WBMP copyright 2000, 2001, 2002 Maurice
+     Szmurlo and Johan Van den Brande.
+
+     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 gd, the authors wish to thank
+     David Koblas, David Rowley, and Hutchison Avenue Software Corporation
+     for their prior contributions.
+
diff --git a/Build/source/texk/dvipng/dvipng-1.14/configure.ac b/Build/source/texk/dvipng/dvipng-1.14/configure.ac
index 5b8c70792e1..0630bb136a4 100644
--- a/Build/source/texk/dvipng/dvipng-1.14/configure.ac
+++ b/Build/source/texk/dvipng/dvipng-1.14/configure.ac
@@ -127,7 +127,7 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_FUNC_STRTOD
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([dup2 memset munmap pow putenv strcasecmp strchr strrchr strtol strstr])
+AC_CHECK_FUNCS([dup2 memset munmap pow putenv strchr strrchr strtol strstr])
 if test "$enable_timing" = "yes"; then
   AC_CHECK_FUNCS([ftime gettimeofday])
 fi
diff --git a/Build/source/texk/dvipng/dvipng-1.14/dvipng.texi b/Build/source/texk/dvipng/dvipng-1.14/dvipng.texi
index 0ceb68b301f..0235c349b4b 100644
--- a/Build/source/texk/dvipng/dvipng-1.14/dvipng.texi
+++ b/Build/source/texk/dvipng/dvipng-1.14/dvipng.texi
@@ -958,35 +958,7 @@ Use of the @code{gd} library requires inclusion of the following
 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/misc.c b/Build/source/texk/dvipng/dvipng-1.14/misc.c
index 42528767070..d13dfcd3a76 100644
--- a/Build/source/texk/dvipng/dvipng-1.14/misc.c
+++ b/Build/source/texk/dvipng/dvipng-1.14/misc.c
@@ -34,7 +34,7 @@
 #endif
 #include <sys/stat.h>
 
-static const char *programname = PACKAGE_NAME; /* just in case */
+static char *programname;
 
 /*-->DecodeArgs*/
 /*********************************************************************/
@@ -47,24 +47,43 @@ bool DecodeArgs(int argc, char ** argv)
   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]            */
 
-  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=basename(argv[0]);
-# if defined(HAVE_STRCASECMP) || defined(HAVE_LIBKPATHSEA)
-    if (!strcmp(programname,"dvigif") || !strcasecmp(programname,"dvigif.exe"))
+# ifdef HAVE_LIBKPATHSEA
+  if (FILESTRCASEEQ (base, "dvigif"))
 # else
-    if (strncmp(programname,"dvigif",6)==0)
+  if (strncmp(programname,"dvigif",6)==0)
 # endif
-      option_flags |= GIF_OUTPUT;
+    option_flags |= GIF_OUTPUT;
 #endif
-    programname=argv[0];
-    Message(BE_NONQUIET,"This is %s",programname);
-    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,"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/help/Makefile.am b/Build/source/texk/dvipng/help/Makefile.am
index 6e61490c65f..b9e7f8aea7d 100644
--- a/Build/source/texk/dvipng/help/Makefile.am
+++ b/Build/source/texk/dvipng/help/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipng/help/
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 DVIPNG_HELP = $(top_srcdir)/doc/dvipng.help
@@ -10,13 +10,13 @@ all-local: help-stamp $(DVIPNG_HELP)
 # If dvipng.help is to be rebuilt, this would fail for a read-only source
 # directory, but rebuilding dvipng.info would equally fail.
 # Do not even try to rebuild dvipng.help if help-stamp is up to date.
-$(DVIPNG_HELP):
-	$(MAKE) $(AM_MAKEFLAGS) help-stamp
+$(DVIPNG_HELP): help-stamp
 help-stamp: ../dvipng$(EXEEXT)
 if !cross
 	-(cd .. && ./dvipng$(EXEEXT)) | \
 	  sed -e's/dvipng.exe/dvipng/' \
 	      -e's/ (dvipng) / /' \
+	      -e's/ (dvipng (TeX Live)) / (TeX Live) /' \
 	      -e's,/lt-dvipng ,/dvipng ,' \
 	      -e's,^This is .*/dvipng ,This is ./dvipng ,' \
 	      -e's,^Usage: .*/dvipng ,Usage: ./dvipng ,' > dvipng.tmp
diff --git a/Build/source/texk/dvipng/help/Makefile.in b/Build/source/texk/dvipng/help/Makefile.in
index c1db25194f4..5443a1251b0 100644
--- a/Build/source/texk/dvipng/help/Makefile.in
+++ b/Build/source/texk/dvipng/help/Makefile.in
@@ -463,12 +463,12 @@ all-local: help-stamp $(DVIPNG_HELP)
 # If dvipng.help is to be rebuilt, this would fail for a read-only source
 # directory, but rebuilding dvipng.info would equally fail.
 # Do not even try to rebuild dvipng.help if help-stamp is up to date.
-$(DVIPNG_HELP):
-	$(MAKE) $(AM_MAKEFLAGS) help-stamp
+$(DVIPNG_HELP): help-stamp
 help-stamp: ../dvipng$(EXEEXT)
 @cross_FALSE@	-(cd .. && ./dvipng$(EXEEXT)) | \
 @cross_FALSE@	  sed -e's/dvipng.exe/dvipng/' \
 @cross_FALSE@	      -e's/ (dvipng) / /' \
+@cross_FALSE@	      -e's/ (dvipng (TeX Live)) / (TeX Live) /' \
 @cross_FALSE@	      -e's,/lt-dvipng ,/dvipng ,' \
 @cross_FALSE@	      -e's,^This is .*/dvipng ,This is ./dvipng ,' \
 @cross_FALSE@	      -e's,^Usage: .*/dvipng ,Usage: ./dvipng ,' > dvipng.tmp