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

[144443] trunk/dports
by devans＠macports.org 08 Jan '16

08 Jan '16

Revision: 144443 https://trac.macports.org/changeset/144443 Author: devans(a)macports.org Date: 2016-01-08 15:54:17 -0800 (Fri, 08 Jan 2016) Log Message: ----------- various dependents of libmng: increment revision to rebuild with libmng 2.0.3. Modified Paths: -------------- trunk/dports/aqua/qt3-mac/Portfile trunk/dports/aqua/qt4-mac/Portfile trunk/dports/aqua/qt5/Portfile trunk/dports/graphics/gimp2/Portfile trunk/dports/graphics/gimp3-devel/Portfile trunk/dports/graphics/synfig/Portfile trunk/dports/x11/qt4-x11/Portfile Modified: trunk/dports/aqua/qt3-mac/Portfile =================================================================== --- trunk/dports/aqua/qt3-mac/Portfile 2016-01-08 23:50:05 UTC (rev 144442) +++ trunk/dports/aqua/qt3-mac/Portfile 2016-01-08 23:54:17 UTC (rev 144443) @@ -5,7 +5,7 @@ name qt3-mac conflicts qt3 qt4-mac qt4-mac-devel version 3.3.8b -revision 4 +revision 5 categories aqua license {QPL-1 GPL-2 GPL-3} maintainers blair openmaintainer Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2016-01-08 23:50:05 UTC (rev 144442) +++ trunk/dports/aqua/qt4-mac/Portfile 2016-01-08 23:54:17 UTC (rev 144443) @@ -16,7 +16,7 @@ #conflicts qt3 qt3-mac qt4-mac-devel conflicts qt3 qt3-mac version 4.8.7 -revision 2 +revision 3 set branch [join [lrange [split ${version} .] 0 1] .] categories aqua Modified: trunk/dports/aqua/qt5/Portfile =================================================================== --- trunk/dports/aqua/qt5/Portfile 2016-01-08 23:50:05 UTC (rev 144442) +++ trunk/dports/aqua/qt5/Portfile 2016-01-08 23:54:17 UTC (rev 144443) @@ -19,7 +19,7 @@ homepage http://qt.io if { ${version} eq "5.5.1" && ${subport} eq "qt5-qtimageformats" } { - incr revision 1 + incr revision 2 } if { ${version} eq "5.5.1" && ${subport} eq "qt5-qtwebengine" } { Modified: trunk/dports/graphics/gimp2/Portfile =================================================================== --- trunk/dports/graphics/gimp2/Portfile 2016-01-08 23:50:05 UTC (rev 144442) +++ trunk/dports/graphics/gimp2/Portfile 2016-01-08 23:54:17 UTC (rev 144443) @@ -8,6 +8,7 @@ conflicts gimp2-devel gimp3-devel # please remember to update the gimp metapackage to match version 2.8.16 +revision 1 license GPL-3+ categories graphics maintainers devans Modified: trunk/dports/graphics/gimp3-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp3-devel/Portfile 2016-01-08 23:50:05 UTC (rev 144442) +++ trunk/dports/graphics/gimp3-devel/Portfile 2016-01-08 23:54:17 UTC (rev 144443) @@ -10,6 +10,7 @@ set git_commit 595248227b17fe1fed4c4ff5a8979493ee863162 set git_date 20151213 version 2.99.0-${git_date} +revision 1 license GPL-3+ categories graphics maintainers devans Modified: trunk/dports/graphics/synfig/Portfile =================================================================== --- trunk/dports/graphics/synfig/Portfile 2016-01-08 23:50:05 UTC (rev 144442) +++ trunk/dports/graphics/synfig/Portfile 2016-01-08 23:54:17 UTC (rev 144443) @@ -16,7 +16,7 @@ default distname {${subport}-${version}} if {${subport} eq ${name}} { - revision 0 + revision 1 description vector-based 2-D animation package Modified: trunk/dports/x11/qt4-x11/Portfile =================================================================== --- trunk/dports/x11/qt4-x11/Portfile 2016-01-08 23:50:05 UTC (rev 144442) +++ trunk/dports/x11/qt4-x11/Portfile 2016-01-08 23:54:17 UTC (rev 144443) @@ -13,7 +13,7 @@ name ${select_name} version 4.4.3 -revision 14 +revision 15 categories x11 license {GPL-2 GPL-3 OpenSSLException} maintainers nomaintainer

