ports/161985: [patch] java/openjdk6: correct MASTER_SITES for jtreg, portlint fixes

[Sam Cassiba]

>Number:         161985
>Category:       ports
>Synopsis:       [patch] java/openjdk6: correct MASTER_SITES for jtreg, portlint fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 25 07:30:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sam Cassiba
>Release:        9.0 amd64
>Organization:
>Environment:
FreeBSD trinity 9.0-BETA3 FreeBSD 9.0-BETA3 #3 r226023: Tue Oct  4 17:07:10 CDT 2011     root at trinity:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
- upstream changed their directory structure for jtreg
- fix portlint fatal errors so 'port test' works
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN openjdk6.orig/Makefile openjdk6/Makefile
--- openjdk6.orig/Makefile	2011-08-09 17:56:39.000000000 -0500
+++ openjdk6/Makefile	2011-10-25 01:36:32.640740121 -0500
@@ -11,14 +11,14 @@
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
 		http://download.java.net/jaxp/openjdk/jdk6/:jaxp \
-		http://download.java.net/glassfish/components/jax-ws/openjdk/jdk6:jaxws \
+		http://download.java.net/glassfish/components/jax-ws/openjdk/jdk6/:jaxws \
 		https://java.net/downloads/jax-ws/OpenJDK6/:jaf \
 		http://icedtea.classpath.org/builds/icedtea6/src/ \
 		http://icedtea.classpath.org/download/drops/:jaxp \
 		http://icedtea.classpath.org/download/drops/:jaxws \
 		http://icedtea.classpath.org/download/drops/:jaf \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
-		http://download.java.net/openjdk/jtreg/promoted/${JTREGVERSION}/:jtreg
+		http://download.java.net/openjdk/jtreg/promoted/4.1/${JTREGVERSION}/:jtreg
 DISTNAME=	openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${JAXPFILE}:jaxp \
@@ -30,6 +30,8 @@
 MAINTAINER=	java at FreeBSD.org
 COMMENT=	Oracle's Java 6 virtual machine release under the GPL v2
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
@@ -37,8 +39,6 @@
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 
-LICENSE=	GPLv2
-
 OPENJDK_BUILDDATE=	05_jul_2011
 
 OPTIONS=	DEBUG "Enable legacy debugging support" off \


>Release-Note:
>Audit-Trail:
>Unformatted: