Revision: 118367 https://trac.macports.org/changeset/118367 Author: devans@macports.org Date: 2014-04-01 00:27:58 -0700 (Tue, 01 Apr 2014) Log Message: ----------- GNOME-3/stable: libpeas, update to version 1.10.0, add +python33 +python34 variants, correct default variant logic, support for gjs dropped upstream. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/libpeas/Portfile Removed Paths: ------------- users/devans/GNOME-3/stable/dports/gnome/libpeas/files/ Modified: users/devans/GNOME-3/stable/dports/gnome/libpeas/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/libpeas/Portfile 2014-04-01 01:18:12 UTC (rev 118366) +++ users/devans/GNOME-3/stable/dports/gnome/libpeas/Portfile 2014-04-01 07:27:58 UTC (rev 118367) @@ -4,8 +4,7 @@ PortSystem 1.0 name libpeas -version 1.9.0 -revision 2 +version 1.10.0 license LGPL-2 set branch [join [lrange [split ${version} .] 0 1] .] description libpeas is a GObject-based plugins engine @@ -18,8 +17,8 @@ use_xz yes -checksums rmd160 8672bf573e18ed44b3489de08ffcbfabf6ea51ff \ - sha256 008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d +checksums rmd160 c5406a1eae9b67db9a849c10164a3c2797959382 \ + sha256 4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47 depends_build port:pkgconfig \ port:intltool \ @@ -29,9 +28,6 @@ port:gobject-introspection \ port:seed -patchfiles patch-configure.ac.diff \ - patch-loaders-python-peas-plugin-loader-python.c.diff - # update m4/intltool.m4 and autoreconf pre-configure { @@ -41,12 +37,8 @@ use_autoreconf yes autoreconf.args -fvi -# disable gjs support which fails to build with newer gjs versions -# TODO: apply upstream patch to remove gjs support for this reason - configure.args --enable-gtk \ --enable-seed \ - --disable-gjs \ --disable-glade-catalog \ --disable-python2 \ --disable-python3 \ @@ -68,9 +60,11 @@ configure.args-replace --disable-python2 --enable-python2 } +default_variants +python27 + # python3 minimum version is 3.2.0 -variant python32 conflicts python33 description {Use python 3.2} { +variant python32 conflicts python33 python34 description {Use python 3.2} { depends_lib-append port:py32-gobject3 set python_prefix ${frameworks_dir}/Python.framework/Versions/3.2 configure.pkg_config_path ${python_prefix}/lib/pkgconfig @@ -80,7 +74,7 @@ configure.args-replace --disable-python3 --enable-python3 } -variant python33 conflicts python32 description {Use python 3.3} { +variant python33 conflicts python32 python34 description {Use python 3.3} { depends_lib-append port:py33-gobject3 set python_prefix ${frameworks_dir}/Python.framework/Versions/3.3 configure.pkg_config_path ${python_prefix}/lib/pkgconfig @@ -90,10 +84,20 @@ configure.args-replace --disable-python3 --enable-python3 } -if {![variant_isset python33]} { - default_variants +python27 +python32 +variant python34 conflicts python32 python33 description {Use python 3.4} { + depends_lib-append port:py34-gobject3 + set python_prefix ${frameworks_dir}/Python.framework/Versions/3.4 + configure.pkg_config_path ${python_prefix}/lib/pkgconfig + configure.python ${prefix}/bin/python3.4 + configure.env-append PYTHON3_CONFIG=${prefix}/bin/python3.4-config + configure.cflags-append -L${python_prefix}/lib + configure.args-replace --disable-python3 --enable-python3 } +if {![variant_isset python32] && ![variant_isset python34]} { + default_variants +python33 +} + post-activate { system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" }