1 0

[144442] trunk/dports/aqua/qt5
by mcalhoun＠macports.org 08 Jan '16

08 Jan '16

Revision: 144442 https://trac.macports.org/changeset/144442 Author: mcalhoun(a)macports.org Date: 2016-01-08 15:50:05 -0800 (Fri, 08 Jan 2016) Log Message: ----------- qt5-qtbase: respect macosx_deployment_target and configure.cxx_stdlib values in build Modified Paths: -------------- trunk/dports/aqua/qt5/Portfile Added Paths: ----------- trunk/dports/aqua/qt5/files/patch-mkspecs.diff Modified: trunk/dports/aqua/qt5/Portfile =================================================================== --- trunk/dports/aqua/qt5/Portfile 2016-01-08 23:45:11 UTC (rev 144441) +++ trunk/dports/aqua/qt5/Portfile 2016-01-08 23:50:05 UTC (rev 144442) @@ -30,6 +30,10 @@ incr revision 1 } +if { ${version} eq "5.5.1" && ${subport} eq "qt5-qtbase" } { + incr revision 1 +} + # generate documentation from complete code base # generate modules from separate downloads if { ${subport} ne "${name}-docs" } { @@ -832,6 +836,7 @@ # special case if { ${subport} ne "${name}-docs" } { + # https://codereview.qt-project.org/#/c/141654/ patchfiles-append patch-add_sdk.diff @@ -850,6 +855,64 @@ #https://codereview.qt-project.org/#/c/138349 patchfiles-append patch-rpath.diff + + #----------------------------------------------------------------------------- + # qtbase is used for: + # 1) building qtbase + # 2) building MacPorts projects via qmake + # 3) building end-user projects + # + # 1 & 2 require consistency with the MacPorts environment + # 3 requires consistency with the default Qt installation + # + # 2 can be achieved via environment variables + # (e.g. QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}) + # + # the only way 3 can be achieved is if no changes are made to the build system + # + # the following is an attempt to achieve 1 without destroying 3 + #----------------------------------------------------------------------------- + + # save default spec files + post-extract { + copy ${worksrcpath}/mkspecs ${worksrcpath}/mkspecs-save + } + + # change default compiler flags for the purpose of building qtbase + patchfiles-append patch-mkspecs.diff + post-patch { + global qt_save_cxx_stdlib + + reinplace \ + "s|__MACPORTS__CXX_STDLIB__|${qt_save_cxx_stdlib}|g" \ + ${worksrcpath}/mkspecs/common/clang-mac.conf + + foreach spec {macx-clang macx-clang-32} { + reinplace \ + "s|__MACPORTS_DEPLOYMENT_TARGET__|${macosx_deployment_target}|g" \ + ${worksrcpath}/mkspecs/${spec}/qmake.conf + } + } + + # return modified spec files to the default values + post-build { + if { [variant_exists universal] && [variant_isset universal] } { + foreach arch ${universal_archs_to_use} { + move -force ${worksrcpath}-${arch}/mkspecs-save/common/clang-mac.conf ${worksrcpath}-${arch}/mkspecs/common/clang-mac.conf + + foreach spec {macx-clang macx-clang-32} { + move -force ${worksrcpath}-${arch}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}-${arch}/mkspecs/${spec}/qmake.conf + } + } + } else { + move -force ${worksrcpath}/mkspecs-save/common/clang-mac.conf ${worksrcpath}/mkspecs/common/clang-mac.conf + + foreach spec {macx-clang macx-clang-32} { + move -force ${worksrcpath}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}/mkspecs/${spec}/qmake.conf + } + } + } + #----------------------------------------------------------------------------- } if { [variant_isset tests] } { @@ -1000,6 +1063,10 @@ # Qt builds part of the system using environment provided my MacPorts. # It builds the rest using its own internal environment. # For consistency, clear MacPorts environment. + + # configure.cxx_stdlib value is needed later in a post-patch + set qt_save_cxx_stdlib ${configure.cxx_stdlib} + configure.cxx_stdlib configure.sdkroot configure.cc_archflags Added: trunk/dports/aqua/qt5/files/patch-mkspecs.diff =================================================================== --- trunk/dports/aqua/qt5/files/patch-mkspecs.diff (rev 0) +++ trunk/dports/aqua/qt5/files/patch-mkspecs.diff 2016-01-08 23:50:05 UTC (rev 144442) @@ -0,0 +1,31 @@ +--- .//mkspecs/common/clang-mac.conf.orig 2016-01-08 05:58:40.000000000 -0700 ++++ .//mkspecs/common/clang-mac.conf 2016-01-08 06:01:16.000000000 -0700 +@@ -6,5 +6,5 @@ + + QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0 + +-QMAKE_CXXFLAGS_CXX11 += -stdlib=libc++ +-QMAKE_LFLAGS_CXX11 += -stdlib=libc++ ++QMAKE_CXXFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__ ++QMAKE_LFLAGS += -stdlib=__MACPORTS__CXX_STDLIB__ +--- mkspecs/macx-clang/qmake.conf.orig 2016-01-08 05:56:17.000000000 -0700 ++++ mkspecs/macx-clang/qmake.conf 2016-01-08 06:02:29.000000000 -0700 +@@ -11,6 +11,6 @@ + include(../common/clang.conf) + include(../common/clang-mac.conf) + +-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 ++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__ + + load(qt_config) +--- .//mkspecs/macx-clang-32/qmake.conf.orig 2016-01-08 05:56:36.000000000 -0700 ++++ .//mkspecs/macx-clang-32/qmake.conf 2016-01-08 06:02:20.000000000 -0700 +@@ -11,7 +11,7 @@ + include(../common/clang.conf) + include(../common/clang-mac.conf) + +-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 ++QMAKE_MACOSX_DEPLOYMENT_TARGET = __MACPORTS_DEPLOYMENT_TARGET__ + + QMAKE_CFLAGS += -arch i386 + QMAKE_OBJECTIVE_CFLAGS += -arch i386

