svn commit: r310503 - head/lang/scala

[Alex Dupre]

Author: ale
Date: Wed Jan 16 16:31:26 2013
New Revision: 310503
URL: http://svnweb.freebsd.org/changeset/ports/310503

Log:
  Update to 2.10.0 release.
  
  PR:		ports/175342
  Submitted by:	maintainer

Deleted:
  head/lang/scala/pkg-plist
Modified:
  head/lang/scala/Makefile
  head/lang/scala/distinfo

Modified: head/lang/scala/Makefile
==============================================================================
--- head/lang/scala/Makefile	Wed Jan 16 16:26:32 2013	(r310502)
+++ head/lang/scala/Makefile	Wed Jan 16 16:31:26 2013	(r310503)
@@ -2,65 +2,68 @@
 # $FreeBSD$
 
 PORTNAME=	scala
-PORTVERSION=	2.9.1
+PORTVERSION=	2.10.0
 CATEGORIES=	lang java
-MASTER_SITES=	http://www.scala-lang.org/downloads/distrib/files/ \
-		LOCAL/glarkin
-DISTNAME=	${PORTNAME}-${PORTVERSION}.final
+MASTER_SITES=	http://www.scala-lang.org/downloads/distrib/files/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mitsururike at gmail.com
 COMMENT=	The Scala Programming Language
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
+
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
-MAN1=		fsc.1 sbaz.1 scala.1 scalac.1 scaladoc.1 scalap.1
-
 SCALA_HOME=	${DATADIR}
-SCALA_SHRDIRS=	lib meta misc
+SCALA_SHRDIRS=	lib misc src
+SCALA_DOCDIRS=	tools
 SCALA_BINS=	fsc \
-		sbaz \
-		sbaz-setup \
 		scala \
 		scalac \
 		scaladoc \
 		scalap
 
-.include <bsd.port.pre.mk>
+MAN1=		${SCALA_BINS:S,$,.1,}
+
+PLIST_FILES=	${SCALA_BINS:S,^,bin/,}
+PORTDATA=	*
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   SCALA_HOME:    ${SCALA_HOME}"
 
-post-patch:
-.for f in ${SCALA_BINS}
-	@${REINPLACE_CMD} 's|^#!/bin/bash|#!${LOCALBASE}/bin/bash|' \
-		${WRKSRC}/bin/${f}
-.endfor
+.include <bsd.port.options.mk>
 
 do-install:
-	@${ECHO_MSG} ">> Installing Scala files..."
-	@${INSTALL} -d ${SCALA_HOME}/bin
+	@${MKDIR} ${SCALA_HOME}/bin
 .for f in ${SCALA_BINS}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${SCALA_HOME}/bin/${f}
-	${LN} -s ${SCALA_HOME}/bin/${f} ${PREFIX}/bin/${f}
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${SCALA_HOME}/bin/${f}
+	@${LN} -s ${SCALA_HOME}/bin/${f} ${PREFIX}/bin/${f}
 .endfor
 .for d in ${SCALA_SHRDIRS}
 	@cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} . ${SCALA_HOME}/${d}
 .endfor
 .for m in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${MANPREFIX}/man/man1/${m}
+	@${INSTALL_MAN} ${WRKSRC}/man/man1/${m} ${MANPREFIX}/man/man1/${m}
 .endfor
-
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} ">> Installing documentation files..."
-	@${INSTALL} -d ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
-	@${ECHO_MSG} " [ DONE ]"
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for d in ${SCALA_DOCDIRS}
+	@cd ${WRKSRC}/doc/${d} && ${COPYTREE_SHARE} . ${DOCSDIR}/${d}
+.endfor
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/lang/scala/distinfo
==============================================================================
--- head/lang/scala/distinfo	Wed Jan 16 16:26:32 2013	(r310502)
+++ head/lang/scala/distinfo	Wed Jan 16 16:31:26 2013	(r310503)
@@ -1,2 +1,2 @@
-SHA256 (scala-2.9.1.final.tgz) = 0bfc99143c63f5f1e3be71a1837b4c8e376e04d801bea4c887ce81661d9c5f13
-SIZE (scala-2.9.1.final.tgz) = 24993458
+SHA256 (scala-2.10.0.tgz) = a57bc12100671253d1ebc4a993e4da1896ff39022ce70c6699986d10644ac9a1
+SIZE (scala-2.10.0.tgz) = 29856741