Update to version 1.2.4. Two new functions since 1.2.1, png_malloc_warn()

and png_set_text_2(), call for a minor version bump in the shared library.
Update "BUILDLINK_DEPENDS" to current level. Also make the shared library
versions visible in the top-level "Makefile", and add a top-level "test"
target to invoke "pngtest" in ${WRKSRC}.

The following is culled from the extensive "CHANGES" file, ommitting
all make system and doc changes, and some bug fixes for bugs that weren't
present in 1.2.1. See "CHANGES" for complete details:

  Added setjmp() at the end of png_create_*_struct_2() in case user forgets
    to put one in their application.
  Exported png_zalloc(), png_zfree(), png_default_read(), png_default_write(),
    png_default_flush(), and png_push_fill_buffer() and included them in
    module definition files.
  Revised prototype for png_default_flush()
  Typos in *.def files (png_default_read|write -> png_default_read|write_data)
  Once more restored png_zalloc and png_zfree to regular nonexported form.
  Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer
    to nonexported form, but with PNGAPI, and removed them from module def files.
  Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c
  Plugged various memory leaks; added png_malloc_warn() and png_set_text_2()
    functions.
  Plugged memory leak of png_ptr->current_text (Matt Holgate).
  Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison)
  Plugged memory leak of row_buf in pngtest.c when there is a png_error().
  Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data.
  Changed png_warning() to png_error() when width is too large to process.

5 files changed, 47 insertions, 34 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 9a7911f607d..9b60d4c2602 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2002/05/16 06:08:09 tron Exp $
+# $NetBSD: Makefile,v 1.42 2002/07/19 14:33:08 fredb Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
-DISTNAME=	libpng-1.2.1
+DISTNAME=	libpng-1.2.4
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpng/} \
@@ -16,17 +16,26 @@ MAINTAINER=	fredb@netbsd.org
 HOMEPAGE=	http://www.libpng.org/pub/png/
 COMMENT=	Library for manipulating PNG images
 
-USE_LIBTOOL=	yes
+USE_BUILDLINK_ONLY=	yes
+USE_LIBTOOL=		yes
+
+LIBPNG_SO_MAJOR=	3
+LIBPNG_SO_MINOR=	1
 
 MAKEFILE=	scripts/makefile.std
 MAKE_ENV+=	REALCC="${CC}"
-
-USE_BUILDLINK_ONLY=	yes
+MAKE_ENV+=	LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR}
+MAKE_ENV+=	LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR}
+PLIST_SUBST+=	LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR}
+PLIST_SUBST+=	LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/png.5 ${PREFIX}/man/man5
 
+test: build
+	@cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} test
+
 .include "../../devel/zlib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/png/PLIST b/graphics/png/PLIST
index 1c4c495750b..1c149201a2c 100644
--- a/graphics/png/PLIST
+++ b/graphics/png/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/13 17:43:38 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/19 14:33:08 fredb Exp $
 include/png.h
 include/pngconf.h
 lib/libpng.a
 lib/libpng.la
 lib/libpng.so
-lib/libpng.so.3
-lib/libpng.so.3.0
+lib/libpng.so.${LIBPNG_SO_MAJOR}
+lib/libpng.so.${LIBPNG_SO_MAJOR}.${LIBPNG_SO_MINOR}
 man/man3/libpng.3
 man/man3/libpngpf.3
 man/man5/png.5
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index e0416d58123..5dc634dfb1f 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2002/03/13 17:43:38 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.11 2002/07/19 14:33:08 fredb Exp $
 #
 # This Makefile fragment is included by packages that use libpng.
 #
@@ -17,7 +17,7 @@ PNG_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.png?=	png>=1.2.1
+BUILDLINK_DEPENDS.png?=	png>=1.2.4
 DEPENDS+=		${BUILDLINK_DEPENDS.png}:../../graphics/png
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.png=png
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 5ceb4d7ca09..3c65c54d8bb 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2002/07/19 03:22:17 mycroft Exp $
+$NetBSD: distinfo,v 1.9 2002/07/19 14:33:08 fredb Exp $
 
-SHA1 (libpng-1.2.1.tar.bz2) = e9efb0bfabf365726abdf84571ef5d445753a513
-Size (libpng-1.2.1.tar.bz2) = 365115 bytes
-SHA1 (patch-aa) = be98bd25c8597df17bda14567ae2f128247a35e0
+SHA1 (libpng-1.2.4.tar.bz2) = c9aec320e4fdb178d6d918ba30258a0480cbe074
+Size (libpng-1.2.4.tar.bz2) = 390161 bytes
+SHA1 (patch-aa) = 6cc8354eccd61a4355d64ca456dc950f379701ad
 SHA1 (patch-ab) = 38db834829b3aeb39a13152245d9a0ec673c4f47
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index 7fc26be6b5e..bcabffdfe05 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.18 2002/03/13 17:43:38 fredb Exp $
+$NetBSD: patch-aa,v 1.19 2002/07/19 14:33:09 fredb Exp $
 
---- scripts/makefile.std.orig	Fri Jan  5 19:25:50 2001
-+++ scripts/makefile.std	Sun May 27 22:36:02 2001
-@@ -3,7 +3,7 @@
+--- scripts/makefile.std.orig	Thu May 23 08:29:59 2002
++++ scripts/makefile.std
+@@ -4,7 +4,7 @@
  # For conditions of distribution and use, see copyright notice in png.h
  
  # where make install puts libpng.a and png.h
 -prefix=/usr/local
 +prefix=${PREFIX}
+ INCPATH=$(prefix)/include
+ LIBPATH=$(prefix)/lib
  
- # Where the zlib library and include files are located
- #ZLIBLIB=/usr/local/lib
-@@ -11,9 +11,9 @@
+@@ -24,9 +24,9 @@
  ZLIBLIB=../zlib
  ZLIBINC=../zlib
  
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.18 2002/03/13 17:43:38 fredb Exp $
  
  #RANLIB=echo
  RANLIB=ranlib
-@@ -22,27 +22,20 @@
+@@ -35,31 +35,20 @@
  	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
  	pngwtran.o pngmem.o pngerror.o pngpread.o
  
@@ -35,28 +35,32 @@ $NetBSD: patch-aa,v 1.18 2002/03/13 17:43:38 fredb Exp $
 -	ar rc $@  $(OBJS)
 -	$(RANLIB) $@
 +libpng.la: $(OBJS)
-+	${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib ${LDFLAGS} -lz -lm -version-info 3:0
++	${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)
 +pngtest: pngtest.o libpng.la
-+	${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) libpng.la -lz -lm
++	${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o ${LDFLAGS} libpng.la -lz -lm
  
  test: pngtest
  	./pngtest
  
 -install: libpng.a
--	-@mkdir $(prefix)/include
--	-@mkdir $(prefix)/lib
--	cp png.h $(prefix)/include
--	cp pngconf.h $(prefix)/include
--	chmod 644 $(prefix)/include/png.h
--	chmod 644 $(prefix)/include/pngconf.h
--	cp libpng.a $(prefix)/lib
--	chmod 644 $(prefix)/lib/libpng.a
+-	-@mkdir $(DESTDIR)$(INCPATH)
+-	-@mkdir $(DESTDIR)$(INCPATH)/libpng
+-	-@mkdir $(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
+-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
+-	(cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
+-	cp libpng.a $(DESTDIR)$(LIBPATH)
+-	chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
 +install: libpng.la
-+	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libpng.la $(prefix)/lib
++	${BSD_INSTALL_DATA} png.h pngconf.h $(INCPATH)
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libpng.la $(LIBPATH)
  
  clean:
  	rm -f *.o libpng.a pngtest pngout.png