diff -ru4NwbB libpng-1.2.41/png.h libpng-1.2.42beta01/png.h
--- libpng-1.2.41/png.h	2009-12-03 10:56:54.609778519 -0600
+++ libpng-1.2.42beta01/png.h	2009-12-04 10:02:09.328405573 -0600
@@ -249,8 +249,9 @@
  *    1.0.51rc01              10    10051  10.so.0.51[.0]
  *    1.2.41rc01-03           13    10241  12.so.0.41[.0]
  *    1.0.51                  10    10051  10.so.0.51[.0]
  *    1.2.41                  13    10241  12.so.0.41[.0]
+ *    1.2.42beta01            13    10242  12.so.0.42[.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 -ru4NwbB libpng-1.2.41/pngconf.h libpng-1.2.42beta01/pngconf.h
--- libpng-1.2.41/pngconf.h	2009-12-03 10:56:54.619090780 -0600
+++ libpng-1.2.42beta01/pngconf.h	2009-12-04 10:02:09.338322112 -0600
@@ -755,9 +755,8 @@
 #endif
 
 #endif /* PNG_WRITE_SUPPORTED */
 
-#define PNG_NO_ERROR_NUMBERS
 #ifndef PNG_1_0_X
 #  ifndef PNG_NO_ERROR_NUMBERS
 #    define PNG_ERROR_NUMBERS_SUPPORTED
 #  endif
diff -ru4NwbB libpng-1.2.41/projects/xcode/libpng.xcodeproj/project.pbxproj libpng-1.2.42beta01/projects/xcode/libpng.xcodeproj/project.pbxproj
--- libpng-1.2.41/projects/xcode/libpng.xcodeproj/project.pbxproj	2009-12-03 10:56:56.019362660 -0600
+++ libpng-1.2.42beta01/projects/xcode/libpng.xcodeproj/project.pbxproj	2009-12-04 10:02:10.739367908 -0600
@@ -221,9 +221,9 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 3;
 				DYLIB_CURRENT_VERSION = 3;
-				FRAMEWORK_VERSION = 1.2.41;
+				FRAMEWORK_VERSION = 1.2.42beta01;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@executable_path/../Frameworks";
@@ -239,9 +239,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 3;
 				DYLIB_CURRENT_VERSION = 3;
-				FRAMEWORK_VERSION = 1.2.41;
+				FRAMEWORK_VERSION = 1.2.42beta01;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@executable_path/../Frameworks";
diff -ru4NwbB libpng-1.2.41/scripts/makefile.darwin libpng-1.2.42beta01/scripts/makefile.darwin
--- libpng-1.2.41/scripts/makefile.darwin	2009-12-03 10:56:56.762243152 -0600
+++ libpng-1.2.42beta01/scripts/makefile.darwin	2009-12-04 10:02:11.497744136 -0600
@@ -41,9 +41,9 @@
 RANLIB=ranlib
 RM_F=/bin/rm -f
 
 # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
-CFLAGS=-DPNG_CONFIGURE_LIBPNG -I$(ZLIBINC) -W -Wall -O -funroll-loops
+CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng%N% -lz
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
diff -ru4NwbB libpng-1.2.41/scripts/makefile.netbsd libpng-1.2.42beta01/scripts/makefile.netbsd
--- libpng-1.2.41/scripts/makefile.netbsd	2009-12-03 10:56:56.944418943 -0600
+++ libpng-1.2.42beta01/scripts/makefile.netbsd	2009-12-04 10:02:11.679140548 -0600
@@ -1,20 +1,20 @@
 # makefile for libpng for NetBSD for the standard
 # make obj && make depend && make && make test
 # make includes && make install
 # Copyright (C) 2002 Patrick R.L. Welche
-# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
+# Copyright (C) 2007-2009 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
 
-# You should also run makefile.ne0bsd
+# You should also run makefile.ne%NN%bsd
 
 LOCALBASE?=/usr/local
 LIBDIR=	${LOCALBASE}/lib
 MANDIR= ${LOCALBASE}/man
-INCSDIR=${LOCALBASE}/include/libpng
+INCSDIR=${LOCALBASE}/include
 
 LIB=	png
 SHLIB_MAJOR=	3
 SHLIB_MINOR=	1.2.42beta01
diff -ru4NwbB libpng-1.2.41/scripts/makefile.openbsd libpng-1.2.42beta01/scripts/makefile.openbsd
--- libpng-1.2.41/scripts/makefile.openbsd	2009-12-03 10:56:56.968637324 -0600
+++ libpng-1.2.42beta01/scripts/makefile.openbsd	2009-12-04 10:02:11.699438626 -0600
@@ -1,7 +1,7 @@
 # makefile for libpng
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# Copyright (C) 2007-2008 Glenn Randers-Pehrson
+# Copyright (C) 2007-2009 Glenn Randers-Pehrson
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
 # and license in png.h
@@ -41,9 +41,9 @@
 		LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
 
 beforeinstall:
 	if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
-	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include/libpng; \
+	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \
 	fi
 	if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
 	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
 	fi
@@ -66,9 +66,9 @@
 	@rm -f ${DESTDIR}${PREFIX}/include/png.h
 	@rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
 	@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
 	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
-		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng
+		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
 	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
 		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
 	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
 		-m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
diff -ru4NwbB libpng-1.2.41/scripts/makefile.sco libpng-1.2.42beta01/scripts/makefile.sco
--- libpng-1.2.41/scripts/makefile.sco	2009-12-03 10:56:56.990945694 -0600
+++ libpng-1.2.42beta01/scripts/makefile.sco	2009-12-04 10:02:11.719556627 -0600
@@ -43,9 +43,9 @@
 
 CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng%N% -lz -lm
 
-INCPATH=$(prefix)/include/libpng
+INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
 MANPATH=$(prefix)/man
 BINPATH=$(exec_prefix)/bin