svn commit: r339657 - head/lang/x10

[Matthias Andree]

Author: mandree
Date: Tue Jan 14 02:40:02 2014
New Revision: 339657
URL: http://svnweb.freebsd.org/changeset/ports/339657

Log:
  - Stop-gap update to fix build on 10.0-BETA1. [1]
  - Add LICENSE=EPL. [1]
  - Convert to staging. [2]
  - Add missing trailing slash to URL in pkg-descr. [2]
  
  PR:		ports/183557
  Submitted by:	Jason Bacon (maintainer) [1]
  Approved by:	portmgr@ (implicit, blanket) [2]

Modified:
  head/lang/x10/Makefile   (contents, props changed)
  head/lang/x10/pkg-descr   (contents, props changed)

Modified: head/lang/x10/Makefile
==============================================================================
--- head/lang/x10/Makefile	Tue Jan 14 02:31:29 2014	(r339656)
+++ head/lang/x10/Makefile	Tue Jan 14 02:40:02 2014	(r339657)
@@ -22,10 +22,13 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	jwbacon at tds.net
 COMMENT=	Object-oriented parallel programming language
 
+LICENSE=	EPL
+
 USE_BZIP2=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
+USE_GCC=	yes
 
 USE_LDCONFIG=	${PREFIX}/stdlib/lib
 
@@ -35,7 +38,8 @@ BUILD_DEPENDS+=	gmake:${PORTSDIR}/devel/
 
 WRKSRC=		${WRKDIR}/x10.dist
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e 's/value="make"/value="gmake"/g' \
 		${WRKDIR}/x10.runtime/build.xml
@@ -52,16 +56,16 @@ post-patch:
 
 do-install:
 .for f in X10Launcher apgas precommit x10 x10c x10c++ x10j
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${MKDIR} ${PREFIX}/stdlib
-	${INSTALL_DATA} ${WRKSRC}/etc/* ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib
-	${CP} -R ${WRKSRC}/stdlib/* ${PREFIX}/stdlib
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/samples/* ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/stdlib
+	${INSTALL_DATA} ${WRKSRC}/etc/* ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib
+	${CP} -R ${WRKSRC}/stdlib/* ${STAGEDIR}${PREFIX}/stdlib
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/lang/x10/pkg-descr
==============================================================================
--- head/lang/x10/pkg-descr	Tue Jan 14 02:31:29 2014	(r339656)
+++ head/lang/x10/pkg-descr	Tue Jan 14 02:40:02 2014	(r339657)
@@ -3,4 +3,4 @@ provide a programming model that can add
 of multiples cores, hardware accelerators, clusters, and supercomputers 
 in a manner that provides scalable performance in a productive manner.
 
-WWW:	http://x10-lang.org
+WWW: http://x10-lang.org/