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

[75347] trunk/dports/gnome/gnofract4d
by ryandesign＠macports.org 23 Jan '11

23 Jan '11

Revision: 75347 http://trac.macports.org/changeset/75347 Author: ryandesign(a)macports.org Date: 2011-01-22 17:37:37 -0800 (Sat, 22 Jan 2011) Log Message: ----------- gnofract4d: fix build with libpng 1.4 (#28089); switch to python 2.7; actually use jpeg Modified Paths: -------------- trunk/dports/gnome/gnofract4d/Portfile Added Paths: ----------- trunk/dports/gnome/gnofract4d/files/patch-fract4d-c-imageIO.cpp.diff trunk/dports/gnome/gnofract4d/files/patch-setup.py.diff Modified: trunk/dports/gnome/gnofract4d/Portfile =================================================================== --- trunk/dports/gnome/gnofract4d/Portfile 2011-01-22 23:16:08 UTC (rev 75346) +++ trunk/dports/gnome/gnofract4d/Portfile 2011-01-23 01:37:37 UTC (rev 75347) @@ -1,11 +1,11 @@ # $Id$ PortSystem 1.0 -PortGroup python26 1.0 +PortGroup python27 1.0 name gnofract4d version 3.12 -revision 1 +revision 2 description Gnofract4D is a descendant of gnofract. long_description ${description} maintainers nomaintainer @@ -20,12 +20,18 @@ dist_subdir ${name} -depends_lib-append port:py26-gtk \ +depends_lib-append port:py27-gtk \ port:jpeg \ port:libpng -patchfiles patch-fract4d_fractconfig.py.diff +patchfiles patch-fract4d_fractconfig.py.diff \ + patch-fract4d-c-imageIO.cpp.diff \ + patch-setup.py.diff +post-patch { + reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py +} + python.link_binaries no post-destroot { ln -s "${python.prefix}/bin/${name}" "${destroot}${prefix}/bin/${name}" Added: trunk/dports/gnome/gnofract4d/files/patch-fract4d-c-imageIO.cpp.diff =================================================================== --- trunk/dports/gnome/gnofract4d/files/patch-fract4d-c-imageIO.cpp.diff (rev 0) +++ trunk/dports/gnome/gnofract4d/files/patch-fract4d-c-imageIO.cpp.diff 2011-01-23 01:37:37 UTC (rev 75347) @@ -0,0 +1,47 @@ +--- fract4d/c/imageIO.cpp.orig 2007-07-03 22:50:02.000000000 -0500 ++++ fract4d/c/imageIO.cpp 2011-01-22 19:25:22.000000000 -0600 +@@ -119,7 +119,7 @@ + info_ptr = png_create_info_struct(png_ptr); + if(NULL == info_ptr) + { +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return; + } + +@@ -312,7 +312,7 @@ + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) + { +- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); + return; + } + +@@ -325,7 +325,7 @@ + //printf("shutdown\n"); + if(ok) + { +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + } + } + +@@ -351,7 +351,7 @@ + + //printf("get IHDR\n"); + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, +- &interlace_type, int_p_NULL, int_p_NULL); ++ &interlace_type, (int *)NULL, (int *)NULL); + + //printf("set res(%d,%d)\n",width,height); + if(!im->set_resolution(width, height, -1, -1)) +@@ -372,7 +372,7 @@ + for (int y = 0; y < im->Yres(); y++) + { + png_bytep row = (png_bytep)(im->getBuffer() + im->row_length() * y); +- png_read_rows(png_ptr, &row, png_bytepp_NULL, 1); ++ png_read_rows(png_ptr, &row, NULL, 1); + } + } + return true; Added: trunk/dports/gnome/gnofract4d/files/patch-setup.py.diff =================================================================== --- trunk/dports/gnome/gnofract4d/files/patch-setup.py.diff (rev 0) +++ trunk/dports/gnome/gnofract4d/files/patch-setup.py.diff 2011-01-23 01:37:37 UTC (rev 75347) @@ -0,0 +1,11 @@ +--- setup.py.orig 2009-05-17 18:27:17.000000000 -0500 ++++ setup.py 2011-01-22 19:30:06.000000000 -0600 +@@ -60,7 +60,7 @@ + png_libs = call_package_config("libpng", "--libs", True) + + jpg_lib = "jpeg" +-if os.path.isfile("/usr/include/jpeglib.h"): ++if os.path.isfile("@PREFIX@/include/jpeglib.h"): + extra_macros.append(('JPG_ENABLED', 1)) + jpg_libs = [ jpg_lib ] + else:

1 0