1 0

[144441] trunk/dports/devel
by devans＠macports.org 08 Jan '16

08 Jan '16

Revision: 144441 https://trac.macports.org/changeset/144441 Author: devans(a)macports.org Date: 2016-01-08 15:45:11 -0800 (Fri, 08 Jan 2016) Log Message: ----------- libdevil, ResIL: add missing dependency on libGLU, increment revision to rebuild with libmng 2.0.3. Modified Paths: -------------- trunk/dports/devel/ResIL/Portfile trunk/dports/devel/libdevil/Portfile Modified: trunk/dports/devel/ResIL/Portfile =================================================================== --- trunk/dports/devel/ResIL/Portfile 2016-01-08 23:42:48 UTC (rev 144440) +++ trunk/dports/devel/ResIL/Portfile 2016-01-08 23:45:11 UTC (rev 144441) @@ -7,7 +7,7 @@ name ResIL conflicts libdevil version 1.7.9 -revision 1 +revision 2 categories devel multimedia platforms darwin license LGPL-2.1 @@ -39,6 +39,7 @@ port:tiff \ port:jasper \ port:xrender \ + port:libGLU \ port:mesa extract { Modified: trunk/dports/devel/libdevil/Portfile =================================================================== --- trunk/dports/devel/libdevil/Portfile 2016-01-08 23:42:48 UTC (rev 144440) +++ trunk/dports/devel/libdevil/Portfile 2016-01-08 23:45:11 UTC (rev 144441) @@ -7,7 +7,7 @@ name libdevil conflicts ResIL version 1.7.8 -revision 6 +revision 7 categories devel multimedia platforms darwin license LGPL-2.1 @@ -42,7 +42,8 @@ port:tiff \ port:jasper \ port:xrender \ - port:mesa + port:mesa \ + port:libGLU patchfiles patch-ilur.c \ patch-devil_internal_exports.h.diff \

