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

[147347] trunk/base/src/macports1.0/macports.tcl
by raimue＠macports.org 02 Apr '16

02 Apr '16

Revision: 147347 https://trac.macports.org/changeset/147347 Author: raimue(a)macports.org Date: 2016-04-01 17:48:28 -0700 (Fri, 01 Apr 2016) Log Message: ----------- mportsync: fetch tar and signature at once Both ports.tar and ports.tar.rmd160 can be transferred in the same connection, removing the need for setting up another rsync process and its connection time. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2016-04-01 23:14:49 UTC (rev 147346) +++ trunk/base/src/macports1.0/macports.tcl 2016-04-02 00:48:28 UTC (rev 147347) @@ -2320,12 +2320,16 @@ # (private) # # @param url source URL to check -# @return a list containing filename and extension or an empty list -proc _source_is_snapshot {url {filename {}} {extension {}}} { +# @param filename upvar variable name for filename +# @param extension upvar variable name for extension +# @param extension upvar variable name for URL excluding the filename +proc _source_is_snapshot {url {filename {}} {extension {}} {rooturl {}}} { + upvar $rooturl myrooturl upvar $filename myfilename upvar $extension myextension - if {[regexp {^(?:https?|ftp|rsync)://.+/(.+\.(tar\.gz|tar\.bz2|tar))$} $url -> f e]} { + if {[regexp {^((?:https?|ftp|rsync)://.+/)(.+\.(tar\.gz|tar\.bz2|tar))$} $url -> u f e]} { + set myrooturl $u set myfilename $f set myextension $e @@ -2494,13 +2498,15 @@ # Where to, boss? set indexfile [macports::getindex $source] set destdir [file dirname $indexfile] - set is_tarball [_source_is_snapshot $source] + set is_tarball [_source_is_snapshot $source filename extension rooturl] file mkdir $destdir if {$is_tarball} { - set exclude_option {} + set exclude_option "--exclude=*" + set include_option "--include=/${filename} --include=/${filename}.rmd160" # need to do a few things before replacing the ports tree in this case set destdir [file dirname $destdir] + set srcstr $rooturl } else { # Keep rsync happy with a trailing slash if {[string index $source end] ne "/"} { @@ -2508,9 +2514,11 @@ } # don't sync PortIndex yet; we grab the platform specific one afterwards set exclude_option '--exclude=/PortIndex*' + set include_option {} + set srcstr $source } # Do rsync fetch - set rsync_commandline "$macports::autoconf::rsync_path $rsync_options $exclude_option $source $destdir" + set rsync_commandline "$macports::autoconf::rsync_path $rsync_options $include_option $exclude_option $srcstr $destdir" try -pass_signal { system $rsync_commandline } catch {*} { @@ -2522,14 +2530,6 @@ if {$is_tarball} { # verify signature for tarball global macports::archivefetch_pubkeys - set rsync_commandline "$macports::autoconf::rsync_path $rsync_options $exclude_option ${source}.rmd160 $destdir" - try -pass_signal { - system $rsync_commandline - } catch {*} { - ui_error "Synchronization of the ports tree signature failed doing rsync" - incr numfailed - continue - } set tarball ${destdir}/[file tail $source] set signature ${tarball}.rmd160 set openssl [macports::findBinary openssl $macports::autoconf::openssl_path]

1 0

[147346] trunk/dports/gnome/frogr
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147346 https://trac.macports.org/changeset/147346 Author: devans(a)macports.org Date: 2016-04-01 16:14:49 -0700 (Fri, 01 Apr 2016) Log Message: ----------- frogr: use gnome stable livecheck. Modified Paths: -------------- trunk/dports/gnome/frogr/Portfile Property Changed: ---------------- trunk/dports/gnome/frogr/ Property changes on: trunk/dports/gnome/frogr ___________________________________________________________________ Modified: svn:mergeinfo - /users/devans/GNOME-3/stable/dports/gnome/frogr:118243-144051 + /users/devans/GNOME-3/stable/dports/gnome/frogr:118243-147345 Modified: trunk/dports/gnome/frogr/Portfile =================================================================== --- trunk/dports/gnome/frogr/Portfile 2016-04-01 23:13:00 UTC (rev 147345) +++ trunk/dports/gnome/frogr/Portfile 2016-04-01 23:14:49 UTC (rev 147346) @@ -61,4 +61,4 @@ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/HighContrast" } -livecheck.type gnome-with-unstable +livecheck.type gnome

1 0

[147345] users/devans/GNOME-3/stable/dports/gnome/frogr/Portfile
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147345 https://trac.macports.org/changeset/147345 Author: devans(a)macports.org Date: 2016-04-01 16:13:00 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: frogr, use gnome stable livecheck. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/frogr/Portfile Modified: users/devans/GNOME-3/stable/dports/gnome/frogr/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/frogr/Portfile 2016-04-01 23:11:23 UTC (rev 147344) +++ users/devans/GNOME-3/stable/dports/gnome/frogr/Portfile 2016-04-01 23:13:00 UTC (rev 147345) @@ -61,4 +61,4 @@ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/HighContrast" } -livecheck.type gnome-with-unstable +livecheck.type gnome

1 0

[147344] users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147344 https://trac.macports.org/changeset/147344 Author: devans(a)macports.org Date: 2016-04-01 16:11:23 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: eog-plugins, add +python35 variant, default +python34. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile Modified: users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2016-04-01 23:04:53 UTC (rev 147343) +++ users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2016-04-01 23:11:23 UTC (rev 147344) @@ -54,7 +54,7 @@ # requires python32 or later -variant python34 conflicts description {Use python 3.4} { +variant python34 conflicts python35 description {Use python 3.4} { depends_build-append port:python34 configure.python ${prefix}/bin/python3.4 set python_framework ${frameworks_dir}/Python.framework/Versions/3.4 @@ -62,8 +62,18 @@ configure.args-replace --disable-python --enable-python } -default_variants +python34 +variant python35 conflicts python34 description {Use python 3.5} { + depends_build-append port:python35 + configure.python ${prefix}/bin/python3.5 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.5 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python +} +if {![variant_isset python35]} { + default_variants +python34 +} + post-activate { system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" }

1 0

[147343] users/devans/GNOME-3/stable/dports/net/rygel
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147343 https://trac.macports.org/changeset/147343 Author: devans(a)macports.org Date: 2016-04-01 16:04:53 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: rygel, update to version 0.30.0. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/net/rygel/Portfile Property Changed: ---------------- users/devans/GNOME-3/stable/dports/net/rygel/ Property changes on: users/devans/GNOME-3/stable/dports/net/rygel ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/dports/net/rygel:113316-141354 /users/devans/GNOME-3/unstable/dports/net/rygel:116416-118154,121463-125933,128864-134601,136856-140541,145538-146322 + /trunk/dports/net/rygel:113316-141354 /users/devans/GNOME-3/unstable/dports/net/rygel:116416-118154,121463-125933,128864-134601,136856-140541,145538-147206 Modified: users/devans/GNOME-3/stable/dports/net/rygel/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/net/rygel/Portfile 2016-04-01 23:02:54 UTC (rev 147342) +++ users/devans/GNOME-3/stable/dports/net/rygel/Portfile 2016-04-01 23:04:53 UTC (rev 147343) @@ -6,8 +6,7 @@ PortGroup gobject_introspection 1.0 name rygel -version 0.28.3 -revision 1 +version 0.30.0 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description Rygel DLNA media server, renderer @@ -21,8 +20,8 @@ use_xz yes -checksums rmd160 0e18a948b2903908ff95055d8bedc5f71a2963af \ - sha256 bedb76ecb1f36b721914b5c65934f8cd01f281f9ab40c22c583902c22f169c77 +checksums rmd160 07139a7fe5b2ca076d5c7de6b47853dfc15992dc \ + sha256 a5344ec726d21e2af1b43491fb3a90450733f2c716f1097eb1ca392b611b5683 depends_build port:pkgconfig \ port:intltool \

1 0

