Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Jun 2014 22:48:58 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356864 - head/math/emc2
Message-ID:  <201406062248.s56MmwsG004227@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Fri Jun  6 22:48:58 2014
New Revision: 356864
URL: http://svnweb.freebsd.org/changeset/ports/356864
QAT: https://qat.redports.org/buildarchive/r356864/

Log:
  - Add staging support
  - Unmute install commands
  - Use options helper

Modified:
  head/math/emc2/Makefile

Modified: head/math/emc2/Makefile
==============================================================================
--- head/math/emc2/Makefile	Fri Jun  6 22:36:41 2014	(r356863)
+++ head/math/emc2/Makefile	Fri Jun  6 22:48:58 2014	(r356864)
@@ -7,10 +7,7 @@ DISTVERSION=	2.16c
 CATEGORIES=	math science
 MASTER_SITES=	http://www.ann.jussieu.fr/~hecht/ftp/emc2/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-.if !defined(NOPORTDOCS)
-DISTFILES+=	RTemc2_fr.pdf RTemc2_gb.pdf
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-.endif
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical editor of two-dimensional mesh geometries
@@ -34,21 +31,19 @@ PORTEXAMPLES=	*
 
 PLIST_FILES=	bin/emc2 bin/prf_f3d
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
+DOCS_DISTFILES=	RTemc2_fr.pdf RTemc2_gb.pdf
+
 .include <bsd.port.options.mk>
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/emc2 ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/prf_f3d ${PREFIX}/bin
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/emc2 ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/prf_f3d ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${DISTDIR} && ${INSTALL_MAN} ${PORTDOCS} ${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${DISTDIR} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 .endif
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>



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