Re: [CHANGE] devel/jdk/1.6 use jamvm bootstrap

2011-10-06 Thread Amit Kulkarni 
 The following diff changes the default bootstrap depend from jdk/1.5 to
 lang/jamvm + Eclipse compiler (ecj).

 Tested on i386 and amd64: builds ok, builds native_bootstrap ok and jdk/1.7
 ok.

 After this goes in we can remove jdk/1.5 which is EOL since 2009.

 okay?

 The in-lined patch got line wrapped by my mailer. Attached is the same diff.

 -Kurt


Smooth upgrade... I had to move stuff from distfiles to distfiles/jdk.
No problems found on amd64. couple more crusty ports removed!!!

Kurt,
The plan is to keep 1.6 u3 around to bootstrap 1.7 and future 1.8, and
concentrate more on upcoming versions only, right? i.e use 1.7 and
discourage 1.6 because of securtiy concerns?

thanks

Re: [CHANGE] devel/jdk/1.6 use jamvm bootstrap

2011-10-06 Thread Kurt Miller 
Hi Amit,

On Thursday 06 October 2011 02:20:42 pm Amit Kulkarni wrote:
  The following diff changes the default bootstrap depend from jdk/1.5 to
  lang/jamvm + Eclipse compiler (ecj).
 
  Tested on i386 and amd64: builds ok, builds native_bootstrap ok and jdk/1.7
  ok.
 
  After this goes in we can remove jdk/1.5 which is EOL since 2009.
 
  okay?
 
  The in-lined patch got line wrapped by my mailer. Attached is the same diff.
 
  -Kurt
 
 
 Smooth upgrade... I had to move stuff from distfiles to distfiles/jdk.
 No problems found on amd64. couple more crusty ports removed!!!

Thanks.

 Kurt,
 The plan is to keep 1.6 u3 around to bootstrap 1.7 and future 1.8, and
 concentrate more on upcoming versions only, right? i.e use 1.7 and
 discourage 1.6 because of securtiy concerns?

No plans here. Just plans to have plans. Idealy someone (or me eventually)
switches 1.6 to OpenJDK 1.6 so we get 1.6 packages but we loose the Sun
plugin. I doubt that will happen this release though. icedtea-web will be
the plugin we rely upon in the future.

Regards,
-Kurt

Re: [CHANGE] devel/jdk/1.6 use jamvm bootstrap

2011-10-02 Thread Amit Kulkarni 
 The following diff changes the default bootstrap depend from jdk/1.5 to
 lang/jamvm + Eclipse compiler (ecj).

 Tested on i386 and amd64: builds ok, builds native_bootstrap ok and jdk/1.7
 ok.

 After this goes in we can remove jdk/1.5 which is EOL since 2009.


lang/kaffe can also be removed, right? its old, and somewhat unmaintained...
thanks

Re: [CHANGE] devel/jdk/1.6 use jamvm bootstrap

2011-10-02 Thread Kurt Miller 
On Saturday 01 October 2011 14:08:18 Kurt Miller wrote:
 The following diff changes the default bootstrap depend from jdk/1.5 to 
 lang/jamvm + Eclipse compiler (ecj).
 
 Tested on i386 and amd64: builds ok, builds native_bootstrap ok and jdk/1.7 
 ok.
 
 After this goes in we can remove jdk/1.5 which is EOL since 2009.
 
 okay?

The in-lined patch got line wrapped by my mailer. Attached is the same diff.

-Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/jdk/1.6/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile	9 Apr 2011 00:38:09 -	1.22
+++ Makefile	1 Oct 2011 18:00:21 -
@@ -8,9 +8,9 @@ COMMENT-jre=		Java2(TM) Standard Edition
 V=			1.6.0.03
 PKGNAME=		jdk-${V}
 PKGNAME-main=		jdk-${V}
-REVISION-main =		13
+REVISION-main =		14
 PKGNAME-jre=		jre-${V}
-REVISION-jre =		13
+REVISION-jre =		14
 
 CATEGORIES=		devel/jdk java
 
@@ -29,6 +29,7 @@ DISTFILES=		${JRLSRC} \
 			${JRLBIN} \
 			${JRLMOZ} \
 			${PATCHSET}
+DIST_SUBDIR=		jdk
 
 MASTER_SITES=		http://download.java.net/jdk6/6u3/promoted/b05/
 