[147342] users/devans/GNOME-3/stable/dports/gnome/seahorse
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147342 https://trac.macports.org/changeset/147342 Author: devans(a)macports.org Date: 2016-04-01 16:02:54 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: seahorse, update to version 3.20.0. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile Property Changed: ---------------- users/devans/GNOME-3/stable/dports/gnome/seahorse/ Property changes on: users/devans/GNOME-3/stable/dports/gnome/seahorse ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/gnome/seahorse:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/seahorse:108265-140924 /users/devans/GNOME-3/unstable/dports/gnome/seahorse:117866-118154,133429-134674,139288-140633 /users/rmstonecipher/gnome/seahorse:102363-103172 + /branches/mld-qt-481/dports/gnome/seahorse:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/seahorse:108265-140924 /users/devans/GNOME-3/unstable/dports/gnome/seahorse:117866-118154,133429-134674,139288-140633,144880-147202 /users/rmstonecipher/gnome/seahorse:102363-103172 Modified: users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile 2016-04-01 22:59:42 UTC (rev 147341) +++ users/devans/GNOME-3/stable/dports/gnome/seahorse/Portfile 2016-04-01 23:02:54 UTC (rev 147342) @@ -4,8 +4,7 @@ PortSystem 1.0 name seahorse -version 3.18.0 -revision 1 +version 3.20.0 license GPL-2+ GFDL-1.1+ set branch [join [lrange [split ${version} .] 0 1] .] description Seahorse is a graphical interface for managing and using encryption keys. @@ -21,8 +20,8 @@ use_xz yes -checksums rmd160 50316d4704f2dc2ed16b82a5d120ce67c4d08927 \ - sha256 530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667 +checksums rmd160 7e29e2f961ec020155f2a95cd851890f4f43e47b \ + sha256 e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df depends_build port:pkgconfig \ port:intltool \

1 0

[147341] users/devans/GNOME-3/stable/dports/gnome/polari
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147341 https://trac.macports.org/changeset/147341 Author: devans(a)macports.org Date: 2016-04-01 15:59:42 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: polari, update to version 3.20.0, dependencies. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/polari/Portfile Property Changed: ---------------- users/devans/GNOME-3/stable/dports/gnome/polari/ Property changes on: users/devans/GNOME-3/stable/dports/gnome/polari ___________________________________________________________________ Added: svn:mergeinfo + /users/devans/GNOME-3/unstable/dports/gnome/polari:145906-147190 Modified: users/devans/GNOME-3/stable/dports/gnome/polari/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/polari/Portfile 2016-04-01 22:57:45 UTC (rev 147340) +++ users/devans/GNOME-3/stable/dports/gnome/polari/Portfile 2016-04-01 22:59:42 UTC (rev 147341) @@ -5,7 +5,7 @@ PortGroup gobject_introspection 1.0 name polari -version 3.18.1 +version 3.20.0 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description An IRC Client for GNOME @@ -21,8 +21,8 @@ use_xz yes -checksums rmd160 c911e2befa64dbc28526791110642f0e7649fb59 \ - sha256 554a089b1edf88d49408ecf6ce79ad6f7114ecf557753c8f39a9af153a76843a +checksums rmd160 9d9549e5fb1d53f49fd0420cc650e7d2990e7c77 \ + sha256 519402e5a7e7aa684d364523bf16357be748c4d0a08b1297e2dee379b8da440a depends_build port:pkgconfig \ port:appstream-glib \ @@ -34,10 +34,13 @@ depends_lib port:desktop-file-utils \ port:gjs \ port:gtk3 \ + port:libsecret \ port:telepathy-glib \ + port:telepathy-idle \ port:telepathy-logger -depends_run port:gnome-themes-standard +depends_run port:gnome-keyring \ + port:gnome-themes-standard gobject_introspection yes

1 0

