Revision: 104822 https://trac.macports.org/changeset/104822 Author: ryandesign@macports.org Date: 2013-04-02 23:38:39 -0700 (Tue, 02 Apr 2013) Log Message: ----------- Quicksilver: update to 1.0.0 (#33435) Modified Paths: -------------- trunk/dports/aqua/Quicksilver/Portfile Added Paths: ----------- trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff Removed Paths: ------------- trunk/dports/aqua/Quicksilver/files/disable-Applications-install.diff Modified: trunk/dports/aqua/Quicksilver/Portfile =================================================================== --- trunk/dports/aqua/Quicksilver/Portfile 2013-04-03 05:33:21 UTC (rev 104821) +++ trunk/dports/aqua/Quicksilver/Portfile 2013-04-03 06:38:39 UTC (rev 104822) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -4,54 +5,62 @@ PortGroup github 1.0 PortGroup xcode 1.0 -github.setup quicksilver Quicksilver B63 +github.setup quicksilver Quicksilver 1.0.0 v platforms darwin maintainers nomaintainer categories aqua sysutils license Apache-2 -supported_archs i386 -description Mac OS X at your fingertips -long_description \ - Quicksilver is a light, fast and free Mac OS X application that gives you \ - the power to control your Mac with keystrokes alone. +description OS X launcher utility app + +long_description Quicksilver is a launcher utility app for OS X which \ + lets you access applications, documents, contacts, \ + music and more\; browse your Mac’s filesystem using \ + keywords and fuzzy matching\; manage content through \ + drag and drop, or grabbing selected content \ + directly\; and interact with installed applications \ + through plugins. + homepage http://qsapp.com/ -checksums rmd160 74990efe4355488aa9ea8c0ef457ed9f41505aa9 \ - sha256 f0bbb06b178beebae1954c54f5b1698022615c133ad091418155d261451d0b70 -build.dir ${worksrcpath}/${name} -xcode.project ${name}.xcodeproj -patchfiles disable-Applications-install.diff +# Fetch from git instead of distfile because it needs submodules +fetch.type git +post-fetch { + system -W ${worksrcpath} "git submodule update --init" +} + set config_root ${prefix}/share/QS -use_configure yes -configure { + +post-extract { file mkdir ${workpath}${config_root} - reinplace -E "s|/tmp/QS|${workpath}${config_root}|" \ - ${build.dir}/Configuration/Common.xcconfig ${build.dir}/${xcode.project}/project.pbxproj } -post-destroot { - move ${workpath}${config_root} ${destroot}${config_root} - foreach framework [glob ${destroot}${applications_dir}/*.framework] { - move ${framework} ${destroot}${frameworks_dir} - } - # set plugins_dir "/Library/Application Support/${name}/PlugIns/" - set plugins_dir "${applications_dir}/${name}.app/Contents/PlugIns/" - xinstall -d ${destroot}${plugins_dir} - foreach plugin [glob ${destroot}${applications_dir}/*.qsplugin] { - move ${plugin} ${destroot}${plugins_dir} - } +patchfiles patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff +post-patch { + reinplace -E "s|/tmp/QS|${workpath}${config_root}|" ${build.dir}/Configuration/Common.xcconfig +} + +build.dir ${worksrcpath}/${name} + +xcode.project ${name}.xcodeproj +xcode.configuration Release + +post-build { # set Info.plist to be world-writable, so that regular users can # set preferences that require writing to Info.plist - file attributes ${destroot}${applications_dir}/${name}.app/Contents/Info.plist -permissions a+w + file attributes ${build.dir}/build/${xcode.configuration}/${name}.app/Contents/Info.plist -permissions a+w +} - # not sure why this hierarchy is here, but we don't want it - if {[file exists ${destroot}${prefix}/var/macports]} { - delete ${destroot}${prefix}/var/macports +destroot { + move ${workpath}${config_root} ${destroot}${config_root} + eval move [glob ${build.dir}/build/${xcode.configuration}/*.app] ${destroot}${applications_dir} +} + +if {${os.major} < 10} { + pre-fetch { + ui_error "${name} ${version} requires OS X 10.6 or greater." + return -code error "incompatible OS X version" } } - -# xcode.target "${name} Distribution" -# xcode.configuration Release Deleted: trunk/dports/aqua/Quicksilver/files/disable-Applications-install.diff =================================================================== --- trunk/dports/aqua/Quicksilver/files/disable-Applications-install.diff 2013-04-03 05:33:21 UTC (rev 104821) +++ trunk/dports/aqua/Quicksilver/files/disable-Applications-install.diff 2013-04-03 06:38:39 UTC (rev 104822) @@ -1,33 +0,0 @@ ---- Quicksilver/Quicksilver.xcodeproj/project.pbxproj.orig 2011-10-29 17:22:00.000000000 -0400 -+++ Quicksilver/Quicksilver.xcodeproj/project.pbxproj 2011-10-29 17:22:21.000000000 -0400 -@@ -11,7 +11,6 @@ - isa = PBXAggregateTarget; - buildConfigurationList = 7F6B3E6D085CE68E000735A8 /* Build configuration list for PBXAggregateTarget "Quicksilver Distribution" */; - buildPhases = ( -- 7F2F820908A97A440022178B /* Install */, - ); - dependencies = ( - 7F0399FB080EE5D7001A9FA3 /* PBXTargetDependency */, -@@ -3334,22 +3333,6 @@ - shellPath = /bin/sh; - shellScript = "#rm -rf \"$BUILT_PRODUCTS_DIR/Quicksilver.app/Contents/PlugIns\""; - }; -- 7F2F820908A97A440022178B /* Install */ = { -- isa = PBXShellScriptBuildPhase; -- buildActionMask = 8; -- files = ( -- ); -- inputPaths = ( -- "$(BUILT_PRODUCTS_DIR)/Quicksilver.app", -- ); -- name = Install; -- outputPaths = ( -- "$(BUILT_PRODUCTS_DIR)/Quicksilver $(QS_INFO_VERSION).dmg", -- ); -- runOnlyForDeploymentPostprocessing = 1; -- shellPath = /bin/sh; -- shellScript = "#echo \"rsync -auzEv $BUILT_PRODUCTS_DIR/Quicksilver.app /Applications/Quicksilver.app\"\n#rsync -auzEv \"$BUILT_PRODUCTS_DIR/Quicksilver.app/\" /Applications/Quicksilver.app/\n\n#exit\n\nif [ $BUILD_STYLE != \"Release\" ]; then\n exit\nfi\n\necho $SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\"\n\n$SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\""; -- }; - 7FA4EF1E0913AE44007DB407 /* Release Notes */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 12; Copied: trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff (from rev 97963, trunk/dports/aqua/Quicksilver/files/disable-Applications-install.diff) =================================================================== --- trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff (rev 0) +++ trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff 2013-04-03 06:38:39 UTC (rev 104822) @@ -0,0 +1,33 @@ +--- Quicksilver/Quicksilver.xcodeproj/project.pbxproj.orig 2013-03-20 12:27:00.000000000 -0500 ++++ Quicksilver/Quicksilver.xcodeproj/project.pbxproj 2013-04-03 00:13:48.000000000 -0500 +@@ -26,7 +26,6 @@ + isa = PBXAggregateTarget; + buildConfigurationList = 7F6B3E6D085CE68E000735A8 /* Build configuration list for PBXAggregateTarget "Quicksilver Distribution" */; + buildPhases = ( +- 7F2F820908A97A440022178B /* Install */, + ); + dependencies = ( + 7F0399FB080EE5D7001A9FA3 /* PBXTargetDependency */, +@@ -4497,22 +4496,6 @@ + shellPath = /bin/sh; + shellScript = "#rm -rf \"$BUILT_PRODUCTS_DIR/Quicksilver.app/Contents/PlugIns\""; + }; +- 7F2F820908A97A440022178B /* Install */ = { +- isa = PBXShellScriptBuildPhase; +- buildActionMask = 8; +- files = ( +- ); +- inputPaths = ( +- "$(BUILT_PRODUCTS_DIR)/Quicksilver.app", +- ); +- name = Install; +- outputPaths = ( +- "$(BUILT_PRODUCTS_DIR)/Quicksilver $(QS_INFO_VERSION).dmg", +- ); +- runOnlyForDeploymentPostprocessing = 1; +- shellPath = /bin/sh; +- shellScript = "#echo \"rsync -auzEv $BUILT_PRODUCTS_DIR/Quicksilver.app /Applications/Quicksilver.app\"\n#rsync -auzEv \"$BUILT_PRODUCTS_DIR/Quicksilver.app/\" /Applications/Quicksilver.app/\n\n#exit\n\nif [ $CONFIGURATION != \"Release\" ]; then\n exit\nfi\n\necho $SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\"\n\n$SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\""; +- }; + 7FA4EF1E0913AE44007DB407 /* Release Notes */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 12;