Revision: 95965 https://trac.macports.org/changeset/95965 Author: mww@macports.org Date: 2012-07-27 00:29:19 -0700 (Fri, 27 Jul 2012) Log Message: ----------- omake: fix build for OCaml 4.0; make link to MacPorts readline, ncurses; inc revision Modified Paths: -------------- trunk/dports/devel/omake/Portfile Added Paths: ----------- trunk/dports/devel/omake/files/patch-lib-build-OCaml.om.diff trunk/dports/devel/omake/files/patch-lib-configure-readline.om.diff Modified: trunk/dports/devel/omake/Portfile =================================================================== --- trunk/dports/devel/omake/Portfile 2012-07-27 07:13:43 UTC (rev 95964) +++ trunk/dports/devel/omake/Portfile 2012-07-27 07:29:19 UTC (rev 95965) @@ -4,7 +4,7 @@ name omake version 0.9.8.6-0.rc1 -revision 1 +revision 2 platforms darwin categories devel maintainers erickt openmaintainer @@ -22,9 +22,9 @@ sha1 f714fa992bf391b8bac49a488bc654128962d1cc \ rmd160 b7ceebea6f4c40460625e2e9528257e200676bca -patchfiles patch-OMakefile.diff +patchfiles patch-OMakefile.diff patch-lib-build-OCaml.om.diff patch-lib-configure-readline.om.diff -depends_lib port:ocaml +depends_lib port:ocaml port:readline port:ncurses use_configure no Added: trunk/dports/devel/omake/files/patch-lib-build-OCaml.om.diff =================================================================== --- trunk/dports/devel/omake/files/patch-lib-build-OCaml.om.diff (rev 0) +++ trunk/dports/devel/omake/files/patch-lib-build-OCaml.om.diff 2012-07-27 07:29:19 UTC (rev 95965) @@ -0,0 +1,11 @@ +--- lib/build/OCaml.om 2008-03-05 02:07:25.000000000 +0100 ++++ OCaml.om 2012-07-27 09:19:02.000000000 +0200 +@@ -176,7 +176,7 @@ + # + declare OCAMLDEPFLAGS + public.OCAMLPPFLAGS = +-public.OCAMLFLAGS = -warn-error A ++public.OCAMLFLAGS = + public.OCAMLCFLAGS = -g + public.OCAMLOPTFLAGS = + public.OCAMLCPPFLAGS = Added: trunk/dports/devel/omake/files/patch-lib-configure-readline.om.diff =================================================================== --- trunk/dports/devel/omake/files/patch-lib-configure-readline.om.diff (rev 0) +++ trunk/dports/devel/omake/files/patch-lib-configure-readline.om.diff 2012-07-27 07:29:19 UTC (rev 95965) @@ -0,0 +1,11 @@ +--- lib/configure/readline.om 2007-05-14 18:38:18.000000000 +0200 ++++ readline.om 2012-07-27 09:25:28.000000000 +0200 +@@ -35,7 +35,7 @@ + # Test that readline exists + if $(and $(CheckHeader readline/readline.h readline/history.h), $(CheckLib ncurses readline, tgetent tgetstr readline)) + READLINE_AVAILABLE = true +- READLINE_CLIBS = -lncurses -lreadline ++ READLINE_CLIBS = -L$(LIBDIR) -lncurses -lreadline + READLINE_CFLAGS += -DREADLINE_ENABLED + + # Test for GNU