1 0

[144440] trunk/dports/graphics/gimp2-devel/Portfile
by devans＠macports.org 08 Jan '16

08 Jan '16

Revision: 144440 https://trac.macports.org/changeset/144440 Author: devans(a)macports.org Date: 2016-01-08 15:42:48 -0800 (Fri, 08 Jan 2016) Log Message: ----------- gimp2-devel: update to version 2.9.3, git master as of 20151220, configuration, last upstream commit that will build without libmypaint. Modified Paths: -------------- trunk/dports/graphics/gimp2-devel/Portfile Modified: trunk/dports/graphics/gimp2-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp2-devel/Portfile 2016-01-08 23:38:51 UTC (rev 144439) +++ trunk/dports/graphics/gimp2-devel/Portfile 2016-01-08 23:42:48 UTC (rev 144440) @@ -7,8 +7,8 @@ name gimp2-devel conflicts gimp2 gimp3-devel set git_name gimp -set git_commit edff1d0647f2f915f47efa471a88f62ed3d01579 -set git_date 20151216 +set git_commit 44d5e7adcd6c8d3073a3cc9d71dee495ee58cf25 +set git_date 20151220 version 2.9.3-${git_date} license GPL-3+ categories graphics @@ -28,8 +28,8 @@ distname ${git_name}-${git_commit} -checksums rmd160 c791d92a557bedae42ae9eb97be74d64fa6649e9 \ - sha256 a6c50583377d0cd4358b2f33128def4d2ae8c65af854c4724c9c901d9b8078b4 +checksums rmd160 0d9a1feba1e1d88ace683fbd198076824fa88487 \ + sha256 9f288ae8f287d303fd20df6f8a06c52c8b337d294f7b7cf3feef3f6c19b3d5d6 depends_build port:pkgconfig \ port:intltool \ @@ -101,6 +101,7 @@ --disable-python \ --without-alsa \ --without-gudev \ + --without-libmypaint \ --without-webkit # --without-mac-twain:

1 0

[144439] trunk/dports/graphics/libmng
by devans＠macports.org 08 Jan '16

08 Jan '16

Revision: 144439 https://trac.macports.org/changeset/144439 Author: devans(a)macports.org Date: 2016-01-08 15:38:51 -0800 (Fri, 08 Jan 2016) Log Message: ----------- libmng: update to version 2.0.3, dependencies, remove outdated patch file (#44768). Modified Paths: -------------- trunk/dports/graphics/libmng/Portfile Removed Paths: ------------- trunk/dports/graphics/libmng/files/ Modified: trunk/dports/graphics/libmng/Portfile =================================================================== --- trunk/dports/graphics/libmng/Portfile 2016-01-08 23:12:46 UTC (rev 144438) +++ trunk/dports/graphics/libmng/Portfile 2016-01-08 23:38:51 UTC (rev 144439) @@ -4,8 +4,7 @@ PortSystem 1.0 name libmng -version 1.0.10 -revision 3 +version 2.0.3 categories graphics platforms darwin license zlib @@ -20,25 +19,13 @@ homepage http://libmng.sourceforge.net/ master_sites sourceforge:project/libmng/libmng-devel/${version} -checksums md5 a464ae7d679781beebdf7440d144b7bd \ - sha1 78ad516a1de79d00de720bf2a7c9afea2c896b09 \ - rmd160 ed09e537ebb129f5e13cba56d9d2c2a106955393 +checksums rmd160 c978990189bf8fd925b4dbe76c7a0eac0b7e7434 \ + sha256 cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa depends_lib port:jpeg \ - port:lcms \ + port:lcms2 \ port:zlib -patchfiles patch-makefiles-configure.in.diff - -post-patch { - ln -s ${worksrcpath}/makefiles/configure.in ${worksrcpath} - ln -s ${worksrcpath}/makefiles/acinclude.m4 ${worksrcpath} - ln -s ${worksrcpath}/makefiles/Makefile.am ${worksrcpath} -} - -use_autoreconf yes -autoreconf.args -fvi - configure.args --with-jpeg=${prefix} \ --with-lcms=${prefix} \ --with-zlib=${prefix}

