Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Oct 2015 18:05:16 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r398781 - head/devel/atlassian-plugin-sdk
Message-ID:  <201510071805.t97I5GQm013808@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Oct  7 18:05:15 2015
New Revision: 398781
URL: https://svnweb.freebsd.org/changeset/ports/398781

Log:
  - Add NO_ARCH
  - Switch to @dir
  - Switch to @sample, fixing stage-qa
  
  Approved by:	portmgr blanket

Modified:
  head/devel/atlassian-plugin-sdk/Makefile
  head/devel/atlassian-plugin-sdk/pkg-plist

Modified: head/devel/atlassian-plugin-sdk/Makefile
==============================================================================
--- head/devel/atlassian-plugin-sdk/Makefile	Wed Oct  7 18:04:30 2015	(r398780)
+++ head/devel/atlassian-plugin-sdk/Makefile	Wed Oct  7 18:05:15 2015	(r398781)
@@ -13,6 +13,7 @@ RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
+NO_ARCH=	yes
 
 EXTRACT_AFTER_ARGS=${DISTNAME}/bin ${DISTNAME}/apache-maven*/conf/settings.xml
 
@@ -41,7 +42,7 @@ do-install:
 	${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}
 

Modified: head/devel/atlassian-plugin-sdk/pkg-plist
==============================================================================
--- head/devel/atlassian-plugin-sdk/pkg-plist	Wed Oct  7 18:04:30 2015	(r398780)
+++ head/devel/atlassian-plugin-sdk/pkg-plist	Wed Oct  7 18:05:15 2015	(r398781)
@@ -36,6 +36,4 @@ 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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510071805.t97I5GQm013808>