January 2011 - macports-changes - lists.macosforge.org

[75525] trunk/dports/kde/kmymoney/Portfile
by mk＠macports.org 28 Jan '11

28 Jan '11

Revision: 75525 http://trac.macports.org/changeset/75525 Author: mk(a)macports.org Date: 2011-01-28 12:04:00 -0800 (Fri, 28 Jan 2011) Log Message: ----------- kmymoney: revert unnecessary rev bump Modified Paths: -------------- trunk/dports/kde/kmymoney/Portfile Modified: trunk/dports/kde/kmymoney/Portfile =================================================================== --- trunk/dports/kde/kmymoney/Portfile 2011-01-28 19:55:06 UTC (rev 75524) +++ trunk/dports/kde/kmymoney/Portfile 2011-01-28 20:04:00 UTC (rev 75525) @@ -5,7 +5,7 @@ name kmymoney version 1.0.5 -revision 6 +revision 1 categories kde finance maintainers mk pixilla

1 0

[75524] trunk/dports/kde
by mk＠macports.org 28 Jan '11

28 Jan '11

Revision: 75524 http://trac.macports.org/changeset/75524 Author: mk(a)macports.org Date: 2011-01-28 11:55:06 -0800 (Fri, 28 Jan 2011) Log Message: ----------- kmymoney, kmymoney4, kmymoney4-devel, skrooge-devel: Brad is now also MacPorts committer Modified Paths: -------------- trunk/dports/kde/kmymoney/Portfile trunk/dports/kde/kmymoney4/Portfile trunk/dports/kde/kmymoney4-devel/Portfile trunk/dports/kde/skrooge-devel/Portfile Modified: trunk/dports/kde/kmymoney/Portfile =================================================================== --- trunk/dports/kde/kmymoney/Portfile 2011-01-28 19:15:11 UTC (rev 75523) +++ trunk/dports/kde/kmymoney/Portfile 2011-01-28 19:55:06 UTC (rev 75524) @@ -5,10 +5,10 @@ name kmymoney version 1.0.5 -revision 1 +revision 6 categories kde finance -maintainers mk pixilla.com:brad +maintainers mk pixilla platforms darwin license GPL2 Modified: trunk/dports/kde/kmymoney4/Portfile =================================================================== --- trunk/dports/kde/kmymoney4/Portfile 2011-01-28 19:15:11 UTC (rev 75523) +++ trunk/dports/kde/kmymoney4/Portfile 2011-01-28 19:55:06 UTC (rev 75524) @@ -10,7 +10,7 @@ version 4.5.2 categories kde finance -maintainers mk pixilla.com:brad openmaintainer +maintainers mk pixilla openmaintainer description kmymoney version 4 (THIS IS STILL AN EXPERIMENTAL PORT.) long_description KMyMoney is the personal finance manager for KDE. (THIS IS STILL AN EXPERIMENTAL PORT.) Modified: trunk/dports/kde/kmymoney4-devel/Portfile =================================================================== --- trunk/dports/kde/kmymoney4-devel/Portfile 2011-01-28 19:15:11 UTC (rev 75523) +++ trunk/dports/kde/kmymoney4-devel/Portfile 2011-01-28 19:55:06 UTC (rev 75524) @@ -8,13 +8,13 @@ fetch.type svn svn.url svn://anonsvn.kde.org/home/kde/trunk/extragear/office/kmymoney -svn.revision 1216485 +svn.revision 1217157 name kmymoney4-devel version 4.5-${svn.revision} categories kde finance -maintainers mk pixilla.com:brad openmaintainer +maintainers mk pixilla openmaintainer description kmymoney version 4 following SVN HEAD as close as possible (THIS IS STILL AN EXPERIMENTAL PORT.) long_description KMyMoney is the personal finance manager for KDE. (THIS IS STILL AN EXPERIMENTAL PORT.) Modified: trunk/dports/kde/skrooge-devel/Portfile =================================================================== --- trunk/dports/kde/skrooge-devel/Portfile 2011-01-28 19:15:11 UTC (rev 75523) +++ trunk/dports/kde/skrooge-devel/Portfile 2011-01-28 19:55:06 UTC (rev 75524) @@ -12,7 +12,7 @@ version 0.8.0-${svn.revision} categories kde finance -maintainers mk pixilla.com:brad openmaintainer +maintainers mk pixilla openmaintainer description Skrooge long_description Personal finance management tool for KDE4, with the aim of being highly intuitive, while \ providing powerful functions such as reporting (including graphics), persistent \

