diff options
-rw-r--r-- | lang/ocaml/Makefile | 5 | ||||
-rw-r--r-- | lang/ocaml/Makefile.common | 3 | ||||
-rw-r--r-- | lang/ocaml/PLIST.opt | 79 | ||||
-rw-r--r-- | lang/ocaml/buildlink3.mk | 8 | ||||
-rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
-rw-r--r-- | lang/ocaml/hacks.mk | 8 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-at | 11 |
7 files changed, 63 insertions, 55 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 4be2457c7ed..98074f72de5 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2010/12/19 08:27:17 is Exp $ +# $NetBSD: Makefile,v 1.69 2011/03/29 13:45:01 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -45,7 +45,6 @@ PLIST_SRC+= ${PKGDIR}/PLIST.prof .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") . if !empty(MACHINE_PLATFORM:MLinux-*-*) || \ - !empty(MACHINE_PLATFORM:MDarwin-*-*) || \ !empty(MACHINE_PLATFORM:MFreeBSD-*-*) PLIST_SRC+= ${PKGDIR}/PLIST.natdynlink . endif @@ -66,6 +65,6 @@ INSTALL_MAKE_FLAGS+= SHELL=${SH:Q} .endif do-test: - cd $(WRKSRC)/testsuite && $(MAKE_PROGRAM) all + cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all .include "../../mk/bsd.pkg.mk" diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index f653e9a7301..400237cf412 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2010/12/19 08:27:17 is Exp $ +# $NetBSD: Makefile.common,v 1.29 2011/03/29 13:45:02 adam Exp $ # used by x11/labltk/Makefile # used by x11/ocaml-graphics/Makefile @@ -11,6 +11,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= adam@NetBSD.org HOMEPAGE= http://caml.inria.fr/ocaml/ COMMENT= The latest implementation of the Caml dialect of ML +LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake HAS_CONFIGURE= yes diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt index 311293b0f09..b74e1b06c08 100644 --- a/lang/ocaml/PLIST.opt +++ b/lang/ocaml/PLIST.opt @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.opt,v 1.17 2010/11/28 08:41:33 is Exp $ +@comment $NetBSD: PLIST.opt,v 1.18 2011/03/29 13:45:02 adam Exp $ bin/camlp4o.opt bin/camlp4of.opt bin/camlp4oof.opt @@ -27,39 +27,73 @@ lib/ocaml/camlinternalLazy.cmx lib/ocaml/camlinternalMod.cmx lib/ocaml/camlinternalOO.cmx lib/ocaml/camlp4/Camlp4Bin.cmx +lib/ocaml/camlp4/Camlp4Bin.o lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmx +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmx +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmx +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmx +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmx +lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmx +lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmx +lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmx +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmx +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmx +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o lib/ocaml/camlp4/Camlp4Top/Rprint.cmx +lib/ocaml/camlp4/Camlp4Top/Rprint.o lib/ocaml/camlp4/Camlp4Top/Top.cmx +lib/ocaml/camlp4/Camlp4Top/Top.o +lib/ocaml/camlp4/camlp4fulllib.a lib/ocaml/camlp4/camlp4fulllib.cmxa +lib/ocaml/camlp4/camlp4lib.a lib/ocaml/camlp4/camlp4lib.cmxa lib/ocaml/camlp4/camlp4prof.cmx +lib/ocaml/camlp4/camlp4prof.o lib/ocaml/char.cmx lib/ocaml/complex.cmx lib/ocaml/dbm.a @@ -91,12 +125,15 @@ lib/ocaml/nums.a lib/ocaml/nums.cmxa lib/ocaml/obj.cmx lib/ocaml/ocamlbuild/ocamlbuild.cmx +lib/ocaml/ocamlbuild/ocamlbuild.o lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx +lib/ocaml/ocamlbuild/ocamlbuild_executor.o lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx +lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o +lib/ocaml/ocamlbuild/ocamlbuildlib.a lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa lib/ocaml/ocamldoc/odoc_info.a lib/ocaml/ocamldoc/odoc_info.cmxa -@comment lib/ocaml/ocamldoc/odoc_opt.cmi lib/ocaml/oo.cmx lib/ocaml/parsing.cmx lib/ocaml/pervasives.cmx @@ -137,41 +174,3 @@ lib/ocaml/unix.cmx lib/ocaml/unix.cmxa lib/ocaml/unixLabels.cmx lib/ocaml/weak.cmx -lib/ocaml/camlp4/Camlp4Bin.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o -lib/ocaml/camlp4/Camlp4Top/Rprint.o -lib/ocaml/camlp4/Camlp4Top/Top.o -lib/ocaml/camlp4/camlp4lib.a -lib/ocaml/camlp4/camlp4fulllib.a -lib/ocaml/camlp4/camlp4prof.o -lib/ocaml/ocamlbuild/ocamlbuild.o -lib/ocaml/ocamlbuild/ocamlbuild_executor.o -lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o -lib/ocaml/ocamlbuild/ocamlbuildlib.a diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index e213e9507c8..63f5f89a017 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2009/06/14 22:58:02 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2011/03/29 13:45:02 adam Exp $ BUILDLINK_TREE+= ocaml @@ -10,10 +10,10 @@ BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.09.1nb2 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml BUILDLINK_DEPMETHOD.ocaml?= build -. include "../../mk/bsd.fast.prefs.mk" -. if ${OPSYS} == "Darwin" +.include "../../mk/bsd.fast.prefs.mk" +.if ${OPSYS} == "Darwin" INSTALL_UNSTRIPPED= yes -. endif +.endif BUILDLINK_TARGETS+= ocaml-wrappers OCAML_WRAPPERS= ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \ diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 9fa2618b67e..b8545c16af3 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2010/12/19 08:27:17 is Exp $ +$NetBSD: distinfo,v 1.54 2011/03/29 13:45:02 adam Exp $ SHA1 (ocaml-3.12.0.tar.bz2) = 33ebbfb1115806f117808f37e40d206c8994943d RMD160 (ocaml-3.12.0.tar.bz2) = 3d10d5f7431d8200688fa74122e7ed528126a0fa @@ -11,7 +11,7 @@ SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488 SHA1 (patch-aj) = 6fd989f1e5dd1263890c14459dd4ab85d75e86cd SHA1 (patch-an) = 8fb8efecd2b3f0ec6f913a0840f4cfebcbb6161e -SHA1 (patch-at) = 2dfd42fb373ad5efedded1a23bf1013d831346fd +SHA1 (patch-at) = e8a133c6ec1958db94f83235b0498cc3f2a5b915 SHA1 (patch-au) = 1e36bcdf39d40e781273ea51df213db05ff46c89 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2 SHA1 (patch-aw) = ce7b09f19f9f086b65b5036b6684c5243e990b8c diff --git a/lang/ocaml/hacks.mk b/lang/ocaml/hacks.mk index cdec39f5d20..6b2ad0088a7 100644 --- a/lang/ocaml/hacks.mk +++ b/lang/ocaml/hacks.mk @@ -1,7 +1,7 @@ -# $NetBSD: hacks.mk,v 1.1 2009/10/08 01:24:51 dmcmahill Exp $ +# $NetBSD: hacks.mk,v 1.2 2011/03/29 13:45:02 adam Exp $ .if !defined(OCAML_HACKS_MK) -OCAML_HACKS_MK= defined +OCAML_HACKS_MK= defined .include "../../mk/compiler.mk" @@ -12,8 +12,8 @@ OCAML_HACKS_MK= defined ### .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) . if !empty(CC_VERSION:Mgcc-4.4.*) -PKG_HACKS+= optimisation -BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-O +PKG_HACKS+= optimisation +BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-O . endif .endif diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at index 265e0ec2539..d9ade42346e 100644 --- a/lang/ocaml/patches/patch-at +++ b/lang/ocaml/patches/patch-at @@ -1,7 +1,16 @@ -$NetBSD: patch-at,v 1.20 2010/12/19 08:27:17 is Exp $ +$NetBSD: patch-at,v 1.21 2011/03/29 13:45:02 adam Exp $ --- configure.orig 2010-07-28 13:18:22.000000000 +0000 +++ configure +@@ -328,6 +328,8 @@ case "$bytecc,$host" in + gcc*) + bytecccompopts="-fno-defer-pop $gcc_warnings";; + esac ++bytecccompopts="$bytecccompopts $CFLAGS" ++bytecclinkopts="$bytecclinkopts $LDFLAGS" + + # Configure compiler to use in further tests + @@ -520,7 +520,7 @@ if test $withsharedlibs = "yes"; then mksharedlib="$flexlink" mkmaindll="$flexlink -maindll" |