On 2 September 2014 00:50, Christopher Zimmermann <chr...@openbsd.org> wrote: > On Mon, 1 Sep 2014 23:34:18 -0400 Kenneth Westerback > <kwesterb...@gmail.com> wrote: > >> On 1 September 2014 07:12, Christopher Zimmermann <chr...@openbsd.org> wrote: >> > Hi, >> > >> > OCaml 4.02 will no longer ship with camlp4. Therefore we need a >> > separate port. OK? >> >> Since git, in what I ascribe to it's infinite annoying stupidity, does >> not actually provide the information necessary to determine where you >> intend this patch to be applied I'm kinda stymied. Especially when >> sqlports bombed out again after jca@'s fix. This time complaining that >> ocaml-camlp4 does not exit. :-( > > > Well it wasn't git's, but my own stupidity. Here's a proper patch. This > time with lang/Makefile addition, too. OK? > > Christopher >
I like my git is stupid theory. Anyway, I see all is committed! Much simpler. :-) Thanks. .... Ken > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/Makefile,v > retrieving revision 1.163 > diff -u -p -r1.163 Makefile > --- Makefile 15 Aug 2014 12:24:46 -0000 1.163 > +++ Makefile 2 Sep 2014 04:48:00 -0000 > @@ -66,6 +66,7 @@ > SUBDIR += nqp > SUBDIR += obc > SUBDIR += ocaml > + SUBDIR += ocaml-camlp4 > SUBDIR += ocamlduce > SUBDIR += onyx > SUBDIR += oo2c > Index: ocaml-camlp4/Makefile > =================================================================== > RCS file: ocaml-camlp4/Makefile > diff -N ocaml-camlp4/Makefile > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ ocaml-camlp4/Makefile 2 Sep 2014 04:48:00 -0000 > @@ -0,0 +1,48 @@ > +# $OpenBSD: $ > + > +COMMENT = OCaml Preprocessor and Pretty-Printer > +CATEGORIES = lang > + > +V = 4.02.0 > +GH_ACCOUNT = ocaml > +GH_PROJECT = camlp4 > +GH_TAGNAME = ${V} > +GH_COMMIT = 0bb620fad7005850beadbf3aafeeb17d28c8fecd > +DISTNAME = ${GH_PROJECT}-${GH_TAGNAME} > +PKGNAME = ocaml-${DISTNAME} > + > +HOMEPAGE = https://github.com/ocaml/camlp4/ > + > +MAINTAINER = Christopher Zimmermann <chr...@openbsd.org> > + > +# LGPL >=2.1 > +PERMIT_PACKAGE_CDROM = Yes > + > +MODULES = lang/ocaml > + > +WANTLIB += c m > +BUILD_DEPENDS += sysutils/findlib > + > +USE_GMAKE = Yes > + > +CONFIGURE_STYLE = simple > + > +MAKE_ENV = DESTDIR=${WRKINST} > + > +ALL_TARGET = byte > + > +.include <bsd.port.arch.mk> > +.if ${PROPERTIES:Mocaml_native} > +ALL_TARGET += native > +.endif > + > +INSTALL_TARGET = install install-META > + > + > +pre-install: > + echo LIBDIR=${PREFIX}/lib/ocaml >>${WRKSRC}/config.sh > + echo BINDIR=${PREFIX}/bin >>${WRKSRC}/config.sh > + echo PKGDIR=${PREFIX}/lib/ocaml/camlp4 >>${WRKSRC}/config.sh > + > + > +.include <bsd.port.mk> > Index: ocaml-camlp4/distinfo > =================================================================== > RCS file: ocaml-camlp4/distinfo > diff -N ocaml-camlp4/distinfo > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ ocaml-camlp4/distinfo 2 Sep 2014 04:48:00 -0000 > @@ -0,0 +1,2 @@ > +SHA256 (camlp4-4.02.0.tar.gz) = 6MuTgKfxtKhiadSr4hr8zws9lsbyB7hVwnFfOVgIu94= > +SIZE (camlp4-4.02.0.tar.gz) = 697243 > Index: ocaml-camlp4/pkg/DESCR > =================================================================== > RCS file: ocaml-camlp4/pkg/DESCR > diff -N ocaml-camlp4/pkg/DESCR > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ ocaml-camlp4/pkg/DESCR 2 Sep 2014 04:48:00 -0000 > @@ -0,0 +1,7 @@ > +Camlp4 is a software system for writing extensible parsers > +for programming languages. It provides a set of OCaml > +libraries that are used to define grammars as well as > +loadable syntax extensions of such grammars. Camlp4 stands > +for Caml Preprocessor and Pretty-Printer and one of its most > +important applications is the definition of domain-specific > +extensions of the syntax of OCaml. > Index: ocaml-camlp4/pkg/PFRAG.native > =================================================================== > RCS file: ocaml-camlp4/pkg/PFRAG.native > diff -N ocaml-camlp4/pkg/PFRAG.native > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ ocaml-camlp4/pkg/PFRAG.native 2 Sep 2014 04:48:00 -0000 > @@ -0,0 +1,75 @@ > +@comment $OpenBSD$ > +@bin bin/camlp4o.opt > +@bin bin/camlp4of.opt > +@bin bin/camlp4oof.opt > +@bin bin/camlp4orf.opt > +@bin bin/camlp4r.opt > +@bin bin/camlp4rf.opt > +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 > Index: ocaml-camlp4/pkg/PLIST > =================================================================== > RCS file: ocaml-camlp4/pkg/PLIST > diff -N ocaml-camlp4/pkg/PLIST > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ ocaml-camlp4/pkg/PLIST 2 Sep 2014 04:48:00 -0000 > @@ -0,0 +1,95 @@ > +@comment $OpenBSD$ > +%%native%% > +bin/camlp4 > +bin/camlp4boot > +bin/camlp4o > +bin/camlp4of > +bin/camlp4oof > +bin/camlp4orf > +bin/camlp4prof > +bin/camlp4r > +bin/camlp4rf > +bin/mkcamlp4 > +lib/ocaml/camlp4/ > +lib/ocaml/camlp4/Camlp4.cmi > +lib/ocaml/camlp4/Camlp4Bin.cmi > +lib/ocaml/camlp4/Camlp4Bin.cmo > +lib/ocaml/camlp4/Camlp4Filters/ > +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmi > +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmo > +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmi > +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmo > +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmi > +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmo > +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmi > +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmo > +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmi > +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmo > +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmi > +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmo > +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi > +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo > +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi > +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo > +lib/ocaml/camlp4/Camlp4Parsers/ > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmo > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmi > +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmo > +lib/ocaml/camlp4/Camlp4Printers/ > +lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmi > +lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmo > +lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmi > +lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmo > +lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmi > +lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmo > +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmi > +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmo > +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmi > +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmo > +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmi > +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmo > +lib/ocaml/camlp4/Camlp4Top/ > +lib/ocaml/camlp4/Camlp4Top.cmi > +lib/ocaml/camlp4/Camlp4Top.cmo > +lib/ocaml/camlp4/Camlp4Top/Rprint.cmi > +lib/ocaml/camlp4/Camlp4Top/Rprint.cmo > +lib/ocaml/camlp4/Camlp4Top/Top.cmi > +lib/ocaml/camlp4/Camlp4Top/Top.cmo > +lib/ocaml/camlp4/Camlp4_config.cmi > +lib/ocaml/camlp4/camlp4/ > +lib/ocaml/camlp4/camlp4/META > +lib/ocaml/camlp4/camlp4fulllib.cma > +lib/ocaml/camlp4/camlp4lib.cma > +lib/ocaml/camlp4/camlp4o.cma > +lib/ocaml/camlp4/camlp4of.cma > +lib/ocaml/camlp4/camlp4oof.cma > +lib/ocaml/camlp4/camlp4orf.cma > +lib/ocaml/camlp4/camlp4prof.cmi > +lib/ocaml/camlp4/camlp4prof.cmo > +lib/ocaml/camlp4/camlp4r.cma > +lib/ocaml/camlp4/camlp4rf.cma > > > > > > -- > http://gmerlin.de > OpenPGP: http://gmerlin.de/christopher.pub > F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE