ok @avsm (this is needed for the 4.02 update as well, to support ppx) -anil
On 25 Aug 2014, at 14:38, Christopher Zimmermann <[email protected]> wrote: > Hi, > > I'd like to update findlib to the latest upstream release. Tested by > bulk building all OCaml ports on amd64 with dynlink-native, without > dynlink and bytecode only. OK? > > Christopher > > > diff -x CVS -Nru sysutils/findlib/Makefile > /usr/ports/mystuff/sysutils/findlib/Makefile > --- sysutils/findlib/Makefile Thu Aug 21 22:54:04 2014 > +++ /usr/ports/mystuff/sysutils/findlib/Makefile Mon Aug 25 14:28:55 2014 > @@ -1,9 +1,8 @@ > -# $OpenBSD: Makefile,v 1.27 2014/08/21 20:54:04 chrisz Exp $ > +# $OpenBSD: Makefile,v 1.26 2013/03/11 11:41:30 espie Exp $ > > COMMENT= OCaml package manager > CATEGORIES= sysutils > -DISTNAME= findlib-1.3.3 > -REVISION= 2 > +DISTNAME= findlib-1.5.2 > MASTER_SITES= http://download.camlcity.org/download/ > > MAINTAINER= Anil Madhavapeddy <[email protected]> > @@ -12,11 +11,11 @@ > # MIT/X11 > PERMIT_PACKAGE_CDROM= Yes > > -WANTLIB = c m > -MODULES+= lang/ocaml x11/tk > -BUILD_DEPENDS +=lang/ocaml,-labltk > -NO_TEST= Yes > +MODULES+= x11/tk > > +RUN_DEPENDS += lang/ocaml > +BUILD_DEPENDS += lang/ocaml lang/ocaml,-labltk lang/ocaml,-camlp4 > + > CONFIGURE_STYLE=simple > CONFIGURE_ARGS= -with-toolbox \ > -no-custom \ > @@ -25,12 +24,23 @@ > > USE_GMAKE= Yes > FAKE_FLAGS= prefix=${DESTDIR} > +NO_TEST= Yes > > -ALL_TARGET= all > .include <bsd.port.arch.mk> > .if ${PROPERTIES:Mocaml_native} > -ALL_TARGET += opt > +PKG_ARGS+=-Dnative=1 > +ALL_TARGET += all opt > +.else > +PKG_ARGS+=-Dnative=0 > +ALL_TARGET = all > .endif > + > +.if ${PROPERTIES:Mocaml_native_dynlink} > +PKG_ARGS+=-Ddynlink=1 > +.else > +PKG_ARGS+=-Ddynlink=0 > +.endif > + > > post-install: > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/findlib > diff -x CVS -Nru sysutils/findlib/distinfo > /usr/ports/mystuff/sysutils/findlib/distinfo > --- sysutils/findlib/distinfo Sun Aug 19 00:24:50 2012 > +++ /usr/ports/mystuff/sysutils/findlib/distinfo Fri Aug 22 12:50:01 2014 > @@ -1,2 +1,2 @@ > -SHA256 (findlib-1.3.3.tar.gz) = mB9cZxGKK+AV76efOvPLAGM3a5MSO11pXny1xYax1Fw= > -SIZE (findlib-1.3.3.tar.gz) = 231414 > +SHA256 (findlib-1.5.2.tar.gz) = cL4xFXF5K2zZI7z00qWBosw4Zc8Xvp/Ya8W0vR6HIv0= > +SIZE (findlib-1.5.2.tar.gz) = 235561 > diff -x CVS -Nru sysutils/findlib/patches/patch-Makefile > /usr/ports/mystuff/sysutils/findlib/patches/patch-Makefile > --- sysutils/findlib/patches/patch-Makefile Thu Jan 3 15:30:57 2013 > +++ /usr/ports/mystuff/sysutils/findlib/patches/patch-Makefile Thu Jan > 1 01:00:00 1970 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-Makefile,v 1.3 2013/01/03 14:30:57 chrisz Exp $ > ---- Makefile.orig Mon Dec 31 12:38:03 2012 > -+++ Makefile Mon Dec 31 12:38:58 2012 > -@@ -63,6 +63,10 @@ findlib.conf: findlib.conf.in > - if ocamldep.opt >/dev/null 2>&1; then \ > - echo 'ocamldep="ocamldep.opt"' >>findlib.conf; \ > - fi > -+ if ocamldoc.opt >/dev/null 2>&1; then \ > -+ echo '#Please consider that ocamldoc plugins depend on > dynlink"' >>findlib.conf; \ > -+ echo '#ocamldoc="ocamldoc.opt"' >>findlib.conf; \ > -+ fi > - > - .PHONY: install-doc > - install-doc: > diff -x CVS -Nru sysutils/findlib/patches/patch-configure > /usr/ports/mystuff/sysutils/findlib/patches/patch-configure > --- sysutils/findlib/patches/patch-configure Thu Jan 3 15:30:57 2013 > +++ /usr/ports/mystuff/sysutils/findlib/patches/patch-configure Thu Jan > 1 01:00:00 1970 > @@ -1,50 +0,0 @@ > -$OpenBSD: patch-configure,v 1.3 2013/01/03 14:30:57 chrisz Exp $ > ---- configure.orig Mon Jul 9 11:29:16 2012 > -+++ configure Mon Dec 31 13:43:10 2012 > -@@ -116,6 +116,7 @@ ocaml_sitelib="" > - ocamlfind_config="" > - with_toolbox=0 > - with_topfind=1 > -+custom=-custom > - system="" > - > - while [ "$#" != "0" ]; do > -@@ -132,6 +133,9 @@ while [ "$#" != "0" ]; do > - -config) ocamlfind_config=$2 > - shift 2 > - ;; > -+ -no-custom) custom= > -+ shift > -+ ;; > - -cygpath) system=mingw > - shift > - ;; > -@@ -153,6 +157,7 @@ while [ "$#" != "0" ]; do > - echo " -mandir path where manual pages are > installed" 1>&2 > - echo " -sitelib path set the location of the > site-specific packages" 1>&2 > - echo " -config path set the location of the > configuration file" 1>&2 > -+ echo " -no-custom don't link in custom runtime > mode" 1>&2 > - echo " -system <systype> override system type (esp. mingw > and win32)" 1>&2 > - echo " -with-toolbox also build the toolbox" 1>&2 > - echo " -no-topfind don't install topfind script > into stdlib directory" 1>&2 > -@@ -536,6 +541,7 @@ echo "OCAMLFIND_CONF=${ocamlfind_config}" >>Makefile.c > - echo "OCAML_AUTOLINK=${ocaml_autolink}" >>Makefile.config > - echo "OCAML_REMOVE_DIRECTORY=${have_remdir}" >>Makefile.config > - echo "EXEC_SUFFIX=${exec_suffix}" >>Makefile.config > -+echo "CUSTOM=${custom}" >>Makefile.config > - echo "PARTS=${parts}" >>Makefile.config > - echo "INSTALL_TOPFIND=${with_topfind}" >>Makefile.config > - echo "USE_CYGPATH=${use_cygpath}" >>Makefile.config > -@@ -572,6 +578,12 @@ if [ $with_toolbox -gt 0 ]; then > - echo "Toolbox: yes" > - else > - echo "Toolbox: no" > -+fi > -+ > -+if [ -z "$custom" ]; then > -+ echo "Link custom runtime: no" > -+else > -+ echo "Link custom runtime: yes" > - fi > - > - echo > diff -x CVS -Nru sysutils/findlib/patches/patch-src_bytes_Makefile > /usr/ports/mystuff/sysutils/findlib/patches/patch-src_bytes_Makefile > --- sysutils/findlib/patches/patch-src_bytes_Makefile Thu Jan 1 01:00:00 1970 > +++ /usr/ports/mystuff/sysutils/findlib/patches/patch-src_bytes_Makefile > Mon Aug 25 15:34:36 2014 > @@ -0,0 +1,30 @@ > +$OpenBSD$ > + > +from upstream: > +We can't use ocamlfind because it may not yet be installed. > +Also respect PREFIX. > + > +--- src/bytes/Makefile.orig Fri Aug 1 14:02:25 2014 > ++++ src/bytes/Makefile Mon Aug 25 14:17:54 2014 > +@@ -19,9 +19,20 @@ opt: > + $(OCAMLBUILD) $$files > + > + install: all > ++ mkdir -p "$(prefix)$(OCAML_SITELIB)/bytes" > ++ cd _build/ && cp ../META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes" > ++ cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ > -f "$$f" ]; then cp $$f "$(prefix)$(OCAML_SITELIB)/bytes"; fi; done > ++ > ++uninstall: > ++ rm -rf "$(prefix)$(OCAML_SITELIB)/bytes" > ++ > ++# install-self and uninstall-self use ocamlfind already. This is a bit > ++# questionable here. > ++ > ++install-self: all > + cd _build/ && ocamlfind install bytes ../META $(BYTE_FILES) -optional > $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK) > + > +-uninstall: > ++uninstall-self: > + ocamlfind remove bytes > + > + clean: > diff -x CVS -Nru sysutils/findlib/patches/patch-src_findlib_Makefile > /usr/ports/mystuff/sysutils/findlib/patches/patch-src_findlib_Makefile > --- sysutils/findlib/patches/patch-src_findlib_Makefile Thu Jan 3 > 15:30:57 2013 > +++ /usr/ports/mystuff/sysutils/findlib/patches/patch-src_findlib_Makefile > Thu Jan 1 01:00:00 1970 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-src_findlib_Makefile,v 1.3 2013/01/03 14:30:57 chrisz Exp $ > ---- src/findlib/Makefile.orig Mon Jul 9 11:29:16 2012 > -+++ src/findlib/Makefile Mon Dec 31 13:40:45 2012 > -@@ -38,7 +38,7 @@ all: ocamlfind$(EXEC_SUFFIX) findlib.cma findlib_top.c > - opt: ocamlfind_opt$(EXEC_SUFFIX) findlib.cmxa topfind > - > - ocamlfind$(EXEC_SUFFIX): findlib.cma $(OCAMLFIND_OBJECTS) > -- $(OCAMLC) -custom -o ocamlfind$(EXEC_SUFFIX) -g findlib.cma unix.cma \ > -+ $(OCAMLC) $(CUSTOM) -o ocamlfind$(EXEC_SUFFIX) -g findlib.cma unix.cma \ > - $(OCAMLC_FLAGS) $(OCAMLFIND_OBJECTS) > - > - ocamlfind_opt$(EXEC_SUFFIX): findlib.cmxa $(OCAMLFIND_XOBJECTS) > diff -x CVS -Nru sysutils/findlib/pkg/PFRAG.dynlink-native > /usr/ports/mystuff/sysutils/findlib/pkg/PFRAG.dynlink-native > --- sysutils/findlib/pkg/PFRAG.dynlink-native Thu Jan 1 01:00:00 1970 > +++ /usr/ports/mystuff/sysutils/findlib/pkg/PFRAG.dynlink-native Fri Aug > 22 13:13:58 2014 > @@ -0,0 +1,3 @@ > +@comment $OpenBSD: $ > +@bin lib/ocaml/bytes/bytes.cmxs > +@bin lib/ocaml/findlib/findlib.cmxs > diff -x CVS -Nru sysutils/findlib/pkg/PFRAG.native > /usr/ports/mystuff/sysutils/findlib/pkg/PFRAG.native > --- sysutils/findlib/pkg/PFRAG.native Sun Aug 19 00:24:50 2012 > +++ /usr/ports/mystuff/sysutils/findlib/pkg/PFRAG.native Fri Aug 22 > 12:52:32 2014 > @@ -1,3 +1,7 @@ > @comment $OpenBSD: PFRAG.native,v 1.2 2012/08/18 22:24:50 avsm Exp $ > +%%dynlink%% > +lib/ocaml/bytes/bytes.a > +lib/ocaml/bytes/bytes.cmx > +lib/ocaml/bytes/bytes.cmxa > lib/ocaml/findlib/findlib.a > lib/ocaml/findlib/findlib.cmxa > diff -x CVS -Nru sysutils/findlib/pkg/PLIST > /usr/ports/mystuff/sysutils/findlib/pkg/PLIST > --- sysutils/findlib/pkg/PLIST Thu Aug 21 22:54:04 2014 > +++ /usr/ports/mystuff/sysutils/findlib/pkg/PLIST Fri Aug 22 13:19:55 2014 > @@ -1,14 +1,16 @@ > -@comment $OpenBSD: PLIST,v 1.10 2014/08/21 20:54:04 chrisz Exp $ > +@comment $OpenBSD: PLIST,v 1.9 2012/08/18 22:24:50 avsm Exp $ > %%native%% > @bin bin/ocamlfind > bin/safe_camlp4 > lib/ocaml/bigarray/ > lib/ocaml/bigarray/META > +lib/ocaml/bytes/ > +lib/ocaml/bytes/META > +lib/ocaml/bytes/bytes.cma > +lib/ocaml/bytes/bytes.cmi > lib/ocaml/camlp4/ > lib/ocaml/camlp4/META > lib/ocaml/compiler-libs/META > -lib/ocaml/dbm/ > -lib/ocaml/dbm/META > lib/ocaml/dynlink/ > lib/ocaml/dynlink/META > lib/ocaml/findlib/ > > > -- > http://gmerlin.de > OpenPGP: http://gmerlin.de/christopher.pub > F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
