summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-05-21 21:39:13 +0000
committerwiz <wiz@pkgsrc.org>2001-05-21 21:39:13 +0000
commitff1f2b2d8e193d93c9c46f97d26f1b4b3f18eac9 (patch)
treec78aa7c2fdb35becaec364655485c96f8d9b0700
parentaf03ce65615d70d91cec5e745f624eb637e18469 (diff)
downloadpkgsrc-ff1f2b2d8e193d93c9c46f97d26f1b4b3f18eac9.tar.gz
Update libpng to 1.0.11.
pkgsrc change: bump shared library major like it happened in libpng some time ago -- our libtool'ified build didn't reflect this. Fixes pkg/12856 by Thor Simon. Note necessity of manual major/minor handling in Makefile, to decrease chance that this will repeat in the future. Changes since 1.0.10: Added type casts on several png_malloc() calls (Dimitri Papadapoulos). Removed a no-longer needed AIX work-around from pngconf.h Changed several "//" single-line comments to C-style in pnggccrd.c Removed PNGAPI from several functions whose prototypes did not have PNGAPI. Updated scripts/pngos2.def Added a check for NULL return from user's malloc_fn(). Removed some useless type casts of the NULL pointer. Added makefile.netbsd [not used, since we're using libtool instead]
-rw-r--r--graphics/png/Makefile7
-rw-r--r--graphics/png/distinfo8
-rw-r--r--graphics/png/patches/patch-aa4
-rw-r--r--graphics/png/pkg/PLIST6
4 files changed, 13 insertions, 12 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index df2050ecfb3..0ff880a45b7 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2001/04/02 02:23:48 mjl Exp $
-# FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp
+# $NetBSD: Makefile,v 1.32 2001/05/21 21:39:13 wiz Exp $
-DISTNAME= libpng-1.0.10
+# On update, don't forget to increase shared library major/minor's in
+# accordance with changes (patch-aa).
+DISTNAME= libpng-1.0.11
PKGNAME= ${DISTNAME:S/lib//}
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.libpng.org/pub/png/src/ \
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 6ac48bbc9be..1ce1fa6ffd1 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:24 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/21 21:39:14 wiz Exp $
-SHA1 (libpng-1.0.10.tar.gz) = 922b3f582767597c1ea6e101be51dda06e8feb17
-Size (libpng-1.0.10.tar.gz) = 528963 bytes
-SHA1 (patch-aa) = 1afde9fc8e1c2fe1b8f46e39c4d720a6634c8f1e
+SHA1 (libpng-1.0.11.tar.gz) = 4064bebe256b1b0b5092162c74287b5a2d5a6166
+Size (libpng-1.0.11.tar.gz) = 529290 bytes
+SHA1 (patch-aa) = 6a6d3ca79ed5bccd0431342f69e5faf25043178e
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index 734c7c09136..f837f4df3fd 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.14 2001/03/04 07:53:34 tron Exp $
+$NetBSD: patch-aa,v 1.15 2001/05/21 21:39:14 wiz Exp $
--- scripts/makefile.std.orig Wed Dec 8 18:44:40 1999
+++ scripts/makefile.std
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.14 2001/03/04 07:53:34 tron Exp $
- ar rc $@ $(OBJS)
- $(RANLIB) $@
+libpng.la: $(OBJS)
-+ ${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 1:4
++ ${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 2:0
-pngtest: pngtest.o libpng.a
- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
diff --git a/graphics/png/pkg/PLIST b/graphics/png/pkg/PLIST
index b1de6184327..2dee24af3a3 100644
--- a/graphics/png/pkg/PLIST
+++ b/graphics/png/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.15 2001/03/04 07:53:35 tron Exp $
+@comment $NetBSD: PLIST,v 1.16 2001/05/21 21:39:14 wiz Exp $
include/png.h
include/pngconf.h
lib/libpng.a
lib/libpng.la
lib/libpng.so
-lib/libpng.so.1
-lib/libpng.so.1.4
+lib/libpng.so.2
+lib/libpng.so.2.0
man/man3/libpng.3
man/man3/libpngpf.3
man/man5/png.5