From stolz@i2.informatik.rwth-aachen.de  Mon Mar 31 06:31:28 2003
Return-Path: <stolz@i2.informatik.rwth-aachen.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B6E1B37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 31 Mar 2003 06:31:28 -0800 (PST)
Received: from atlas.informatik.rwth-aachen.de (atlas.Informatik.RWTH-Aachen.DE [137.226.194.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 37BF643F75
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 31 Mar 2003 06:31:27 -0800 (PST)
	(envelope-from stolz@i2.informatik.rwth-aachen.de)
Received: from menelaos.informatik.rwth-aachen.de (menelaos.Informatik.RWTH-Aachen.DE [137.226.194.73])
	by atlas.informatik.rwth-aachen.de (8.11.3/8.11.3/SuSE Linux 8.11.1-0.5) with ESMTP id h2VEVPa04939
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 31 Mar 2003 16:31:25 +0200
Received: (from stolz@localhost)
	by menelaos.informatik.rwth-aachen.de (8.12.6/8.12.6/Submit) id h2VEVQMN014823;
	Mon, 31 Mar 2003 16:31:26 +0200 (CEST)
	(envelope-from stolz)
Message-Id: <200303311431.h2VEVQMN014823@menelaos.informatik.rwth-aachen.de>
Date: Mon, 31 Mar 2003 16:31:26 +0200 (CEST)
From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
Reply-To: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] update java/bluej -> 1.2.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50481
>Category:       ports
>Synopsis:       [patch] update java/bluej -> 1.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glewis
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 31 06:40:03 PST 2003
>Closed-Date:    Thu Jul 10 09:20:00 PDT 2003
>Last-Modified:  Thu Jul 10 09:20:00 PDT 2003
>Originator:     Volker Stolz
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
Lehrstuhl fr Informatik II
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.7-STABLE FreeBSD 4.7-STABLE #2: Fri Feb 7 12:48:00 CET 2003 root@menelaos.informatik.rwth-aachen.de:/usr/src/sys/compile/MENELAOS i386


>Description:
Update java/bluej to 1.2.2.

Maintainer was contacted and even received the patch some weeks ago.
>How-To-Repeat:
>Fix:
- Update to 1.2.2
- Track new JDK version

--- bluej.patch begins here ---
diff -urN bluej.orig/Makefile bluej/Makefile
--- bluej.orig/Makefile	Sat Aug 10 12:54:06 2002
+++ bluej/Makefile	Sun Jan 26 17:09:16 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bluej
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.2
 CATEGORIES=	java editors
 MASTER_SITES=	ftp://ftp.bluej.org/pub/bluej/ \
 		http://www.metaverse.nl/~ernst/ \
@@ -23,7 +23,7 @@
 
 # Called MY_JDK and MY_JDK_PORT so not to conflict with any other possible
 # definitions in the ports system.
-MY_JDK=		linux-sun-jdk1.4.0
+MY_JDK=		linux-sun-jdk1.4.1
 MY_JDK_PORT=	linux-sun-jdk14
 RUN_DEPENDS=    ${LOCALBASE}/${MY_JDK}/bin/java:${PORTSDIR}/java/${MY_JDK_PORT}
 
diff -urN bluej.orig/distinfo bluej/distinfo
--- bluej.orig/distinfo	Thu Jul  4 20:50:47 2002
+++ bluej/distinfo	Sun Jan 26 17:09:48 2003
@@ -1 +1 @@
-MD5 (bluej-120.jar) = a8cbd5bcfb544ea13fb31f2898cb15dd
+MD5 (bluej-122.jar) = ec480c16a3aa2cb61db9cebcf3653841
--- bluej.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->glewis 
Responsible-Changed-By: glewis 
Responsible-Changed-When: Wed Jun 18 08:30:24 PDT 2003 
Responsible-Changed-Why:  
I'll try to get this committed.  BTW, here is an updated patch 
which converts the JDK specification to USE_JAVA, simplifies the 
install and fixes the packing list.  I'd also like to see  
${PREFIX}/bluej/bluej moved into ${PREFIX}/bin, since I think  
thats a more reasonable location (and allows people to just type 
"bluej" and have it all work without messing with their PATH). 

Index: bluej/Makefile 
=================================================================== 
RCS file: /var/fcvs/ports/java/bluej/Makefile,v 
retrieving revision 1.13 
diff -u -r1.13 Makefile 
--- bluej/Makefile	21 Feb 2003 12:30:25 -0000	1.13 
+++ bluej/Makefile	18 Jun 2003 06:08:29 -0000 
@@ -6,12 +6,9 @@ 
# 

PORTNAME=	bluej 
-PORTVERSION=	1.2.0 
+PORTVERSION=	1.2.2 
CATEGORIES=	java editors 
-MASTER_SITES=	ftp://ftp.bluej.org/pub/bluej/  
-		http://www.metaverse.nl/~ernst/  
-		${MASTER_SITE_LOCAL} 
-MASTER_SITE_SUBDIR=	znerd 
+MASTER_SITES=	ftp://ftp.bluej.org/pub/bluej/ 
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g} 
EXTRACT_SUFX=	.jar 

@@ -22,17 +19,11 @@ 
EXTRACT_ONLY= 
NO_BUILD=	yes 

-# Called MY_JDK and MY_JDK_PORT so not to conflict with any other possible 
-# definitions in the ports system. 
-MY_JDK=		linux-sun-jdk1.4.0 
-MY_JDK_PORT=	linux-sun-jdk14 
-RUN_DEPENDS=    ${LOCALBASE}/${MY_JDK}/bin/java:${PORTSDIR}/java/${MY_JDK_PORT} 
+USE_JAVA=	1.3+ 

do-install: 
-	@${LN} -s ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${PREFIX}/${DISTNAME}${EXTRACT_SUFX} 
@${ECHO} Starting BlueJ graphical installer...  Please install to default path of 
@${ECHO} ${PREFIX}/bluej.  Close the installer when done. 
-	@cd ${PREFIX}; ${LOCALBASE}/${MY_JDK}/bin/java -jar ${DISTNAME}${EXTRACT_SUFX} 
-	@${RM} -f ${PREFIX}/${DISTNAME}${EXTRACT_SUFX} 
+	@cd ${PREFIX}; ${JAVA_HOME}/bin/java -jar ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} 

.include <bsd.port.mk> 
Index: bluej/distinfo 
=================================================================== 
RCS file: /var/fcvs/ports/java/bluej/distinfo,v 
retrieving revision 1.4 
diff -u -r1.4 distinfo 
--- bluej/distinfo	4 Jul 2002 18:50:47 -0000	1.4 
+++ bluej/distinfo	17 Jun 2003 16:40:07 -0000 
@@ -1 +1 @@ 
-MD5 (bluej-120.jar) = a8cbd5bcfb544ea13fb31f2898cb15dd 
+MD5 (bluej-122.jar) = ec480c16a3aa2cb61db9cebcf3653841 
Index: bluej/pkg-plist 
=================================================================== 
RCS file: /var/fcvs/ports/java/bluej/pkg-plist,v 
retrieving revision 1.3 
diff -u -r1.3 pkg-plist 
--- bluej/pkg-plist	4 Jul 2002 18:50:47 -0000	1.3 
+++ bluej/pkg-plist	18 Jun 2003 06:02:17 -0000 
@@ -46,6 +46,58 @@ 
bluej/examples/shapes/README.TXT 
bluej/examples/shapes/Square.java 
bluej/examples/shapes/Triangle.java 
+bluej/lib/afrikaans/templates/newclass/abstract.tmpl 
+bluej/lib/afrikaans/templates/newclass/applet.tmpl 
+bluej/lib/afrikaans/templates/newclass/interface.tmpl 
+bluej/lib/afrikaans/templates/newclass/LEESMY.txt 
+bluej/lib/afrikaans/templates/newclass/stdclass.tmpl 
+bluej/lib/afrikaans/templates/newclass/unittest.tmpl 
+bluej/lib/afrikaans/templates/appletj.tmpl 
+bluej/lib/afrikaans/templates/html.tmpl 
+bluej/lib/afrikaans/templates/LEESMY.txt 
+bluej/lib/afrikaans/templates/method.tmpl 
+bluej/lib/afrikaans/templates/readme.tmpl 
+bluej/lib/afrikaans/templates/readmeexp.tmpl 
+bluej/lib/afrikaans/dialogues 
+bluej/lib/afrikaans/exception.help 
+bluej/lib/afrikaans/javac.help 
+bluej/lib/afrikaans/jikes.help 
+bluej/lib/afrikaans/labels 
+bluej/lib/afrikaans/moe.help 
+bluej/lib/chinese/templates/newclass/abstract.tmpl 
+bluej/lib/chinese/templates/newclass/applet.tmpl 
+bluej/lib/chinese/templates/newclass/interface.tmpl 
+bluej/lib/chinese/templates/newclass/README 
+bluej/lib/chinese/templates/newclass/stdclass.tmpl 
+bluej/lib/chinese/templates/appletj.tmpl 
+bluej/lib/chinese/templates/html.tmpl 
+bluej/lib/chinese/templates/method.tmpl 
+bluej/lib/chinese/templates/README 
+bluej/lib/chinese/templates/readme.tmpl 
+bluej/lib/chinese/templates/readmeexp.tmpl 
+bluej/lib/chinese/dialogues 
+bluej/lib/chinese/exception.help 
+bluej/lib/chinese/javac.help 
+bluej/lib/chinese/jikes.help 
+bluej/lib/chinese/labels 
+bluej/lib/chinese/moe.help 
+bluej/lib/czech/templates/newclass/abstract.tmpl 
+bluej/lib/czech/templates/newclass/applet.tmpl 
+bluej/lib/czech/templates/newclass/interface.tmpl 
+bluej/lib/czech/templates/newclass/README 
+bluej/lib/czech/templates/newclass/stdclass.tmpl 
+bluej/lib/czech/templates/appletj.tmpl 
+bluej/lib/czech/templates/html.tmpl 
+bluej/lib/czech/templates/method.tmpl 
+bluej/lib/czech/templates/README 
+bluej/lib/czech/templates/readme.tmpl 
+bluej/lib/czech/templates/readmeexp.tmpl 
+bluej/lib/czech/dialogues 
+bluej/lib/czech/exception.help 
+bluej/lib/czech/javac.help 
+bluej/lib/czech/jikes.help 
+bluej/lib/czech/labels 
+bluej/lib/czech/moe.help 
bluej/lib/english/templates/newclass/abstract.tmpl 
bluej/lib/english/templates/newclass/applet.tmpl 
bluej/lib/english/templates/newclass/interface.tmpl 
@@ -57,7 +109,6 @@ 
bluej/lib/english/templates/README 
bluej/lib/english/templates/readme.tmpl 
bluej/lib/english/templates/readmeexp.tmpl 
-bluej/lib/english/templates/shell.tmpl 
bluej/lib/english/dialogues 
bluej/lib/english/exception.help 
bluej/lib/english/javac.help 
@@ -75,7 +126,6 @@ 
bluej/lib/german/templates/README 
bluej/lib/german/templates/readme.tmpl 
bluej/lib/german/templates/readmeexp.tmpl 
-bluej/lib/german/templates/shell.tmpl 
bluej/lib/german/dialogues 
bluej/lib/german/exception.help 
bluej/lib/german/javac.help 
@@ -101,6 +151,7 @@ 
bluej/lib/images/darrow_red.gif 
bluej/lib/images/delete16.gif 
bluej/lib/images/edit16.gif 
+bluej/lib/images/empty.gif 
bluej/lib/images/help.gif 
bluej/lib/images/export16.gif 
bluej/lib/images/import16.gif 
@@ -130,6 +181,23 @@ 
bluej/lib/images/working-disab.gif 
bluej/lib/images/working-stopped.gif 
bluej/lib/images/working.gif 
+bluej/lib/italian/templates/newclass/abstract.tmpl 
+bluej/lib/italian/templates/newclass/applet.tmpl 
+bluej/lib/italian/templates/newclass/interface.tmpl 
+bluej/lib/italian/templates/newclass/README 
+bluej/lib/italian/templates/newclass/stdclass.tmpl 
+bluej/lib/italian/templates/appletj.tmpl 
+bluej/lib/italian/templates/html.tmpl 
+bluej/lib/italian/templates/method.tmpl 
+bluej/lib/italian/templates/README 
+bluej/lib/italian/templates/readme.tmpl 
+bluej/lib/italian/templates/readmeexp.tmpl 
+bluej/lib/italian/dialogues 
+bluej/lib/italian/exception.help 
+bluej/lib/italian/javac.help 
+bluej/lib/italian/jikes.help 
+bluej/lib/italian/labels 
+bluej/lib/italian/moe.help 
bluej/lib/japanese/templates/newclass/abstract.tmpl 
bluej/lib/japanese/templates/newclass/applet.tmpl 
bluej/lib/japanese/templates/newclass/interface.tmpl 
@@ -140,7 +208,6 @@ 
bluej/lib/japanese/templates/README 
bluej/lib/japanese/templates/readme.tmpl 
bluej/lib/japanese/templates/readmeexp.tmpl 
-bluej/lib/japanese/templates/shell.tmpl 
bluej/lib/japanese/dialogues 
bluej/lib/japanese/exception.help 
bluej/lib/japanese/javac.help 
@@ -158,7 +225,6 @@ 
bluej/lib/spanish/templates/README 
bluej/lib/spanish/templates/readme.tmpl 
bluej/lib/spanish/templates/readmeexp.tmpl 
-bluej/lib/spanish/templates/shell.tmpl 
bluej/lib/spanish/dialogues 
bluej/lib/spanish/exception.help 
bluej/lib/spanish/javac.help 
@@ -176,7 +242,6 @@ 
bluej/lib/swedish/templates/README 
bluej/lib/swedish/templates/readme.tmpl 
bluej/lib/swedish/templates/readmeexp.tmpl 
-bluej/lib/swedish/templates/shell.tmpl 
bluej/lib/swedish/dialogues 
bluej/lib/swedish/exception.help 
bluej/lib/swedish/javac.help 
@@ -185,7 +250,6 @@ 
bluej/lib/swedish/moe.help 
bluej/lib/antlr.jar 
bluej/lib/bluej.defs 
-bluej/lib/bluej.ico 
bluej/lib/bluej.jar 
bluej/lib/editor.jar 
bluej/lib/moe.defs 
@@ -200,6 +264,15 @@ 
@dirrm bluej/examples/picture 
@dirrm bluej/examples/shapes 
@dirrm bluej/examples 
+@dirrm bluej/lib/afrikaans/templates/newclass 
+@dirrm bluej/lib/afrikaans/templates 
+@dirrm bluej/lib/afrikaans 
+@dirrm bluej/lib/chinese/templates/newclass 
+@dirrm bluej/lib/chinese/templates 
+@dirrm bluej/lib/chinese 
+@dirrm bluej/lib/czech/templates/newclass 
+@dirrm bluej/lib/czech/templates 
+@dirrm bluej/lib/czech 
@dirrm bluej/lib/english/templates/newclass 
@dirrm bluej/lib/english/templates 
@dirrm bluej/lib/english 
@@ -207,6 +280,9 @@ 
@dirrm bluej/lib/german/templates 
@dirrm bluej/lib/german 
@dirrm bluej/lib/images 
+@dirrm bluej/lib/italian/templates/newclass 
+@dirrm bluej/lib/italian/templates 
+@dirrm bluej/lib/italian 
@dirrm bluej/lib/japanese/templates/newclass 
@dirrm bluej/lib/japanese/templates 
@dirrm bluej/lib/japanese 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50481 
State-Changed-From-To: open->closed 
State-Changed-By: glewis 
State-Changed-When: Thu Jul 10 09:19:47 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50481 
>Unformatted:
