diff options
| author | bapt <bapt@FreeBSD.org> | 2013-04-29 16:57:12 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-04-29 16:57:12 +0800 |
| commit | 1ca518c98321627ea34bdaae84c439a2f0df0cdf (patch) | |
| tree | 526d65e6697f1e03c06ab0d0f901688aa2c4e18d /java/eclipse | |
| parent | 81215f7fb03620d52b441a5714e6af1fb655c743 (diff) | |
| download | freebsd-ports-gnome-1ca518c98321627ea34bdaae84c439a2f0df0cdf.tar.gz freebsd-ports-gnome-1ca518c98321627ea34bdaae84c439a2f0df0cdf.tar.zst freebsd-ports-gnome-1ca518c98321627ea34bdaae84c439a2f0df0cdf.zip | |
Rely on bsdtar to autodetermine the format of the distfiles when possible
For a while now bsdtar is able to autotermine compression and archive format.
Let's then use tar directly instead of piping to tar.
Now USE_BZIP2 and USE_XZ only set EXTRACT_SUFX to the right format
Diffstat (limited to 'java/eclipse')
| -rw-r--r-- | java/eclipse/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 6170465eca07..84996e4351a2 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -155,9 +155,9 @@ post-extract: .for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ .endfor - @(${MKDIR} ${BUILD_WRKSRC}/generatedScripts && cd ${BUILD_WRKSRC}/generatedScripts && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} ${EXTRACT_AFTER_ARGS}) + @(${MKDIR} ${BUILD_WRKSRC}/generatedScripts && cd ${BUILD_WRKSRC}/generatedScripts && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} ${EXTRACT_AFTER_ARGS}) - @(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS}) + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS}) .for f in ${ANT_BUNDLES} @${CP} ${WRKDIR}/apache-ant-${ANT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ .endfor @@ -167,7 +167,7 @@ post-extract: @${CP} ${WRKDIR}/junit/junit${JUNIT3_VERSION}/junit.jar ${BUILD_WRKSRC}/bundles/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/${JUNIT4_SRCFILE} ${BUILD_WRKSRC}/bundles/junit4.jar - @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) @${CP} ${DISTDIR}/${DIST_SUBDIR}/${TOMCAT_SRCFILES:M*.jar} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/ .for f in ${TOMCAT_BUNDLES} @${CP} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ |