From 21b10ee694e42e6718f898a11c7bfc4921958797 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 19 Apr 2006 17:04:31 +0000 Subject: Fix build after png-1.2.9nb2 update. Bump PKGREVISION. --- graphics/xart/Makefile | 8 ++++---- graphics/xart/distinfo | 6 +++--- graphics/xart/patches/patch-ac | 18 +++++++++--------- graphics/xart/patches/patch-af | 40 ++++++++++++++++++++++++++++++++++------ 4 files changed, 50 insertions(+), 22 deletions(-) (limited to 'graphics') diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile index 395cdb3618c..9a502633171 100644 --- a/graphics/xart/Makefile +++ b/graphics/xart/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.39 2006/04/17 13:46:36 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2006/04/19 17:04:31 wiz Exp $ # -DISTNAME= xart19980415 +DISTNAME= xart19980415 PKGNAME= xart-19980415 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= graphics x11 MASTER_SITES= http://linux01.gwdg.de/~rhohen/linux/ EXTRACT_SUFX= .tgz @@ -13,7 +13,7 @@ HOMEPAGE= http://linux01.gwdg.de/~rhohen/linux.html COMMENT= Paint program (enhanced xpaint) WRKSRC= ${WRKDIR}/19980415 -USE_IMAKE= YES +USE_IMAKE= YES post-extract: ${FIND} ${WRKSRC} -type d -exec ${CHMOD} 755 {} \; diff --git a/graphics/xart/distinfo b/graphics/xart/distinfo index 7f8f36982c1..f2e9e02c6b8 100644 --- a/graphics/xart/distinfo +++ b/graphics/xart/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.10 2006/03/01 14:40:34 joerg Exp $ +$NetBSD: distinfo,v 1.11 2006/04/19 17:04:31 wiz Exp $ SHA1 (xart19980415.tgz) = d4445392e33a5dcf5ae951babac82394e7cdd65c RMD160 (xart19980415.tgz) = 99077c23a798d8c0026bd53450052b1a8cf6ff6f Size (xart19980415.tgz) = 343909 bytes SHA1 (patch-aa) = 7d8ae61d9a624cc537396f406b496f28376cf7b5 SHA1 (patch-ab) = b0f00e29560ce786e37a8ba62fef82dae80c4ee9 -SHA1 (patch-ac) = e23c8bd13a0731eab0e0c814ebe2cd85f1cd8f37 +SHA1 (patch-ac) = d8d359dec9e440a821b7af79e810f5f067f3ab6f SHA1 (patch-ad) = 08059ca068d156be0e31283180c5deaebb99f7bd SHA1 (patch-ae) = d0d87fe957cbec5979e635270d2ad05b294f7530 -SHA1 (patch-af) = 6bf891c7532f257a18d3e2917353a36ca519221f +SHA1 (patch-af) = 2ee00a7b02d14a5962ac0f561ede6423c4d45801 SHA1 (patch-ag) = c764ddf68af02eda1475778e6c1774d751e68a92 SHA1 (patch-ah) = f888c5167cd8a6111e2064d586ff50984320b210 SHA1 (patch-ai) = 349170a16199734f35dc56de12e77dd289db412b diff --git a/graphics/xart/patches/patch-ac b/graphics/xart/patches/patch-ac index 74a924a8fb0..33d5c25c792 100644 --- a/graphics/xart/patches/patch-ac +++ b/graphics/xart/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ +$NetBSD: patch-ac,v 1.7 2006/04/19 17:04:31 wiz Exp $ ---- Local.config.orig Wed Apr 1 02:58:05 1998 +--- Local.config.orig 1998-04-01 02:58:05.000000000 +0200 +++ Local.config -@@ -62,8 +62,8 @@ +@@ -62,8 +62,8 @@ XCOMM #define HaveTIFF #ifdef HaveTIFF @@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ #endif XCOMM If you have the JPEG library, make HaveJPEG defined -@@ -73,8 +73,8 @@ +@@ -73,8 +73,8 @@ XCOMM includes are correct. #define HaveJPEG #ifdef HaveJPEG @@ -24,18 +24,18 @@ $NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ #endif XCOMM If you have the PNG library, make HavePNG defined -@@ -84,8 +84,8 @@ +@@ -84,8 +84,8 @@ XCOMM includes are correct. #define HavePNG #ifdef HavePNG -PNG_LIB = -L/usr/local/lib -lpng -lz -PNG_INCLUDE = -I/usr/local/include/png -+PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz ++PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng12 -lz -lm +PNG_INCLUDE = -I${LOCALBASE}/include #endif XCOMM If you are running SunOS and get an error with the following undefined -@@ -102,11 +102,11 @@ +@@ -102,11 +102,11 @@ XCOMM XCOMM You must have the XPM library. XCOMM Make sure the path name to the library is correct. @@ -49,7 +49,7 @@ $NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ DEPENDFLAGS = -I./bitmaps -@@ -114,10 +114,10 @@ +@@ -114,10 +114,10 @@ DEPENDFLAGS = -I./bitmaps XCOMM Uncomment these lines and tailor to taste, if you don't like XCOMM the default paths and man page extension. XCOMM @@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ XCOMM Add '-g' here if you want to include debugging information. XCOMM Also add any optimizer flags etc. that you want. -@@ -138,9 +138,9 @@ +@@ -138,9 +138,9 @@ XCOMM This should take care of everythin #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || \ defined(BSD386Architecture) ARCH_DEFINES = -DHAVE_PARAM_H diff --git a/graphics/xart/patches/patch-af b/graphics/xart/patches/patch-af index 750a72cd88f..e4340b745e6 100644 --- a/graphics/xart/patches/patch-af +++ b/graphics/xart/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2001/08/03 09:43:18 wiz Exp $ +$NetBSD: patch-af,v 1.2 2006/04/19 17:04:31 wiz Exp $ ---- rw/readPNG.c.orig Thu Aug 29 07:24:48 1996 +--- rw/readPNG.c.orig 1996-08-29 07:24:48.000000000 +0200 +++ rw/readPNG.c -@@ -46,8 +46,8 @@ +@@ -46,8 +46,8 @@ Image * ReadPNG(char *file) { FILE *fp; @@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.1 2001/08/03 09:43:18 wiz Exp $ int i, hasAlpha=FALSE; int width, height, level, bit_depth, npasses; Image *image = NULL; -@@ -59,14 +59,15 @@ +@@ -59,14 +59,15 @@ ReadPNG(char *file) return NULL; } @@ -31,16 +31,17 @@ $NetBSD: patch-af,v 1.1 2001/08/03 09:43:18 wiz Exp $ if (!info_ptr) { RWSetMsg("Error allocating PNG info_ptr memory"); free(png_ptr); -@@ -74,17 +75,13 @@ +@@ -74,17 +75,13 @@ ReadPNG(char *file) return NULL; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { RWSetMsg("Error setting longjmp error handler"); - png_read_destroy(png_ptr, info_ptr, (png_info *)0); +- png_read_destroy(png_ptr, info_ptr, (png_info *)0); - free(png_ptr); - free(info_ptr); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); fclose(fp); return NULL; } @@ -50,3 +51,30 @@ $NetBSD: patch-af,v 1.1 2001/08/03 09:43:18 wiz Exp $ png_init_io(png_ptr, fp); png_read_info(png_ptr, info_ptr); +@@ -183,7 +180,7 @@ ReadPNG(char *file) + info_ptr->color_type); + fflush(stderr); + RWSetMsg("Unknown PNG image type"); +- png_read_destroy(png_ptr, info_ptr, (png_infop)NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + free(png_ptr); + free(info_ptr); + fclose(fp); +@@ -217,7 +214,7 @@ ReadPNG(char *file) + fprintf(stderr, "ReadPNG error: unable to malloc png_data\n"); + fflush(stderr); + ImageDelete(image); +- png_read_destroy(png_ptr, info_ptr, (png_infop)NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + free(png_ptr); + free(info_ptr); + fclose(fp); +@@ -271,7 +268,7 @@ ReadPNG(char *file) + */ + + png_read_end(png_ptr, info_ptr); +- png_read_destroy(png_ptr, info_ptr, (png_infop)NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + free(png_ptr); + free(info_ptr); + fclose(fp); -- cgit v1.2.3