duplicating apache-ant-*-bin distfiles?

[Alexey Dokuchaev]

On Thu, Dec 25, 2014 at 09:56:10PM +0600, Alexey Dokuchaev wrote:
> On Thu, Dec 11, 2014 at 07:23:33PM +0600, Alexey Dokuchaev wrote:
> > $ ll apache-ant-1.9.4-bin.*
> >   .. bla-bla.. 	4351965 30 Apr  2014 apache-ant-1.9.4-bin.tar.bz2
> >   .. bla-bla..  8309406 30 Apr  2014 apache-ant-1.9.4-bin.zip
> > 
> > their contents look the same, just packed differently (notice how .zip
> > sucks ass).
> > 
> > why two files?  because `devel/apache-ant' wants .tar.bz2, but both
> > `java/openjdk6' and `java/openjdk7' want .zip.
> > 
> > could we do something about this, so everyone (users, buildbots) would
> > not have to download the same stuff [more than] twice?  thanks,
> 
> retransmit.  if this problem only looks simple, i apologize for annoyance
> (but please explain); otherwise i'm willing to provide a patch.  i won't
> tolerate such an abuse of harddrive space and common sense.

first patch (for openjdk6), any objections?

./danfe
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 376813)
+++ Makefile	(working copy)
@@ -6,18 +6,16 @@
 PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
+MASTER_SITES=	APACHE/ant/binaries/:ant \
 		http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \
 		https://java.net/downloads/openjdk6/ \
-		LOCAL
-MASTER_SITE_SUBDIR=	jkim
+		LOCAL/jkim
 DISTNAME=	openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE}
 DISTFILES=	${ANTFILE}:ant \
 		${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${ANTFILE}
 
 MAINTAINER=	java at FreeBSD.org
-COMMENT?=	Oracle's Java 6 virtual machine release under the GPL v2
+COMMENT?=	Oracle's Java 6 virtual machine released under GPLv2
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -66,9 +64,9 @@
 USE_XORG=	x11 xext xi xt xtst
 
 # do not depend on devel/apache-ant to avoid circular dependency, but
-# use .tar.bz2 distfile to avoid duplicated downloads
+# use .zip distfile to avoid duplicated downloads
 ANTVERSION=	1.9.4
-ANTFILE=	apache-ant-${ANTVERSION}-bin.tar.bz2
+ANTFILE=	apache-ant-${ANTVERSION}-bin.zip
 
 JTREG_BUILD=	b05_29_nov_2012
 JTREGFILE=	jtreg-4.1-bin-${JTREG_BUILD}.zip
@@ -79,7 +77,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MTZUPDATE}
-RUN_DEPENDS+=  ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+RUN_DEPENDS+=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
 .endif
 
 # avoid ARCH in MAKEFLAGS, breaks build
@@ -152,7 +150,6 @@
 
 .if ${PORT_OPTIONS:MTEST}
 DISTFILES+=	${JTREGFILE}:jtreg
-EXTRACT_ONLY+=	${JTREGFILE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 USES+=		display:test
 .else
Index: distinfo
===================================================================
--- distinfo	(revision 376813)
+++ distinfo	(working copy)
@@ -1,5 +1,5 @@
-SHA256 (apache-ant-1.9.4-bin.tar.bz2) = 20c16575684b8869dd9d19abe0fb504566adefb5d397881e70a417886e0088cf
-SIZE (apache-ant-1.9.4-bin.tar.bz2) = 4351965
+SHA256 (apache-ant-1.9.4-bin.zip) = 973d97d656e65561e2753823de6cf6db35570aaf93eeec6e7cb3d68e1ec4d0e8
+SIZE (apache-ant-1.9.4-bin.zip) = 8309406
 SHA256 (openjdk-6-src-b33-14_oct_2014.tar.xz) = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293
 SIZE (openjdk-6-src-b33-14_oct_2014.tar.xz) = 33476800
 SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 376813)
+++ pkg-descr	(working copy)
@@ -1,4 +1,5 @@
-OpenJDK is an open-source implementation of the Java Platform, Standard Edition.
+OpenJDK is an open-source implementation of the Java Platform, Standard
+Edition.
 
 Much of the OpenJDK code is licensed under the GPL version 2 with the
 Classpath exception. The Java Hotspot virtual machine source code is