svn commit: r351670 - head/devel/libcii

[Rodrigo Osorio]

Author: rodrigo
Date: Mon Apr 21 09:11:28 2014
New Revision: 351670
URL: http://svnweb.freebsd.org/changeset/ports/351670
QAT: https://qat.redports.org/buildarchive/r351670/

Log:
  - support staging
  
  Submitted by:	rodrigo at FreeBSD.org (maintainer)
  Reviewed by:	bapt (mentor)

Modified:
  head/devel/libcii/Makefile
  head/devel/libcii/pkg-plist

Modified: head/devel/libcii/Makefile
==============================================================================
--- head/devel/libcii/Makefile	Mon Apr 21 08:09:57 2014	(r351669)
+++ head/devel/libcii/Makefile	Mon Apr 21 09:11:28 2014	(r351670)
@@ -26,7 +26,6 @@ SAMPLES=	double calc ids	mpcalc wf xref 
 		idents words basename dirname
 I386_SAMPLES=	sort spin sieve
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
@@ -56,35 +55,35 @@ pre-build:
 # .h is placed in	${PREFIX}/include/cii
 #
 do-install:
-	@${MKDIR} ${CIIDEST}
-	@${MKDIR} ${CIIDEST}/${CIIMAJOR}
-	@${MKDIR} ${CIIDEST}/${CIIMAJOR}/include
-	@${MKDIR} ${CIIDEST}/${CIIMAJOR}/examples
+	@${MKDIR} ${STAGEDIR}${CIIDEST}
+	@${MKDIR} ${STAGEDIR}${CIIDEST}/${CIIMAJOR}
+	@${MKDIR} ${STAGEDIR}${CIIDEST}/${CIIMAJOR}/include
+	@${MKDIR} ${STAGEDIR}${CIIDEST}/${CIIMAJOR}/examples
 ##
-	${INSTALL_DATA} ${CIIBUILD}/libcii.a ${CIIDEST}/${CIIMAJOR}
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${CIIDEST}/${CIIMAJOR}/include
+	${INSTALL_DATA} ${CIIBUILD}/libcii.a ${STAGEDIR}${CIIDEST}/${CIIMAJOR}
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${CIIDEST}/${CIIMAJOR}/include
 ##
-	${LN} -sf ${CIIDEST}/${CIIMAJOR}/libcii.a ${PREFIX}/lib/libcii.a
-	${LN} -sf ${CIIDEST}/${CIIMAJOR}/include ${PREFIX}/include/cii
+	${LN} -sf ${CIIDEST}/${CIIMAJOR}/libcii.a ${STAGEDIR}${PREFIX}/lib/libcii.a
+	${LN} -sf ${CIIDEST}/${CIIMAJOR}/include ${STAGEDIR}${PREFIX}/include/cii
 ##
 .for a in ${SAMPLES}
-	${INSTALL_PROGRAM} ${CIIBUILD}/${a} ${CIIDEST}/${CIIMAJOR}/examples
+	${INSTALL_PROGRAM} ${CIIBUILD}/${a} ${STAGEDIR}${CIIDEST}/${CIIMAJOR}/examples
 .endfor
 .if ${ARCH} == "i386"
 .  for a in ${I386_SAMPLES}
-	${INSTALL_PROGRAM} ${CIIBUILD}/${a} ${CIIDEST}/${CIIMAJOR}/examples
+	${INSTALL_PROGRAM} ${CIIBUILD}/${a} ${STAGEDIR}${CIIDEST}/${CIIMAJOR}/examples
 .  endfor
 .endif
 ##
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/cii
-	@${MKDIR} ${PREFIX}/share/doc/cii/examples
-	@${MKDIR} ${PREFIX}/share/doc/cii/src
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cii
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cii/examples
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cii/src
 .for f in CPYRIGHT README history.html install.html makefile packing.lst
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/cii
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/doc/cii
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/doc/cii/examples
-	${INSTALL_DATA} ${WRKSRC}/src/* ${PREFIX}/share/doc/cii/src
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${PREFIX}/share/doc/cii/examples
+	${INSTALL_DATA} ${WRKSRC}/src/* ${STAGEDIR}${PREFIX}/share/doc/cii/src
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/devel/libcii/pkg-plist
==============================================================================
--- head/devel/libcii/pkg-plist	Mon Apr 21 08:09:57 2014	(r351669)
+++ head/devel/libcii/pkg-plist	Mon Apr 21 09:11:28 2014	(r351670)
@@ -1,3 +1,5 @@
+include/cii
+lib/libcii.a
 lib/cii/%%CIIMAJOR%%/examples/double
 lib/cii/%%CIIMAJOR%%/examples/calc
 lib/cii/%%CIIMAJOR%%/examples/ids
@@ -43,10 +45,6 @@ lib/cii/%%CIIMAJOR%%/libcii.a
 @dirrm lib/cii/%%CIIMAJOR%%/examples
 @dirrm lib/cii/%%CIIMAJOR%%
 @dirrm lib/cii
- at unexec /bin/rm %D/lib/libcii.a
- at unexec /bin/rm %D/include/cii
- at exec /bin/ln -sf %D/lib/cii/%%CIIMAJOR%%/include %D/include/cii
- at exec /bin/ln -sf %D/lib/cii/%%CIIMAJOR%%/libcii.a %D/lib/libcii.a
 %%PORTDOCS%%share/doc/cii/CPYRIGHT
 %%PORTDOCS%%share/doc/cii/README
 %%PORTDOCS%%share/doc/cii/examples/basename.c