diff -ru4N libpng-1.2.28/Makefile.am libpng-1.2.30beta01/Makefile.am
--- libpng-1.2.28/Makefile.am	2008-04-30 12:36:23.005569826 -0500
+++ libpng-1.2.30beta01/Makefile.am	2008-05-29 12:44:03.126928744 -0500
@@ -110,11 +110,11 @@
 	mv $@.new $@
 
 libpng.vers: libpng.sym
 	rm -f $@ $@.new
-	$(ECHO) PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0 '{global:' > $@.new
+	echo PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0 '{global:' > $@.new
 	$(SED) s/$$/\;/ libpng.sym >> $@.new
-	$(ECHO) 'local: *; };' >> $@.new
+	echo 'local: *; };' >> $@.new
 	mv $@.new $@
 
 test: check
 
diff -ru4N libpng-1.2.28/autogen.sh libpng-1.2.30beta01/autogen.sh
--- libpng-1.2.28/autogen.sh	2008-05-02 06:18:04.700713287 -0500
+++ libpng-1.2.30beta01/autogen.sh	2008-05-29 12:44:03.143520897 -0500
@@ -6,18 +6,18 @@
 # of the tools which are used and, maybe, required!
         touch Makefile.am configure.ac
 {
 	echo "running libtoolize" >&2
-	libtoolize --copy --automake
+	libtoolize --force --copy --automake
 } && {
 	echo "running aclocal" >&2
 	aclocal
 } && {
 	echo "running autoheader [ignore the warnings]" >&2
 	autoheader
 } && {
 	echo "running automake" >&2
-	automake --foreign -a -c
+	automake --force-missing --foreign -a -c
 } && {
 	echo "running autoconf" >&2
 	autoconf
 } &&
diff -ru4N libpng-1.2.28/png.h libpng-1.2.30beta01/png.h
--- libpng-1.2.28/png.h	2008-04-30 12:36:00.065757228 -0500
+++ libpng-1.2.30beta01/png.h	2008-05-29 12:43:39.546030915 -0500
@@ -187,8 +187,14 @@
  *    1.0.33                  10    10033  10.so.0.33[.0]
  *    1.2.27                  13    10227  12.so.0.27[.0]
  *    1.0.34                  10    10034  10.so.0.34[.0]
  *    1.2.28                  13    10228  12.so.0.28[.0]
+ *    1.2.29beta01-03         13    10229  12.so.0.29[.0]
+ *    1.2.29rc01              13    10229  12.so.0.29[.0]
+ *    1.0.35                  10    10035  10.so.0.35[.0]
+ *    1.2.29                  13    10229  12.so.0.29[.0]
+ *    1.0.37                  10    10037  10.so.0.37[.0]
+ *    1.2.30beta01            13    10230  12.so.0.30[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
  *    used for changes in backward compatibility, as it is intended.  The
diff -ru4N libpng-1.2.28/pnggccrd.c libpng-1.2.30beta01/pnggccrd.c
--- libpng-1.2.28/pnggccrd.c	2008-04-30 12:36:00.211450145 -0500
+++ libpng-1.2.30beta01/pnggccrd.c	2008-05-29 12:43:39.685085146 -0500
@@ -1,10 +1,12 @@
 /* pnggccrd.c was removed from libpng-1.2.20. */
 
 /* This code snippet is for use by configure's compilation test. */
 
-#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
+#if (!defined _MSC_VER) && \
+    defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
     defined(PNG_MMX_CODE_SUPPORTED)
+
 int PNGAPI png_dummy_mmx_support(void);
 
 static int _mmx_supported = 2; // 0: no MMX; 1: MMX supported; 2: not tested
 
diff -ru4N libpng-1.2.28/scripts/libpng-config.in libpng-1.2.30beta01/scripts/libpng-config.in
--- libpng-1.2.28/scripts/libpng-config.in	2007-01-04 13:00:25.000000000 -0600
+++ libpng-1.2.30beta01/scripts/libpng-config.in	2008-05-29 12:37:58.557431000 -0500
@@ -13,9 +13,9 @@
 exec_prefix="@exec_prefix@"
 libdir="@libdir@"
 includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
 libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ -lz -lm"
+all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
 I_opts="-I${includedir}"
 L_opts="-L${libdir}"
 R_opts=""
 cppflags=""
diff -ru4N libpng-1.2.28/scripts/libpng.pc-configure.in libpng-1.2.30beta01/scripts/libpng.pc-configure.in
--- libpng-1.2.28/scripts/libpng.pc-configure.in	2008-04-30 12:36:03.303691173 -0500
+++ libpng-1.2.30beta01/scripts/libpng.pc-configure.in	2008-05-29 12:39:19.138226000 -0500
@@ -1,10 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/libpng%N%
+includedir=@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.2.30beta01
-Libs: -L${libdir} -lpng%N%
+Version: @PNGLIB_VERSION@
+Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
+Libs.private: @LIBS@
 Cflags: -I${includedir} @LIBPNG_NO_MMX@