Ticket #18790: caml-findlib.diff

Portfile

@@ -2 +2 @@
 
 PortSystem          1.0
 name                caml-findlib
-version             1.2.1
-distfiles           findlib-${version}.tar.gz
-worksrcdir          findlib-${version}
+version             1.2.4
+distname            findlib-${version}
 categories          devel ml
-maintainers         eridius@macports.org
+maintainers         eridius
 description         Objective Caml library management system
 long_description    The findlib library provides a scheme to manage reusable \
                     software components (packages), and includes tools that support \
@@ -19 +18 @@
                     enter queries on the command-line. In order to simplify compilation and \
                     linkage, there are new frontends of the various OCaml compilers that \
                     can directly deal with packages.
-homepage            http://www.ocaml-programming.de/programming/findlib.html
+homepage            http://projects.camlcity.org/projects/findlib.html
 platforms           darwin
-master_sites        http://www.ocaml-programming.de/packages/
-extract.suffix      .tar.gz
+master_sites        http://download.camlcity.org/download/
 build.target        all opt
-checksums           sha1 04af3e36ccaa4a5ba41773ee6118b825fd1dff90 \
-                    md5 fa580a4c1fc28c06fe79aa1c98b6ef2d
+checksums           md5     52cfcacff3e07a94bc3adb977fbb3c07 \
+                    sha1    de73c1c4287263e986b4a4f56b029aadaffc2944 \
+                    rmd160  bafa1bbea71fb05ee2fd411dabe00ba34a25d506
 
 livecheck.check     regex
 livecheck.regex     "findlib-(.*?).tar.gz"
@@ -40 +39 @@
 
 destroot.destdir    prefix=${destroot}
 
+# `ocamlfind printconf destdir` returns nothing if the dir isn't in place
+# but we know it's the same as our site-lib dir
+set ocamlfind_destdir [file normalize ${prefix}/lib/ocaml/site-lib/stublibs]
+destroot.keepdirs   ${destroot}${ocamlfind_destdir}
 post-destroot {
-        # `ocamlfind printconf destdir` returns nothing if the dir isn't in place
-        # but we know it's the same as our site-lib dir
-        set ocamlfind_destdir [file normalize ${prefix}/lib/ocaml/site-lib/stublibs]
         file mkdir ${destroot}${ocamlfind_destdir}
-        # make a turd file so the directory doesn't get pruned when installing
-        # I suppose I don't actually know if it prunes before or after this phase
-        # but better to be safe than sorry
-        close [open ${destroot}${ocamlfind_destdir}/.turd_${name} w]
 }
 
 post-activate {
         # Add our stublibs dir path to ld.conf
-        set ocamlfind_destdir [file normalize ${prefix}/lib/ocaml/site-lib/stublibs]
         set ldconfpath [exec ${destroot}${prefix}/bin/ocamlfind printconf ldconf]
         # ld.conf should exist since ocaml is installed, but lets just be safe anyway
         if {[file exists $ldconfpath]} then {