1 0

[75523] trunk/dports/java/google-guava/Portfile
by blair＠macports.org 28 Jan '11

28 Jan '11

Revision: 75523 http://trac.macports.org/changeset/75523 Author: blair(a)macports.org Date: 2011-01-28 11:15:11 -0800 (Fri, 28 Jan 2011) Log Message: ----------- New upstream r08 release. Revision Links: -------------- http://trac.macports.org/changeset/08 Modified Paths: -------------- trunk/dports/java/google-guava/Portfile Modified: trunk/dports/java/google-guava/Portfile =================================================================== --- trunk/dports/java/google-guava/Portfile 2011-01-28 18:27:42 UTC (rev 75522) +++ trunk/dports/java/google-guava/Portfile 2011-01-28 19:15:11 UTC (rev 75523) @@ -3,7 +3,7 @@ PortSystem 1.0 name google-guava -set real_version 07 +set real_version 08 version 0.beta.${real_version} categories java platforms darwin @@ -23,9 +23,9 @@ distname guava-r${real_version} use_zip yes -checksums md5 a543a380347ad80d3d50c65d48ae92ea \ - sha1 abc951ce3e1e7e008c5589524825c49349fbb62e \ - rmd160 1ff305ee297e396c9019614a0f76ac9af810a954 +checksums md5 b73fe1bb5f443993adcf8b274f6a48b2 \ + sha1 d0effbb04c3ff1d64a39bef43c5197684546b16c \ + rmd160 25c756d4c9740560bce062af967633b4fd380fb6 depends_lib bin:java:kaffe

1 0

[75522] trunk/dports/math/fftw/Portfile
by jmr＠macports.org 28 Jan '11

28 Jan '11

Revision: 75522 http://trac.macports.org/changeset/75522 Author: jmr(a)macports.org Date: 2011-01-28 10:27:42 -0800 (Fri, 28 Jan 2011) Log Message: ----------- fftw: add gcc variants and enable shared libs and MPI (#22458) Modified Paths: -------------- trunk/dports/math/fftw/Portfile Modified: trunk/dports/math/fftw/Portfile =================================================================== --- trunk/dports/math/fftw/Portfile 2011-01-28 16:45:50 UTC (rev 75521) +++ trunk/dports/math/fftw/Portfile 2011-01-28 18:27:42 UTC (rev 75522) @@ -4,7 +4,7 @@ name fftw version 2.1.5 -revision 2 +revision 3 categories math devel maintainers nomaintainer description Fast C routines to compute the Discrete Fourier Transform @@ -30,17 +30,46 @@ sha1 12020b58edc1b0490a83db4aa912fac5dfdfb26b \ rmd160 723308722d76c12710db6473979adf8d086b0909 configure.args --enable-type-prefix --enable-threads \ - --disable-fortran --infodir=${prefix}/share/info + --disable-fortran --infodir=${prefix}/share/info \ + --enable-shared --enable-mpi -variant fortran description {include fortran-callable wrappers} { +variant fortran requires g95 description {obsolete synonym for g95} {} + +variant g95 conflicts gcc42 gcc43 gcc44 gcc45 description {include fortran-callable wrappers built with g95} { depends_lib-append port:g95 configure.f77 ${prefix}/bin/g95 - configure.args-delete --disable-fortran - configure.args-append --enable-fortran } -platform darwin { - if {[variant_isset fortran]} { - patchfiles-append patch-configure_darwin - } +variant gcc42 conflicts g95 gcc43 gcc44 gcc45 description {include fortran-callable wrappers built with gcc 4.2} { + depends_lib-append port:gcc42 + configure.compiler macports-gcc-4.2 } + +variant gcc43 conflicts g95 gcc42 gcc44 gcc45 description {include fortran-callable wrappers built with gcc 4.3} { + depends_lib-append port:gcc43 + configure.compiler macports-gcc-4.3 +} + +variant gcc44 conflicts g95 gcc42 gcc43 gcc45 description {include fortran-callable wrappers built with gcc 4.4} { + depends_lib-append port:gcc44 + configure.compiler macports-gcc-4.4 +} + +variant gcc45 conflicts g95 gcc42 gcc43 gcc44 description {include fortran-callable wrappers built with gcc 4.5} { + depends_lib-append port:gcc45 + configure.compiler macports-gcc-4.5 +} + +if {[variant_isset g95] || [variant_isset gcc42] || [variant_isset gcc43] || [variant_isset gcc44] || [variant_isset gcc45]} { + configure.args-delete --disable-fortran + configure.args-append --enable-fortran + if {![variant_isset g95]} { + configure.args-append --with-gcc + } + platform darwin { + patchfiles-append patch-configure_darwin + } + post-destroot { + xinstall -m 644 ${worksrcpath}/fortran/fftw_f77.i ${destroot}${prefix}/include + } +}

