3 files changed, 50 insertions, 7 deletions

diff --git a/devel/arcanist/Makefile b/devel/arcanist/Makefile
index 11a55dd584e4..ddb859ecfe58 100644
--- a/devel/arcanist/Makefile
+++ b/devel/arcanist/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	arcanist
-PORTVERSION=	20170630
-PORTREVISION=	1
+PORTVERSION=	20180420
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
@@ -24,7 +23,7 @@ USE_GITHUB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 GH_ACCOUNT=	phacility
-GH_TAGNAME=	c04f141
+GH_TAGNAME=	ad3087e
 
 OPTIONS_DEFINE=	ENCODINGS
 OPTIONS_DEFAULT=ENCODINGS
diff --git a/devel/arcanist/distinfo b/devel/arcanist/distinfo
index d6437241e99d..88015df8304a 100644
--- a/devel/arcanist/distinfo
+++ b/devel/arcanist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498824723
-SHA256 (phacility-arcanist-20170630-c04f141_GH0.tar.gz) = 8c2efeedcc635940e9fd6ace13b1af43a12afc9df3cc2dac49efbc92aa9e0272
-SIZE (phacility-arcanist-20170630-c04f141_GH0.tar.gz) = 502693
+TIMESTAMP = 1524248441
+SHA256 (phacility-arcanist-20180420-ad3087e_GH0.tar.gz) = 2a8ea0013238aac2659e69235456ec6aa8400c3b8f6359b05f20ddd1fa318ff3
+SIZE (phacility-arcanist-20180420-ad3087e_GH0.tar.gz) = 641806
diff --git a/devel/arcanist/pkg-plist b/devel/arcanist/pkg-plist
index a12cfe018d4e..2cb777192d25 100644
--- a/devel/arcanist/pkg-plist
+++ b/devel/arcanist/pkg-plist
@@ -49,6 +49,7 @@ lib/php/arcanist/src/lint/ArcanistLintMessage.php
 lib/php/arcanist/src/lint/ArcanistLintPatcher.php
 lib/php/arcanist/src/lint/ArcanistLintResult.php
 lib/php/arcanist/src/lint/ArcanistLintSeverity.php
+lib/php/arcanist/src/lint/__tests__/ArcanistLintMessageTestCase.php
 lib/php/arcanist/src/lint/engine/ArcanistComprehensiveLintEngine.php
 lib/php/arcanist/src/lint/engine/ArcanistConfigurationDrivenLintEngine.php
 lib/php/arcanist/src/lint/engine/ArcanistLintEngine.php
@@ -275,7 +276,6 @@ lib/php/arcanist/src/lint/linter/__tests__/xhpast/single-pass-adjacent-patches.l
 lib/php/arcanist/src/lint/linter/__tests__/xhpast/syntax-error.lint-test
 lib/php/arcanist/src/lint/linter/__tests__/xhpast/unreasonably-deep-nesting.lint-test
 lib/php/arcanist/src/lint/linter/__tests__/xml/almost-empty.lint-test
-lib/php/arcanist/src/lint/linter/__tests__/xml/attr2.lint-test
 lib/php/arcanist/src/lint/linter/__tests__/xml/big-entity-name.lint-test
 lib/php/arcanist/src/lint/linter/__tests__/xml/big-name-1.lint-test
 lib/php/arcanist/src/lint/linter/__tests__/xml/big-name-2.lint-test
@@ -472,6 +472,7 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistNestedNamespaces
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistNewlineAfterOpenTagXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistNoParentScopeXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistObjectOperatorSpacingXHPASTLinterRuleTestCase.php
+lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPCloseTagXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPCompatibilityXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPEchoTagXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPOpenTagXHPASTLinterRuleTestCase.php
@@ -607,6 +608,8 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/parent-member-references
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parentheses-spacing.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/parse_str-use/parse_str-use.lint-test
+lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/php-close-tag/php-close-tag-inline-html-good.lint-test
+lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/php-close-tag/php-close-tag.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/php-compatibility/conditional-usage.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/php-compatibility/index-function.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/php-compatibility/nowdoc.lint-test
@@ -661,6 +664,41 @@ lib/php/arcanist/src/lint/renderer/ArcanistJSONLintRenderer.php
 lib/php/arcanist/src/lint/renderer/ArcanistLintRenderer.php
 lib/php/arcanist/src/lint/renderer/ArcanistNoneLintRenderer.php
 lib/php/arcanist/src/lint/renderer/ArcanistSummaryLintRenderer.php
