Index: head/devel/atlassian-plugin-sdk/Makefile
===================================================================
--- head/devel/atlassian-plugin-sdk/Makefile	(revision 398780)
+++ head/devel/atlassian-plugin-sdk/Makefile	(revision 398781)
@@ -1,48 +1,49 @@
 # Created by: Mikhail T. <mi@aldan.algebra.com>
 # $FreeBSD$
 
 PORTNAME=	atlassian-plugin-sdk
 PORTVERSION=	6.0.1
 CATEGORIES=	devel java
 MASTER_SITES=	https://maven.atlassian.com/content/repositories/atlassian-public/com/atlassian/amps/atlassian-plugin-sdk/${PORTVERSION}/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Atlassian Plugin SDK
 
 RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
+NO_ARCH=	yes
 
 EXTRACT_AFTER_ARGS=${DISTNAME}/bin ${DISTNAME}/apache-maven*/conf/settings.xml
 
 NO_BUILD=	Just sh-scripts and JARs here, no source code
 MAVEN_SETTINGS=	${ETCDIR_REL}/settings.xml
 PLIST_SUB+=	MAVEN_SETTINGS="${MAVEN_SETTINGS}"
 RESTRICTED=	License uncertain and no point in redistributing anyway
 
 post-patch:
 	${REINPLACE_CMD} -i ""	\
 		-e '$$s,^sh -c "\([^"]*\)",exec \1,'	\
 		-e 's|^ATLAS_HOME=.*|ATLAS_HOME=${DATADIR}|'	\
 		-e 's|^MAVEN_EXECUTABLE=.*|MAVEN_EXECUTABLE=${LOCALBASE}/bin/mvn|'	\
 		-e '/^M2_HOME/d'	\
 		-e 's/^read$$/& unused/'	\
 		-e 's|^MVN_PARAMS=.*|MVN_PARAMS="-gs ${PREFIX}/${MAVEN_SETTINGS}"|' \
 		-e 's|\$${ATLAS_HOME}/bin|${PREFIX}/bin|g'	\
 		${WRKSRC}/bin/*
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${PREFIX}/${MAVEN_SETTINGS:H}
 	${INSTALL_DATA} ${WRKSRC}/apache-maven*/conf/settings.xml	\
 		${STAGEDIR}${PREFIX}/${MAVEN_SETTINGS}.dist
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} --strip-components 1 -C ${STAGEDIR}${DATADIR} -xv	\
 	    --no-same-permissions --no-same-owner --exclude maven	\
 	    -f ${DISTDIR}/${DISTFILES} ${DISTNAME}/repository 2>&1 | \
-		${SED} -e 's,^x ,${DATADIR_REL}/,' -e 's,.*/$$,@dirrm &,' | \
+		${SED} -e 's,^x ,${DATADIR_REL}/,' -e 's,.*/$$,@dir &,' | \
 		${SORT} -r >> ${TMPPLIST}
 	${FIND} ${STAGEDIR}${DATADIR}/repository -type f | ${XARGS} ${CHMOD} ${_SHAREMODE}
 
 .include <bsd.port.mk>
Index: head/devel/atlassian-plugin-sdk/pkg-plist
===================================================================
--- head/devel/atlassian-plugin-sdk/pkg-plist	(revision 398780)
+++ head/devel/atlassian-plugin-sdk/pkg-plist	(revision 398781)
@@ -1,41 +1,39 @@
 bin/atlas-clean
 bin/atlas-cli
 bin/atlas-clover
 bin/atlas-compile
 bin/atlas-create-bamboo-plugin
 bin/atlas-create-bamboo-plugin-module
 bin/atlas-create-confluence-plugin
 bin/atlas-create-confluence-plugin-module
 bin/atlas-create-crowd-plugin
 bin/atlas-create-crowd-plugin-module
 bin/atlas-create-fecru-plugin
 bin/atlas-create-fecru-plugin-module
 bin/atlas-create-home-zip
 bin/atlas-create-jira-plugin
 bin/atlas-create-jira-plugin-module
 bin/atlas-create-jira4-plugin
 bin/atlas-create-jira5-plugin
 bin/atlas-create-plugin
 bin/atlas-create-refapp-plugin
 bin/atlas-create-refapp-plugin-module
 bin/atlas-create-stash-plugin
 bin/atlas-create-stash-plugin-module
 bin/atlas-debug
 bin/atlas-help
 bin/atlas-install-plugin
 bin/atlas-integration-test
 bin/atlas-mvn
 bin/atlas-package
 bin/atlas-release
 bin/atlas-release-rollback
 bin/atlas-remote-test
 bin/atlas-ruin
 bin/atlas-run
 bin/atlas-run-standalone
 bin/atlas-unit-test
 bin/atlas-update
 bin/atlas-version
 @exec %D/%F
-%%MAVEN_SETTINGS%%.dist
-@unexec cmp -s %D/%F %D/%%MAVEN_SETTINGS%% && rm -f %D/%%MAVEN_SETTINGS%% && rmdir %D/%B || true
-@exec [ -f %D/%%MAVEN_SETTINGS%% ] || cp -p %D/%F %D/%%MAVEN_SETTINGS%%
+@sample %%MAVEN_SETTINGS%%.dist %%MAVEN_SETTINGS%%