[54686] trunk/dports/devel/caml-json-wheel/Portfile

[ryandesign at macports.org]

Revision: 54686
          http://trac.macports.org/changeset/54686
Author:   ryandesign at macports.org
Date:     2009-07-31 10:30:54 -0700 (Fri, 31 Jul 2009)
Log Message:
-----------
caml-json-wheel:

 * before activation, remove jsoncat from ${prefix}/bin if it's there; before r54632, the port installed it there directly
 * increase revision so everyone gets the change from r54632
 * remove unnecessary slash before ${prefix}

See #20489

Modified Paths:
--------------
    trunk/dports/devel/caml-json-wheel/Portfile

Modified: trunk/dports/devel/caml-json-wheel/Portfile
===================================================================
--- trunk/dports/devel/caml-json-wheel/Portfile	2009-07-31 17:19:49 UTC (rev 54685)
+++ trunk/dports/devel/caml-json-wheel/Portfile	2009-07-31 17:30:54 UTC (rev 54686)
@@ -4,6 +4,7 @@
 
 name                caml-json-wheel
 version             1.0.6
+revision            1
 categories          devel ml
 maintainers         anil at recoil.org
 description         JSON parsing library for OCaml
@@ -26,7 +27,7 @@
                     port:caml-ocamlnet
 
 use_configure       no
-destroot.env-append BINDIR=${destroot}/${prefix}/bin
+destroot.env-append BINDIR=${destroot}${prefix}/bin
 
 post-patch {
     set ocaml_site_path [exec ocamlfind printconf destdir]
@@ -44,3 +45,13 @@
 pre-destroot {
     destroot.args DESTDIR="${destroot}" OCAMLFIND_DESTDIR="${destroot}/[exec ${prefix}/bin/ocamlfind printconf destdir]"
 }
+
+pre-activate {
+    # caml-json-wheel 1.0.6_0 installed an item in ${prefix}/bin; remove it if found
+    set filepath ${prefix}/bin/jsoncat
+    if {[file exists ${filepath}]} {
+        if {[catch {delete ${filepath}}]} {
+            ui_warn "Cannot delete ${filepath}; please remove it manually"
+        }
+    }
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090731/f383fc03/attachment-0001.html>