[147340] users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147340 https://trac.macports.org/changeset/147340 Author: devans(a)macports.org Date: 2016-04-01 15:57:45 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: gnome-sudoku, update to version 3.20.0, update autogen.sh from upstream git master, no longer requires gnome-common to build. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/files/autogen.sh Property Changed: ---------------- users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/ Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/gnome/gnome-sudoku:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/gnome-sudoku:139335-142269 /users/rmstonecipher/gnome/gnome-sudoku:102363-103172 + /branches/mld-qt-481/dports/gnome/gnome-sudoku:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/gnome/gnome-sudoku:139335-142269 /users/devans/GNOME-3/unstable/dports/gnome/gnome-sudoku:142745-147190 /users/rmstonecipher/gnome/gnome-sudoku:102363-103172 Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/Portfile 2016-04-01 22:56:13 UTC (rev 147339) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/Portfile 2016-04-01 22:57:45 UTC (rev 147340) @@ -4,8 +4,7 @@ PortSystem 1.0 name gnome-sudoku -version 3.18.2 -revision 1 +version 3.20.0 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description Sudoku is a Japanese logic game that exploded in popularity in 2005. @@ -18,15 +17,14 @@ use_xz yes -checksums rmd160 408b34ab9ec592b0535bf6c8b9e108f2b5c57c03 \ - sha256 4eefde04145d9f4bf30f4327b83929f6bfb8a19b604337c1d75f66e984f8c0ac +checksums rmd160 c69861beded077248e2360c06d2cecbff12fbab2 \ + sha256 08369a080eb09ce12cbacd0efbe0f4e7edf07e08b3d15918d0e99a42efb810d9 depends_build port:pkgconfig \ port:intltool \ port:itstool \ port:yelp-tools \ port:appstream-glib \ - port:gnome-common \ port:autoconf \ port:automake \ port:libtool Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/files/autogen.sh =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/files/autogen.sh 2016-04-01 22:56:13 UTC (rev 147339) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-sudoku/files/autogen.sh 2016-04-01 22:57:45 UTC (rev 147340) @@ -1,15 +1,47 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. -which gnome-autogen.sh || { - echo "You need to install gnome-common from GNOME git (or from" - echo "your OS vendor's package manager)." - exit 1 +olddir=`pwd` + +cd $srcdir + +(test -f configure.ac) || { + echo "*** ERROR: Directory "\`$srcdir\'" does not look like the top-level project directory ***" + exit 1 } -REQUIRED_AUTOMAKE_VERSION=1.9 -REQUIRED_YELP_TOOLS_VERSION=3.1.1 -REQUIRED_GETTEXT_VERSION=0.12 -REQUIRED_INTLTOOL_VERSION=0.40.4 +# Use the style-checker as pre-commit and pre-applypatch hooks +if [ -d $srcdir/.git ]; then + if [ ! -L $srcdir/.git/hooks/pre-commit ]; then + ln -s ../../../libgames-support/style-checker $srcdir/.git/hooks/pre-commit && echo "Enabled pre-commit style checker." || : + fi + if [ ! -L $srcdir/.git/hooks/pre-applypatch ]; then + ln -s ../../../libgames-support/style-checker $srcdir/.git/hooks/pre-applypatch && echo "Enabled pre-applypatch style checker." || : + fi +fi -. gnome-autogen.sh +PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac` + +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + echo "*** WARNING: I am going to run \`configure' with no arguments." >&2 + echo "*** If you wish to pass any to it, please specify them on the" >&2 + echo "*** \`$0\' command line." >&2 + echo "" >&2 +fi + +aclocal --install || exit 1 +intltoolize --force --copy --automake || exit 1 +autoreconf --verbose --force --install -Wno-portability || exit 1 + +cd $olddir +if [ "$NOCONFIGURE" = "" ]; then + $srcdir/configure "$@" || exit 1 + + if [ "$1" = "--help" ]; then exit 0 else + echo "Now type \`make\' to compile $PKG_NAME" || exit 1 + fi +else + echo "Skipping configure process." +fi

1 0

[147339] users/devans/GNOME-3/stable/dports/gnome/gnome-photos
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147339 https://trac.macports.org/changeset/147339 Author: devans(a)macports.org Date: 2016-04-01 15:56:13 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: gnome-photos, update to version 3.20.0, dependencies, disable silent rules, quiet compile warnings. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/gnome-photos/Portfile Property Changed: ---------------- users/devans/GNOME-3/stable/dports/gnome/gnome-photos/ Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-photos ___________________________________________________________________ Modified: svn:mergeinfo - /users/devans/GNOME-3/unstable/dports/gnome/gnome-photos:120511-125933,132286-134600,136848-140557 + /users/devans/GNOME-3/unstable/dports/gnome/gnome-photos:120511-125933,132286-134600,136848-140557,143569-147190 Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-photos/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-photos/Portfile 2016-04-01 22:53:54 UTC (rev 147338) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-photos/Portfile 2016-04-01 22:56:13 UTC (rev 147339) @@ -4,7 +4,7 @@ PortSystem 1.0 name gnome-photos -version 3.18.3 +version 3.20.0 license GPL-2 set branch [join [lrange [split ${version} .] 0 1] .] description Photo manager for GNOME. @@ -18,36 +18,31 @@ use_xz yes -checksums rmd160 2155be8194938b9e9ff2e814a3e1554a2498e815 \ - sha256 cb0b0573b2b473257a41024de7b99986a10a67af07cbdead5bf266291e9ed167 +checksums rmd160 4008b6d87b993ee9f5204ffcf08e207e3838fbef \ + sha256 2b026a34bf29e7e020e9dbfac39aaeabaad94bf03d9cc786dadd711048f945ae depends_build port:pkgconfig \ port:intltool \ port:itstool \ port:yelp-tools \ - port:gnome-common \ port:autoconf \ port:automake \ port:libtool depends_lib port:desktop-file-utils \ port:gtk3 \ - port:babl \ port:cairo \ - port:exempi \ - port:gfbgraph \ port:gegl-0.3 \ + port:gfbgraph \ port:gdk-pixbuf2 \ port:gnome-desktop \ port:gnome-online-accounts \ port:grilo \ port:grilo-plugins \ - port:lcms2 \ - port:libexif \ - port:librsvg \ port:tracker -depends_run port:gnome-themes-standard \ +depends_run port:gnome-online-miners \ + port:gnome-themes-standard \ port:yelp patchfiles patch-configure.ac.diff @@ -61,11 +56,9 @@ configure.cmd ./autogen.sh configure.args --disable-schemas-compile \ - --disable-silent-rules + --disable-silent-rules \ + --enable-compile-warnings=no -configure.cflags-append \ - -Wno-error=format-nonliteral - # port installs hicolor icons, desktop application file, and gschemas post-activate { system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"