@@ -102,8 +103,22 @@ ERRORS += Fatal: This flavor requires a
 BUILD_DEPENDS+=		jdk-=1.6,1.7:devel/jdk/1.6
 MAKE_ENV+=		ALT_BOOTDIR=${LOCALBASE}/${JDKHOME}
 .else
-BUILD_DEPENDS+=		jdk-=1.5,1.6:devel/jdk/1.5
-MAKE_ENV+=		ALT_BOOTDIR=${LOCALBASE}/jdk-1.5.0
+DISTFILES+=		bsd-jdk16-gensrc.tar.gz \
+			xalan-j_2_7_0-bin.tar.gz \
+			ecj-3.7.1.jar
+FETCH_MANUALLY+=	Get the file:
+FETCH_MANUALLY+=	bsd-jdk16-gensrc.tar.gz
+FETCH_MANUALLY+=	from http:://www.intricatesoftware.com/distfiles/bsd-jdk16-gensrc.tar.gz
+FETCH_MANUALLY+=	Get the Apache Xalan Java file:
+FETCH_MANUALLY+=	xalan-j_2_7_0-bin.tar.gz
+FETCH_MANUALLY+=	from http://archive.apache.org/dist/xml/xalan-j/;
+FETCH_MANUALLY+=	Get the Eclipse Java Compiler file:
+FETCH_MANUALLY+=	ecj-3.7.1.jar
+FETCH_MANUALLY+=	from http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/ecj-3.7.1.jar;
+BUILD_DEPENDS+=		lang/jamvm=1.5.4
+MAKE_ENV+=		ALT_BOOTDIR=${WRKDIST} \
+			ALT_BOOTSTRAP=yes \
+			ECJ_JAR=${FULLDISTDIR}/ecj-3.7.1.jar
 .endif
 
 .if !${FLAVOR:L:Mno_web}
@@ -164,6 +179,16 @@ post-extract:
 pre-patch:
 	@cd ${WRKDIR}   \
 		${PATCH} -p0 -z .orig.bsd --quiet  ${WRKDIR}/jdk16.patches
+
+.if !${FLAVOR:L:Mnative_bootstrap}
+post-patch:
+	@cd ${WRKDIR}/bin  \
+		${CHMOD} +x bootscript
+.for prog in java javac javah jar
+	@cd ${WRKDIR}/bin  \
+		ln -s bootscript ${prog}
+.endfor
+.endif
 
 post-build:
 	@rm -rf ${JDKIMAGEDIR}/man/ja \
