Ticket #29566: FScript.diff

Portfile

@@ -6 +6 @@
 
 name                    FScript
 version                 2.1
+revision                1
 categories              aqua lang
 platforms               darwin
 license                 BSD
@@ -22 +23 @@
 
 homepage                http://www.fscript.org/
 
-fetch.type              git
-git.url                 git://github.com/pmougin/F-Script
-git.branch              25c850c66760bcc5e69af273607e5fae7920fbe5
+master_sites            https://github.com/pmougin/F-Script/zipball/v${version}:fscript
+
+distfiles               pmougin-F-Script-v2.1-0-g25c850c.zip:fscript
+
+checksums               pmougin-F-Script-v2.1-0-g25c850c.zip \
+                        sha1    5f1afa244f41ab372953a616d27a72a1573f4a15 \
+                        rmd160  aa38b5e587bd3c0a8aeb1a8df8a38445d0036952
+
+use_zip                 yes
+
+post-extract {
+    file rename [glob ${workpath}/pmougin-F-Script-*] ${worksrcpath}
+}
 
 patchfiles              patch-FScript.xcodeproj-project.pbxproj.diff
 
-xcode.target            FScriptFramework F-Script FScriptIBPlugin
+xcode.target            FScriptFramework F-Script
 xcode.destroot.settings SKIP_INSTALL=NO
 xcode.destroot.type     ""
 
-if {[variant_isset injection_service] || ![variant_isset without_ibplugin]} {
-    destroot.violate_mtree yes
-}
+set is_xcode_4_x [expr [rpm-vercomp $xcodeversion 4] >= 0]
 
-variant without_ibplugin description "Disable Interface Builder Plug-in" {
-        xcode.target-delete FScriptIBPlugin
+if !$is_xcode_4_x {
+    default_variants        +ib_plugin
 }
 
-set ibplugin_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/Library/Interface Builder/Plug-ins"
+variant ib_plugin description "Install the Interface Builder Plug-in" {
+        xcode.target-append FScriptIBPlugin
+        destroot.violate_mtree yes
+}
 
 variant injection_service description "Enable F-Script injection service" {
-    master_sites            http://www.fscript.org/download
-    distfiles               F-ScriptInjectionService.zip
+    master_sites-append     http://www.fscript.org/download:injection_service
+    distfiles-append        F-ScriptInjectionService.zip:injection_service
 
-    checksums               F-ScriptInjectionService.zip \
-                            1a628553308b4e607854e5e6393790d5
-    use_zip                 yes
+    checksums-append        F-ScriptInjectionService.zip \
+                            sha1   58436fe48375abdfed6251a2fc2ee2b2a39d6bf1 \
+                            rmd160 dd7dbf0580584f14742c5e38a5f59df4bbb5c951
+
+    destroot.violate_mtree  yes
+}
 
+pre-configure {
+    if {[variant_isset ib_plugin] && $is_xcode_4_x} {
+        ui_error "Xcode 4.x does not support Interface Builder plug-ins.\n \
+                  Please install ${name} without the Interface Builder plug-in:\n \
+                  sudo port install ${name} -ib_plugin"
+        return -code error "incompatible xcode version"
+    }
 }
 
 pre-build {
@@ -58 +80 @@
 }
 
 post-destroot {
-        if { ![variant_isset without_ibplugin] } {
-                xinstall -d -m 755 ${destroot}${ibplugin_dir}
-                file rename ${destroot}${applications_dir}/FScriptIBPlugin.ibplugin ${destroot}${ibplugin_dir}
+        if [variant_isset ib_plugin] {
+            set ibplugin_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/Library/Interface Builder/Plug-ins"
+            xinstall -d -m 755 ${destroot}${ibplugin_dir}
+            file rename ${destroot}${applications_dir}/FScriptIBPlugin.ibplugin ${destroot}${ibplugin_dir}
         }
 
         if [variant_isset injection_service] {