1 0

[144438] trunk/dports/graphics/gegl-0.3/Portfile
by devans＠macports.org 08 Jan '16

08 Jan '16

Revision: 144438 https://trac.macports.org/changeset/144438 Author: devans(a)macports.org Date: 2016-01-08 15:12:46 -0800 (Fri, 08 Jan 2016) Log Message: ----------- gegl-0.3: increment revision to rebuild with webp 0.5.0. Modified Paths: -------------- trunk/dports/graphics/gegl-0.3/Portfile Modified: trunk/dports/graphics/gegl-0.3/Portfile =================================================================== --- trunk/dports/graphics/gegl-0.3/Portfile 2016-01-08 23:07:13 UTC (rev 144437) +++ trunk/dports/graphics/gegl-0.3/Portfile 2016-01-08 23:12:46 UTC (rev 144438) @@ -9,6 +9,7 @@ name gegl-0.3 set gname gegl version 0.3.4 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] conflicts gegl-devel license {GPL-3+ LGPL-3+}

1 0

[144437] trunk/dports/python/py-pystache/Portfile
by stromnov＠macports.org 08 Jan '16

08 Jan '16

Revision: 144437 https://trac.macports.org/changeset/144437 Author: stromnov(a)macports.org Date: 2016-01-08 15:07:13 -0800 (Fri, 08 Jan 2016) Log Message: ----------- py-pystache: add py35 subport Modified Paths: -------------- trunk/dports/python/py-pystache/Portfile Modified: trunk/dports/python/py-pystache/Portfile =================================================================== --- trunk/dports/python/py-pystache/Portfile 2016-01-08 23:06:11 UTC (rev 144436) +++ trunk/dports/python/py-pystache/Portfile 2016-01-08 23:07:13 UTC (rev 144437) @@ -12,7 +12,7 @@ license MIT supported_archs noarch -python.versions 27 33 34 +python.versions 27 33 34 35 maintainers stromnov openmaintainer

1 0

[144436] trunk/dports/graphics/gegl-devel/Portfile
by devans＠macports.org 08 Jan '16

08 Jan '16

Revision: 144436 https://trac.macports.org/changeset/144436 Author: devans(a)macports.org Date: 2016-01-08 15:06:11 -0800 (Fri, 08 Jan 2016) Log Message: ----------- gegl-devel: update to version 0.3.5, git master as of 20160108. Modified Paths: -------------- trunk/dports/graphics/gegl-devel/Portfile Modified: trunk/dports/graphics/gegl-devel/Portfile =================================================================== --- trunk/dports/graphics/gegl-devel/Portfile 2016-01-08 23:04:14 UTC (rev 144435) +++ trunk/dports/graphics/gegl-devel/Portfile 2016-01-08 23:06:11 UTC (rev 144436) @@ -9,8 +9,8 @@ name gegl-devel conflicts gegl set git_name gegl -set git_commit e1a6b5c164478fe9b82917ab468e5018e1705bd6 -set git_date 20151215 +set git_commit 1236c30a3e2158139ed909e6164c18663a5ee591 +set git_date 20160108 version 0.3.5-${git_date} license {GPL-3+ LGPL-3+} categories graphics @@ -29,8 +29,8 @@ distname ${git_name}-${git_commit} -checksums rmd160 8a389ad74c326e36b9540670d2db371ce4a21065 \ - sha256 0ac3386911882e45e8b4023fcb8bdb99d1aa0b5ec2a2ac3457dd83697cc4bcab +checksums rmd160 7afd9036318906a388acd7ca00532a7f9f4cae58 \ + sha256 f08e1d0107105d462c1c5193d011c2ebd2a453a2151f9926723ad7ead09f55f3 depends_build port:pkgconfig \ port:intltool \

