Upgrade to 1.2.0.

PR:		39956, 37922
Submitted by:	maintainer

4 files changed, 11 insertions, 24 deletions

diff --git a/java/bluej/Makefile b/java/bluej/Makefile
index 2a9b4004a1ff..6e884976ca19 100644
--- a/java/bluej/Makefile
+++ b/java/bluej/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bluej
-PORTVERSION=	1.1.6
+PORTVERSION=	1.2.0
 CATEGORIES=	java editors
 MASTER_SITES=	ftp://ftp.bluej.org/pub/bluej/ \
 		http://www.metaverse.nl/~ernst/ \
@@ -22,19 +22,16 @@ EXTRACT_ONLY=
 NO_BUILD=	yes
 
 # Called MY_JDK and MY_JDK_PORT so not to conflict with any other possible
-# defns in the ports system.
-MY_JDK=		linux-jdk1.3.1
-MY_JDK_PORT=	linux-sun-jdk13
+# definitions in the ports system.
+MY_JDK=		linux-jdk1.4.0.01
+MY_JDK_PORT=	linux-sun-jdk14
 RUN_DEPENDS=    ${LOCALBASE}/${MY_JDK}/bin/java:${PORTSDIR}/java/${MY_JDK_PORT}
 
 do-install:
 	@${LN} -s ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${PREFIX}/${DISTNAME}${EXTRACT_SUFX}
-	@${ECHO} ""
 	@${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}
-	@${PATCH} ${PREFIX}/bluej/bluej < ${FILESDIR}/bluej.diff
-	@${RM} -f ${PREFIX}/bluej/bluej.orig
 
 .include <bsd.port.mk>
diff --git a/java/bluej/distinfo b/java/bluej/distinfo
index eb798586e1b1..ab68dc0ee6c2 100644
--- a/java/bluej/distinfo
+++ b/java/bluej/distinfo
@@ -1 +1 @@
-MD5 (bluej-116.jar) = ba2e689e38c625959d55fa5a87af6fa0
+MD5 (bluej-120.jar) = a8cbd5bcfb544ea13fb31f2898cb15dd
diff --git a/java/bluej/files/bluej.diff b/java/bluej/files/bluej.diff
deleted file mode 100644
index 5ece2da71c34..000000000000
--- a/java/bluej/files/bluej.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- /usr/local/bluej/bluej.orig	Mon Feb  4 21:55:16 2002
-+++ /usr/local/bluej/bluej	Mon Feb  4 21:55:24 2002
-@@ -1,4 +1,4 @@
- #!/bin/sh
- APPBASE=/usr/local/bluej
- CP=$APPBASE/lib/bluej.jar:$APPBASE/lib/editor.jar:$APPBASE/lib/antlr.jar:$APPBASE/lib/MRJToolkitStubs.zip:/usr/local/linux-jdk1.3.1/lib/tools.jar
--/usr/local/linux-jdk1.3.1/bin/java -cp $CP -native bluej.Main $*
-+/usr/local/linux-jdk1.3.1/bin/java -cp $CP bluej.Main $*
diff --git a/java/bluej/pkg-plist b/java/bluej/pkg-plist
index be788cadceb9..c43473143301 100644
--- a/java/bluej/pkg-plist
+++ b/java/bluej/pkg-plist
@@ -1,6 +1,3 @@
-bluej/examples/appletClock/bluej.pkg
-bluej/examples/appletClock/Clock.java
-bluej/examples/appletClock/README.TXT
 bluej/examples/appletdemo/bluej.pkg
 bluej/examples/appletdemo/CaseConverter.java
 bluej/examples/appletdemo/README.TXT
@@ -8,6 +5,10 @@ bluej/examples/debugdemo/bluej.pkg
 bluej/examples/debugdemo/Car.java
 bluej/examples/debugdemo/Demo.java
 bluej/examples/debugdemo/README.TXT
+bluej/examples/file-reader/bluej.pkg
+bluej/examples/file-reader/FileReader.java
+bluej/examples/file-reader/README.TXT
+bluej/examples/file-reader/test.txt
 bluej/examples/hello/bluej.pkg
 bluej/examples/hello/Hello.java
 bluej/examples/hello/README.TXT
@@ -39,9 +40,6 @@ bluej/examples/picture/Picture.java
 bluej/examples/picture/README.TXT
 bluej/examples/picture/Square.java
 bluej/examples/picture/Triangle.java
-bluej/examples/reader/bluej.pkg
-bluej/examples/reader/Reader.java
-bluej/examples/reader/README.TXT
 bluej/examples/shapes/bluej.pkg
 bluej/examples/shapes/Canvas.java
 bluej/examples/shapes/Circle.java
@@ -193,14 +191,13 @@ bluej/lib/editor.jar
 bluej/lib/moe.defs
 bluej/lib/MRJToolkitStubs.zip
 bluej/bluej
-@dirrm bluej/examples/appletClock
 @dirrm bluej/examples/appletdemo
 @dirrm bluej/examples/debugdemo
+@dirrm bluej/examples/file-reader
 @dirrm bluej/examples/hello
 @dirrm bluej/examples/people
 @dirrm bluej/examples/people2
 @dirrm bluej/examples/picture
-@dirrm bluej/examples/reader
 @dirrm bluej/examples/shapes
 @dirrm bluej/examples
 @dirrm bluej/lib/english/templates/newclass
@@ -220,3 +217,4 @@ bluej/bluej
 @dirrm bluej/lib/swedish/templates
 @dirrm bluej/lib/swedish
 @dirrm bluej/lib
+@dirrm bluej