Update to 1.2.9:

Changes since the last public release (1.2.8):

version 1.2.9 [April 14, 2006]
  Initialized some structure members in pngwutil.c to avoid gcc-4.0.0 complaints
  Fixed an incorrect typecast in pngrutil.c
  Added PNG_NO_READ_SUPPORTED conditionals for making a write-only library.
  Added PNG_NO_WRITE_INTERLACING_SUPPORTED conditional.
  Optimized alpha-inversion loops in pngwtran.c
  Moved test for nonzero gamma outside of png_build_gamma_table() in pngrtran.c
  Make sure num_trans is <= 256 before copying data in png_set_tRNS().
  Make sure num_palette is <= 256 before copying data in png_set_PLTE().
  Interchanged order of write_swap_alpha and write_invert_alpha transforms.
  Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin).
  Exported png_get_uint_32, png_save_uint_32, png_get_uint_16, png_save_uint_16,
    png_get_int_32, png_save_int_32, png_get_uint_31 (Cosmin).
  Added parentheses in the definition of PNG_LIBPNG_BUILD_TYPE (Cosmin).
  Added type cast (png_byte) in png_write_sCAL() (Cosmin).
  Fixed scripts/makefile.cygwin (Cosmin).
  Updated scripts/makefile.bc32 for Borland C++ 5.6 (Cosmin).
  Updated scripts/pngos2.def, scripts/pngw32.def (Cosmin).
  Updated references to png-mng-implement mailing list.
  Revised man page and libpng.txt to make it clear that one should not call
    png_read_end or png_write_end after png_read_png or png_write_png.
  Optimized zlib window flag (CINFO) in contrib/pngsuite/*.png (Cosmin).
  Check for png_rgb_to_gray and png_gray_to_rgb read transformations before
    checking for png_read_dither in pngrtran.c
  Revise checking of chromaticity limits to accommodate extended RGB
    colorspace (John Denker).
  Changed line endings in some of the project files to CRLF, even in the
    "Unix" tar distributions (Cosmin).
  Make png_get_int_32 and png_save_int_32 always available (Cosmin).
  Updated scripts/pngos2.def, scripts/pngw32.def and projects/wince/png32ce.def
    with the newly exported functions.
  Eliminated distributions without the "configure" script.
  Updated INSTALL instructions.
  Make libpng.pc respect EXEC_PREFIX (D.P.Kreil)
  Remove reference to pngasmrd.h from Makefile.am
  Change definition of PKGCONFIG from $prefix/lib to $libdir in configure.ac
  Removed newline from the end of some error and warning messages.
  Removed test for sqrt() from configure.ac and configure.
  Made swap tables in pngtrans.c PNG_CONST (Carlo Bramix).
  Added "OS2" to list of systems that don't need underscores, in pnggccrd.c
  Removed libpng version and date from *.c files.
  Removed trailing blanks from source files.
  Put version and date of latest change in each source file, and changed
    copyright year accordingly.
  Restored scripts/makefile.elf which was inadvertently deleted.
  Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am
  Fixed inconsistent #ifdef's around png_sig_bytes() and png_set_sCAL_s()
    in png.h.
  Updated makefile.elf as suggested by debian.
  Added LN_SF, MKDIR_P, and other macros to some of the makefiles.
  Made some makefiles accept "exec_prefix".
  Simplified some makefiles by using LIBSO, LIBSOMAJ, and LIBSOVER macros.
  Fixed some "#ifdef defined (..." which should be "#ifdef defined(..."
    Bug introduced in libpng-1.2.8.
  Fixed inconsistency in definition of png_default_read_data()
  Revised calculation of "current" and "major" for irix in ltmain.sh
  Separated PNG_EXPAND and PNG_EXPAND_tRNS.
  Added png_set_expand_gray_1_2_4_to_8() and deprecated
    png_set_gray_1_2_4_to_8() which also expands tRNS to alpha.
  Include "config.h" in pngconf.h when available.
  Added some checks for NULL png_ptr or NULL info_ptr (Coverity)
  Made pnggccrd.c PIC-compliant (Christian Aichinger).
  Added makefile.mingw (Wolfgang Glas)
  Revised pngconf.h MMX checking.
  Defined PNG_USER_PRIVATEBUILD when including "pngusr.h" (Cosmin).
  Removed nonsensical assertion check from pngtest.c (Cosmin).
  Revised makefile.beos and added "none" selector in ltmain.sh

6 files changed, 59 insertions, 49 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index f4796c7f161..fc2af969266 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2005/12/27 17:34:53 reed Exp $
+# $NetBSD: Makefile,v 1.74 2006/04/16 19:39:46 wiz Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
-DISTNAME=	libpng-1.2.8
+DISTNAME=	libpng-1.2.9
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
@@ -22,7 +22,7 @@ USE_LIBTOOL=	yes
 TEST_TARGET=	test
 
 LIBPNG_SO_MAJOR=	3
-LIBPNG_SO_MINOR=	2
+LIBPNG_SO_MINOR=	3
 
 MAKEFILE=	scripts/makefile.std
 MAKE_ENV+=	REALCC=${CC:Q}
@@ -37,7 +37,7 @@ SUBST_CLASSES+=		pc
 SUBST_STAGE.pc=		post-patch
 SUBST_FILES.pc=		scripts/libpng.pc.in
 SUBST_SED.pc=		-e 's,@PREFIX@,${PREFIX},'
-SUBST_MESSAGE.pc=	"Fixing libpng.pc.in."
+SUBST_MESSAGE.pc=	Fixing libpng.pc.in.
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/${PKGMANDIR}/man3
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 0da284d8fc7..d74825598ba 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2005/02/24 08:45:11 agc Exp $
+$NetBSD: distinfo,v 1.26 2006/04/16 19:39:46 wiz Exp $
 
-SHA1 (libpng-1.2.8.tar.bz2) = b6d73493eea4095166118b298efecb54a8e3d2f5
-RMD160 (libpng-1.2.8.tar.bz2) = 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c
-Size (libpng-1.2.8.tar.bz2) = 384970 bytes
-SHA1 (patch-aa) = 0b3d28e526f8d1530e82c30be46aea19e5a32d6a
-SHA1 (patch-ab) = 95de0ebcb6ac2a381291b91623388ff9907d939f
-SHA1 (patch-ad) = ab818a80ee084075130110f7500e24e5e82b9ef3
-SHA1 (patch-ae) = 757a514ccd6ec035a4faacfe95ec27584d33177f
+SHA1 (libpng-1.2.9.tar.bz2) = ee9b8b1d42b855561a6fddd1b98963f345c40254
+RMD160 (libpng-1.2.9.tar.bz2) = fb00f7776639bf55446a0be87d38261859825efb
+Size (libpng-1.2.9.tar.bz2) = 618689 bytes
+SHA1 (patch-aa) = bdfc304e4113383d56f656772789e3774969169f
+SHA1 (patch-ab) = 979175c65587686b339a5556e8bcae3be95a07ca
+SHA1 (patch-ad) = 0ad974fb163e2f8800b3501767b3fd26ffc129c5
+SHA1 (patch-ae) = 6e7b05808ffe1c0fb05569a0141f0d6a487eaed6
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index a32b7239941..3b960523098 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.22 2004/04/27 22:40:35 tv Exp $
+$NetBSD: patch-aa,v 1.23 2006/04/16 19:39:46 wiz Exp $
 
---- scripts/makefile.std.orig	Thu May 23 08:29:59 2002
+--- scripts/makefile.std.orig	2006-03-06 17:06:28.000000000 +0000
 +++ scripts/makefile.std
 @@ -4,7 +4,7 @@
  # For conditions of distribution and use, see copyright notice in png.h
@@ -11,20 +11,24 @@ $NetBSD: patch-aa,v 1.22 2004/04/27 22:40:35 tv Exp $
  INCPATH=$(prefix)/include
  LIBPATH=$(prefix)/lib
  
-@@ -24,9 +24,9 @@
+@@ -24,45 +24,34 @@ DESTDIR=
  ZLIBLIB=../zlib
  ZLIBINC=../zlib
  
 -CC=cc
++CC=${LIBTOOL} --mode=compile ${REALCC}
+ AR_RC=ar rc
+ MKDIR_P=mkdir
+ LN_SF=ln -sf
+ RANLIB=ranlib
+ RM_F=rm -f
+ 
 -CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-+CC=${LIBTOOL} --mode=compile $(REALCC)
-+#CFLAGS+=-O # -g -DPNG_DEBUG=5
++#CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 +#LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
  
- #RANLIB=echo
- RANLIB=ranlib
-@@ -35,31 +35,20 @@
+ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
  	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
  	pngwtran.o pngmem.o pngerror.o pngpread.o
  
@@ -32,13 +36,14 @@ $NetBSD: patch-aa,v 1.22 2004/04/27 22:40:35 tv Exp $
 +all: libpng.la pngtest
  
 -libpng.a: $(OBJS)
--	ar rc $@  $(OBJS)
+-	$(AR_RC) $@  $(OBJS)
 -	$(RANLIB) $@
-+libpng.la: $(OBJS)
-+	${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath $(LIBPATH) ${LDFLAGS} -lz -lm -version-info ${LIBPNG_SO_MAJOR}:${LIBPNG_SO_MINOR}
- 
+-
 -pngtest: pngtest.o libpng.a
 -	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
++libpng.la: $(OBJS)
++	${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath $(LIBPATH) ${LDFLAGS} -lz -lm -version-info ${LIBPNG_SO_MAJOR}:${LIBPNG_SO_MINOR}
++  
 +pngtest: pngtest.o libpng.la
 +	${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o ${LDFLAGS} libpng.la -lz -lm
  
@@ -46,11 +51,11 @@ $NetBSD: patch-aa,v 1.22 2004/04/27 22:40:35 tv Exp $
  	./pngtest
  
 -install: libpng.a
--	-@mkdir $(DESTDIR)$(INCPATH)
--	-@mkdir $(DESTDIR)$(INCPATH)/libpng
--	-@mkdir $(DESTDIR)$(LIBPATH)
--	-@rm -f $(DESTDIR)$(INCPATH)/png.h
--	-@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
+-	-@$(MKDIR_P) $(DESTDIR)$(INCPATH)
+-	-@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng
+-	-@$(MKDIR_P) $(DESTDIR)$(LIBPATH)
+-	-@$(RM_F) $(DESTDIR)$(INCPATH)/png.h
+-	-@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h
 -	cp png.h $(DESTDIR)$(INCPATH)/libpng
 -	cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
 -	chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
@@ -63,4 +68,4 @@ $NetBSD: patch-aa,v 1.22 2004/04/27 22:40:35 tv Exp $
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libpng.la $(LIBPATH)
  
  clean:
- 	rm -f *.o libpng.a pngtest pngout.png
+ 	$(RM_F) *.o libpng.a pngtest pngout.png
diff --git a/graphics/png/patches/patch-ab b/graphics/png/patches/patch-ab
index a1db36c6d16..3f63d84734f 100644
--- a/graphics/png/patches/patch-ab
+++ b/graphics/png/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2004/08/17 09:54:30 drochner Exp $
+$NetBSD: patch-ab,v 1.10 2006/04/16 19:39:46 wiz Exp $
 
---- pngtest.c.orig	2004-08-17 11:24:59.000000000 +0200
+--- pngtest.c.orig	2006-04-14 11:22:24.000000000 +0000
 +++ pngtest.c
-@@ -578,7 +578,7 @@ png_debug_free(png_structp png_ptr, png_
+@@ -576,7 +576,7 @@ png_debug_free(png_structp png_ptr, png_
           }
           if (pinfo->next == NULL)
           {
@@ -11,18 +11,18 @@ $NetBSD: patch-ab,v 1.9 2004/08/17 09:54:30 drochner Exp $
              break;
           }
           ppinfo = &pinfo->next;
-@@ -1435,8 +1435,8 @@ main(int argc, char *argv[])
+@@ -1433,8 +1433,8 @@ main(int argc, char *argv[])
                 current_allocation);
              while (pinfo != NULL)
              {
--               fprintf(STDERR, " %lu bytes at %x\n", pinfo->size, 
+-               fprintf(STDERR, " %lu bytes at %x\n", pinfo->size,
 -                 (unsigned int) pinfo->pointer);
-+               fprintf(STDERR, " %lu bytes at %p\n", pinfo->size, 
++               fprintf(STDERR, " %lu bytes at %p\n", pinfo->size,
 +                 pinfo->pointer);
                 pinfo = pinfo->next;
              }
           }
-@@ -1510,8 +1510,8 @@ main(int argc, char *argv[])
+@@ -1508,8 +1508,8 @@ main(int argc, char *argv[])
                  current_allocation);
               while (pinfo != NULL)
               {
diff --git a/graphics/png/patches/patch-ad b/graphics/png/patches/patch-ad
index 420bbfaddf9..43f02c3c68e 100644
--- a/graphics/png/patches/patch-ad
+++ b/graphics/png/patches/patch-ad
@@ -1,12 +1,17 @@
-$NetBSD: patch-ad,v 1.6 2004/12/05 11:17:12 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2006/04/16 19:39:46 wiz Exp $
 
---- scripts/libpng.pc.in.orig	2004-12-03 01:14:31.000000000 +0100
+--- scripts/libpng.pc.in.orig	2006-03-03 02:48:03.000000000 +0000
 +++ scripts/libpng.pc.in
-@@ -7,5 +7,5 @@ includedir=${exec_prefix}/include
- Name: libpng12
+@@ -1,10 +1,10 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@/libpng@PNGLIB_MAJOR@
++includedir=@includedir@
+ 
+ Name: libpng
  Description: Loads and saves PNG files
- Version: 1.2.8
--Libs: -L${libdir} -lpng12 -lz -lm
--Cflags: -I${includedir}/libpng12
-+Libs: -L${libdir} -lpng -lz -lm
-+Cflags: -I${includedir}
+ Version: @PNGLIB_VERSION@
+-Libs: -L${libdir} -lpng@PNGLIB_MAJOR@
++Libs: -L${libdir} -lpng
+ Cflags: -I${includedir}
diff --git a/graphics/png/patches/patch-ae b/graphics/png/patches/patch-ae
index 9bb1d6c3b7f..ba48990d710 100644
--- a/graphics/png/patches/patch-ae
+++ b/graphics/png/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2004/12/05 11:17:12 wiz Exp $
+$NetBSD: patch-ae,v 1.5 2006/04/16 19:39:46 wiz Exp $
 
---- pngconf.h.orig	2004-12-03 01:14:24.000000000 +0100
+--- pngconf.h.orig	2006-04-14 11:22:24.000000000 +0000
 +++ pngconf.h
-@@ -304,8 +304,8 @@
+@@ -311,8 +311,8 @@
       /* If you encounter a compiler error here, see the explanation
        * near the end of INSTALL.
        */