Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Jan 2017 12:23:53 -0600
From:      John Marino <freebsd.contact@marino.st>
To:        Hiroki Sato <hrs@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r431473 - in head/devel/ocaml-findlib: . files
Message-ID:  <b2c7d8c9-22f1-5356-37db-436ab922bbee@marino.st>
In-Reply-To: <201701141556.v0EFuUju035888@repo.freebsd.org>
References:  <201701141556.v0EFuUju035888@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 1/14/2017 09:56, Hiroki Sato wrote:
> Author: hrs
> Date: Sat Jan 14 15:56:29 2017
> New Revision: 431473
> URL: https://svnweb.freebsd.org/changeset/ports/431473
>
> Log:
>   Update to 1.7.1.
>
> Modified:
>   head/devel/ocaml-findlib/Makefile
>   head/devel/ocaml-findlib/distinfo
>   head/devel/ocaml-findlib/files/patch-Makefile
>   head/devel/ocaml-findlib/files/patch-src__bytes__Makefile
>   head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile
>   head/devel/ocaml-findlib/files/patch-src_findlib_Makefile
>   head/devel/ocaml-findlib/pkg-plist
>
> Modified: head/devel/ocaml-findlib/Makefile
> ==============================================================================
> --- head/devel/ocaml-findlib/Makefile	Sat Jan 14 15:39:16 2017	(r431472)
> +++ head/devel/ocaml-findlib/Makefile	Sat Jan 14 15:56:29 2017	(r431473)
> @@ -2,25 +2,31 @@
>  # $FreeBSD$
>
>  PORTNAME=	findlib
> -PORTVERSION=	1.6.2
> +PORTVERSION=	1.7.1
>  CATEGORIES=	devel
>  MASTER_SITES=	http://download.camlcity.org/download/
>  PKGNAMEPREFIX=	ocaml-
>
> -MAINTAINER=	ports@FreeBSD.org
> +MAINTAINER=	hrs@FreeBSD.org
>  COMMENT=	OCaml package manager
>
> +LICENSE=	MIT
> +LICENSE_FILE=	${WRKSRC}/LICENSE
> +
> +USES=		gmake
>  USE_OCAML=	yes
> +USE_OCAML_CAMLP4=yes
> +USE_OCAML_FINDLIB=yes
> +OCAMLFIND_DEPEND=	# Avoid dependency loop
>  HAS_CONFIGURE=	yes
> -USES=		gmake
> -ALL_TARGET=	all opt
> -
>  CONFIGURE_ARGS=	-bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \
>  		-sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \
>  		-config "${PREFIX}/etc/findlib.conf"
> -USE_OCAML_CAMLP4=yes
> -USE_OCAML_FINDLIB=yes
> -OCAMLFIND_DEPEND=	# Avoid dependency loop
> +MAKE_ENV=	OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}"
> +ALL_TARGET=	all opt
> +MAKE_JOBS_UNSAFE=	yes
> +DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
> +PORTDOCS=	*
>
>  OPTIONS_DEFINE=	TOOLBOX DOCS
>  OPTIONS_DEFAULT=TOOLBOX
> @@ -30,21 +36,18 @@ TOOLBOX_CONFIGURE_ON=	-with-toolbox
>  TOOLBOX_RUN_DEPENDS=	labltk:x11-toolkits/ocaml-labltk
>  TOOLBOX_BUILD_DEPENDS=	${TOOLBOX_RUN_DEPENDS}
>
> -MAKE_JOBS_UNSAFE=	yes
> -
> -DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
> -PORTDOCS=	*
> -
> -post-patch:
> -	@${REINPLACE_CMD} -e 's,path="@SITELIB@,&:${PREFIX}/${OCAML_LIBDIR},' \
> -		${WRKSRC}/findlib.conf.in
> -
>  post-install:
> -	@-${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \
> -		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard
> +	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \
> +	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard
> +	cd ${STAGEDIR}${PREFIX} && \
> +	    ${STRIP_CMD} bin/ocamlfind \
> +	    ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \
> +	    ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \
> +	    ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs
> +
> +post-install-DOCS-on:
>  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>  	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
> -		"! -regex .*ref-man.*"
> -	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocamlfind
> +	    "! -regex .*ref-man.*"
>
>  .include <bsd.port.mk>
>
> Modified: head/devel/ocaml-findlib/distinfo
> ==============================================================================
> --- head/devel/ocaml-findlib/distinfo	Sat Jan 14 15:39:16 2017	(r431472)
> +++ head/devel/ocaml-findlib/distinfo	Sat Jan 14 15:56:29 2017	(r431473)
> @@ -1,2 +1,3 @@
> -SHA256 (findlib-1.6.2.tar.gz) = 3917904342ffbb66089f9fec1adc023b8854178bc21f303e4cbf96b8b164c946
> -SIZE (findlib-1.6.2.tar.gz) = 253764
> +TIMESTAMP = 1484407844
> +SHA256 (findlib-1.7.1.tar.gz) = 5d4b9a79e9abf8be0b509f6b8cf5696221cbe14fa2fbb2bb352342755fd15eef
> +SIZE (findlib-1.7.1.tar.gz) = 256883
>
> Modified: head/devel/ocaml-findlib/files/patch-Makefile
> ==============================================================================
> --- head/devel/ocaml-findlib/files/patch-Makefile	Sat Jan 14 15:39:16 2017	(r431472)
> +++ head/devel/ocaml-findlib/files/patch-Makefile	Sat Jan 14 15:56:29 2017	(r431473)
> @@ -1,5 +1,5 @@
> ---- Makefile.orig	2016-03-07 14:46:34.000000000 +0100
> -+++ Makefile	2016-03-10 22:51:25.356292000 +0100
> +--- Makefile.orig	2016-11-18 13:04:45 UTC
> ++++ Makefile
>  @@ -17,14 +17,14 @@ opt:
>   	for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
>
> @@ -18,11 +18,20 @@
>   	fi
>   	$(MAKE) install-doc
>
> +@@ -55,7 +55,7 @@ findlib.conf: findlib.conf.in
> + 	USE_CYGPATH="$(USE_CYGPATH)"; \
> + 	export USE_CYGPATH; \
> + 	cat findlib.conf.in | \
> +-		tools/patch '@SITELIB@' '$(OCAML_SITELIB)' >findlib.conf
> ++		tools/patch '@SITELIB@' '$(OCAML_SITELIB):$(OCAML_LIBDIR)' >findlib.conf
> + 	if ./tools/cmd_from_same_dir ocamlc; then \
> + 		echo 'ocamlc="ocamlc.opt"' >>findlib.conf; \
> + 	fi


I think this change is the direct cause for math/ocaml-zarith failing on 
all platforms.  It's expecting a single directory, not a concatenated 
series of directories.

What was this change supposed to address?


(more below)


>  @@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
>
>   .PHONY: install-doc
>   install-doc:
> --	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
> +-	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
>  -	-cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
>  -	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
>  +	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
>
> Modified: head/devel/ocaml-findlib/files/patch-src__bytes__Makefile
> ==============================================================================
> --- head/devel/ocaml-findlib/files/patch-src__bytes__Makefile	Sat Jan 14 15:39:16 2017	(r431472)
> +++ head/devel/ocaml-findlib/files/patch-src__bytes__Makefile	Sat Jan 14 15:56:29 2017	(r431473)
> @@ -1,5 +1,5 @@
> ---- src/bytes/Makefile.orig	2016-03-07 14:46:34.000000000 +0100
> -+++ src/bytes/Makefile	2016-03-10 22:51:25.358157000 +0100
> +--- src/bytes/Makefile.orig	2016-11-18 13:04:46 UTC
> ++++ src/bytes/Makefile
>  @@ -19,9 +19,9 @@ opt:
>   	$(OCAMLBUILD) $$files
>
>
> Modified: head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile
> ==============================================================================
> --- head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile	Sat Jan 14 15:39:16 2017	(r431472)
> +++ head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile	Sat Jan 14 15:56:29 2017	(r431473)
> @@ -1,5 +1,5 @@
> ---- src/findlib-toolbox/Makefile.orig	2016-03-07 14:46:34.000000000 +0100
> -+++ src/findlib-toolbox/Makefile	2016-03-10 22:51:25.360014000 +0100
> +--- src/findlib-toolbox/Makefile.orig	2016-11-18 13:04:46 UTC
> ++++ src/findlib-toolbox/Makefile
>  @@ -13,7 +13,8 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
>   	 	findlib.cma make_wizard.ml
>
>
> Modified: head/devel/ocaml-findlib/files/patch-src_findlib_Makefile
> ==============================================================================
> --- head/devel/ocaml-findlib/files/patch-src_findlib_Makefile	Sat Jan 14 15:39:16 2017	(r431472)
> +++ head/devel/ocaml-findlib/files/patch-src_findlib_Makefile	Sat Jan 14 15:56:29 2017	(r431473)
> @@ -1,5 +1,5 @@
> ---- src/findlib/Makefile.orig	2016-03-07 14:46:34.000000000 +0100
> -+++ src/findlib/Makefile	2016-03-10 22:51:25.362057000 +0100
> +--- src/findlib/Makefile.orig	2016-11-18 13:04:46 UTC
> ++++ src/findlib/Makefile
>  @@ -19,6 +19,7 @@ OCAMLDEP = ocamldep
>   OCAMLLEX = ocamllex
>   #CAMLP4O =  camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --
> @@ -8,7 +8,7 @@
>
>
>   OBJECTS        = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \
> -@@ -112,23 +113,23 @@ clean:
> +@@ -119,23 +120,23 @@ clean:
>   	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
>
>   install: all
> @@ -18,25 +18,24 @@
>  +	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
>  +	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
>  +	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
> - 	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
> + 	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
>  -	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
> -+	${BSD_INSTALL_DATA} $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
> ++	cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
>   	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
>  -	cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
> -+	${BSD_INSTALL_DATA} $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
> ++	cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
>   	# the following "if" block is only needed for 4.00beta2
>   	if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
>   	    cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
>  -	    cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
> -+	    ${BSD_INSTALL_DATA} topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
> ++	    cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
>   	fi
>
>   install-num-top:
>  -	mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
> --	cp num_top.cma num_top.cmi num_top_printers.cmi \
> --		"$(prefix)$(OCAML_SITELIB)/num-top"
>  +	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
> -+	${BSD_INSTALL_DATA} num_top.cma num_top.cmi num_top_printers.cmi \
> + 	cp num_top.cma num_top.cmi num_top_printers.cmi \
> +-		"$(prefix)$(OCAML_SITELIB)/num-top"
>  +		"$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
>


why were all the standard BSD_INSTALL_* macros replaced with "cp" ??

John




>   # Note: uninstall-num-top is part of the removal of the META files.
>
> Modified: head/devel/ocaml-findlib/pkg-plist
> ==============================================================================
> --- head/devel/ocaml-findlib/pkg-plist	Sat Jan 14 15:39:16 2017	(r431472)
> +++ head/devel/ocaml-findlib/pkg-plist	Sat Jan 14 15:56:29 2017	(r431473)
> @@ -18,7 +18,10 @@ bin/safe_camlp4
>  %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cma
>  %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxa
>  %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxs
> +%%OCAML_SITELIBDIR%%/findlib/findlib_top.a
>  %%OCAML_SITELIBDIR%%/findlib/findlib_top.cma
> +%%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxa
> +%%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxs
>  %%OCAML_SITELIBDIR%%/findlib/fl_dynload.cmi
>  %%OCAML_SITELIBDIR%%/findlib/fl_dynload.mli
>  %%OCAML_SITELIBDIR%%/findlib/fl_metascanner.cmi
>

---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b2c7d8c9-22f1-5356-37db-436ab922bbee>