1 0

[75521] trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c.diff
by vince＠macports.org 28 Jan '11

28 Jan '11

Revision: 75521 http://trac.macports.org/changeset/75521 Author: vince(a)macports.org Date: 2011-01-28 08:45:50 -0800 (Fri, 28 Jan 2011) Log Message: ----------- Added Paths: ----------- trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c.diff Added: trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c.diff =================================================================== --- trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c.diff (rev 0) +++ trunk/dports/gis/gdal/files/patch-gdalwarpkernel_opencl_c.diff 2011-01-28 16:45:50 UTC (rev 75521) @@ -0,0 +1,14 @@ +--- alg/gdalwarpkernel_opencl.c.orig 2011-01-28 12:19:27.000000000 +0100 ++++ alg/gdalwarpkernel_opencl.c 2011-01-28 12:20:32.000000000 +0100 +@@ -212,9 +212,9 @@ + case CL_INVALID_MIP_LEVEL: + return("CL_INVALID_MIP_LEVEL"); + break; +- case CL_INVALID_GLOBAL_WORK_SIZE: ++/* case CL_INVALID_GLOBAL_WORK_SIZE: + return("CL_INVALID_GLOBAL_WORK_SIZE"); +- break; ++ break; */ + } + + return "unknown_error";

1 0

[75520] trunk/dports/gis/gdal/Portfile
by vince＠macports.org 28 Jan '11

28 Jan '11

