Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Jul 2014 07:30:59 +0000 (UTC)
From:      Brendan Fabeny <bf@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r363533 - head/x11-toolkits/ocaml-lablgtk2
Message-ID:  <201407310730.s6V7Ux17025287@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407310730.s6V7Ux17025287>