From owner-svn-ports-all@FreeBSD.ORG  Wed Mar 26 20:35:55 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 E69895DE;
 Wed, 26 Mar 2014 20:35:55 +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 D2C3A929;
 Wed, 26 Mar 2014 20:35:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2QKZtM9074944;
 Wed, 26 Mar 2014 20:35:55 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2QKZtaP074942;
 Wed, 26 Mar 2014 20:35:55 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201403262035.s2QKZtaP074942@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 26 Mar 2014 20:35:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349289 - head/archivers/ocaml-zip
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 <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: Wed, 26 Mar 2014 20:35:56 -0000

Author: antoine
Date: Wed Mar 26 20:35:55 2014
New Revision: 349289
URL: http://svnweb.freebsd.org/changeset/ports/349289
QAT: https://qat.redports.org/buildarchive/r349289/

Log:
  Stage support

Modified:
  head/archivers/ocaml-zip/Makefile

Modified: head/archivers/ocaml-zip/Makefile
==============================================================================
--- head/archivers/ocaml-zip/Makefile	Wed Mar 26 20:18:38 2014	(r349288)
+++ head/archivers/ocaml-zip/Makefile	Wed Mar 26 20:35:55 2014	(r349289)
@@ -16,36 +16,22 @@ USE_OCAML=	yes
 USE_OCAML_LDCONFIG=yes
 USE_OCAML_WASH=	yes
 
-NO_STAGE=	yes
-
 ALL_TARGET=	all allopt
 INSTALL_TARGET=	install installopt
-MASTERPORT=	${PORTSDIR}/devel/ocaml-camlidl
 PATTERN=	([[:space:]]*)cp([[:space:]]+.*)
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 # PREFIX, CFLAGS and permissions safeness
 	@${REINPLACE_CMD} -E \
 		-e "s,${PATTERN},\1\$${BSD_INSTALL_DATA}\2," \
 		-e "s,(-ccopt[[:space:]])-g,\1\"${CFLAGS}\"," \
-		-e "s,^(INSTALLDIR=).*,\1${OCAMLFIND_DESTDIR}/zip," \
+		-e "s,^(INSTALLDIR=).*,\1${STAGEDIR}${OCAMLFIND_DESTDIR}/zip," \
 		-e "/ldconf/d" ${WRKSRC}/Makefile
 
-pre-install:
-# For nonstandard prefixes
-.if !exists(${OCAMLFIND_DESTDIR})
-	${MKDIR} ${OCAMLFIND_DESTDIR}
-.endif
-.if !exists(${OCAMLFIND_LDCONF})
-	${TOUCH} ${OCAMLFIND_LDCONF}
-.endif
-
 post-install:
-	@${INSTALL_DATA} ${FILESDIR}/META ${OCAMLFIND_DESTDIR}/${PORTNAME}
-	@${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
+	${INSTALL_DATA} ${FILESDIR}/META ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME}
+	@${FIND} ${STAGEDIR}${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \
+		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
 	@${ECHO_CMD} "@dirrm ${OCAML_SITELIBDIR}/${PORTNAME}" >> ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>