Revision: 75520 http://trac.macports.org/changeset/75520 Author: vince(a)macports.org Date: 2011-01-28 08:45:17 -0800 (Fri, 28 Jan 2011) Log Message: ----------- Bump to version 1.8, add various options (Python 2.7, OpenCL support) Modified Paths: -------------- trunk/dports/gis/gdal/Portfile Modified: trunk/dports/gis/gdal/Portfile =================================================================== --- trunk/dports/gis/gdal/Portfile 2011-01-28 16:07:25 UTC (rev 75519) +++ trunk/dports/gis/gdal/Portfile 2011-01-28 16:45:17 UTC (rev 75520) @@ -2,8 +2,8 @@ PortSystem 1.0 name gdal -version 1.7.3 -revision 1 +version 1.8.0 +#revision 1 maintainers gmail.com:seanasy platforms darwin description GDAL - Geospatial Data Abstraction Library @@ -18,24 +18,28 @@ master_sites http://www.gdal.org/dl/ \ http://download.osgeo.org/gdal/ categories gis -checksums md5 c4673970bd2285032de9ae9bbd82754a \ - rmd160 ce84a12d48c85a58c56a17381aee1c4f2ba08b57 \ - sha1 58d4355fe792ad618bb74605dc1a084a0aeb7cb1 +checksums md5 c762cdab0f7e51a677ba49278a8a263d \ + rmd160 0e116f41b23ff5b44c692f56459facab332c6201 \ + sha1 e5a2802933054050c6fb0b0a0e1f46b5dd195b0a depends_lib port:zlib port:libpng port:tiff port:libgeotiff port:jpeg \ path:include/gif_lib.h:giflib port:proj set PYINST "" +set OPENCLBASE "/System/Library/Frameworks/OpenCL.framework/" -configure.args --with-local=${prefix} --with-libz=${prefix} \ +configure.args --with-local=${prefix} \ + --with-libz=${prefix} --without-lzma \ --with-png=${prefix} \ --with-libtiff=${prefix} --with-geotiff=${prefix} \ - --with-jpeg=${prefix} --with-gif=${prefix} \ + --with-jpeg=${prefix}\ + --with-gif=${prefix} \ --with-static-proj4=${prefix} \ --without-pg --without-grass --without-libgrass \ --without-cfitsio --without-pcraster --without-netcdf \ --without-ogdi --without-fme --without-hdf4 --without-hdf5 \ - --without-jasper --without-ecw --without-kakadu \ + --without-jasper --without-openjpeg \ + --without-ecw --without-kakadu \ --without-mrsid \ --without-jp2mrsid --without-msg --without-bsb --without-oci \ --without-grib --without-mysql --without-ingres \ @@ -44,13 +48,15 @@ --without-curl --without-sqlite3 --without-spatialite\ --without-dwgdirect --without-idb --without-sde \ --without-geos \ + --without-opencl \ --without-pam --without-perl \ --without-php --without-ruby \ --without-python \ --without-xerces --without-expat \ --mandir=${prefix}/share/man # Patch to ensure that the python installation respects DESTDIR -patchfiles patch-swig_python_GNUmakefile +patchfiles patch-swig_python_GNUmakefile \ + patch-gdalwarpkernel_opencl_c.diff # Patches for universal build @@ -66,6 +72,13 @@ # Set target to none build.target +variant lzma conflicts universal \ + description {Enable LZMA (7Z) compression support} { + depends_lib-append port:lzma + configure.args-delete --without-lzma + configure.args-append --with-lzma=${prefix} +} + variant geos description {Enable GEOS geometry engine functionality} { depends_lib-append port:geos configure.args-delete --without-geos @@ -106,12 +119,23 @@ configure.args-append --with-netcdf=${prefix} } -variant jasper description {Enable JasPer JPEG-2000 file format} { +#JPEG-2K + +variant jasper conflicts openjpeg \ + description {Enable JasPer JPEG-2000 format support} { depends_lib-append port:jasper configure.args-delete --without-jasper configure.args-append --with-jasper=${prefix} } +variant openjpeg conflicts jasper \ + description {Enable OpenJPEG JPEG-2000 format support} { + depends_lib-append port:openjpeg + configure.args-delete --without-openjpeg + configure.args-append --with-openjpeg=${prefix} +} + + variant xerces description {Enable xerces XML support for GML file format} { depends_lib-append port:xercesc configure.args-delete --without-xerces @@ -125,7 +149,8 @@ } # Python variants -variant python24 description {Enable Python 2.4 support} { +variant python24 conflicts python25 python26 python27 \ + description {Enable Python 2.4 support} { depends_lib-append port:python24 \ port:py-numpy configure.args-delete --without-python @@ -134,7 +159,8 @@ build.args-append PYTHON=python2.4 } -variant python25 description {Enable Python 2.5 support} { +variant python25 conflicts python24 python26 python27 \ + description {Enable Python 2.5 support} { depends_lib-append port:python25 \ port:py25-numpy configure.args-delete --without-python @@ -143,7 +169,8 @@ build.args-append PYTHON=python2.5 } -variant python26 description {Enable Python 2.6 support} { +variant python26 conflicts python24 python25 python27 \ + description {Enable Python 2.6 support} { depends_lib-append port:python26 \ port:py26-numpy configure.args-delete --without-python @@ -154,6 +181,18 @@ use_parallel_build no } +variant python27 conflicts python24 python25 python26 \ + description {Enable Python 2.7 support} { + depends_lib-append port:python27 \ + port:py27-numpy + configure.args-delete --without-python + configure.args-append --with-python + configure.args-append + build.args-append PYTHON=python2.7 + set PYINST ${frameworks_dir}/Python.framework/Versions/2.7 + use_parallel_build no +} + # Database variants variant postgresql81 description {Enable PostgreSQL 8.1 support} { depends_lib-append port:postgresql81 @@ -209,17 +248,37 @@ configure.args-append --with-odbc=${prefix} } +# OpenCL + +variant opencl description {Use OpenCL for parallel computations} { + configure.args-delete --without-opencl + configure.args-append --with-opencl + configure.args-append --with-opencl-include=${OPENCLBASE}/Headers + configure.args-append --with-opencl-lib='-framework OpenCL' +} + # OS X Framework variant framework description {Build as a Mac OS X framework} { configure.args-append --with-macosx-framework } +# Postconfigure hack to avoid read ${include} .h files before +# GDAL own include directories + +post-configure { + set FRMT_PATH ${worksrcpath}/ogr/ogrsf_frmts + foreach makefile [glob -dir $FRMT_PATH */GNUmakefile] { + reinplace "s|\$$EXPAT_INCLUDE$||" $makefile + } +} + post-destroot { xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} xinstall -m 644 -W ${worksrcpath} HOWTO-RELEASE NEWS VERSION \ ${destroot}${prefix}/share/doc/${name} } + livecheck.type regex livecheck.url http://download.osgeo.org/gdal/ livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)\\.tar