Index: distinfo
===
RCS file: /cvs/ports/devel/jdk/1.6/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo	17 Mar 2008 03:28:26 -	1.2
+++ distinfo	1 Oct 2011 18:00:21 -
@@ -1,20 +1,35 @@
-MD5 (bsd-jdk16-patches-4.tar.bz2) = YyBltgOkKKYDg9t/DLBM3w==
-MD5 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = i28bjY3sBRwYOFU5ERFB7A==
-MD5 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = bcr3rxYhFhet/11nKot59A==
-MD5 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = gzkDefufMZPpOp1e7Vsx2Q==
-RMD160 (bsd-jdk16-patches-4.tar.bz2) = uejP2jkrnE/N6uIs1eiqI6jk2GA=
-RMD160 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = fxvCv48G8stpoPfAsC32v6s2cn0=
-RMD160 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 6KePLdZ5CJHIE0i1UpkmkryDaXE=
-RMD160 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = eSRJxzWuLx5FTpC900Bbski15AQ=
-SHA1 (bsd-jdk16-patches-4.tar.bz2) = iUIf2iB8nGMEftEynEEf3HclN8Q=
-SHA1 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = xhtWgGJxWxRwvW/B5V+oG+c0iMU=
-SHA1 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = Sb8hpRWgp7n0W373J3/J09dvkwk=
-SHA1 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = EqmNoH2CNAWabtr/pgWe/yY35GE=
-SHA256 (bsd-jdk16-patches-4.tar.bz2) = XcdTvuFWdvNbBjD4dP3QnhUoIUTdSiXPEiLnwogB+MY=
-SHA256 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = C7zELB/3uA2OPqXMB7mmB3j+x6gmc7QrPlS7mnqy6b4=
-SHA256 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = M23boc1LxqlLzRGFUMXHo6gI5Lvjm7ITQkupiD8gCcQ=
-SHA256 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = 0ci9lFhM1SgY46HcPwOxELOSQ9VRJQSgnAbFHAadK/k=
-SIZE (bsd-jdk16-patches-4.tar.bz2) = 960930
-SIZE (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = 2116124
-SIZE (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 8608204
-SIZE (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = 116791442
+MD5 (jdk/bsd-jdk16-gensrc.tar.gz) = YqixvW5QHuntj2X5muIYEw==
+MD5 (jdk/bsd-jdk16-patches-4.tar.bz2) = YyBltgOkKKYDg9t/DLBM3w==
+MD5 (jdk/ecj-3.7.1.jar) = XdYKNUidOpzUsUklWSoBZQ==
+MD5 (jdk/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = i28bjY3sBRwYOFU5ERFB7A==
+MD5 (jdk/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = bcr3rxYhFhet/11nKot59A==
+MD5 (jdk/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = gzkDefufMZPpOp1e7Vsx2Q==
+MD5 (jdk/xalan-j_2_7_0-bin.tar.gz) = 1SbQhIyIYHzk46Ck7bddUA==
+RMD160 (jdk/bsd-jdk16-gensrc.tar.gz) = Jzug24cPOLB/Sydx+OT4icgpG5c=
+RMD160 (jdk/bsd-jdk16-patches-4.tar.bz2) =

Re: [CHANGE] devel/jdk/1.6 use jamvm bootstrap

2011-10-02 Thread Kurt Miller 
On Sunday 02 October 2011 09:51:25 Amit Kulkarni wrote:
  The following diff changes the default bootstrap depend from jdk/1.5 to
  lang/jamvm + Eclipse compiler (ecj).
 
  Tested on i386 and amd64: builds ok, builds native_bootstrap ok and jdk/1.7
  ok.
 
  After this goes in we can remove jdk/1.5 which is EOL since 2009.
 
 
 lang/kaffe can also be removed, right? its old, and somewhat unmaintained...

Yes, that is correct.

-Kurt

[CHANGE] devel/jdk/1.6 use jamvm bootstrap

2011-10-01 Thread Kurt Miller 
The following diff changes the default bootstrap depend from jdk/1.5 to 
lang/jamvm + Eclipse compiler (ecj).

Tested on i386 and amd64: builds ok, builds native_bootstrap ok and jdk/1.7 
ok.

After this goes in we can remove jdk/1.5 which is EOL since 2009.

okay?

Index: Makefile
===
RCS file: /cvs/ports/devel/jdk/1.6/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile9 Apr 2011 00:38:09 -   1.22
+++ Makefile1 Oct 2011 18:00:21 -
@@ -8,9 +8,9 @@ COMMENT-jre=Java2(TM) Standard Edition
 V= 1.6.0.03
 PKGNAME=   jdk-${V}
 PKGNAME-main=  jdk-${V}
-REVISION-main =13
+REVISION-main =14
 PKGNAME-jre=   jre-${V}
-REVISION-jre = 13
+REVISION-jre = 14
 
 CATEGORIES=devel/jdk java
 
@@ -29,6 +29,7 @@ DISTFILES=${JRLSRC} \
${JRLBIN} \
${JRLMOZ} \
${PATCHSET}
+DIST_SUBDIR=   jdk
 
 MASTER_SITES=  http://download.java.net/jdk6/6u3/promoted/b05/
 
@@ -102,8 +103,22 @@ ERRORS += Fatal: This flavor requires a
 BUILD_DEPENDS+=jdk-=1.6,1.7:devel/jdk/1.6
 MAKE_ENV+= ALT_BOOTDIR=${LOCALBASE}/${JDKHOME}
 .else
-BUILD_DEPENDS+=jdk-=1.5,1.6:devel/jdk/1.5
-MAKE_ENV+= ALT_BOOTDIR=${LOCALBASE}/jdk-1.5.0
+DISTFILES+=bsd-jdk16-gensrc.tar.gz \
+   xalan-j_2_7_0-bin.tar.gz \
+   ecj-3.7.1.jar
+FETCH_MANUALLY+=   Get the file:
+FETCH_MANUALLY+=   bsd-jdk16-gensrc.tar.gz
+FETCH_MANUALLY+=   from 
http:://www.intricatesoftware.com/distfiles/bsd-jdk16-gensrc.tar.gz
+FETCH_MANUALLY+=   Get the Apache Xalan Java file:
+FETCH_MANUALLY+=   xalan-j_2_7_0-bin.tar.gz
+FETCH_MANUALLY+=   from http://archive.apache.org/dist/xml/xalan-j/;
+FETCH_MANUALLY+=   Get the Eclipse Java Compiler file:
+FETCH_MANUALLY+=   ecj-3.7.1.jar
+FETCH_MANUALLY+=   from 
http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/ecj-3.7.1.jar;
+BUILD_DEPENDS+=lang/jamvm=1.5.4
+MAKE_ENV+= ALT_BOOTDIR=${WRKDIST} \
+   ALT_BOOTSTRAP=yes \
+   ECJ_JAR=${FULLDISTDIR}/ecj-3.7.1.jar
 .endif
 
 .if !${FLAVOR:L:Mno_web}
@@ -164,6 +179,16 @@ post-extract:
 pre-patch:
@cd ${WRKDIR}   \
${PATCH} -p0 -z .orig.bsd --quiet  ${WRKDIR}/jdk16.patches
+
+.if !${FLAVOR:L:Mnative_bootstrap}
+post-patch:
+   @cd ${WRKDIR}/bin  \
+   ${CHMOD} +x bootscript
+.for prog in java javac javah jar
+   @cd ${WRKDIR}/bin  \
+   ln -s bootscript ${prog}
+.endfor
+.endif
 
 post-build:
@rm -rf ${JDKIMAGEDIR}/man/ja \
Index: distinfo
===
RCS file: /cvs/ports/devel/jdk/1.6/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo17 Mar 2008 03:28:26 -  1.2
+++ distinfo1 Oct 2011 18:00:21 -
@@ -1,20 +1,35 @@
-MD5 (bsd-jdk16-patches-4.tar.bz2) = YyBltgOkKKYDg9t/DLBM3w==
-MD5 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = i28bjY3sBRwYOFU5ERFB7A==
-MD5 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 
bcr3rxYhFhet/11nKot59A==
-MD5 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = gzkDefufMZPpOp1e7Vsx2Q==
-RMD160 (bsd-jdk16-patches-4.tar.bz2) = uejP2jkrnE/N6uIs1eiqI6jk2GA=
-RMD160 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = 
fxvCv48G8stpoPfAsC32v6s2cn0=
-RMD160 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 
6KePLdZ5CJHIE0i1UpkmkryDaXE=
-RMD160 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = 
eSRJxzWuLx5FTpC900Bbski15AQ=
-SHA1 (bsd-jdk16-patches-4.tar.bz2) = iUIf2iB8nGMEftEynEEf3HclN8Q=
-SHA1 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = xhtWgGJxWxRwvW/B5V+oG+c0iMU=
-SHA1 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 
Sb8hpRWgp7n0W373J3/J09dvkwk=
-SHA1 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = EqmNoH2CNAWabtr/pgWe/yY35GE=
-SHA256 (bsd-jdk16-patches-4.tar.bz2) = 
XcdTvuFWdvNbBjD4dP3QnhUoIUTdSiXPEiLnwogB+MY=
-SHA256 (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = 
C7zELB/3uA2OPqXMB7mmB3j+x6gmc7QrPlS7mnqy6b4=
-SHA256 (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 
M23boc1LxqlLzRGFUMXHo6gI5Lvjm7ITQkupiD8gCcQ=
-SHA256 (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = 
0ci9lFhM1SgY46HcPwOxELOSQ9VRJQSgnAbFHAadK/k=
-SIZE (bsd-jdk16-patches-4.tar.bz2) = 960930
-SIZE (jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) = 2116124
-SIZE (jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar) = 8608204
-SIZE (jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar) = 116791442
+MD5 (jdk/bsd-jdk16-gensrc.tar.gz) = YqixvW5QHuntj2X5muIYEw==
+MD5 (jdk/bsd-jdk16-patches-4.tar.bz2) = YyBltgOkKKYDg9t/DLBM3w==
+MD5 (jdk/ecj-3.7.1.jar) = XdYKNUidOpzUsUklWSoBZQ==
+MD5 (jdk/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar) =