From owner-svn-ports-all@FreeBSD.ORG  Thu Jul 31 07:31:00 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2C24A2F1;
 Thu, 31 Jul 2014 07:31:00 +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 19DB5246D;
 Thu, 31 Jul 2014 07:31:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6V7UxRQ025288;
 Thu, 31 Jul 2014 07:30:59 GMT (envelope-from bf@svn.freebsd.org)
Received: (from bf@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6V7Ux17025287;
 Thu, 31 Jul 2014 07:30:59 GMT (envelope-from bf@svn.freebsd.org)
Message-Id: <201407310730.s6V7Ux17025287@svn.freebsd.org>
From: Brendan Fabeny <bf@FreeBSD.org>
Date: Thu, 31 Jul 2014 07:30:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363533 - head/x11-toolkits/ocaml-lablgtk2
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Jul 2014 07:31:00 -0000

Author: bf
Date: Thu Jul 31 07:30:59 2014
New Revision: 363533
URL: http://svnweb.freebsd.org/changeset/ports/363533
QAT: https://qat.redports.org/buildarchive/r363533/

Log:
  Use staging; disable ocaml ld.conf additions for now

Modified:
  head/x11-toolkits/ocaml-lablgtk2/Makefile

Modified: head/x11-toolkits/ocaml-lablgtk2/Makefile
==============================================================================
--- head/x11-toolkits/ocaml-lablgtk2/Makefile	Thu Jul 31 06:01:33 2014	(r363532)
+++ head/x11-toolkits/ocaml-lablgtk2/Makefile	Thu Jul 31 07:30:59 2014	(r363533)
@@ -9,7 +9,7 @@ MASTER_SITES=	http://forge.ocamlcore.org
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	lablgtk-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bf@FreeBSD.org
 COMMENT=	An Objective Caml interface to GTK+ 2.x
 
 LICENSE=	LGPL21
@@ -43,7 +43,6 @@ CONFIGURE_ENV=	CAMLP4O="camlp4 pa_o.cmo 
 
 PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -128,17 +127,19 @@ post-patch:
 		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \
 		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \
 		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \
+		-e 's,(touch)( "\$$\(DESTDIR\)\$$\(OCAMLLDCONF\)"),${TRUE}\2,' \
+		-e 's,(-ldconf )("\$$\(DESTDIR\)\$$\(OCAMLLDCONF\)"),\1ignore,' \
 		${WRKSRC}/src/Makefile
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples ; ${COPYTREE_SHARE} \
-	"*.ml *.png *.rgb *.xpm text ${EXAMPLES_SUBDIRS}" ${EXAMPLESDIR}
+	"*.ml *.png *.rgb *.xpm text ${EXAMPLES_SUBDIRS}" ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>