[pkgsrc/trunk]: pkgsrc/lang 1.5 uses the 6.x license, not the 1.3 license.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ac0c4575d37
branches:  trunk
changeset: 537912:3ac0c4575d37
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Jan 21 01:50:21 2008 +0000

description:
1.5 uses the 6.x license, not the 1.3 license.

diffstat:

 lang/sun-jdk15/Makefile        |  4 +++-
 lang/sun-jre15/Makefile        |  4 +++-
 lang/sun-jre15/Makefile.common |  3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r a21c481b88c6 -r 3ac0c4575d37 lang/sun-jdk15/Makefile
--- a/lang/sun-jdk15/Makefile   Mon Jan 21 01:39:01 2008 +0000
+++ b/lang/sun-jdk15/Makefile   Mon Jan 21 01:50:21 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/01/07 19:59:34 tron Exp $
+# $NetBSD: Makefile,v 1.29 2008/01/21 01:50:22 tnn Exp $
 
 DISTNAME=      jdk-1_5_0_14-linux-${DIST_ARCH}
 PKGNAME=       sun-jdk15-5.0.14
@@ -12,6 +12,8 @@
 JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \
                javac javadoc javah javap jdb rmic serialver
 
+LICENSE=       sun-jdk6-license
+
 .include "../../lang/sun-jre15/Makefile.common"
 
 # Remove parts that are in common with the JRE
diff -r a21c481b88c6 -r 3ac0c4575d37 lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Mon Jan 21 01:39:01 2008 +0000
+++ b/lang/sun-jre15/Makefile   Mon Jan 21 01:50:21 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2008/01/07 19:56:27 tron Exp $
+# $NetBSD: Makefile,v 1.50 2008/01/21 01:50:21 tnn Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -19,6 +19,8 @@
 REQD_DIRS+=    ${JAVA_HOME}/lib/security
 CONF_FILES=    # empty
 
+LICENSE=       sun-jre6-license
+
 .include "../../lang/sun-jre15/Makefile.common"
 
 .sinclude "sfiles-${EMUL_ARCH}.mk"
diff -r a21c481b88c6 -r 3ac0c4575d37 lang/sun-jre15/Makefile.common
--- a/lang/sun-jre15/Makefile.common    Mon Jan 21 01:39:01 2008 +0000
+++ b/lang/sun-jre15/Makefile.common    Mon Jan 21 01:50:21 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2008/01/09 02:38:26 ghen Exp $
+# $NetBSD: Makefile.common,v 1.23 2008/01/21 01:50:22 tnn Exp $
 
 CATEGORIES=    lang java
 COMMENT=       Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME}
@@ -10,7 +10,6 @@
 DOWNLOAD_NAME= ${SHORT_NAME} 5.0 Update ${PKGNAME_NOREV:C/^.*\.//}
 ARCHIVE=       http://java.sun.com/products/archive/
 
-LICENSE=       jdk13-license
 RESTRICTED=    Redistribution of repackaged binaries not permitted
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_SRC_ON_FTP= ${RESTRICTED}