From ebf58363a9d3f881600fe9fdaf671161aac34951 Mon Sep 17 00:00:00 2001 From: Jonathan-Christofer Demay Date: Tue, 22 Sep 2009 23:14:23 +0000 Subject: Various updates related to Frama-C. --- dev-ml/ocamlgraph/Manifest | 6 +- .../ocamlgraph/files/ocamlgraph-1.2-makefile.patch | 102 +++++++++++++++++++++ dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild | 52 +++++++++++ 3 files changed, 157 insertions(+), 3 deletions(-) create mode 100644 dev-ml/ocamlgraph/files/ocamlgraph-1.2-makefile.patch create mode 100644 dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild (limited to 'dev-ml/ocamlgraph') diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest index f62c106c2..00d24f7ef 100644 --- a/dev-ml/ocamlgraph/Manifest +++ b/dev-ml/ocamlgraph/Manifest @@ -1,3 +1,3 @@ -AUX ocamlgraph-1.1-makefile.patch 5379 RMD160 e97ef8d3b70bd470f419ea5fd0d18a77c8f1df8a SHA1 f9b1236890d7372b19f17489ced2ccf86c5397d9 SHA256 53efa9874769339eca9adefc09ad40ea0abc28a8fe248d7443df71c50f18d054 -DIST ocamlgraph-1.1.tar.gz 195045 RMD160 f48af8e9c1c681bf6ee42ea22267ce022777db57 SHA1 70152127fd05aa97006434614441425182e87471 SHA256 955e0bfbfda83e055b0cf0527af0b706c8f4a14f680d3a77be1e1e725e1cfb3f -EBUILD ocamlgraph-1.1.ebuild 1005 RMD160 31ce50aa3fdf5c98986ceae5b2e5684a956df22f SHA1 575d1b50fc6c1f6aed30f4ad2eae1d86fee7ff47 SHA256 e98c0a4509a55bf95cc2fddd0f8549e8197213774745ed10049fe6cfb4d287cf +AUX ocamlgraph-1.2-makefile.patch 3980 RMD160 fda851982c979d4c4d667bdd803bb9a570f8e3f8 SHA1 74eec2569ad39f35fd784fc13fa16f7d37cbe3f8 SHA256 fa5ce23b1561555c07d51a75b7e2850fdb1b6abe41bc902b9d4f8f99a1473e0c +DIST ocamlgraph-1.2.tar.gz 213426 RMD160 c5ef73069a912ba179adbad3c4e0d629cc91cd54 SHA1 087cd2720c1a3df3f6543db4ad8d81983fcddba0 SHA256 0695a91a3f2abc0f47eafdae4af8a6022154727aec00784a12362d3719ff51f2 +EBUILD ocamlgraph-1.2.ebuild 1027 RMD160 27095298c445a12f3a8d3bead261336141f7d1e8 SHA1 6f6d8036141f1425f3feef777229185b2b705da1 SHA256 ec26bf47e8acdc1e89ace4f685e59192b6bae62c046d623ccab0742826988fd7 diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.2-makefile.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.2-makefile.patch new file mode 100644 index 000000000..fd7b8de5c --- /dev/null +++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.2-makefile.patch @@ -0,0 +1,102 @@ +diff -Naurd ocamlgraph-1.2-orign/Makefile.in ocamlgraph-1.2-patch/Makefile.in +--- ocamlgraph-1.2-orign/Makefile.in 2009-08-31 05:57:53.000000000 +0000 ++++ ocamlgraph-1.2-patch/Makefile.in 2009-09-11 13:23:51.000000000 +0000 +@@ -31,7 +31,7 @@ + OCAMLDOC = @OCAMLDOC@ + OCAMLLEX = @OCAMLLEX@ + OCAMLYACC= @OCAMLYACC@ +-OCAMLLIB = @OCAMLLIB@ ++OCAMLLIB = @OCAMLLIB@/ocamlgraph/ + OCAMLBEST= @OCAMLBEST@ + OCAMLVERSION = @OCAMLVERSION@ + OCAMLWEB = @OCAMLWEB@ +@@ -147,6 +147,7 @@ + VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO)) + VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx) + VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi) ++VIEWER_OBJ=$(VIEWER_CMO:.cmo=.o) + + VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I . + +@@ -175,6 +176,7 @@ + DGRAPH_CMO:=$(patsubst %,$(DGRAPH_DIR)/%.cmo, $(DGRAPH_CMO)) + DGRAPH_CMX=$(DGRAPH_CMO:.cmo=.cmx) + DGRAPH_CMI=$(DGRAPH_CMO:.cmo=.cmi) ++DGRAPH_OBJ=$(DGRAPH_CMO:.cmo=.o) + + DGRAPH_INCLUDES= @INCLUDEGTK2@ -I $(DGRAPH_DIR) $(INCLUDES) -I . + +@@ -270,42 +272,48 @@ + + install: install-$(OCAMLBEST) install-byte + ifeq (@LABLGNOMECANVAS@,yes) ++ mkdir -p $(DESTDIR)$(BINDIR) + ifeq ($(OCAMLBEST),byte) +- cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE) +- cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE) ++ ln -s $(BINDIR)/ocamlgraph-editor.byte $(DESTDIR)$(BINDIR)/ocamlgraph-editor$(EXE) ++ ln -s $(BINDIR)/ocamlgraph-viewer.byte $(DESTDIR)$(BINDIR)/ocamlgraph-viewer$(EXE) + else +- cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE) +- cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE) ++ mv $(DESTDIR)$(BINDIR)/ocamlgraph-editor.opt $(DESTDIR)$(BINDIR)/ocamlgraph-editor$(EXE) ++ mv $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.opt $(DESTDIR)$(BINDIR)/ocamlgraph-viewer$(EXE) + endif + endif + + install-byte: ++ mkdir -p "$(DESTDIR)$(OCAMLLIB)" + cp -f graph.cmo graph.cmi $(CMA) "$(DESTDIR)$(OCAMLLIB)" + ifeq (@LABLGNOMECANVAS@,yes) +- cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte +- cp -f $(VIEWER_CMO) "$(DESTDIR)$(OCAMLLIB)" +- cp -f $(DGRAPH_CMO) "$(DESTDIR)$(OCAMLLIB)" +- cp -f $(DGRAPH_DIR)/dgraph.byte $(BINDIR)/graph-viewer.byte ++ mkdir -p $(DESTDIR)$(BINDIR) ++ cp -f $(ED_DIR)/editor.byte $(DESTDIR)$(BINDIR)/ocamlgraph-editor.byte ++ cp -f $(VIEWER_CMO) $(VIEWER_CMI) "$(DESTDIR)$(OCAMLLIB)" ++ cp -f $(DGRAPH_CMO) $(DGRAPH_CMI) "$(DESTDIR)$(OCAMLLIB)" ++ cp -f $(DGRAPH_DIR)/dgraph.byte $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.byte + endif + + install-opt: install-byte ++ mkdir -p "$(DESTDIR)$(OCAMLLIB)" + cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(DESTDIR)$(OCAMLLIB)" + ifeq (@LABLGNOMECANVAS@,yes) +- cp -f $(ED_DIR)/editor.opt $(BINDIR)/graph-editor.opt +- cp -f $(VIEWER_CMX) "$(DESTDIR)$(OCAMLLIB)" +- cp -f $(DGRAPH_CMX) "$(DESTDIR)$(OCAMLLIB)" +- cp -f $(DGRAPH_DIR)/dgraph.opt $(BINDIR)/graph-viewer.opt ++ mkdir -p $(DESTDIR)$(BINDIR) ++ cp -f $(ED_DIR)/editor.opt $(DESTDIR)$(BINDIR)/ocamlgraph-editor.opt ++ cp -f $(VIEWER_CMX) $(VIEWER_OBJ) "$(DESTDIR)$(OCAMLLIB)" ++ cp -f $(DGRAPH_CMX) $(DGRAPH_OBJ) "$(DESTDIR)$(OCAMLLIB)" ++ cp -f $(DGRAPH_DIR)/dgraph.opt $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.opt + endif + + install-findlib: META + ifdef OCAMLFIND ++ mkdir -p $(DESTDIR)/$(OCAMLLIB) + ifeq (@LABLGNOMECANVAS@,yes) +- $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \ +- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \ +- $(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO) ++ $(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIB) \ ++ ocamlgraph META $(SRCDIR)/*.mli dgraph/*.mli dgraph/viewer.ml \ ++ dgraph/dGraphViewer.ml view_graph/*.mli view_graph/viewGraph_test.ml + else +- $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \ +- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) ++ $(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIB) \ ++ ocamlgraph META $(SRCDIR)/*.mli + endif + endif + +@@ -328,7 +336,6 @@ + mkdir -p doc + rm -f doc/* + $(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC) +- $(MAKE) -C $(VIEWER_DIR) doc + + # literate programming + $(NAME).tex: $(DOC_SRC) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild new file mode 100644 index 000000000..9ee425cd8 --- /dev/null +++ b/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: Exp $ + +inherit eutils autotools + +DESCRIPTION="A graph library for Objective Caml" +HOMEPAGE="http://ocamlgraph.lri.fr/" +SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND=">=dev-lang/ocaml-3.10.2" + +DEPEND="${RDEPEND} + gtk? ( >=dev-ml/lablgtk-2.6 ) + ocamlopt? ( dev-lang/ocaml[ocamlopt] )" + +IUSE="doc examples gtk +ocamlopt" + +src_unpack() { + unpack ${A} + cd ${S} + epatch "${FILESDIR}/${P}-makefile.patch" + eautoreconf +} + +src_compile() { + econf || die "econf failed" + emake DESTDIR="/" -j1 || die "emake failed" + + if use doc; then + emake doc || die "emake doc failed" + fi +} + +src_install() { + emake install install-findlib DESTDIR="${D}" || die "emake install failed" + dodoc CHANGES COPYING CREDITS FAQ README + + if use doc; then + dohtml doc/* + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples + fi +} + -- cgit v1.2.3-18-g5258