+lib/php/arcanist/src/lint/renderer/__tests__/ArcanistConsoleLintRendererTestCase.php
+lib/php/arcanist/src/lint/renderer/__tests__/data/addline.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/addline.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/addlinesuffix.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/addlinesuffix.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/caret.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/caret.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/eofmultilinechar.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/eofmultilinechar.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/eofmultilineline.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/eofmultilineline.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/eofnewline.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/eofnewline.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/extrawhitespace.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/extrawhitespace.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/inline.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/inline.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/midline.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/midline.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/newline.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/newline.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/original.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/original.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/overlap.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/overlap.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/remline.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/remline.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/rmmulti.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/rmmulti.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/rmmulti2.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/rmmulti2.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/simple.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/simple.txt
+lib/php/arcanist/src/lint/renderer/__tests__/data/xml.expect
+lib/php/arcanist/src/lint/renderer/__tests__/data/xml.txt
 lib/php/arcanist/src/parser/ArcanistBaseCommitParser.php
 lib/php/arcanist/src/parser/ArcanistBundle.php
 lib/php/arcanist/src/parser/ArcanistCommentRemover.php
@@ -774,6 +812,7 @@ lib/php/arcanist/src/parser/__tests__/patches/fb28468d25a5fdd063aca4ca559454c998
 lib/php/arcanist/src/parser/diff/ArcanistDiffChange.php
 lib/php/arcanist/src/parser/diff/ArcanistDiffChangeType.php
 lib/php/arcanist/src/parser/diff/ArcanistDiffHunk.php
+lib/php/arcanist/src/ref/ArcanistBuildRef.php
 lib/php/arcanist/src/repository/api/ArcanistGitAPI.php
 lib/php/arcanist/src/repository/api/ArcanistGitUpstreamPath.php
 lib/php/arcanist/src/repository/api/ArcanistMercurialAPI.php
@@ -782,6 +821,9 @@ lib/php/arcanist/src/repository/api/ArcanistSubversionAPI.php
 lib/php/arcanist/src/repository/api/__tests__/ArcanistRepositoryAPIMiscTestCase.php
 lib/php/arcanist/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php
 lib/php/arcanist/src/repository/api/__tests__/state/git_basic.git.tgz
+lib/php/arcanist/src/repository/api/__tests__/state/git_spaces.git.tgz
+lib/php/arcanist/src/repository/api/__tests__/state/git_submodules_dirty.git.tgz
+lib/php/arcanist/src/repository/api/__tests__/state/git_submodules_staged.git.tgz
 lib/php/arcanist/src/repository/api/__tests__/state/hg_basic.hg.tgz
 lib/php/arcanist/src/repository/api/__tests__/state/svn_basic.svn.tgz
 lib/php/arcanist/src/repository/parser/ArcanistMercurialParser.php
@@ -820,6 +862,7 @@ lib/php/arcanist/src/unit/parser/__tests__/testresults/go.multiple-test-cases-fa
 lib/php/arcanist/src/unit/parser/__tests__/testresults/go.multiple-test-cases-successful
 lib/php/arcanist/src/unit/parser/__tests__/testresults/go.multiple-test-cases-successful-go1.4
 lib/php/arcanist/src/unit/parser/__tests__/testresults/go.nonverbose
+lib/php/arcanist/src/unit/parser/__tests__/testresults/go.nonverbose-go1.10
 lib/php/arcanist/src/unit/parser/__tests__/testresults/go.nonverbose-go1.4
 lib/php/arcanist/src/unit/parser/__tests__/testresults/go.single-test-case-failure
 lib/php/arcanist/src/unit/parser/__tests__/testresults/go.single-test-case-failure-go1.4
@@ -873,6 +916,7 @@ lib/php/arcanist/src/workflow/ArcanistUpgradeWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistUploadWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistVersionWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistVersionWorkflow.php.orig
+lib/php/arcanist/src/workflow/ArcanistWeldWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistWhichWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistWorkflow.php
 lib/php/arcanist/src/workflow/exception/ArcanistCapabilityNotSupportedException.php