From owner-svn-ports-all@FreeBSD.ORG Wed Mar 26 17:51:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B760B8B3; Wed, 26 Mar 2014 17:51:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8AA26263; Wed, 26 Mar 2014 17:51:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2QHpOXS008418; Wed, 26 Mar 2014 17:51:24 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2QHpO89008416; Wed, 26 Mar 2014 17:51:24 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201403261751.s2QHpO89008416@svn.freebsd.org> From: John Marino Date: Wed, 26 Mar 2014 17:51:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349273 - head/devel/ocaml-findlib X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2014 17:51:24 -0000 Author: marino Date: Wed Mar 26 17:51:23 2014 New Revision: 349273 URL: http://svnweb.freebsd.org/changeset/ports/349273 QAT: https://qat.redports.org/buildarchive/r349273/ Log: Ocaml update 2/4: devel/ocaml-findlib adjust for Ocaml 4 Tweak plist and support stage after Ocaml update. Urged by: portmgr (bapt) Modified: head/devel/ocaml-findlib/Makefile head/devel/ocaml-findlib/pkg-plist Modified: head/devel/ocaml-findlib/Makefile ============================================================================== --- head/devel/ocaml-findlib/Makefile Wed Mar 26 17:50:28 2014 (r349272) +++ head/devel/ocaml-findlib/Makefile Wed Mar 26 17:51:23 2014 (r349273) @@ -3,6 +3,7 @@ PORTNAME= findlib PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- @@ -29,11 +30,16 @@ MAKE_JOBS_UNSAFE= yes DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +.include + post-patch: @${REINPLACE_CMD} -e 's,path="@SITELIB@,&:${PREFIX}/${OCAML_LIBDIR},' \ ${WRKSRC}/findlib.conf.in post-install: +.if ${PORT_OPTIONS:MTOOLBOX} + @${CHMOD} 755 ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard +.endif @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \ "! -regex .*ref-man.*" Modified: head/devel/ocaml-findlib/pkg-plist ============================================================================== --- head/devel/ocaml-findlib/pkg-plist Wed Mar 26 17:50:28 2014 (r349272) +++ head/devel/ocaml-findlib/pkg-plist Wed Mar 26 17:51:23 2014 (r349273) @@ -3,7 +3,7 @@ bin/safe_camlp4 etc/findlib.conf lib/ocaml/site-lib/bigarray/META lib/ocaml/site-lib/camlp4/META -lib/ocaml/site-lib/dbm/META +lib/ocaml/site-lib/compiler-libs/META lib/ocaml/site-lib/dynlink/META lib/ocaml/site-lib/findlib/META lib/ocaml/site-lib/findlib/Makefile.config @@ -18,9 +18,7 @@ lib/ocaml/site-lib/findlib/fl_metascanne lib/ocaml/site-lib/findlib/fl_metatoken.cmi lib/ocaml/site-lib/findlib/fl_package_base.cmi lib/ocaml/site-lib/findlib/fl_package_base.mli -@mode 755 %%TOOLBOX%%lib/ocaml/site-lib/findlib/make_wizard -@mode %%TOOLBOX%%lib/ocaml/site-lib/findlib/make_wizard.pattern lib/ocaml/site-lib/findlib/topfind.cmi lib/ocaml/site-lib/findlib/topfind.mli @@ -139,8 +137,8 @@ man/man5/site-lib.5.gz @dirrm lib/ocaml/site-lib/graphics @dirrm lib/ocaml/site-lib/findlib @dirrm lib/ocaml/site-lib/dynlink -@dirrm lib/ocaml/site-lib/dbm @dirrm lib/ocaml/site-lib/camlp4 +@dirrm lib/ocaml/site-lib/compiler-libs @dirrm lib/ocaml/site-lib/bigarray @dirrmtry lib/ocaml/site-lib/labltk @dirrmtry lib/ocaml/site-lib