Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Mar 2014 20:35:55 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349289 - head/archivers/ocaml-zip
Message-ID:  <201403262035.s2QKZtaP074942@svn.freebsd.org>

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



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