propchange - r75337 svn:log
by takeshi＠macports.org 23 Jan '11

23 Jan '11

Author: takeshi(a)macports.org (original author: takeshi(a)macports.org) Revision: 75337 Property Name: svn:log --- /admin/var/tmp/revprops/pre-75337-takeshi(a)macports.org 2011-01-22 16:23:45.000000000 -0800 +++ /admin/var/tmp/revprops/post-75337-takeshi(a)macports.org 2011-01-22 16:25:30.000000000 -0800 @@ -1 +1 @@ -ncarg: addresses #28043 +ncarg: fix absence of ncl when built with libpng 1.4 (#28043); add gcc45 variant

1 0

[75346] trunk/dports/perl/p5-io-socket-ssl/Portfile
by l2g＠macports.org 22 Jan '11

22 Jan '11

Revision: 75346 http://trac.macports.org/changeset/75346 Author: l2g(a)macports.org Date: 2011-01-22 15:16:08 -0800 (Sat, 22 Jan 2011) Log Message: ----------- p5-io-socket-ssl: upgrade to 1.38, which fixes a bug related to HTTP certificate verification and common-name wildcards Modified Paths: -------------- trunk/dports/perl/p5-io-socket-ssl/Portfile Modified: trunk/dports/perl/p5-io-socket-ssl/Portfile =================================================================== --- trunk/dports/perl/p5-io-socket-ssl/Portfile 2011-01-22 23:09:03 UTC (rev 75345) +++ trunk/dports/perl/p5-io-socket-ssl/Portfile 2011-01-22 23:16:08 UTC (rev 75346) @@ -4,9 +4,9 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.setup IO-Socket-SSL 1.37 +perl5.setup IO-Socket-SSL 1.38 ../../authors/id/S/SU/SULLR platforms darwin -maintainers l2g +maintainers l2g openmaintainer license Artistic/GPL supported_archs noarch @@ -16,8 +16,8 @@ oriented interface to SSL sockets. The class is a \ descendent of IO::Socket::INET. -checksums sha1 ff68bd379643c2551b94a5a35e79363613d82e9c \ - rmd160 fdb7482e09f3a904ff17a66e098a192cf89b9ff1 +checksums sha1 8e003cedd7ca9b4d4cd0d1e45ad544914df19bdc \ + rmd160 0398f0a522ac2ef61ce850314aa8c141fbdf8c33 depends_lib-append port:p5-net-ssleay port:p5-net-libidn

1 0

[75345] trunk/dports/perl/p5-uri/Portfile
by l2g＠macports.org 22 Jan '11

22 Jan '11

Revision: 75345 http://trac.macports.org/changeset/75345 Author: l2g(a)macports.org Date: 2011-01-22 15:09:03 -0800 (Sat, 22 Jan 2011) Log Message: ----------- p5-uri: upgrade to URI 1.57, which includes various enhancements Modified Paths: -------------- trunk/dports/perl/p5-uri/Portfile Modified: trunk/dports/perl/p5-uri/Portfile =================================================================== --- trunk/dports/perl/p5-uri/Portfile 2011-01-22 21:00:43 UTC (rev 75344) +++ trunk/dports/perl/p5-uri/Portfile 2011-01-22 23:09:03 UTC (rev 75345) @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.setup URI 1.56 +perl5.setup URI 1.57 ../../authors/id/G/GA/GAAS platforms darwin maintainers l2g openmaintainer license Artistic/GPL @@ -17,8 +17,8 @@ implements the URI class. Objects of this class represent Uniform Resource \ Identifier references as specified in RFC 2396 and updated by RFC 2732. -checksums sha1 86b2dcd534f946754a2e714ff488a50cf15183e3 \ - rmd160 cd33b7b204a5b80c279d570568d14eb9ec6b9360 +checksums sha1 3a910fbb16247b9641ac4d80343d3e9a291f0f0d \ + rmd160 4acdd79c46e03bc59e95212c0eac65b274a5055c depends_lib-append port:p5-mime-base64

1 0

[75344] trunk/dports/cross/avr-gdb/Portfile
by landonf＠macports.org 22 Jan '11

22 Jan '11

Revision: 75344 http://trac.macports.org/changeset/75344 Author: landonf(a)macports.org Date: 2011-01-22 13:00:43 -0800 (Sat, 22 Jan 2011) Log Message: ----------- Do not install unnecessary files that conflict with autoconf and other gdb ports. Modified Paths: -------------- trunk/dports/cross/avr-gdb/Portfile Modified: trunk/dports/cross/avr-gdb/Portfile =================================================================== --- trunk/dports/cross/avr-gdb/Portfile 2011-01-22 20:29:57 UTC (rev 75343) +++ trunk/dports/cross/avr-gdb/Portfile 2011-01-22 21:00:43 UTC (rev 75344) @@ -35,4 +35,7 @@ file delete $f } file delete "${destroot}${prefix}/share/info/bfd.info" + + # Conflcts with autoconf and other gdb ports + file delete -force "${destroot}/${prefix}/share/info" }

1 0

[75343] trunk/dports/graphics/lprof/Portfile
by michaelld＠macports.org 22 Jan '11

22 Jan '11

Revision: 75343 http://trac.macports.org/changeset/75343 Author: michaelld(a)macports.org Date: 2011-01-22 12:29:57 -0800 (Sat, 22 Jan 2011) Log Message: ----------- lprof: Use MacPorts' provided 'vigra' since it works with libpng14 (the internal-to-lprof version of vigra does not). Add some CMake include directory defines to overcome user-installed versions (from "UnixImageIO.framework"). Addresses ticket #25315 once ticket #28087 is committed. Modified Paths: -------------- trunk/dports/graphics/lprof/Portfile Modified: trunk/dports/graphics/lprof/Portfile =================================================================== --- trunk/dports/graphics/lprof/Portfile 2011-01-22 20:19:11 UTC (rev 75342) +++ trunk/dports/graphics/lprof/Portfile 2011-01-22 20:29:57 UTC (rev 75343) @@ -26,7 +26,7 @@ cvs.module lprof depends_lib-append port:libusb-compat port:libpng port:tiff \ - port:zlib port:qt-assistant + port:zlib port:qt-assistant port:vigra depends_build-append port:cmake depends_skip_archcheck cmake @@ -46,6 +46,9 @@ -DCMAKE_INCLUDE_PATH=${prefix}/include \ -DCMAKE_LIBRARY_PATH=${prefix}/lib \ ${qt_cmake_defines} \ + -DJPEG_INCLUDE_DIR=${prefix}/include \ + -DPNG_PNG_INCLUDE_DIR=${prefix}/include \ + -DTIFF_INCLUDE_DIR=${prefix}/include \ -DQTTRANS_LRELEASE_EXECUTABLE=${qt_lrelease_cmd} \ -Wno-dev .

1 0

[75342] trunk/dports/python/py27-pyqt4/Portfile
by michaelld＠macports.org 22 Jan '11

22 Jan '11

Revision: 75342 http://trac.macports.org/changeset/75342 Author: michaelld(a)macports.org Date: 2011-01-22 12:19:11 -0800 (Sat, 22 Jan 2011) Log Message: ----------- py27-pyqt4: Add missing 'Q' in UIC code; ticket #27801. Modified Paths: -------------- trunk/dports/python/py27-pyqt4/Portfile Modified: trunk/dports/python/py27-pyqt4/Portfile =================================================================== --- trunk/dports/python/py27-pyqt4/Portfile 2011-01-22 16:30:13 UTC (rev 75341) +++ trunk/dports/python/py27-pyqt4/Portfile 2011-01-22 20:19:11 UTC (rev 75342) @@ -6,6 +6,7 @@ name py27-pyqt4 version 4.8.2 +revision 1 categories python devel platforms macosx maintainers michaelld openmaintainer @@ -35,6 +36,10 @@ patchfiles patch-configure.py post-patch { reinplace "s|@@MACPORTS_PYTHON_FRAMEWORK@@|${frameworks_dir}/Python.framework/Versions/${pyversion}/Python|" ${worksrcpath}/configure.py + + # fix missing "Q" in UIC code + reinplace "s,\\.StackedWidget,.QStackedWidget,g" \ + ${worksrcpath}/pyuic/uic/uiparser.py } pre-configure {

1 0

[75341] trunk/dports/www/midori/Portfile
by afb＠macports.org 22 Jan '11

22 Jan '11

Revision: 75341 http://trac.macports.org/changeset/75341 Author: afb(a)macports.org Date: 2011-01-22 08:30:13 -0800 (Sat, 22 Jan 2011) Log Message: ----------- midori: revbump for libpng 1.4 (r75159) Revision Links: -------------- http://trac.macports.org/changeset/75159 Modified Paths: -------------- trunk/dports/www/midori/Portfile Modified: trunk/dports/www/midori/Portfile =================================================================== --- trunk/dports/www/midori/Portfile 2011-01-22 16:15:32 UTC (rev 75340) +++ trunk/dports/www/midori/Portfile 2011-01-22 16:30:13 UTC (rev 75341) @@ -4,7 +4,7 @@ name midori version 0.2.9 -revision 2 +revision 3 categories www description Midori is a lightweight web browser long_description ${description}

