summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryoon <ryoon>2014-07-26 00:06:50 +0000
committerryoon <ryoon>2014-07-26 00:06:50 +0000
commit39b5bc9f9161e1d0854f5eb9b8ccae4d905543d7 (patch)
tree3497e53c1ee6b1ae2d01c2eb03f895e87535927c
parente930cbf721be723d0e4e9a552c4db97aa12acfc4 (diff)
downloadpkgsrc-39b5bc9f9161e1d0854f5eb9b8ccae4d905543d7.tar.gz
For emul-distinfo, always include jce distfile.
-rw-r--r--lang/sun-jre7/Makefile6
-rw-r--r--lang/sun-jre7/distinfo2
2 files changed, 5 insertions, 3 deletions
diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile
index f16495dd2f6..140b31366c9 100644
--- a/lang/sun-jre7/Makefile
+++ b/lang/sun-jre7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/03/02 09:53:41 obache Exp $
+# $NetBSD: Makefile,v 1.22 2014/07/26 00:06:50 ryoon Exp $
# Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce
# Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -53,8 +53,10 @@ PKG_SUPPORTED_OPTIONS= sun-jre-jce
PLIST_SRC= PLIST.${DIST_OS}-${EMUL_ARCH}
PLIST_VARS+= jce native
-.if !empty(PKG_OPTIONS:Msun-jre-jce)
+.if !empty(PKG_OPTIONS:Msun-jre-jce) || make(distinfo)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} UnlimitedJCEPolicyJDK7.zip
+.endif
+.if !empty(PKG_OPTIONS:Msun-jre-jce)
PLIST.jce= yes
FETCH_MESSAGE+= ""
FETCH_MESSAGE+= "As sun-jre-jce is enabled UnlimitedJCEPolicyJDK7.zip is also needed"
diff --git a/lang/sun-jre7/distinfo b/lang/sun-jre7/distinfo
index 47c13515157..96114157222 100644
--- a/lang/sun-jre7/distinfo
+++ b/lang/sun-jre7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2014/06/07 06:56:14 ryoon Exp $
+$NetBSD: distinfo,v 1.21 2014/07/26 00:06:50 ryoon Exp $
SHA1 (UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
RMD160 (UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f