1 0

[75519] trunk/dports/python/py26-bpython/Portfile
by jameskyle＠macports.org 28 Jan '11

28 Jan '11

Revision: 75519 http://trac.macports.org/changeset/75519 Author: jameskyle(a)macports.org Date: 2011-01-28 08:07:25 -0800 (Fri, 28 Jan 2011) Log Message: ----------- Version bump for py26-bpython Modified Paths: -------------- trunk/dports/python/py26-bpython/Portfile Modified: trunk/dports/python/py26-bpython/Portfile =================================================================== --- trunk/dports/python/py26-bpython/Portfile 2011-01-28 16:03:33 UTC (rev 75518) +++ trunk/dports/python/py26-bpython/Portfile 2011-01-28 16:07:25 UTC (rev 75519) @@ -5,7 +5,7 @@ PortGroup python26 1.0 name py26-bpython -version 0.9.6.2 +version 0.9.7.1 platforms darwin categories python maintainers jameskyle @@ -17,10 +17,9 @@ master_sites ${homepage}/releases/ distname bpython-${version} -checksums md5 d30fdb663fa9957c21c63108ed249b59 \ - sha1 617041bfd22c00b2d6eb025bf3bedd7240f29e29 \ - rmd160 52ab17724575a71c06a04d6398be6c595a2aeffb - +checksums md5 f32ce6aa8ae6af8d2cf65e13f58859d4 \ + sha1 4ab3b8c06e3ab0bd30fc20f52cd97c1687731699 \ + rmd160 4e5f3e1603957bdd0984024d0abb0e3e59f33aa8 depends_lib-append port:py26-parsing \ port:py26-pygments \ port:py26-distribute

1 0

[75518] trunk/dports/devel/akonadi/Portfile
by snc＠macports.org 28 Jan '11

28 Jan '11

Revision: 75518 http://trac.macports.org/changeset/75518 Author: snc(a)macports.org Date: 2011-01-28 08:03:33 -0800 (Fri, 28 Jan 2011) Log Message: ----------- akonadi: update to 1.5.0 Modified Paths: -------------- trunk/dports/devel/akonadi/Portfile Modified: trunk/dports/devel/akonadi/Portfile =================================================================== --- trunk/dports/devel/akonadi/Portfile 2011-01-28 11:55:35 UTC (rev 75517) +++ trunk/dports/devel/akonadi/Portfile 2011-01-28 16:03:33 UTC (rev 75518) @@ -5,7 +5,7 @@ PortGroup kde4 1.1 name akonadi -version 1.4.3 +version 1.5.0 categories devel kde kde4 maintainers nomaintainer description A personal information management storage service. @@ -16,8 +16,8 @@ master_sites http://download.akonadi-project.org/ use_bzip2 yes -checksums md5 ffe61aca65dffded578bd6fae8aba6bd \ - sha1 0b054b601248403646cb4139744eba70e7aa7761 +checksums sha1 faa1e0b1dd3d76327cbefd951697a30a1173538c \ + rmd160 0c201033553cac09127714738d110315e02a83be depends_lib-append port:soprano \ port:boost \

1 0

propchange - r10176 svn:log
by ryandesign＠macports.org 28 Jan '11

28 Jan '11

Author: ryandesign(a)macports.org (original author: waqar) Revision: 10176 Property Name: svn:log --- /admin/var/tmp/revprops/pre-10176-ryandesign(a)macports.org 2011-01-28 04:05:06.000000000 -0800 +++ /admin/var/tmp/revprops/post-10176-ryandesign(a)macports.org 2011-01-28 04:05:09.000000000 -0800 @@ -1,4 +1,3 @@ Submitted by: toby(a)opendarwin.org Approved by: waqar(a)opendarwin.org -Updated to the latest version of the release, and added dependency on local -install of libz. +Updated to 1.2.8, and added dependency on local install of libz.

