[pkgsrc/trunk]: pkgsrc/www/amaya Fix build after png update.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d8c1aa0e6cfe
branches:  trunk
changeset: 511747:d8c1aa0e6cfe
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Apr 20 22:54:53 2006 +0000

description:
Fix build after png update.
While here, do pkglint cleanup.
Bump PKGREVISION.

diffstat:

 www/amaya/Makefile         |   9 +++++----
 www/amaya/distinfo         |   3 ++-
 www/amaya/patches/patch-ae |  22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r a4ee991a732d -r d8c1aa0e6cfe www/amaya/Makefile
--- a/www/amaya/Makefile        Thu Apr 20 22:51:56 2006 +0000
+++ b/www/amaya/Makefile        Thu Apr 20 22:54:53 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2006/04/17 13:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/20 22:54:53 wiz Exp $
 
 DISTNAME=      amaya-fullsrc-9.2.1
 PKGNAME=       ${DISTNAME:S/-fullsrc//}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    www
 MASTER_SITES=  http://www.w3.org/Amaya/Distribution/ \
                ftp://ftp.w3.org/pub/amaya/ \
@@ -17,14 +17,14 @@
 WRKSRC=                        ${WRKDIR}/Amaya/work
 
 USE_DIRS+=             xdg-1.1
-USE_LANGUAGE=          c c++
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake perl
 GNU_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      ../configure
 CONFIGURE_ARGS+=       --without-graphic-libs  # Use pkgsrc libraries
 CFLAGS+=               -Dunix
 # link correctly with pkgsrc zlib
-LIBS+=                 -Wl,-R${LOCALBASE}/lib
+LIBS+=                 ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
 
 FONTS_DIRS.ttf+=       ${PREFIX}/share/Amaya/fonts
 REQD_DIRS+=            ${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts
@@ -39,5 +39,6 @@
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r a4ee991a732d -r d8c1aa0e6cfe www/amaya/distinfo
--- a/www/amaya/distinfo        Thu Apr 20 22:51:56 2006 +0000
+++ b/www/amaya/distinfo        Thu Apr 20 22:54:53 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2005/07/14 08:06:58 adam Exp $
+$NetBSD: distinfo,v 1.17 2006/04/20 22:54:53 wiz Exp $
 
 SHA1 (amaya-fullsrc-9.2.1.tgz) = 1736bc9a7ad997b128fa435bc99594f9f4b60b05
 RMD160 (amaya-fullsrc-9.2.1.tgz) = 74b8ce30c6c85c05b0ab94b6f950f214cbe0f512
@@ -7,4 +7,5 @@
 SHA1 (patch-ab) = 942957562f8b607227812d8b377b4be61685af32
 SHA1 (patch-ac) = 5d9df3fc894f06c981b26d82f216ff223a821954
 SHA1 (patch-ad) = 405499e719944030e131c0815e4472efeed5df64
+SHA1 (patch-ae) = e479ca874e3c2f33545e692997743f85956d9aa6
 SHA1 (patch-ah) = a0ea86df77bc1afa1db9e4f012f25d5c84c2b093
diff -r a4ee991a732d -r d8c1aa0e6cfe www/amaya/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/amaya/patches/patch-ae        Thu Apr 20 22:54:53 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.9 2006/04/20 22:54:53 wiz Exp $
+
+--- ../thotlib/image/pnghandler.c.orig 2005-05-31 11:50:35.000000000 +0200
++++ ../thotlib/image/pnghandler.c
+@@ -217,8 +217,6 @@ static unsigned char *ReadPng (FILE *pfF
+     png_read_end(png_ptr, NULL);
+     TtaFreeMemory (ppbRowPointers);
+     ppbRowPointers = NULL; 
+-    /* clean up after the read, and free any memory allocated */
+-    png_read_destroy (png_ptr, info_ptr, (png_info*) NULL);
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
+     return pixels;
+@@ -586,8 +584,6 @@ static unsigned char *ReadPng (FILE *inf
+       *bg = -1;
+     }
+ 
+-  /* clean up after the read, and free any memory allocated */
+-  png_read_destroy (png_ptr, info_ptr, (png_info*) NULL);
+   /* Free all of the memory associated with the png_ptr and info_ptr */
+   png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
+   /* free the structures */