diff --git a/lang/ocamlduce/Makefile b/lang/ocamlduce/Makefile index 56933ffa467..01124084ccb 100644 --- a/lang/ocamlduce/Makefile +++ b/lang/ocamlduce/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2005/09/23 14:27:27 avsm Exp $ +# $OpenBSD: Makefile,v 1.2 2006/05/29 03:55:33 avsm Exp $ COMMENT= "XML extension types for Objective Caml" CATEGORIES= lang textproc -V= 3.08.4pl3 +V= 3.09.2pl1 DISTNAME= ocamlduce-${V} MASTER_SITES= http://pauillac.inria.fr/~frisch/ocamlcduce/download/ -WRKDIST= ${WRKDIR}/ocaml-sub MAINTAINER= Anil Madhavapeddy HOMEPAGE= http://www.cduce.org/ocaml.html @@ -17,16 +16,18 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes MODULES= lang/ocaml -RUN_DEPENDS= :ocaml-3.08.4:lang/ocaml WANTLIB= curses m c pthread NO_REGRESS= Yes -CONFIGURE_STYLE=simple -CONFIGURE_ARGS= -prefix ${PREFIX} -MAKE_FILE= Makefile.ocamlduce -BYT_FLAGS= CAMLC=ocamlc CAMLOPT=ocamlopt CAMLDEP=ocamldep -MAKE_FLAGS= ${MODOCAML_NATIVE:S,Yes,,:S,No,${BYT_FLAGS},} +USE_GMAKE= Yes +MAKE_FLAGS= CAMLC=ocamlc${MODOCAML_NATIVE:S,Yes,.opt,:S,No,,} +FAKE_FLAGS= CAMLC=ocamlc${MODOCAML_NATIVE:S,Yes,.opt,:S,No,,} ALL_TARGET= all ${MODOCAML_NATIVE:S,Yes,opt,:S,No,,} -INSTALL_TARGET= minstall ${MODOCAML_NATIVE:S,Yes,minstallopt,:S,No,,} + +BUILD_DEPENDS= ::sysutils/findlib +RUN_DPENDS= ::sysutils/findlib + +pre-fake: + ${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml/site-lib .include diff --git a/lang/ocamlduce/distinfo b/lang/ocamlduce/distinfo index 259b2b77445..5b3d322a1fa 100644 --- a/lang/ocamlduce/distinfo +++ b/lang/ocamlduce/distinfo @@ -1,4 +1,4 @@ -MD5 (ocamlduce-3.08.4pl3.tar.gz) = 16e69929c9fbe57642dd700bb595360e -RMD160 (ocamlduce-3.08.4pl3.tar.gz) = c8e147c6b5a3883280b20b9717c189fbd570fa0c -SHA1 (ocamlduce-3.08.4pl3.tar.gz) = e93dfe87b853573d6c5a72824131a9ae78a59a30 -SIZE (ocamlduce-3.08.4pl3.tar.gz) = 3079977 +MD5 (ocamlduce-3.09.2pl1.tar.gz) = f9163058f53ce1900faa2cf2b66644a7 +RMD160 (ocamlduce-3.09.2pl1.tar.gz) = 2e8153ff8eb3267ce9ea5f6fd4dff4cf9bb993a9 +SHA1 (ocamlduce-3.09.2pl1.tar.gz) = a51a60c3867f7ee028549f150e74a4bccbd8c9a1 +SIZE (ocamlduce-3.09.2pl1.tar.gz) = 939816 diff --git a/lang/ocamlduce/patches/patch-Makefile b/lang/ocamlduce/patches/patch-Makefile new file mode 100644 index 00000000000..07d31e81015 --- /dev/null +++ b/lang/ocamlduce/patches/patch-Makefile @@ -0,0 +1,16 @@ +$OpenBSD: patch-Makefile,v 1.1 2006/05/29 03:55:33 avsm Exp $ +--- Makefile.orig Thu May 11 05:24:34 2006 ++++ Makefile Sun May 28 20:00:32 2006 +@@ -487,10 +487,10 @@ INSTALL_DOC_FILES= \ + + install: FORCE META + for i in $(INSTALL_BINARIES); do \ +- cp $$i $(BINDIR)/; \ ++ cp $$i $(DESTDIR)$(BINDIR)/; \ + done + for i in $(OPT_VARIANTS); do \ +- cp $$i.opt $(BINDIR)/$$i; \ ++ if [ -r $$i.opt ]; then cp $$i.opt $(DESTDIR)$(BINDIR)/$$i; fi \ + done + ocamlfind install ocamlduce META -optional $(INSTALL_LIB_FILES) + diff --git a/lang/ocamlduce/patches/patch-Makefile_ocamlduce b/lang/ocamlduce/patches/patch-Makefile_ocamlduce deleted file mode 100644 index 3e2dd20b46f..00000000000 --- a/lang/ocamlduce/patches/patch-Makefile_ocamlduce +++ /dev/null @@ -1,43 +0,0 @@ -$OpenBSD: patch-Makefile_ocamlduce,v 1.1.1.1 2005/09/23 14:27:27 avsm Exp $ ---- Makefile.ocamlduce.orig Fri Sep 23 14:44:26 2005 -+++ Makefile.ocamlduce Fri Sep 23 14:53:27 2005 -@@ -396,17 +396,32 @@ clean:: - rm -f ocamlducedoc* - cd ocamldoc && $(MAKE) clean - -+NAT_BIN= ocamlducec.opt ocamlduceopt.opt ocamlducedep.opt \ -+ ocamlducedoc.opt ocamlduceopt -+NAT_LIB= ocamlduce.cmxa ocamlduce.a -+BYT_BIN= ocamlducec ocamlduce ocamlducedep ocamlducedoc -+BYT_LIB= ocamlduce.cma stdlib/ocamlduce.cmi \ -+ cduce_types.cmi stdlib/ocamlduce.mli - - # Findlib installation - --INSTALL_FILES= \ -- ocamlducec ocamlduce ocamlducedep ocamlducedoc ocamlduce.cma \ -- ocamlduceopt ocamlduce.cmxa ocamlduce.a \ -- ocamlducec.opt ocamlduceopt.opt ocamlducedep.opt ocamlducedoc.opt \ -- stdlib/ocamlduce.cmi cduce_types.cmi stdlib/ocamlduce.mli -+INSTALL_FILES= ${NAT_BIN} ${NAT_LIB} ${BYT_BIN} ${BYT_LIB} - - install: FORCE - ocamlfind install ocamlduce META $(wildcard $(INSTALL_FILES)) - - uninstall: FORCE -- ocamlfind remove ocamlduce -\ No newline at end of file -+ ocamlfind remove ocamlduce -+ -+# Normal installation -+ -+minstall: FORCE -+ mkdir -p ${DESTDIR}${PREFIX}/lib/ocaml -+ cp ${BYT_LIB} ${DESTDIR}${PREFIX}/lib/ocaml -+ cp ${BYT_BIN} ${DESTDIR}${PREFIX}/bin -+ -+minstallopt: FORCE -+ mkdir -p ${DESTDIR}${PREFIX}/lib/ocaml -+ cp ${NAT_LIB} ${DESTDIR}${PREFIX}/lib/ocaml -+ cp ${NAT_BIN} ${DESTDIR}${PREFIX}/bin -+ diff --git a/lang/ocamlduce/pkg/PFRAG.native b/lang/ocamlduce/pkg/PFRAG.native index dbfeff93c0e..4ebc9875d51 100644 --- a/lang/ocamlduce/pkg/PFRAG.native +++ b/lang/ocamlduce/pkg/PFRAG.native @@ -1,8 +1,6 @@ -@comment $OpenBSD: PFRAG.native,v 1.1.1.1 2005/09/23 14:27:27 avsm Exp $ -bin/ocamlducec.opt -bin/ocamlducedep.opt -bin/ocamlducedoc.opt +@comment $OpenBSD: PFRAG.native,v 1.2 2006/05/29 03:55:33 avsm Exp $ bin/ocamlduceopt -bin/ocamlduceopt.opt -lib/ocaml/ocamlduce.a -lib/ocaml/ocamlduce.cmxa +lib/ocaml/site-lib/ocamlduce/cduce_types.o +lib/ocaml/site-lib/ocamlduce/ocamlduce.a +lib/ocaml/site-lib/ocamlduce/ocamlduce.cmxa +lib/ocaml/site-lib/ocamlduce/ocamlduce.o diff --git a/lang/ocamlduce/pkg/PLIST b/lang/ocamlduce/pkg/PLIST index c9339a06c83..3cb7dc5e4d6 100644 --- a/lang/ocamlduce/pkg/PLIST +++ b/lang/ocamlduce/pkg/PLIST @@ -1,10 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/09/23 14:27:27 avsm Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/05/29 03:55:33 avsm Exp $ +bin/expungeduce bin/ocamlduce bin/ocamlducec bin/ocamlducedep bin/ocamlducedoc -lib/ocaml/cduce_types.cmi -lib/ocaml/ocamlduce.cma -lib/ocaml/ocamlduce.cmi -lib/ocaml/ocamlduce.mli +bin/ocamlducefind +bin/ocamlducemktop +lib/ocaml/ +lib/ocaml/site-lib/ +lib/ocaml/site-lib/ocamlduce/ +lib/ocaml/site-lib/ocamlduce/META +lib/ocaml/site-lib/ocamlduce/cduce_types.cmi +lib/ocaml/site-lib/ocamlduce/ocamlduce.cma +lib/ocaml/site-lib/ocamlduce/ocamlduce.cmi +lib/ocaml/site-lib/ocamlduce/ocamlduce.mli +lib/ocaml/site-lib/ocamlduce/toplevelducelib.cma +lib/ocaml/site-lib/ocamlduce/topstart.cmo %%native%%