1 0

[75517] trunk/dports/graphics/pngmeta
by ryandesign＠macports.org 28 Jan '11

28 Jan '11

Revision: 75517 http://trac.macports.org/changeset/75517 Author: ryandesign(a)macports.org Date: 2011-01-28 03:55:35 -0800 (Fri, 28 Jan 2011) Log Message: ----------- pngmeta: replace use of private libpng constants (which are now inaccessible in libpng 1.4) with their values; see #28183 Modified Paths: -------------- trunk/dports/graphics/pngmeta/Portfile Added Paths: ----------- trunk/dports/graphics/pngmeta/files/ trunk/dports/graphics/pngmeta/files/patch-pngmeta.c.diff Modified: trunk/dports/graphics/pngmeta/Portfile =================================================================== --- trunk/dports/graphics/pngmeta/Portfile 2011-01-27 21:50:42 UTC (rev 75516) +++ trunk/dports/graphics/pngmeta/Portfile 2011-01-28 11:55:35 UTC (rev 75517) @@ -13,6 +13,9 @@ master_sites sourceforge:pmt checksums md5 5d495f7668f7ccc64a1576c8cfd15506 depends_lib port:libpng port:zlib + +patchfiles patch-pngmeta.c.diff + configure.args --with-png-includes="${prefix}/include" \ --with-png-lib="${prefix}/lib" \ --with-png="${prefix}/include" --with-zlib="${prefix}/include" \ Added: trunk/dports/graphics/pngmeta/files/patch-pngmeta.c.diff =================================================================== --- trunk/dports/graphics/pngmeta/files/patch-pngmeta.c.diff (rev 0) +++ trunk/dports/graphics/pngmeta/files/patch-pngmeta.c.diff 2011-01-28 11:55:35 UTC (rev 75517) @@ -0,0 +1,49 @@ +--- pngmeta.c.orig 2001-05-16 09:41:06.000000000 -0500 ++++ pngmeta.c 2011-01-28 05:36:42.000000000 -0600 +@@ -126,15 +126,15 @@ + + png_reset_crc(png_ptr); + png_crc_read(png_ptr, png_ptr->chunk_name, 4); +- } while (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4)); ++ } while (!png_memcmp(png_ptr->chunk_name, "IDAT", 4)); + + png_ptr->mode |= PNG_AFTER_IDAT; + + do + { +- if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4)) ++ if (!png_memcmp(png_ptr->chunk_name, "IHDR", 4)) + png_handle_IHDR(png_ptr, info_ptr, length); +- else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4)) ++ else if (!png_memcmp(png_ptr->chunk_name, "IDAT", 4)) + { + /* Zero length IDATs are legal after the last IDAT has been + * read, but not after other chunks have been read. +@@ -145,22 +145,22 @@ + png_crc_finish(png_ptr, 0); + } + #if defined(PNG_READ_tIME_SUPPORTED) +- else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4)) ++ else if (!png_memcmp(png_ptr->chunk_name, "tIME", 4)) + png_handle_tIME(png_ptr, info_ptr, length); + #endif + #if defined(PNG_READ_tEXt_SUPPORTED) +- else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4)) ++ else if (!png_memcmp(png_ptr->chunk_name, "tEXt", 4)) + png_handle_tEXt(png_ptr, info_ptr, length); + #endif + #if defined(PNG_READ_zTXt_SUPPORTED) +- else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4)) ++ else if (!png_memcmp(png_ptr->chunk_name, "zTXt", 4)) + png_handle_zTXt(png_ptr, info_ptr, length); + #endif + #if defined(PNG_READ_iTXt_SUPPORTED) +- else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4)) ++ else if (!png_memcmp(png_ptr->chunk_name, "iTXt", 4)) + png_handle_iTXt(png_ptr, info_ptr, length); + #endif +- else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4)) ++ else if (!png_memcmp(png_ptr->chunk_name, "IEND", 4)) + png_handle_IEND(png_ptr, info_ptr, length); + else + png_handle_unknown(png_ptr, info_ptr, length);

1 0