- Update to 2.1.1

- Update MASTER_SITES
- Use shebangfix helper
- Use options helpers
- Add CLOJURE, DYNJS, GROOVY, PHP, RHINO and SCALA
  options (default OFF)
- Add a do-build target
- Remove pkg-message.jruby file
- Update pkg-descr

www/vertx/Makefile

@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	vertx
-PORTVERSION=	1.3.1
+PORTVERSION=	2.1.1
 #PORTREVISION=	0
 CATEGORIES=	www
-MASTER_SITES=	http://vert-x.github.io/vertx-downloads/downloads/
-DISTNAME=	vert.x-${PORTVERSION}.final
+MASTER_SITES=	http://dl.bintray.com/vertx/downloads/
+DISTNAME=	vert.x-${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Effortless asynchronous application development for the modern web
@@ -21,59 +21,105 @@ JAVA_OS=	native
 JAVA_RUN=	yes
 JAVA_VERSION=	1.7+
 
-NO_BUILD=	yes
-
 PLIST_SUB=	VERTXVER=${PORTVERSION}
 
-REINPLACE_ARGS=	-E -e 's,^\#!/bin/bash$$,\#!/usr/bin/env bash,1' \
-		-e '/APP_BASE_NAME=/a \${SED_APPEND_ARGS}' \
+REINPLACE_ARGS=	-E -e '/APP_BASE_NAME=/a \${SED_APPEND_ARGS}' \
 		-e 's,(pattern=)%t,\1%h,1' -i ''
 
 SED_APPEND_ARGS=	${nl}JAVA_HOME=${JAVA_HOME}
+SHEBANG_FILES=	bin/vertx
 
 USE_JAVA=	yes
+USES=	shebangfix
 
-OPTIONS_DEFINE=	DOCS EXAMPLES JYTHON JRUBY
+VERTX_CMD=	${WRKSRC}/bin/vertx
+VERTX_DIST=	client conf lib
 
+OPTIONS_DEFINE=	CLOJURE DOCS DYNJS GROOVY JYTHON JRUBY PHP RHINO SCALA
+OPTIONS_SUB=	yes
+
+CLOJURE_DESC=	Use Clojure to write verticles
+DYNJS_DESC=	Use DynJS to write verticles
+GROOVY_DESC=	Use Groovy to write verticles
 JYTHON_DESC=	Use Python to write verticles
 JRUBY_DESC=	Use Ruby to write verticles
+PHP_DESC=	Use PHP to write verticles (experimental)
+RHINO_DESC=	Use Rhino to write verticles
+SCALA_DESC=	Use Scala to write verticles
+
+JYTHON_RUN_DEPENDS=	jython:${PORTSDIR}/lang/jython
+JRUBY_RUN_DEPENDS=	jruby:${PORTSDIR}/lang/jruby
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MCLOJURE}
+VERTX_MODULES=	clojure
+.endif
+
+.if ${PORT_OPTIONS:MDYNJS}
+VERTX_MODULES+=	dynjs
+.endif
+
+.if ${PORT_OPTIONS:MGROOVY}
+VERTX_MODULES+=	groovy
+.endif
+
 .if ${PORT_OPTIONS:MJYTHON}
 SED_APPEND_ARGS+=	\${nl}JYTHON_HOME=${LOCALBASE}/lib/jython
 REINPLACE_ARGS+=	-e 's,-Djruby.home=,-Dpython.cachedir=$${HOME}/.jython-cachedir &,1'
-RUN_DEPENDS+=	jython:${PORTSDIR}/lang/jython
+VERTX_MODULES+=	jython
 .endif
 
 .if ${PORT_OPTIONS:MJRUBY}
-PKGMESSAGE=	${PKGDIR}/pkg-message.jruby
-RUN_DEPENDS+=	jruby:${PORTSDIR}/lang/jruby
+
 SED_APPEND_ARGS+=	\${nl}JRUBY_HOME=${LOCALBASE}/share/jruby
+VERTX_MODULES+=	ruby
+.endif
+
+.if ${PORT_OPTIONS:MPHP}
+VERTX_MODULES+=	php
+.endif
+
+.if ${PORT_OPTIONS:MRHINO}
+VERTX_MODULES+=	rhino
+.endif
+
+.if ${PORT_OPTIONS:MSCALA}
+VERTX_MODULES+=	scala
 .endif
 
 nl=	${.newline}
 
+.if !empty(VERTX_MODULES)
+MAKE_ENV=	VERTX_MODS=${WRKSRC}
+PLIST_SUB+=	SYSMODS=""
+VERTX_DIST+=	sys-mods
+
+do-build:
+	@(cd ${VERTX_MODS} && \
+	for mod in $$(${CUT} -s -d = -f 2 ${WRKSRC}/conf/langs.properties | \
+	${CUT} -s -d : -f 1 | ${EGREP} -i -e '(${VERTX_MODULES:ts|})'); do \
+	${VERTX_CMD} install $${mod}; \
+	done;)
+.else
+PLIST_SUB+=	SYSMODS="@comment "
+
+do-build:
+	@${DO_NADA}
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -type f \( -name "*.bat" -o -name "*.orig" \) -delete
 	@${REINPLACE_CMD} ${WRKSRC}/bin/${PORTNAME} ${WRKSRC}/conf/logging.properties
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-.for d in client conf lib
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+.for d in ${VERTX_DIST}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}
 .endfor
-	${MKDIR} ${STAGEDIR}${DATADIR}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${DATADIR}/bin/${PORTNAME}
 	${LN} -s ${DATADIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-.if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/api-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if ${PORT_OPTIONS:MJRUBY}
-	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.mk>

www/vertx/distinfo

@@ -1,2 +1,2 @@
-SHA256 (vert.x-1.3.1.final.tar.gz) = be4cf4ebda435d290fc637b303b79702014815403b2e97649e5695fc4c4c464d
-SIZE (vert.x-1.3.1.final.tar.gz) = 12426208
+SHA256 (vert.x-2.1.1.tar.gz) = c25f85aa65f65b4ce6f2d4728a722d606eed5b799fca0da382721f7078e5fcce
+SIZE (vert.x-2.1.1.tar.gz) = 6340246

www/vertx/pkg-descr

@@ -3,7 +3,8 @@ effortlessly scalable, concurrent web applications.
 
 It is an event driven application framework that runs on the JVM
 - a run-time with real concurrency and unrivalled performance.
-Vert.x then exposes the API in Ruby, Java, Groovy, JavaScript and
-Python. So you choose what language you want to use.
+Vert.x then exposes the API in Clojure, DynJS, Groovy, Java,
+JavaScript, Ruby, PHP, Python, and Scala.
+So you choose what language you want to use.
 
 WWW: http://vertx.io/

www/vertx/pkg-message.jruby

@@ -1,14 +0,0 @@
-**************************************************************
-
- If you want to use Ruby with Vert.x you will need to install
- the json Ruby Gem since this is used in Vert.x.
- You can do this by running
-
-	jruby -S gem install json
-
- When you deinstall Vert.x, you can then remove that Ruby Gem
- by running
-
-	jruby -S gem uninstall json
-
-**************************************************************