[41663] trunk/dports/devel

nox at macports.org nox at macports.org
Sat Nov 8 12:21:01 PST 2008


Revision: 41663
          http://trac.macports.org/changeset/41663
Author:   nox at macports.org
Date:     2008-11-08 12:21:00 -0800 (Sat, 08 Nov 2008)
Log Message:
-----------
ocaml-bitstring (was bitmatch): Updated to 2.0.0.

Modified Paths:
--------------
    trunk/dports/devel/ocaml-bitstring/Portfile

Added Paths:
-----------
    trunk/dports/devel/ocaml-bitstring/
    trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-ocamlfind.diff
    trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-top_srcdir.diff

Removed Paths:
-------------
    trunk/dports/devel/bitmatch/
    trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-DESTDIR.diff


Property changes on: trunk/dports/devel/ocaml-bitstring
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: trunk/dports/devel/ocaml-bitstring/Portfile
===================================================================
--- trunk/dports/devel/bitmatch/Portfile	2008-11-08 11:01:52 UTC (rev 41656)
+++ trunk/dports/devel/ocaml-bitstring/Portfile	2008-11-08 20:21:00 UTC (rev 41663)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem      1.0
@@ -2,21 +3,23 @@
 
-name            bitmatch
-version         1.3
+name            ocaml-bitstring
+version         2.0.0
 platforms       macosx
-categories      devel caml
+categories      devel ocaml
 maintainers     nox openmaintainer
-description     Bitmatch adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml.
+description     bitstrings and bitstring matching for OCaml
 
 long_description \
-    $description
+    The ocaml-bitstring project adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml. \
+    (This project was formerly known as bitmatch). You can use this module to both parse and generate binary formats, files and protocols. \
+    Bitstring handling is added as primitives to the language, making it exceptionally simple to use and very powerful.
 
-homepage        http://code.google.com/p/bitmatch/
-master_sites    googlecode
-distname        ocaml-$name-$version
+homepage        http://code.google.com/p/bitstring/
+master_sites    googlecode:bitstring
 
-checksums       md5     ac577325e7577fe9fe981e54f1747a94 \
-                sha1    2f6f30f88e49eb821fe3412a3d264d8e597f99c6 \
-                rmd160  d9c13629dfb905638120a5d3bf46651286cff53b
+checksums       md5     9f597c267318a88f2754ca10450e478f \
+                sha1    ca54f7cd2e1457d9102200fd8aebb3dce3d10a32 \
+                rmd160  74d24e4a75915707f47319f010634396e2c96a0b
 
-patchfiles      patch-Makefile.in-DESTDIR.diff
+patchfiles      patch-Makefile.in-ocamlfind.diff \
+                patch-Makefile.in-top_srcdir.diff
 
@@ -26,10 +29,28 @@
 depends_lib     port:ocaml
 depends_run     port:caml-findlib
 
-use_parallel_build  no
+use_parallel_build  yes
 
 test.run        yes
 
 pre-destroot {
-    file mkdir ${destroot}${prefix}/lib/ocaml/site-lib
+    file mkdir $destroot$prefix/lib/ocaml/site-lib
 }
+
+post-activate {
+    set ldconf  [open $prefix/lib/ocaml/ld.conf r+]
+    set found   0
+
+    while {[gets $ldconf line] != -1} {
+        if {$line eq "$prefix/lib/ocaml/site-lib/bitstring"} {
+            set found 1
+            break
+        }
+    }
+
+    if {!$found} {
+        puts $ldconf $prefix/lib/ocaml/site-lib/bitstring
+    }
+
+    close $ldconf
+}

Deleted: trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-DESTDIR.diff
===================================================================
--- trunk/dports/devel/bitmatch/files/patch-Makefile.in-DESTDIR.diff	2008-11-08 11:01:52 UTC (rev 41656)
+++ trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-DESTDIR.diff	2008-11-08 20:21:00 UTC (rev 41663)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-06-02 12:14:00.000000000 +0200
-+++ Makefile.in	2008-06-02 12:14:18.000000000 +0200
-@@ -110,7 +110,7 @@
- # Install.
- 
- install:
--	ocamlfind install bitmatch META *.mli *.cmx *.cma *.cmxa *.a \
-+	ocamlfind install -destdir $(DESTDIR)@prefix@@libdir@/ocaml/site-lib bitmatch META *.mli *.cmx *.cma *.cmxa *.a \
- 		bitmatch.cmi \
- 		pa_bitmatch.cmo
- 

Copied: trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-ocamlfind.diff (from rev 41656, trunk/dports/devel/bitmatch/files/patch-Makefile.in-DESTDIR.diff)
===================================================================
--- trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-ocamlfind.diff	                        (rev 0)
+++ trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-ocamlfind.diff	2008-11-08 20:21:00 UTC (rev 41663)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2008-06-02 12:14:00.000000000 +0200
++++ Makefile.in	2008-06-02 12:14:18.000000000 +0200
+@@ -268,7 +268,7 @@
+ # Install.
+ 
+ install:
+-	ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a *.so \
++	ocamlfind install -ldconf ignore -destdir $(DESTDIR)@prefix@@libdir@/ocaml/site-lib bitstring META *.mli *.cmx *.cma *.cmxa *.a *.so \
+ 		bitstring.cmi \
+ 		bitstring_persistent.cmi \
+ 		pa_bitstring.cmo


Property changes on: trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-ocamlfind.diff
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-top_srcdir.diff
===================================================================
--- trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-top_srcdir.diff	                        (rev 0)
+++ trunk/dports/devel/ocaml-bitstring/files/patch-Makefile.in-top_srcdir.diff	2008-11-08 20:21:00 UTC (rev 41663)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2008-11-08 20:32:00.000000000 +0100
++++ Makefile.in	2008-11-08 20:32:22.000000000 +0100
+@@ -123,7 +123,7 @@
+ 
+ byteswap.h: byteswap.in.h
+ 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+-	  cat $(srcdir)/byteswap.in.h; \
++	  cat $(top_srcdir)/byteswap.in.h; \
+ 	} > $@-t
+ 	mv -f $@-t $@
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081108/fb6d13d5/attachment-0001.html>


More information about the macports-changes mailing list