[77742] trunk/dports/devel/caml-findlib/Portfile

[jmr at macports.org]

Revision: 77742
          http://trac.macports.org/changeset/77742
Author:   jmr at macports.org
Date:     2011-04-10 21:22:33 -0700 (Sun, 10 Apr 2011)
Log Message:
-----------
caml-findlib: update to 1.2.7, and enable pre-deactivate code (#28251)

Modified Paths:
--------------
    trunk/dports/devel/caml-findlib/Portfile

Modified: trunk/dports/devel/caml-findlib/Portfile
===================================================================
--- trunk/dports/devel/caml-findlib/Portfile	2011-04-11 02:49:28 UTC (rev 77741)
+++ trunk/dports/devel/caml-findlib/Portfile	2011-04-11 04:22:33 UTC (rev 77742)
@@ -2,7 +2,7 @@
 
 PortSystem          1.0
 name                caml-findlib
-version             1.2.6
+version             1.2.7
 distname            findlib-${version}
 categories          devel ml
 maintainers         mww openmaintainer
@@ -22,9 +22,9 @@
                     can directly deal with packages.
 homepage            http://projects.camlcity.org/projects/findlib.html
 master_sites        http://download.camlcity.org/download/
-checksums           md5     4924c8c3ef1208eb0fa9096c8b8bb72f \
-                    sha1    50d2764025168a5f3cab7f559b8fdf3cb680e405 \
-                    rmd160  76ee6ba0cf5c4ec8693dec14fae8582ad6cd5de3
+checksums           md5     000bff723e8d3d727a7edd5b5901b540 \
+                    sha1    bb99da86a454ec755c9c5e4a464013be5c766801 \
+                    rmd160  d374a9dcfee69e2428e904a77882616dd4fe61e7
 
 livecheck.type      regex
 livecheck.regex     "findlib-(.*?).tar.gz"
@@ -54,7 +54,7 @@
 
 post-activate {
         # Add our stublibs dir path to ld.conf
-        set ldconfpath [exec ${destroot}${prefix}/bin/ocamlfind printconf ldconf]
+        set ldconfpath [exec ${prefix}/bin/ocamlfind printconf ldconf]
         # ld.conf should exist since ocaml is installed, but lets just be safe anyway
         if {[file exists $ldconfpath]} then {
           # make sure ld.conf doesn't already have this line, so if the user installs,
@@ -67,8 +67,10 @@
             }
           }
           if {!$has_line} {
-            ui_msg "## Adding line `${ocamlfind_destdir}' to file ${ldconfpath}"
-            ui_msg "## Be sure to remove this line if you uninstall ${name}"
+            if {${registry.format} == "receipt_flat"} {
+                ui_msg "## Adding line `${ocamlfind_destdir}' to file ${ldconfpath}"
+                ui_msg "## Be sure to remove this line if you uninstall ${name}"
+            }
             puts $ldconf $ocamlfind_destdir
           }
           close $ldconf
@@ -78,26 +80,24 @@
         }
 }
 
-# pre-deactivate doesn't actually exist
-# which annoys me, because it means I can't remove the line I added to ld.conf
-#pre-deactivate {
-#        # remove our stublibs dir path from ld.conf
-#        set ocamlfind_destdir [file normalize ${prefix}/lib/ocaml/site-lib/stublibs]
-#        set ldconfpath ${destroot}[exec ${destroot}${prefix}/bin/ocamlfind printconf ldconf]
-#        set ldconfoutpath [file dirname $ldconfpath]/.[file tail $ldconfpath]~
-#        if {[file exists $ldconfpath]} then {
-#          set ldconf [open $ldconfpath r]
-#          set ldconfout [open $ldconfoutpath w]
-#          while {[gets $ldconf line] != -1} {
-#            if {![string equal $line $ocamlfind_destdir]} {
-#              puts $ldconfout $line
-#            }
-#          }
-#          close $ldconfout
-#          close $ldconf
-#          file rename -force $ldconfoutpath $ldconfpath
-#        }
-#}
+pre-deactivate {
+        # remove our stublibs dir path from ld.conf
+        set ocamlfind_destdir [file normalize ${prefix}/lib/ocaml/site-lib/stublibs]
+        set ldconfpath [exec ${prefix}/bin/ocamlfind printconf ldconf]
+        set ldconfoutpath [file dirname $ldconfpath]/.[file tail $ldconfpath]~
+        if {[file exists $ldconfpath]} then {
+          set ldconf [open $ldconfpath r]
+          set ldconfout [open $ldconfoutpath w]
+          while {[gets $ldconf line] != -1} {
+            if {![string equal $line $ocamlfind_destdir]} {
+              puts $ldconfout $line
+            }
+          }
+          close $ldconfout
+          close $ldconf
+          file rename -force $ldconfoutpath $ldconfpath
+        }
+}
 
 variant toolbox description {build the toolbox wizard, requires labltk} {
         configure.args-append -with-toolbox
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110410/92daceea/attachment.html>