aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2015-10-08 02:05:15 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2015-10-08 02:05:15 +0800
commit8cfa0d68e0b4795a9422917e2a8a0c97e32535da (patch)
tree042263a167a351090509e5e70dab4d4c24ad15c8 /devel
parentf3f790d3782bf86caf255ecb768a69665e420e9a (diff)
downloadfreebsd-ports-gnome-8cfa0d68e0b4795a9422917e2a8a0c97e32535da.tar.gz
freebsd-ports-gnome-8cfa0d68e0b4795a9422917e2a8a0c97e32535da.tar.zst
freebsd-ports-gnome-8cfa0d68e0b4795a9422917e2a8a0c97e32535da.zip
- Add NO_ARCH
- Switch to @dir - Switch to @sample, fixing stage-qa Approved by: portmgr blanket
Diffstat (limited to 'devel')
-rw-r--r--devel/atlassian-plugin-sdk/Makefile3
-rw-r--r--devel/atlassian-plugin-sdk/pkg-plist4
2 files changed, 3 insertions, 4 deletions
diff --git a/devel/atlassian-plugin-sdk/Makefile b/devel/atlassian-plugin-sdk/Makefile
index 39ccbc604604..ffdfe3e91750 100644
--- a/devel/atlassian-plugin-sdk/Makefile
+++ b/devel/atlassian-plugin-sdk/Makefile
@@ -13,6 +13,7 @@ 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
@@ -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}
diff --git a/devel/atlassian-plugin-sdk/pkg-plist b/devel/atlassian-plugin-sdk/pkg-plist
index 80c2bb1035b2..67399bf423bb 100644
--- a/devel/atlassian-plugin-sdk/pkg-plist
+++ b/devel/atlassian-plugin-sdk/pkg-plist
@@ -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%%