diff options
| author | wiz <wiz> | 2010-06-13 22:43:46 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-06-13 22:43:46 +0000 |
| commit | 6af156235b3b94e0c3542e1b617f2653855e0c4f (patch) | |
| tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /cad/nelma | |
| parent | 354cf6a07fa5783bda1f7548ccc97a684c6a7f8e (diff) | |
| download | pkgsrc-6af156235b3b94e0c3542e1b617f2653855e0c4f.tar.gz | |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'cad/nelma')
| -rw-r--r-- | cad/nelma/Makefile | 4 | ||||
| -rw-r--r-- | cad/nelma/distinfo | 3 | ||||
| -rw-r--r-- | cad/nelma/patches/patch-ac | 49 |
3 files changed, 53 insertions, 3 deletions
diff --git a/cad/nelma/Makefile b/cad/nelma/Makefile index c6de54082ff..9854000f7b7 100644 --- a/cad/nelma/Makefile +++ b/cad/nelma/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2010/01/28 19:27:03 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:55 wiz Exp $ # DISTNAME= nelma-3.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= cad MASTER_SITES= http://www.tablix.org/~avian/nelma/releases/ diff --git a/cad/nelma/distinfo b/cad/nelma/distinfo index aec3db94133..59ea714ceb5 100644 --- a/cad/nelma/distinfo +++ b/cad/nelma/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2010/01/28 19:27:03 joerg Exp $ +$NetBSD: distinfo,v 1.5 2010/06/13 22:43:55 wiz Exp $ SHA1 (nelma-3.0.tar.gz) = e08f1b0097ce7a90e535cb1920658780c50aec5c RMD160 (nelma-3.0.tar.gz) = 68056717d5fe9b8268aeca5d839f974090e305ad Size (nelma-3.0.tar.gz) = 64078 bytes SHA1 (patch-aa) = 1ed06b063a0e0766e3a9d597629180aa27de9714 SHA1 (patch-ab) = a1ced09d3ce03ea92d82e8ad4edc51ed1050cfb0 +SHA1 (patch-ac) = 5585eed126e7bd3133cb412aaf191a7c363dcc1c diff --git a/cad/nelma/patches/patch-ac b/cad/nelma/patches/patch-ac new file mode 100644 index 00000000000..355ea00208a --- /dev/null +++ b/cad/nelma/patches/patch-ac @@ -0,0 +1,49 @@ +$NetBSD: patch-ac,v 1.1 2010/06/13 22:43:55 wiz Exp $ + +--- src/pngutil.c.orig 2006-12-10 15:50:19.000000000 +0000 ++++ src/pngutil.c +@@ -145,7 +145,7 @@ int png_read(struct image **dest, char * + { + error("Can't allocate memory"); + fclose(fp); +- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, NULL, NULL); + return -1; + } + +@@ -159,7 +159,7 @@ int png_read(struct image **dest, char * + error("libpng error"); + /* Free all of the memory associated with the png_ptr and + * info_ptr */ +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(fp); + /* If we get here, we had a problem reading the file */ + return -1; +@@ -185,7 +185,7 @@ int png_read(struct image **dest, char * + PNG_TRANSFORM_PACKING | + PNG_TRANSFORM_EXPAND; + +- png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL); ++ png_read_png(png_ptr, info_ptr, png_transforms, NULL); + + /* At this point you have read the entire image */ + img=png_alloc( png_get_image_width(png_ptr, info_ptr), +@@ -209,7 +209,7 @@ int png_read(struct image **dest, char * + *dest=img; + + /* Clean up after the read, and free any memory allocated - REQUIRED */ +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + /* close the file */ + fclose(fp); +@@ -253,7 +253,7 @@ int png_write(struct image *img, char *f + if (info_ptr == NULL) { + error("Can't allocate memory"); + fclose(fp); +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + return -1; + } + |