Index: head/lang/swift/Makefile
===================================================================
--- head/lang/swift/Makefile	(revision 415422)
+++ head/lang/swift/Makefile	(revision 415423)
@@ -1,112 +1,112 @@
 # $FreeBSD$
 
 PORTNAME=	swift
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	lang
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Swift programing language
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/swift/LICENSE.txt
 
 BUILD_DEPENDS=	cmake:devel/cmake \
 		bash:shells/bash \
 		swig:devel/swig13 \
 		python:lang/python \
 		sphinx-build:textproc/py-sphinx \
 		binutils>=2.25.1:devel/binutils
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	apple:DEFAULT,llvm,clang,lldb,cmark,llbuild,swiftpm,xctest,xcfound
 GH_PROJECT=	swift:DEFAULT swift-llvm:llvm swift-clang:clang swift-lldb:lldb \
 		swift-cmark:cmark swift-llbuild:llbuild swift-package-manager:swiftpm \
 		swift-corelibs-xctest:xctest swift-corelibs-foundation:xcfound
-GH_TAGNAME=	swift-2.2-RELEASE:DEFAULT,llvm,clang,lldb,cmark \
-		swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a:llbuild,swiftpm,xctest,xcfound
+GH_TAGNAME=	swift-${PORTVERSION}-RELEASE:DEFAULT,llvm,clang,lldb,cmark \
+		swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a:llbuild,swiftpm,xctest,xcfound
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		iconv libedit ninja perl5 pkgconfig python:3,build sqlite
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	amd64
 CONFLICTS_BUILD=	googletest
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 .if (${OSVERSION} < 1002000) || (${OSVERSION} < 1100079)
 BUILD_DEPENDS+=	clang38:devel/llvm38
 EXTRA_FLAGS=	--host-cc=${LOCALBASE}/bin/clang38 --host-cxx=${LOCALBASE}/bin/clang++38
 .endif
 .if (${OSVERSION} < 1001513)
 BROKEN=		Does not build
 .endif
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}
 	@${MV} ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}-RELEASE ${WRKSRC}/swift
 	@${MV} ${WRKSRC_llvm} ${WRKSRC}/llvm
 	@${MV} ${WRKSRC_clang} ${WRKSRC}/clang
 	@${MV} ${WRKSRC_lldb} ${WRKSRC}/lldb
 	@${MV} ${WRKSRC_cmark} ${WRKSRC}/cmark
 	@${MV} ${WRKSRC_llbuild} ${WRKSRC}/llbuild
 	@${MV} ${WRKSRC_swiftpm} ${WRKSRC}/swiftpm
 	@${MV} ${WRKSRC_xctest} ${WRKSRC}/swift-corelibs-xctest
 	@${MV} ${WRKSRC_xcfound} ${WRKSRC}/swift-corelibs-foundation
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/swift/cmake/modules/SwiftSharedCMakeConfig.cmake
 
 do-build:
 	@${MKDIR} ${STAGEDIR}${PREFIX}
 	cd ${WRKSRC}/swift; ${SETENV} PATH=${LOCALBASE}/bin:${PATH} \
 		CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
 		CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" \
 		LDFLAGS='-B${LOCALBASE}/bin -fuse-ld=bfd' \
 		install_destdir=${STAGEDIR} \
 		./utils/build-script -R --no-assertions \
 		--llbuild \
 		-- \
 		${EXTRA_FLAGS} \
 		--verbose-build \
 		--swift-runtime-enable-dtrace \
 		--install-swift \
 		--install-llbuild \
 		--install_prefix=${PREFIX} \
 		--install_destdir=${STAGEDIR} \
 		--swift-install-components='compiler;clang-builtin-headers;stdlib;sdk-overlay;license;tools;editor-integration' \
 		--build-swift-static-stdlib=1 \
 		--skip-test-lldb=1
 	@${RM} /var/run/libuuid/clock.txt /var/run/libuuid/request /var/run/libuuid/uuidd.pid
 
 do-install:
 	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/swift.1 ${STAGEDIR}${PREFIX}/man/man1/swift.1
 	${RM} -r ${STAGEDIR}${PREFIX}/share/man
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/swift.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/swift/freebsd/libswiftGlibc.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/swift/freebsd/libswiftCore.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-compress
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sil-extract
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-ide-test
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-llvm-opt
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-build-tool
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-demangle
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sil-opt
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/build/Ninja-Release/swift-freebsd-x86_64/docs/html ; \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
Index: head/lang/swift/distinfo
===================================================================
--- head/lang/swift/distinfo	(revision 415422)
+++ head/lang/swift/distinfo	(revision 415423)
@@ -1,18 +1,19 @@
-SHA256 (apple-swift-2.2-swift-2.2-RELEASE_GH0.tar.gz) = 6dfb9de14201b9804974b1f221573cfb3e24fd657ec3bf132bf3c75de02565f5
-SIZE (apple-swift-2.2-swift-2.2-RELEASE_GH0.tar.gz) = 8425866
-SHA256 (apple-swift-llvm-swift-2.2-RELEASE_GH0.tar.gz) = b975b816773aa9d888a9139f51acd1b57fd58959bb391f8f65645a2f9b6d4cc4
-SIZE (apple-swift-llvm-swift-2.2-RELEASE_GH0.tar.gz) = 22556064
-SHA256 (apple-swift-clang-swift-2.2-RELEASE_GH0.tar.gz) = ba9220e61971a55d13f501dc30f452a5c272e4d897b444a5220f2e23dbbfc2f8
-SIZE (apple-swift-clang-swift-2.2-RELEASE_GH0.tar.gz) = 12994360
-SHA256 (apple-swift-lldb-swift-2.2-RELEASE_GH0.tar.gz) = b562fee1963900c86fed016408e3acbb63500a3603f4af70928c11ce376b9a72
-SIZE (apple-swift-lldb-swift-2.2-RELEASE_GH0.tar.gz) = 14215846
-SHA256 (apple-swift-cmark-swift-2.2-RELEASE_GH0.tar.gz) = 09c8da18c37f32cd0eb82b252a172481f5403c1bc6ab5740f92e87f8d1e79991
-SIZE (apple-swift-cmark-swift-2.2-RELEASE_GH0.tar.gz) = 214423
-SHA256 (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a_GH0.tar.gz) = c146c9475e646de3bc9644a951c3067440b352fe8d23de59e9d8793e13c6c224
-SIZE (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a_GH0.tar.gz) = 4708201
-SHA256 (apple-swift-package-manager-swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a_GH0.tar.gz) = 5833e69d4d158949a9b4986eced73806e10d597ebb5db8549ba3c7962d6f3c32
-SIZE (apple-swift-package-manager-swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a_GH0.tar.gz) = 118190
-SHA256 (apple-swift-corelibs-xctest-swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a_GH0.tar.gz) = 65e3ef58877c8bbec926177a6d7ce790de98cf76cabb808a46a735e6945554d6
-SIZE (apple-swift-corelibs-xctest-swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a_GH0.tar.gz) = 31103
-SHA256 (apple-swift-corelibs-foundation-swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a_GH0.tar.gz) = 2ef008a1fd32b9d1c34eb242c7a13569e1f2e83ef127a964260b1cfcee6f82e3
-SIZE (apple-swift-corelibs-foundation-swift-DEVELOPMENT-SNAPSHOT-2016-03-16-a_GH0.tar.gz) = 2436196
+TIMESTAMP = 1463523202
+SHA256 (apple-swift-2.2.1-swift-2.2.1-RELEASE_GH0.tar.gz) = e971e2287055da72564356f369bad97e95821afb1ef36157e954a04a7e90753a
+SIZE (apple-swift-2.2.1-swift-2.2.1-RELEASE_GH0.tar.gz) = 8443158
+SHA256 (apple-swift-llvm-swift-2.2.1-RELEASE_GH0.tar.gz) = f7977e5bb275494b5dac4490afc5d634f894ba5f209f3b2dbd5b7e520fa5fce2
+SIZE (apple-swift-llvm-swift-2.2.1-RELEASE_GH0.tar.gz) = 22560962
+SHA256 (apple-swift-clang-swift-2.2.1-RELEASE_GH0.tar.gz) = 40bdfa7eec0497ec69005d6a5d018b12c85aa2c0959d3408ecaaa9e34ff0415f
+SIZE (apple-swift-clang-swift-2.2.1-RELEASE_GH0.tar.gz) = 12995260
+SHA256 (apple-swift-lldb-swift-2.2.1-RELEASE_GH0.tar.gz) = 2098043dbda98374e784d3357f71f8e931aea3ac958c042adf0df0fae7bc22a3
+SIZE (apple-swift-lldb-swift-2.2.1-RELEASE_GH0.tar.gz) = 14216244
+SHA256 (apple-swift-cmark-swift-2.2.1-RELEASE_GH0.tar.gz) = 254d3c02bf2b03ad456fa3ad27b4da854e36318fcaf6b6f199fdb3e978a90803
+SIZE (apple-swift-cmark-swift-2.2.1-RELEASE_GH0.tar.gz) = 214444
+SHA256 (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 520680d66b14329089d0040d5e05f48f3a6d4c7266aa9e92ca3e5b332d567808
+SIZE (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 4713455
+SHA256 (apple-swift-package-manager-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = fce64a4266bb00717293f7d3b3e39d6601887910b60505885d670fc70a6f958b
+SIZE (apple-swift-package-manager-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 142826
+SHA256 (apple-swift-corelibs-xctest-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 97bbc56579e2af93c5101478e99c18446963af3d6764f6e75220ea22e4886c4f
+SIZE (apple-swift-corelibs-xctest-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 42557
+SHA256 (apple-swift-corelibs-foundation-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 5fbb87ea62faf2a3fcc3cd1cfb49348d0e94837ba7aa8a430c172cac685e6d97
+SIZE (apple-swift-corelibs-foundation-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 2455060