- Support staging

- Break lines after 80 chars

2 files changed, 78 insertions, 75 deletions

diff --git a/java/bluej/Makefile b/java/bluej/Makefile
index c48328d663a1..5e9667ea11e9 100644
--- a/java/bluej/Makefile
+++ b/java/bluej/Makefile
@@ -19,12 +19,15 @@ NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
-NO_STAGE=	yes
 do-install:
-	@${ECHO} Starting BlueJ graphical installer...  Please install to default path of
-	@${ECHO} ${PREFIX}/bluej.  Close the installer when done.
-	@cd ${PREFIX}; ${JAVA_HOME}/bin/java -jar ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-	-@${MKDIR} ${PREFIX}/bin
-	@${LN} -sf ${PREFIX}/bluej/bluej ${PREFIX}/bin/bluej
+	@${ECHO} Starting BlueJ graphical installer...  
+	@${ECHO} Please install to default path of
+	@${ECHO} ${STAGEDIR}${PREFIX}/bluej.
+	@${ECHO} Close the installer when done.
+	@cd ${STAGEDIR}${PREFIX}; ${JAVA_HOME}/bin/java \
+		-jar ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
+	-@${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	@${LN} -sf ${STAGEDIR}${PREFIX}/bluej/bluej \
+		${STAGEDIR}${PREFIX}/bin/bluej
 
 .include <bsd.port.mk>
diff --git a/java/bluej/pkg-plist b/java/bluej/pkg-plist
index 1bfd7056cb70..6e4f897afcae 100644
--- a/java/bluej/pkg-plist
+++ b/java/bluej/pkg-plist
@@ -431,72 +431,72 @@ bluej/lib/swedish/templates/readme.tmpl
 bluej/lib/trilead.jar
 bluej/lib/userlib/README.TXT
 bluej/lib/windowtofront.js
-@dirrm bluej/lib/userlib
-@dirrm bluej/lib/swedish/templates/newclass
-@dirrm bluej/lib/swedish/templates
-@dirrm bluej/lib/swedish
-@dirrm bluej/lib/spanish/templates/newclass
-@dirrm bluej/lib/spanish/templates
-@dirrm bluej/lib/spanish
-@dirrm bluej/lib/slovak/templates/newclass
-@dirrm bluej/lib/slovak/templates
-@dirrm bluej/lib/slovak
-@dirrm bluej/lib/russian/templates/newclass
-@dirrm bluej/lib/russian/templates
-@dirrm bluej/lib/russian
-@dirrm bluej/lib/portuguese/templates/newclass
-@dirrm bluej/lib/portuguese/templates
-@dirrm bluej/lib/portuguese
-@dirrm bluej/lib/korean/templates/newclass
-@dirrm bluej/lib/korean/templates
-@dirrm bluej/lib/korean
-@dirrm bluej/lib/japanese/templates/newclass
-@dirrm bluej/lib/japanese/templates
-@dirrm bluej/lib/japanese
-@dirrm bluej/lib/italian/templates/newclass
-@dirrm bluej/lib/italian/templates
-@dirrm bluej/lib/italian
-@dirrm bluej/lib/images
-@dirrm bluej/lib/greek/templates/newclass
-@dirrm bluej/lib/greek/templates
-@dirrm bluej/lib/greek
-@dirrm bluej/lib/german/templates/newclass
-@dirrm bluej/lib/german/templates
-@dirrm bluej/lib/german
-@dirrm bluej/lib/french/templates/newclass
-@dirrm bluej/lib/french/templates
-@dirrm bluej/lib/french
-@dirrm bluej/lib/extensions
-@dirrm bluej/lib/english/templates/newclass
-@dirrm bluej/lib/english/templates
-@dirrm bluej/lib/english
-@dirrm bluej/lib/dutch/templates/newclass
-@dirrm bluej/lib/dutch/templates
-@dirrm bluej/lib/dutch
-@dirrm bluej/lib/danish/templates/newclass
-@dirrm bluej/lib/danish/templates
-@dirrm bluej/lib/danish
-@dirrm bluej/lib/czech/templates/newclass
-@dirrm bluej/lib/czech/templates
-@dirrm bluej/lib/czech
-@dirrm bluej/lib/chinese/templates/newclass
-@dirrm bluej/lib/chinese/templates
-@dirrm bluej/lib/chinese
-@dirrm bluej/lib/catalan/templates/newclass
-@dirrm bluej/lib/catalan/templates
-@dirrm bluej/lib/catalan
-@dirrm bluej/lib/afrikaans/templates/newclass
-@dirrm bluej/lib/afrikaans/templates
-@dirrm bluej/lib/afrikaans
-@dirrm bluej/lib
-@dirrm bluej/icons
-@dirrm bluej/examples/shapes
-@dirrm bluej/examples/picture
-@dirrm bluej/examples/people2
-@dirrm bluej/examples/people
-@dirrm bluej/examples/hello
-@dirrm bluej/examples/file-reader
-@dirrm bluej/examples/debugdemo
-@dirrm bluej/examples/appletdemo
-@dirrm bluej/examples
-@dirrm bluej
+@dirrmtry bluej/lib/userlib
+@dirrmtry bluej/lib/swedish/templates/newclass
+@dirrmtry bluej/lib/swedish/templates
+@dirrmtry bluej/lib/swedish
+@dirrmtry bluej/lib/spanish/templates/newclass
+@dirrmtry bluej/lib/spanish/templates
+@dirrmtry bluej/lib/spanish
+@dirrmtry bluej/lib/slovak/templates/newclass
+@dirrmtry bluej/lib/slovak/templates
+@dirrmtry bluej/lib/slovak
+@dirrmtry bluej/lib/russian/templates/newclass
+@dirrmtry bluej/lib/russian/templates
+@dirrmtry bluej/lib/russian
+@dirrmtry bluej/lib/portuguese/templates/newclass
+@dirrmtry bluej/lib/portuguese/templates
+@dirrmtry bluej/lib/portuguese
+@dirrmtry bluej/lib/korean/templates/newclass
+@dirrmtry bluej/lib/korean/templates
+@dirrmtry bluej/lib/korean
+@dirrmtry bluej/lib/japanese/templates/newclass
+@dirrmtry bluej/lib/japanese/templates
+@dirrmtry bluej/lib/japanese
+@dirrmtry bluej/lib/italian/templates/newclass
+@dirrmtry bluej/lib/italian/templates
+@dirrmtry bluej/lib/italian
+@dirrmtry bluej/lib/images
+@dirrmtry bluej/lib/greek/templates/newclass
+@dirrmtry bluej/lib/greek/templates
+@dirrmtry bluej/lib/greek
+@dirrmtry bluej/lib/german/templates/newclass
+@dirrmtry bluej/lib/german/templates
+@dirrmtry bluej/lib/german
+@dirrmtry bluej/lib/french/templates/newclass
+@dirrmtry bluej/lib/french/templates
+@dirrmtry bluej/lib/french
+@dirrmtry bluej/lib/extensions
+@dirrmtry bluej/lib/english/templates/newclass
+@dirrmtry bluej/lib/english/templates
+@dirrmtry bluej/lib/english
+@dirrmtry bluej/lib/dutch/templates/newclass
+@dirrmtry bluej/lib/dutch/templates
+@dirrmtry bluej/lib/dutch
+@dirrmtry bluej/lib/danish/templates/newclass
+@dirrmtry bluej/lib/danish/templates
+@dirrmtry bluej/lib/danish
+@dirrmtry bluej/lib/czech/templates/newclass
+@dirrmtry bluej/lib/czech/templates
+@dirrmtry bluej/lib/czech
+@dirrmtry bluej/lib/chinese/templates/newclass
+@dirrmtry bluej/lib/chinese/templates
+@dirrmtry bluej/lib/chinese
+@dirrmtry bluej/lib/catalan/templates/newclass
+@dirrmtry bluej/lib/catalan/templates
+@dirrmtry bluej/lib/catalan
+@dirrmtry bluej/lib/afrikaans/templates/newclass
+@dirrmtry bluej/lib/afrikaans/templates
+@dirrmtry bluej/lib/afrikaans
+@dirrmtry bluej/lib
+@dirrmtry bluej/icons
+@dirrmtry bluej/examples/shapes
+@dirrmtry bluej/examples/picture
+@dirrmtry bluej/examples/people2
+@dirrmtry bluej/examples/people
+@dirrmtry bluej/examples/hello
+@dirrmtry bluej/examples/file-reader
+@dirrmtry bluej/examples/debugdemo
+@dirrmtry bluej/examples/appletdemo
+@dirrmtry bluej/examples
+@dirrmtry bluej