[64622] trunk/dports/devel/caml-camlzip

[avsm at macports.org]

Revision: 64622
          http://trac.macports.org/changeset/64622
Author:   avsm at macports.org
Date:     2010-03-11 02:29:11 -0800 (Thu, 11 Mar 2010)
Log Message:
-----------
build fixes for camlzip: actually install META file, call package camlzip to match Debian, fix description, and disable parallel build

Modified Paths:
--------------
    trunk/dports/devel/caml-camlzip/Portfile
    trunk/dports/devel/caml-camlzip/files/META
    trunk/dports/devel/caml-camlzip/files/Makefile.diff

Modified: trunk/dports/devel/caml-camlzip/Portfile
===================================================================
--- trunk/dports/devel/caml-camlzip/Portfile	2010-03-11 06:17:20 UTC (rev 64621)
+++ trunk/dports/devel/caml-camlzip/Portfile	2010-03-11 10:29:11 UTC (rev 64622)
@@ -5,7 +5,7 @@
 version             1.04
 categories          devel ml
 maintainers         erickt openmaintainer
-description         Automated code generation for converting OCaml-values to S-expressions
+description         read and write ZIP, JAR and GZIP files from OCaml
 long_description    ${description}
 homepage            http://cristal.inria.fr/~xleroy/software.html
 platforms           darwin
@@ -28,17 +28,16 @@
 }
 
 use_configure       no
+use_parallel_build  no
 
 build.env           PREFIX=${prefix}
 build.target        all allopt
 
+set ocamlfind_destdir ${destroot}${prefix}/lib/ocaml/site-lib
+destroot.env        OCAMLFIND_INSTFLAGS="-destdir $ocamlfind_destdir -ldconf ignore"
+destroot.target     ocamlfind-install
 
 pre-destroot {
-    # Set these in pre-destroot so the Portfile can be evaluated on a
-    # system without caml-findlib (eg, the portindex server)
-    set ocamlfind_destdir ${destroot}[exec ocamlfind printconf destdir]
-    destroot.env        OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir $ocamlfind_destdir"
-    destroot.target     ocamlfind-install
     file mkdir $ocamlfind_destdir
 }
 

Modified: trunk/dports/devel/caml-camlzip/files/META
===================================================================
--- trunk/dports/devel/caml-camlzip/files/META	2010-03-11 06:17:20 UTC (rev 64621)
+++ trunk/dports/devel/caml-camlzip/files/META	2010-03-11 10:29:11 UTC (rev 64622)
@@ -1,4 +1,4 @@
-name="zip"
+name="camlzip"
 version="1.04"
 description="reading and writing ZIP, JAR and GZIP files"
 requires="unix"

Modified: trunk/dports/devel/caml-camlzip/files/Makefile.diff
===================================================================
--- trunk/dports/devel/caml-camlzip/files/Makefile.diff	2010-03-11 06:17:20 UTC (rev 64621)
+++ trunk/dports/devel/caml-camlzip/files/Makefile.diff	2010-03-11 10:29:11 UTC (rev 64622)
@@ -5,7 +5,7 @@
  	cp zip.cmxa zip.a zip.cmx gzip.cmx $(INSTALLDIR)
  
 +ocamlfind-install: all allopt
-+	  ocamlfind install $(OCAMLFIND_INSTFLAGS) zip META gzip.cmi gzip.cmx gzip.mli libcamlzip.a zip.a zip.cma zip.cmi zip.cmx zip.cmxa zip.mli zlib.cmi zlib.mli dllcamlzip.so
++	  ocamlfind install $(OCAMLFIND_INSTFLAGS) camlzip META gzip.cmi gzip.cmx gzip.mli libcamlzip.a zip.a zip.cma zip.cmi zip.cmx zip.cmxa zip.mli zlib.cmi zlib.mli dllcamlzip.so
 +
  depend:
  	gcc -MM -I$(ZLIB_INCLUDE) *.c > .depend
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100311/a295eaf2/attachment-0001.html>