diff options
author | jperkin <jperkin@pkgsrc.org> | 2013-03-08 15:08:50 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2013-03-08 15:08:50 +0000 |
commit | f69105fdfe5c18b63605744bc9a221e7fc79da52 (patch) | |
tree | 39c6c4766c97916907647e66c4ba741f69f9b40b /lang | |
parent | a531a93103897b4a4f5d50ec48fc266c56ba8533 (diff) | |
download | pkgsrc-f69105fdfe5c18b63605744bc9a221e7fc79da52.tar.gz |
Revert changes to use .gz suffix instead of .tar.gz. The issue is caused
by downloading files from Oracle's site using Chrome (Chromium #136305).
Diffstat (limited to 'lang')
-rw-r--r-- | lang/sun-jdk7/Makefile | 8 | ||||
-rw-r--r-- | lang/sun-jdk7/distinfo | 14 | ||||
-rw-r--r-- | lang/sun-jre7/Makefile | 4 | ||||
-rw-r--r-- | lang/sun-jre7/distinfo | 14 |
4 files changed, 16 insertions, 24 deletions
diff --git a/lang/sun-jdk7/Makefile b/lang/sun-jdk7/Makefile index 6c70633f00e..e7dca1651cb 100644 --- a/lang/sun-jdk7/Makefile +++ b/lang/sun-jdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/03/06 16:58:57 jperkin Exp $ +# $NetBSD: Makefile,v 1.8 2013/03/08 15:08:50 jperkin Exp $ # Note: This must be kept in sync with the sun-jre7 package # Note: make sure you include sums for both the x86_64 and the x86_32 @@ -26,12 +26,6 @@ MAKE_JOBS_SAFE= no CHECK_SHLIBS_SUPPORTED= no .endif -# XXX: The download page says .tar.gz but sends the file as .gz -.if ${OPSYS} == "SunOS" -EXTRACT_OPTS= -f tar -EXTRACT_SUFX= .gz -.endif - # The 64-bit Solaris downloads for some inexplicable reason only contain # the additional 64-bit files, and you need the main 32-bit file too. .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "x86_64" diff --git a/lang/sun-jdk7/distinfo b/lang/sun-jdk7/distinfo index d90902697a4..4f11446dc9a 100644 --- a/lang/sun-jdk7/distinfo +++ b/lang/sun-jdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2013/03/06 16:58:57 jperkin Exp $ +$NetBSD: distinfo,v 1.7 2013/03/08 15:08:50 jperkin Exp $ SHA1 (jdk-7u15-linux-i586.tar.gz) = bf42fd0fd45d6bc3b644f2035410df0eaee32900 RMD160 (jdk-7u15-linux-i586.tar.gz) = 94342179c7cc88e264743a803399da166637ebd9 @@ -6,9 +6,9 @@ Size (jdk-7u15-linux-i586.tar.gz) = 97486991 bytes SHA1 (jdk-7u15-linux-x64.tar.gz) = 1dfa71bc04d3c1ef02aba4a21d6d3031d39c8346 RMD160 (jdk-7u15-linux-x64.tar.gz) = 5c7532c6b3423f0659fcaae619b47cee9e20ae43 Size (jdk-7u15-linux-x64.tar.gz) = 96131837 bytes -SHA1 (jdk-7u15-solaris-i586.gz) = 11788476781accd918c9343344de12e774517bfe -RMD160 (jdk-7u15-solaris-i586.gz) = 326e56f7067a451c0260f57619e8fdfd9a133c34 -Size (jdk-7u15-solaris-i586.gz) = 96403012 bytes -SHA1 (jdk-7u15-solaris-x64.gz) = ba2b71f00ab4021213b171994f19f71f92eee7a9 -RMD160 (jdk-7u15-solaris-x64.gz) = a3db29cdd486d3add24f5eff9b1c53ce66a5dec3 -Size (jdk-7u15-solaris-x64.gz) = 15688278 bytes +SHA1 (jdk-7u15-solaris-i586.tar.gz) = 11788476781accd918c9343344de12e774517bfe +RMD160 (jdk-7u15-solaris-i586.tar.gz) = 326e56f7067a451c0260f57619e8fdfd9a133c34 +Size (jdk-7u15-solaris-i586.tar.gz) = 96403012 bytes +SHA1 (jdk-7u15-solaris-x64.tar.gz) = ba2b71f00ab4021213b171994f19f71f92eee7a9 +RMD160 (jdk-7u15-solaris-x64.tar.gz) = a3db29cdd486d3add24f5eff9b1c53ce66a5dec3 +Size (jdk-7u15-solaris-x64.tar.gz) = 15688278 bytes diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile index 6e377a2d14e..4abf2f50ac5 100644 --- a/lang/sun-jre7/Makefile +++ b/lang/sun-jre7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/03/06 16:21:13 jperkin Exp $ +# $NetBSD: Makefile,v 1.12 2013/03/08 15:08:50 jperkin Exp $ # Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version @@ -7,8 +7,6 @@ DISTNAME= jre-7u15-${DIST_OS}-${DIST_ARCH} PKGNAME= sun-jre7-7.0.15 -EXTRACT_OPTS=-f tar -EXTRACT_SUFX=.gz MASTER_SITES= # empty LICENSE= oracle-binary-code-license diff --git a/lang/sun-jre7/distinfo b/lang/sun-jre7/distinfo index 17d3701b7ad..f579cfb98fe 100644 --- a/lang/sun-jre7/distinfo +++ b/lang/sun-jre7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2013/03/06 16:21:13 jperkin Exp $ +$NetBSD: distinfo,v 1.9 2013/03/08 15:08:50 jperkin Exp $ SHA1 (UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 RMD160 (UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f @@ -9,9 +9,9 @@ Size (jre-7u15-linux-i586.tar.gz) = 48129053 bytes SHA1 (jre-7u15-linux-x64.tar.gz) = cfd274e6a18c135f3f16955388127fb48ebecb37 RMD160 (jre-7u15-linux-x64.tar.gz) = b453d346173c7583d948856e54c61a02fa6893fe Size (jre-7u15-linux-x64.tar.gz) = 46794487 bytes -SHA1 (jre-7u15-solaris-i586.gz) = a99e1cd8c704961447aa99ef5f35323437aa1363 -RMD160 (jre-7u15-solaris-i586.gz) = b65b2e2898dd27707496ac4ad71c9efd6abd6909 -Size (jre-7u15-solaris-i586.gz) = 47614844 bytes -SHA1 (jre-7u15-solaris-x64.gz) = c364fdfa72ad6433db9b551c54c1914afb47545d -RMD160 (jre-7u15-solaris-x64.gz) = 83218ba2f4494e1b2522dccb9459833e62aa7e5b -Size (jre-7u15-solaris-x64.gz) = 15520392 bytes +SHA1 (jre-7u15-solaris-i586.tar.gz) = a99e1cd8c704961447aa99ef5f35323437aa1363 +RMD160 (jre-7u15-solaris-i586.tar.gz) = b65b2e2898dd27707496ac4ad71c9efd6abd6909 +Size (jre-7u15-solaris-i586.tar.gz) = 47614844 bytes +SHA1 (jre-7u15-solaris-x64.tar.gz) = c364fdfa72ad6433db9b551c54c1914afb47545d +RMD160 (jre-7u15-solaris-x64.tar.gz) = 83218ba2f4494e1b2522dccb9459833e62aa7e5b +Size (jre-7u15-solaris-x64.tar.gz) = 15520392 bytes |