1 0

[75340] trunk/dports/graphics/mtpaint/Portfile
by afb＠macports.org 22 Jan '11

22 Jan '11

Revision: 75340 http://trac.macports.org/changeset/75340 Author: afb(a)macports.org Date: 2011-01-22 08:15:32 -0800 (Sat, 22 Jan 2011) Log Message: ----------- port upgrade: mtpaint 3.31 Modified Paths: -------------- trunk/dports/graphics/mtpaint/Portfile Modified: trunk/dports/graphics/mtpaint/Portfile =================================================================== --- trunk/dports/graphics/mtpaint/Portfile 2011-01-22 16:06:12 UTC (rev 75339) +++ trunk/dports/graphics/mtpaint/Portfile 2011-01-22 16:15:32 UTC (rev 75340) @@ -3,8 +3,7 @@ PortSystem 1.0 name mtpaint -version 3.20 -revision 2 +version 3.31 categories graphics maintainers afb openmaintainer description Mark Tyler's Painting Program @@ -15,7 +14,9 @@ platforms darwin master_sites sourceforge:mtpaint use_bzip2 yes -checksums md5 772f96288f6dc7c78597e4878fc68597 +checksums md5 fbe34eb25f96b6092403115f1f6ab387 \ + sha1 19396c905a227ab66b804dafd6fe76ecda519282 \ + rmd160 94243d246cef12e09c33b728ef37b16594d40813 depends_lib port:libpng port:gtk2 port:freetype @@ -24,9 +25,9 @@ configure.args-append gtk2 man cflags configure.env CFLAGS=-I${prefix}/include universal_variant no -destroot.args-append MT_PREFIX=${destroot}${prefix} \ - BIN_INSTALL=${destroot}${prefix}/bin \ - MT_MAN_DEST=${destroot}${prefix}/share/man/man1 +destroot.args-append MT_PREFIX=${prefix} \ + BIN_INSTALL=${prefix}/bin \ + MT_MAN_DEST=${prefix}/share/man/man1 variant gtk1 description "use GTK+1 instead of GTK+2" { depends_lib-delete port:gtk2 port:freetype

1 0

[75339] trunk/dports/graphics/mtpaint
by afb＠macports.org 22 Jan '11

22 Jan '11

Revision: 75339 http://trac.macports.org/changeset/75339 Author: afb(a)macports.org Date: 2011-01-22 08:06:12 -0800 (Sat, 22 Jan 2011) Log Message: ----------- fix png upgrade breakage (#28090) Modified Paths: -------------- trunk/dports/graphics/mtpaint/Portfile Added Paths: ----------- trunk/dports/graphics/mtpaint/files/ trunk/dports/graphics/mtpaint/files/patch-png.c.diff Modified: trunk/dports/graphics/mtpaint/Portfile =================================================================== --- trunk/dports/graphics/mtpaint/Portfile 2011-01-22 14:54:27 UTC (rev 75338) +++ trunk/dports/graphics/mtpaint/Portfile 2011-01-22 16:06:12 UTC (rev 75339) @@ -4,7 +4,7 @@ name mtpaint version 3.20 -revision 1 +revision 2 categories graphics maintainers afb openmaintainer description Mark Tyler's Painting Program @@ -19,6 +19,8 @@ depends_lib port:libpng port:gtk2 port:freetype +patchfiles patch-png.c.diff + configure.args-append gtk2 man cflags configure.env CFLAGS=-I${prefix}/include universal_variant no Added: trunk/dports/graphics/mtpaint/files/patch-png.c.diff =================================================================== --- trunk/dports/graphics/mtpaint/files/patch-png.c.diff (rev 0) +++ trunk/dports/graphics/mtpaint/files/patch-png.c.diff 2011-01-22 16:06:12 UTC (rev 75339) @@ -0,0 +1,20 @@ +--- src/png.c.orig 2007-12-27 20:06:44.000000000 +0100 ++++ src/png.c 2011-01-21 19:50:48.000000000 +0100 +@@ -357,7 +357,7 @@ + if (settings->bpp == 3) + { + png_set_strip_16(png_ptr); +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + png_set_palette_to_rgb(png_ptr); + png_set_gray_to_rgb(png_ptr); + +@@ -462,7 +462,7 @@ + png_set_strip_alpha(png_ptr); + png_set_packing(png_ptr); + if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + for (i = 0; i < height; i++) + { + row_pointers[i] = settings->img[CHN_IMAGE] + i * width;

1 0