1 0

[147338] users/devans/GNOME-3/stable/dports/gnome/gnome-music
by devans＠macports.org 01 Apr '16

01 Apr '16

Revision: 147338 https://trac.macports.org/changeset/147338 Author: devans(a)macports.org Date: 2016-04-01 15:53:54 -0700 (Fri, 01 Apr 2016) Log Message: ----------- GNOME-3/stable: gnome-music, update to version 3.20.0, add variant +python35, default +python34. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/gnome-music/Portfile users/devans/GNOME-3/stable/dports/gnome/gnome-music/files/autogen.sh Property Changed: ---------------- users/devans/GNOME-3/stable/dports/gnome/gnome-music/ Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-music ___________________________________________________________________ Modified: svn:mergeinfo - /users/devans/GNOME-3/unstable/dports/gnome/gnome-music:119584-125933,128864-134600,137968-140554 + /users/devans/GNOME-3/unstable/dports/gnome/gnome-music:119584-125933,128864-134600,137968-140554,144870-147190 Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-music/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-music/Portfile 2016-04-01 22:51:20 UTC (rev 147337) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-music/Portfile 2016-04-01 22:53:54 UTC (rev 147338) @@ -5,7 +5,7 @@ PortGroup gobject_introspection 1.0 name gnome-music -version 3.18.2 +version 3.20.0 license GPL-2 set branch [join [lrange [split ${version} .] 0 1] .] description Music is the GNOME music playing application. @@ -19,8 +19,8 @@ use_xz yes -checksums rmd160 355952b63a3a622359147968deb41e11baa45e82 \ - sha256 81b6ae8b4193774a1dc05e77c59ad8ff5e7debc0aea30ce2ecd13b2ceda10bff +checksums rmd160 f820aece6ad9bb2daf541b1c3623ffec4c34ad0b \ + sha256 f68359104d9d001dc9d7942d4082a2cfffa42f90834b29a87781a521473f6e63 depends_build port:pkgconfig \ port:intltool \ @@ -57,14 +57,28 @@ --disable-silent-rules # requires python >= 3.3 -# configure for python34 +# default to python 3.4 -depends_lib-append port:py34-gobject3 \ - port:py34-requests \ - port:dbus-python34 +variant python34 conflicts python35 description {Use Python 3.4 at run time} { + depends_lib-append port:py34-gobject3 \ + port:py34-requests \ + port:dbus-python34 -configure.python ${prefix}/bin/python3.4 + configure.python ${prefix}/bin/python3.4 +} +variant python35 conflicts python34 description {Use Python 3.5 at run time} { + depends_lib-append port:py35-gobject3 \ + port:py35-requests \ + port:dbus-python35 + + configure.python ${prefix}/bin/python3.5 +} + +if {![variant_isset python35]} { + default_variants +python34 +} + # port installs hicolor icons, desktop application file, and gschemas post-activate { system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-music/files/autogen.sh =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-music/files/autogen.sh 2016-04-01 22:51:20 UTC (rev 147337) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-music/files/autogen.sh 2016-04-01 22:53:54 UTC (rev 147338) @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Run this to generate all the initial makefiles, etc. srcdir=`dirname $0`

1 0