diff options
| author | wiz <wiz> | 2006-04-20 22:54:53 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2006-04-20 22:54:53 +0000 |
| commit | 024b6876982851729d4e43c07919824464a0c1e7 (patch) | |
| tree | 4e7018af3317e8d81e77e68700b5930f9f4df47e /www/amaya | |
| parent | b47b4388a78988f58eb4753b7f835bdf6e1db986 (diff) | |
| download | pkgsrc-024b6876982851729d4e43c07919824464a0c1e7.tar.gz | |
Fix build after png update.
While here, do pkglint cleanup.
Bump PKGREVISION.
Diffstat (limited to 'www/amaya')
| -rw-r--r-- | www/amaya/Makefile | 9 | ||||
| -rw-r--r-- | www/amaya/distinfo | 3 | ||||
| -rw-r--r-- | www/amaya/patches/patch-ae | 22 |
3 files changed, 29 insertions, 5 deletions
diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 0fe1f7b8e8a..c23c1e71751 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -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 @@ EXTRACT_ELEMENTS= Amaya libwww 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 @@ post-configure: .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 --git a/www/amaya/distinfo b/www/amaya/distinfo index 924250c13a1..ea3bee14bf2 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -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-aa) = daa3b4ad4e00d6e6ca855bb638cc8ec8d2565791 SHA1 (patch-ab) = 942957562f8b607227812d8b377b4be61685af32 SHA1 (patch-ac) = 5d9df3fc894f06c981b26d82f216ff223a821954 SHA1 (patch-ad) = 405499e719944030e131c0815e4472efeed5df64 +SHA1 (patch-ae) = e479ca874e3c2f33545e692997743f85956d9aa6 SHA1 (patch-ah) = a0ea86df77bc1afa1db9e4f012f25d5c84c2b093 diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae new file mode 100644 index 00000000000..1ac97dde403 --- /dev/null +++ b/www/amaya/patches/patch-ae @@ -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 */ |