From owner-svn-ports-head@FreeBSD.ORG  Wed Mar 26 20:07:12 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 937467FB;
 Wed, 26 Mar 2014 20:07:12 +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 665453E2;
 Wed, 26 Mar 2014 20:07:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2QK7C3D062733;
 Wed, 26 Mar 2014 20:07:12 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2QK7CrC062731;
 Wed, 26 Mar 2014 20:07:12 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201403262007.s2QK7CrC062731@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 26 Mar 2014 20:07:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349286 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Mar 2014 20:07:12 -0000

Author: antoine
Date: Wed Mar 26 20:07:11 2014
New Revision: 349286
URL: http://svnweb.freebsd.org/changeset/ports/349286
QAT: https://qat.redports.org/buildarchive/r349286/

Log:
  Make bsd.ocaml.mk more stage friendly
  
  Reviewed by:	bapt
  With hat:	portmgr

Modified:
  head/Mk/bsd.ocaml.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.ocaml.mk
==============================================================================
--- head/Mk/bsd.ocaml.mk	Wed Mar 26 20:01:23 2014	(r349285)
+++ head/Mk/bsd.ocaml.mk	Wed Mar 26 20:07:11 2014	(r349286)
@@ -108,25 +108,19 @@ post-install-script: ocaml-findlib ocaml
 #
 BUILD_DEPENDS+=		${OCAMLFIND_DEPEND}
 RUN_DEPENDS+=		${OCAMLFIND_DEPEND}
-MAKE_ENV+=	OCAMLFIND_DESTDIR="${OCAMLFIND_DESTDIR}" \
+MAKE_ENV+=	OCAMLFIND_DESTDIR="${STAGEDIR}${OCAMLFIND_DESTDIR}" \
 		OCAMLFIND_LDCONF="${OCAMLFIND_LDCONF}"
 
 #
 # Directories under site-lib to process automatically
 #
 OCAML_PKGDIRS?=	${PORTNAME}
-. if !target(pre-install-script)
-pre-install-script:
-.if !exists(${OCAMLFIND_DESTDIR})
-	@${MKDIR} "${PREFIX}/${OCAML_SITELIBDIR}"
-.endif
-. endif
 . if !target(ocaml-findlib)
 ocaml-findlib:
 .  for DIR in ${OCAML_PKGDIRS}
 .   if defined(USE_OCAMLFIND_PLIST)
-	@${FIND} ${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \
-		's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \
+		's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 .   endif
 	@${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR}/${DIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \
@@ -143,7 +137,9 @@ OCAML_LDLIBS?=	${OCAML_SITELIBDIR}/${POR
 . if !target(ocaml-ldconfig)
 ocaml-ldconfig:
 .  for LIB in ${OCAML_LDLIBS}
+.   if defined(NO_STAGE)
 	@${ECHO_CMD} "${PREFIX}/${LIB}" >> "${PREFIX}/${OCAML_LDCONF}"
+.   endif
 	@${ECHO_CMD} "@exec ${ECHO_CMD} "%D/${LIB}" >> %D/${OCAML_LDCONF}" \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${SED} -i \"\" -e '/${LIB:S#/#\/#g}/d' %D/${OCAML_LDCONF}"  >> ${TMPPLIST}
@@ -199,3 +195,15 @@ add-plist-post:
 .endif
 
 .endif #!defined(OCAML_include)
+
+.if defined(_POSTMKINCLUDED)
+
+.if defined(USE_OCAML_FINDLIB)
+
+pre-install: ${STAGEDIR}${OCAMLFIND_DESTDIR}
+${STAGEDIR}${OCAMLFIND_DESTDIR}:
+	@${MKDIR} ${.TARGET}
+
+.endif
+
+.endif # _POSTMKINCLUDED

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Mar 26 20:01:23 2014	(r349285)
+++ head/Mk/bsd.port.mk	Wed Mar 26 20:07:11 2014	(r349286)
@@ -1845,6 +1845,10 @@ IGNORE=	Do not define STAGEDIR in comman
 .include "${PORTSDIR}/Mk/bsd.java.mk"
 .endif
 
+.if defined(USE_OCAML)
+.include "${PORTSDIR}/Mk/bsd.ocaml.mk"
+.endif
+
 .if defined(USE_LINUX_RPM)
 .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
 .endif