diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-09-09 23:24:58 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-09-09 23:24:58 +0000 |
| commit | 37f02b55e82937270b8b7a7225f90fcc19c81d55 (patch) | |
| tree | 1a72f420f58528c57bd1703d3b998bca4d7113ca | |
| parent | update to trunk (r13550) (diff) | |
| download | inkscape-37f02b55e82937270b8b7a7225f90fcc19c81d55.tar.gz inkscape-37f02b55e82937270b8b7a7225f90fcc19c81d55.zip | |
Use global variants instead attempting to propagate default variants via meta port
(bzr r13506.1.86)
| -rw-r--r-- | packaging/macosx/README.txt | 10 | ||||
| -rw-r--r-- | packaging/macosx/ports/devel/inkscape-packaging/Portfile | 9 | ||||
| -rw-r--r-- | packaging/macosx/ports/python/py-sk1libs/Portfile | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt index 45ed39799..d6aa0b9f4 100644 --- a/packaging/macosx/README.txt +++ b/packaging/macosx/README.txt @@ -16,12 +16,16 @@ $ sudo sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" "$MP_PREFIX/etc/macp $ (cd ports && portindex) -5) install required dependencies: +5) add default variants for x11-based package to MacPorts' global variants: + +$ sudo echo '+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' >> "$MP_PREFIX/etc/macports/variants.conf" + +6) install required dependencies: $ sudo port install inkscape-packaging -6) compile inkscape, create app bundle and DMG: +7) compile inkscape, create app bundle and DMG: $ LIBPREFIX="$MP_PREFIX" ./osx-build.sh a c b -j 5 i p -s d -7) upload the DMG. +8) upload the DMG. diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile index b7437c3a0..67a46781b 100644 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -116,14 +116,7 @@ variant dbus description {with dbus} { # variants universal_variant no -variant x11 conflicts quartz {} - -variant quartz conflicts x11 {} - -default_variants +no_startupitem +no_web -atlas -ffmpeg -video \ - +x11 -quartz -no_x11 \ - +rsvg +Pillow -tkinter \ - +gnome_vfs +default_variants-append +gnome_vfs # livecheck livecheck.type none diff --git a/packaging/macosx/ports/python/py-sk1libs/Portfile b/packaging/macosx/ports/python/py-sk1libs/Portfile index 1e9c01d63..0c152ce8c 100644 --- a/packaging/macosx/ports/python/py-sk1libs/Portfile +++ b/packaging/macosx/ports/python/py-sk1libs/Portfile @@ -57,6 +57,8 @@ if {$subport != $name} { } } +default_variants +Pillow + livecheck.type regex livecheck.url http://sk1project.org/modules.php?name=Products&product=uniconvertor&op=download livecheck.regex "sk1libs-(\\d+(?:\\.\\d+)*)${extract.suffix}" |