1 0

[144435] trunk/dports/graphics/babl-devel/Portfile
by devans＠macports.org 08 Jan '16

08 Jan '16

Revision: 144435 https://trac.macports.org/changeset/144435 Author: devans(a)macports.org Date: 2016-01-08 15:04:14 -0800 (Fri, 08 Jan 2016) Log Message: ----------- babl-devel: update to version 0.1.15, git master as of 20160108. Modified Paths: -------------- trunk/dports/graphics/babl-devel/Portfile Modified: trunk/dports/graphics/babl-devel/Portfile =================================================================== --- trunk/dports/graphics/babl-devel/Portfile 2016-01-08 22:58:10 UTC (rev 144434) +++ trunk/dports/graphics/babl-devel/Portfile 2016-01-08 23:04:14 UTC (rev 144435) @@ -6,8 +6,8 @@ name babl-devel conflicts babl set git_name babl -set git_commit 746b5b64a6daa660dfc65f531f0cd46628c13660 -set git_date 20151121 +set git_commit d8f9a0d48cea1857550aa2b9f030bc1b7d768790 +set git_date 20160108 version 0.1.15-${git_date} license LGPL-3+ categories graphics @@ -25,8 +25,8 @@ distname ${git_name}-${git_commit} -checksums rmd160 5c7f822fafa4416bb3a2c4ba640f8456ba87b9e7 \ - sha256 80bb0df252a2d1713c438475cfc2b723a8f17932a4c451c5a69b9ecd65df0bd7 +checksums rmd160 29a1945b7df273078ccc226537c8e9861a29e89c \ + sha256 1d7dd86ec9d8c4893592765873d99f171380e107ed160b7a08991a95cd9cd5d2 depends_build port:automake \ port:autoconf \

1 0

[144434] trunk/dports/devel/libsdl2_ttf/Portfile
by jmr＠macports.org 08 Jan '16

08 Jan '16

Revision: 144434 https://trac.macports.org/changeset/144434 Author: jmr(a)macports.org Date: 2016-01-08 14:58:10 -0800 (Fri, 08 Jan 2016) Log Message: ----------- libsdl2_ttf: update to 2.0.13 Modified Paths: -------------- trunk/dports/devel/libsdl2_ttf/Portfile Modified: trunk/dports/devel/libsdl2_ttf/Portfile =================================================================== --- trunk/dports/devel/libsdl2_ttf/Portfile 2016-01-08 22:51:10 UTC (rev 144433) +++ trunk/dports/devel/libsdl2_ttf/Portfile 2016-01-08 22:58:10 UTC (rev 144434) @@ -4,8 +4,7 @@ name libsdl2_ttf set my_name SDL2_ttf -version 2.0.12 -revision 1 +version 2.0.13 categories devel graphics platforms darwin license zlib @@ -20,8 +19,8 @@ master_sites ${homepage}release/ distname ${my_name}-${version} -checksums rmd160 ac5dee6f8e6e1aaef36c1f070b8b07b6c4582ba1 \ - sha256 8728605443ea1cca5cad501dc34dc0cb15135d1e575551da6d151d213d356f6e +checksums rmd160 13f7490ec369fa75baee9d0d5e2da2959abf1355 \ + sha256 25ddad0302e7d74ce16a770974930cefbdcf67499ca7d40ce7a6bd7de6022fdf depends_build port:pkgconfig depends_lib port:libsdl2 \

1 0