diff -ru4NwbB libpng-1.5.10/png.h libpng-1.5.11rc01/png.h
--- libpng-1.5.10/png.h	2012-03-29 00:06:54.479097811 -0500
+++ libpng-1.5.11rc01/png.h	2012-05-22 15:47:43.030551134 -0500
@@ -173,8 +173,10 @@
  *    1.5.9rc01               15    10509  15.so.15.9[.0]
  *    1.5.9                   15    10509  15.so.15.9[.0]
  *    1.5.10beta01-05         15    10510  15.so.15.10[.0]
  *    1.5.10                  15    10510  15.so.15.10[.0]
+ *    1.5.11beta01            15    10511  15.so.15.11[.0]
+ *    1.5.11rc01              15    10511  15.so.15.11[.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.5.10/pngpread.c libpng-1.5.11rc01/pngpread.c
--- libpng-1.5.10/pngpread.c	2012-03-29 00:06:54.567379144 -0500
+++ libpng-1.5.11rc01/pngpread.c	2012-05-22 15:47:43.118322046 -0500
@@ -1,8 +1,8 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.5.9 [February 18, 2012]
+ * Last changed in libpng 1.5.11 [(PENDING RELEASE)]
  * Copyright (c) 1998-2012 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff -ru4NwbB libpng-1.5.10/pngpriv.h libpng-1.5.11rc01/pngpriv.h
--- libpng-1.5.10/pngpriv.h	2012-03-29 00:06:54.496932731 -0500
+++ libpng-1.5.11rc01/pngpriv.h	2012-05-22 15:47:43.048256455 -0500
@@ -1258,12 +1258,10 @@
 PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
     png_uint_32 length));
 #endif
 
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
     png_infop info_ptr, png_uint_32 length));
-#endif
 
 PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
     png_uint_32 chunk_name));
 
diff -ru4NwbB libpng-1.5.10/pngset.c libpng-1.5.11rc01/pngset.c
--- libpng-1.5.10/pngset.c	2012-03-29 00:06:54.637034941 -0500
+++ libpng-1.5.11rc01/pngset.c	2012-05-22 15:47:43.176018301 -0500
@@ -1290,10 +1290,12 @@
       png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;
 }
 #endif /* PNG_BENIGN_ERRORS_SUPPORTED */
 
-#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   /* Do not report invalid palette index; added at libng-1.5.10 */
+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+/* Whether to report invalid palette index; added at libng-1.5.10
+ *   allowed  - one of 0: disable; 1: enable
+ */
 void PNGAPI
 png_set_check_for_invalid_index(png_structp png_ptr, int allowed)
 {
    png_debug(1, "in png_set_check_for_invalid_index");
diff -ru4NwbB libpng-1.5.10/scripts/makefile.darwin libpng-1.5.11rc01/scripts/makefile.darwin
--- libpng-1.5.10/scripts/makefile.darwin	2012-03-29 00:06:56.508167982 -0500
+++ libpng-1.5.11rc01/scripts/makefile.darwin	2012-05-22 15:47:44.809719033 -0500
@@ -14,12 +14,10 @@
 prefix=/usr/local
 exec_prefix=$(prefix)
 
 # Where the zlib library and include files are located
-#ZLIBLIB=/usr/local/lib
-#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
+ZLIBLIB=/usr/lib
+ZLIBINC=/usr/include
 
 # Library name:
 LIBNAME = libpng%NN%
 PNGMAJ = %NN%
@@ -36,9 +34,9 @@
 MKDIR_P=mkdir -p
 LN_SF=ln -sf
 RANLIB=ranlib
 RM_F=/bin/rm -f
-ARCH="-arch i386 -arch x86_64"
+ARCH=-arch ppc -arch i386 -arch x86_64
 
 # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops
 CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops $(ARCH)
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng%NN% -lz $(ARCH)
@@ -106,9 +104,9 @@
 $(LIBSOMAJ): $(OBJSDLL)
 	$(CC) -dynamiclib \
 	 -install_name $(LIBPATH)/$(LIBSOMAJ) \
 	 -current_version %SONUM% -compatibility_version %SONUM% \
-	 -o $(LIBSOMAJ) \
+ 	 $(ARCH) -o $(LIBSOMAJ) \
 	 $(OBJSDLL) -L$(ZLIBLIB) -lz
 
 pngtest: pngtest.o $(LIBSO)
 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -135,12 +133,12 @@
 
 install-shared: install-headers $(LIBSOMAJ) libpng.pc
 	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
 	-@$(RM_F) $(DL)/$(LIBSO)
-	-@$(RM_F) $(DL)/$(LIBSOREL)
+	-@$(RM_F) $(DL)/$(LIBSOMAJ)
 	-@$(RM_F) $(DL)/$(OLDSO)
-	cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
-	chmod 755 $(DL)/$(LIBSOREL)
+	cp $(LIBSOMAJ) $(DL)
+	chmod 755 $(DL)/$(LIBSOMAJ)
 	(cd $(DL); \
 	$(LN_SF) $(LIBSOREL) $(LIBSO); \
 	$(LN_SF) $(LIBSO) $(OLDSO))
 	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
diff -ru4NwbB libpng-1.5.10/scripts/makefile.freebsd libpng-1.5.11rc01/scripts/makefile.freebsd
--- libpng-1.5.10/scripts/makefile.freebsd	2012-03-29 00:06:56.550848864 -0500
+++ libpng-1.5.11rc01/scripts/makefile.freebsd	2012-05-22 15:47:44.850502767 -0500
@@ -10,10 +10,10 @@
 
 LIB=		png
 SHLIB_MAJOR=	${SHLIB_VER}
 SHLIB_MINOR=	0
-NOPROFILE=	YES
-NOOBJ=          YES
+NO_PROFILE=	YES
+NO_OBJ=          YES
 
 # where make install puts libpng.a and png.h
 DESTDIR=	${PREFIX}
 LIBDIR=		/lib
@@ -24,9 +24,12 @@
 MANDIR=		/man/man
 SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
 		libpng/pngconf.h ${INCSDIR}/../pngconf.h \
 		libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
+
 LDADD+=         -lm -lz
+#LDADD+=         -lm -lz -lssp_nonshared   # for OSVERSION >= 800000 ?
+
 DPADD+=         ${LIBM} ${LIBZ}
 
 CFLAGS+= -I.