- Update to 1.0.7

- Fetch from SourceForge
- No longer RESTRICTED (now under Common Public License)
- SIZEify
- Set and use DATADIR for installing and in pkg-plist

PR:		79551
Submitted by:	Sam Lawrance <boris@brooknet.com.au>

4 files changed, 152 insertions, 202 deletions

diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index e481ff035f52..995d59412ccf 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	robocode
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.0.7
 CATEGORIES=	games java
-MASTER_SITES=	ftp://dragon.adtech.internet.ibm.com/pub/robocode/ \
-		http://robocode.alphaworks.ibm.com/
-DISTNAME=	robocode-setup
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=robocode
+DISTNAME=	${PORTNAME}-setup-${PORTVERSION}
 EXTRACT_SUFX=	.jar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,15 +23,14 @@ JAVA_RUN=	yes
 
 JAVAVM=		${JAVA_HOME}/bin/java
 JAVAJAR=	${JAVA_HOME}/bin/jar
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 USE_ZIP=	yes
 USE_XLIB=	yes
-RESTRICTED=	"Redistribution isn't permitted - see license for details"
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-NO_SIZE=	yes
 
-INSTFILES=	battles javadoc license.html robocode.ico \
+INSTFILES=	battles javadoc license robocode.ico \
 		robocode.jar robots templates versions.txt
 
 post-extract:
@@ -43,12 +41,9 @@ do-configure:
 		${FILESDIR}/robocode.sh > ${WRKDIR}/robocode.sh
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/java/robocode
+	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC} && ${TAR} -c -f - ${INSTFILES} | \
-		${TAR} --unlink -x -f - -C ${PREFIX}/share/java/robocode
+		${TAR} --unlink -x -f - -C ${DATADIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/robocode.sh ${PREFIX}/bin/robocode
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/games/robocode/distinfo b/games/robocode/distinfo
index ae67cb010f3e..9a8c78050276 100644
--- a/games/robocode/distinfo
+++ b/games/robocode/distinfo
@@ -1 +1,2 @@
-MD5 (robocode-setup.jar) = 00375d490bac25a18792ab607ab86bd1
+MD5 (robocode-setup-1.0.7.jar) = 3a0f545886dc40bb40fc382e6601e89c
+SIZE (robocode-setup-1.0.7.jar) = 3373280
diff --git a/games/robocode/pkg-message b/games/robocode/pkg-message
deleted file mode 100644
index 0397794dcd7c..000000000000
--- a/games/robocode/pkg-message
+++ /dev/null
@@ -1,82 +0,0 @@
-alphaWorks License Agreement
-
-Please read this IBM alphaWorks license agreement (called the
-"Agreement") carefully. Your use of the software or any related
-documentation (called the "Software") indicates your acceptance of
-the following terms and conditions. If you do not agree to these
-terms and conditions, you may not install or use the Software.
-
-Notice: The Software that is made available through the alphaWorks
-project is not generally available software. It has not undergone
-complete testing and may contain errors. It may not function properly
-and is subject to change or withdrawal at any time. No support or
-maintenance is provided with the Software. Do not install this
-software if you are not accustomed to using experimental software.
-
-The alphaWorks Software is made available without charge in the
-experimental stage in order to allow you to evaluate the Software
-in its developmental stage. We encourage your feedback and suggestions.
-
-1. Ownership and License.
-
-The Software is owned by International Business Machines Corporation
-or one of its subsidiaries ("IBM") and is copyrighted and licensed,
-not sold.
-
-IBM grants you a non-exclusive, non-transferable license to
-download the Software and use it only for your personal, non-commercial
-and lawful end use. Implied licenses are negated.
-
-You may copy the Software for backup only. You may not: 1) merge,
-distribute (for free or for sale) or sublicense the Software; 2)
-reverse assemble, reverse compile, or otherwise translate the
-Software.
-
-2. Term and Termination
-
-This Agreement will terminate ninety (90) days after the date
-on which you receive the Software. Upon such termination you will
-delete or destroy all copies of the Software.
-
-3. Warranty Disclaimer and Limitation of Liability
-
-IBM licenses the Software to you on an "as is" basis, without
-warranty of any kind. IBM hereby expressly disclaims all warranties
-or conditions, either express or implied, including, but not limited
-to, the implied warranties or conditions of merchantability and
-fitness for a particular purpose. You are solely responsible for
-determining the appropriateness of using this Software and assume
-all risks associated with the use of this Software, including but
-not limited to the risks of program errors, damage to or loss of
-data, programs or equipment, and unavailability or interruption of
-operations. Some jurisdictions do not allow for the exclusion or
-limitation of implied warranties, so the above limitations or
-exclusions may not apply to you.
-
-IBM will not be liable for any direct damages or for any special,
-incidental, or indirect damages or for any economic consequential
-damages (including lost profits or savings), even if IBM has been
-advised of the possibility of such damages. IBM will not be liable
-for the loss of, or damage to, your records or data, or any damages
-claimed by you based on a third party claim. Some jurisdictions do
-not allow for the exclusion or limitation of incidental or consequential
-damages, so the above limitations or exclusions may not apply to
-you.
-
-4. License Rights
-
-You hereby grant to IBM an irrevocable license under all
-intellectual property rights (including copyright) to use, copy,
-distribute, sublicense, display, perform and prepare derivative
-works based upon any feedback, including materials, fixes, error
-corrections, enhancements, suggestions and the like that you provide
-to IBM.
-
-5. General
-
-This Agreement is governed by the laws of the State of New York.
-
-This Agreement is the only understanding and agreement we have
-regarding your use of the Software. It supersedes all other
-communications, understandings or agreements we may have had prior
-to this Agreement.
diff --git a/games/robocode/pkg-plist b/games/robocode/pkg-plist
index 71a7cf7af301..c2bb8b8820cc 100644
--- a/games/robocode/pkg-plist
+++ b/games/robocode/pkg-plist
@@ -1,107 +1,143 @@
 bin/robocode
-share/java/robocode/battles/intro.battle
-share/java/robocode/battles/sample.battle
-share/java/robocode/javadoc/allclasses-frame.html
-share/java/robocode/javadoc/allclasses-noframe.html
-share/java/robocode/javadoc/constant-values.html
-share/java/robocode/javadoc/deprecated-list.html
-share/java/robocode/javadoc/help-doc.html
-share/java/robocode/javadoc/index-all.html
-share/java/robocode/javadoc/index.html
-share/java/robocode/javadoc/overview-summary.html
-share/java/robocode/javadoc/overview-tree.html
-share/java/robocode/javadoc/package-list
-share/java/robocode/javadoc/packages.html
-share/java/robocode/javadoc/robocode/AdvancedRobot.html
-share/java/robocode/javadoc/robocode/Bullet.html
-share/java/robocode/javadoc/robocode/BulletHitBulletEvent.html
-share/java/robocode/javadoc/robocode/BulletHitEvent.html
-share/java/robocode/javadoc/robocode/BulletMissedEvent.html
-share/java/robocode/javadoc/robocode/Condition.html
-share/java/robocode/javadoc/robocode/CustomEvent.html
-share/java/robocode/javadoc/robocode/DeathEvent.html
-share/java/robocode/javadoc/robocode/Droid.html
-share/java/robocode/javadoc/robocode/Event.html
-share/java/robocode/javadoc/robocode/GunTurnCompleteCondition.html
-share/java/robocode/javadoc/robocode/HitByBulletEvent.html
-share/java/robocode/javadoc/robocode/HitRobotEvent.html
-share/java/robocode/javadoc/robocode/HitWallEvent.html
-share/java/robocode/javadoc/robocode/MessageEvent.html
-share/java/robocode/javadoc/robocode/MoveCompleteCondition.html
-share/java/robocode/javadoc/robocode/RadarTurnCompleteCondition.html
-share/java/robocode/javadoc/robocode/Robocode.html
-share/java/robocode/javadoc/robocode/RobocodeFileOutputStream.html
-share/java/robocode/javadoc/robocode/RobocodeFileWriter.html
-share/java/robocode/javadoc/robocode/Robot.html
-share/java/robocode/javadoc/robocode/RobotDeathEvent.html
-share/java/robocode/javadoc/robocode/ScannedRobotEvent.html
-share/java/robocode/javadoc/robocode/SkippedTurnEvent.html
-share/java/robocode/javadoc/robocode/TeamRobot.html
-share/java/robocode/javadoc/robocode/TurnCompleteCondition.html
-share/java/robocode/javadoc/robocode/WinEvent.html
-share/java/robocode/javadoc/robocode/_AdvancedRadiansRobot.html
-share/java/robocode/javadoc/robocode/_AdvancedRobot.html
-share/java/robocode/javadoc/robocode/_Robot.html
-share/java/robocode/javadoc/robocode/package-frame.html
-share/java/robocode/javadoc/robocode/package-summary.html
-share/java/robocode/javadoc/robocode/package-tree.html
-share/java/robocode/javadoc/serialized-form.html
-share/java/robocode/javadoc/stylesheet.css
-share/java/robocode/license.html
-share/java/robocode/robocode.ico
-share/java/robocode/robocode.jar
-share/java/robocode/robots/sample/Corners.class
-share/java/robocode/robots/sample/Corners.java
-share/java/robocode/robots/sample/Corners.properties
-share/java/robocode/robots/sample/Crazy.class
-share/java/robocode/robots/sample/Crazy.java
-share/java/robocode/robots/sample/Crazy.properties
-share/java/robocode/robots/sample/Fire.class
-share/java/robocode/robots/sample/Fire.java
-share/java/robocode/robots/sample/Fire.properties
-share/java/robocode/robots/sample/MyFirstRobot.class
-share/java/robocode/robots/sample/MyFirstRobot.java
-share/java/robocode/robots/sample/MyFirstRobot.properties
-share/java/robocode/robots/sample/RamFire.class
-share/java/robocode/robots/sample/RamFire.java
-share/java/robocode/robots/sample/RamFire.properties
-share/java/robocode/robots/sample/SittingDuck.class
-share/java/robocode/robots/sample/SittingDuck.html
-share/java/robocode/robots/sample/SittingDuck.java
-share/java/robocode/robots/sample/SittingDuck.properties
-share/java/robocode/robots/sample/SpinBot.class
-share/java/robocode/robots/sample/SpinBot.java
-share/java/robocode/robots/sample/SpinBot.properties
-share/java/robocode/robots/sample/Target$1.class
-share/java/robocode/robots/sample/Target.class
-share/java/robocode/robots/sample/Target.java
-share/java/robocode/robots/sample/Target.properties
-share/java/robocode/robots/sample/TrackFire.class
-share/java/robocode/robots/sample/TrackFire.java
-share/java/robocode/robots/sample/TrackFire.properties
-share/java/robocode/robots/sample/Tracker.class
-share/java/robocode/robots/sample/Tracker.java
-share/java/robocode/robots/sample/Tracker.properties
-share/java/robocode/robots/sample/Walls.class
-share/java/robocode/robots/sample/Walls.java
-share/java/robocode/robots/sample/Walls.properties
-share/java/robocode/robots/sampleteam/MyFirstDroid.class
-share/java/robocode/robots/sampleteam/MyFirstDroid.java
-share/java/robocode/robots/sampleteam/MyFirstLeader.class
-share/java/robocode/robots/sampleteam/MyFirstLeader.java
-share/java/robocode/robots/sampleteam/MyFirstTeam.team
-share/java/robocode/robots/sampleteam/Point.class
-share/java/robocode/robots/sampleteam/Point.java
-share/java/robocode/robots/sampleteam/RobotColors.class
-share/java/robocode/robots/sampleteam/RobotColors.java
-share/java/robocode/templates/newjavafile.tpt
-share/java/robocode/templates/newrobot.tpt
-share/java/robocode/versions.txt
-@dirrm share/java/robocode/templates
-@dirrm share/java/robocode/robots/sampleteam
-@dirrm share/java/robocode/robots/sample
-@dirrm share/java/robocode/robots
-@dirrm share/java/robocode/javadoc/robocode
-@dirrm share/java/robocode/javadoc
-@dirrm share/java/robocode/battles
-@dirrm share/java/robocode
+%%DATADIR%%/battles/intro.battle
+%%DATADIR%%/battles/sample.battle
+%%DATADIR%%/javadoc/allclasses-frame.html
+%%DATADIR%%/javadoc/allclasses-noframe.html
+%%DATADIR%%/javadoc/constant-values.html
+%%DATADIR%%/javadoc/deprecated-list.html
+%%DATADIR%%/javadoc/help-doc.html
+%%DATADIR%%/javadoc/index-all.html
+%%DATADIR%%/javadoc/index.html
+%%DATADIR%%/javadoc/overview-tree.html
+%%DATADIR%%/javadoc/package-list
+%%DATADIR%%/javadoc/packages.html
+%%DATADIR%%/javadoc/resources/inherit.gif
+%%DATADIR%%/javadoc/robocode/class-use/AdvancedRobot.html
+%%DATADIR%%/javadoc/robocode/class-use/BulletHitBulletEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/BulletHitEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/BulletMissedEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/GunTurnCompleteCondition.html
+%%DATADIR%%/javadoc/robocode/class-use/CustomEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/MoveCompleteCondition.html
+%%DATADIR%%/javadoc/robocode/class-use/HitByBulletEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/RadarTurnCompleteCondition.html
+%%DATADIR%%/javadoc/robocode/class-use/RobocodeFileOutputStream.html
+%%DATADIR%%/javadoc/robocode/class-use/RobocodeFileWriter.html
+%%DATADIR%%/javadoc/robocode/class-use/RobotDeathEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/Condition.html
+%%DATADIR%%/javadoc/robocode/class-use/ScannedRobotEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/DeathEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/TurnCompleteCondition.html
+%%DATADIR%%/javadoc/robocode/class-use/HitRobotEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/HitWallEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/SkippedTurnEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/Bullet.html
+%%DATADIR%%/javadoc/robocode/class-use/Droid.html
+%%DATADIR%%/javadoc/robocode/class-use/Event.html
+%%DATADIR%%/javadoc/robocode/class-use/MessageEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/Robocode.html
+%%DATADIR%%/javadoc/robocode/class-use/TeamRobot.html
+%%DATADIR%%/javadoc/robocode/class-use/WinEvent.html
+%%DATADIR%%/javadoc/robocode/class-use/_AdvancedRadiansRobot.html
+%%DATADIR%%/javadoc/robocode/class-use/Robot.html
+%%DATADIR%%/javadoc/robocode/class-use/_AdvancedRobot.html
+%%DATADIR%%/javadoc/robocode/class-use/_Robot.html
+%%DATADIR%%/javadoc/robocode/AdvancedRobot.html
+%%DATADIR%%/javadoc/robocode/Bullet.html
+%%DATADIR%%/javadoc/robocode/BulletHitBulletEvent.html
+%%DATADIR%%/javadoc/robocode/BulletHitEvent.html
+%%DATADIR%%/javadoc/robocode/BulletMissedEvent.html
+%%DATADIR%%/javadoc/robocode/Condition.html
+%%DATADIR%%/javadoc/robocode/CustomEvent.html
+%%DATADIR%%/javadoc/robocode/DeathEvent.html
+%%DATADIR%%/javadoc/robocode/Droid.html
+%%DATADIR%%/javadoc/robocode/Event.html
+%%DATADIR%%/javadoc/robocode/GunTurnCompleteCondition.html
+%%DATADIR%%/javadoc/robocode/HitByBulletEvent.html
+%%DATADIR%%/javadoc/robocode/HitRobotEvent.html
+%%DATADIR%%/javadoc/robocode/HitWallEvent.html
+%%DATADIR%%/javadoc/robocode/MessageEvent.html
+%%DATADIR%%/javadoc/robocode/MoveCompleteCondition.html
+%%DATADIR%%/javadoc/robocode/RadarTurnCompleteCondition.html
+%%DATADIR%%/javadoc/robocode/Robocode.html
+%%DATADIR%%/javadoc/robocode/RobocodeFileOutputStream.html
+%%DATADIR%%/javadoc/robocode/RobocodeFileWriter.html
+%%DATADIR%%/javadoc/robocode/Robot.html
+%%DATADIR%%/javadoc/robocode/RobotDeathEvent.html
+%%DATADIR%%/javadoc/robocode/ScannedRobotEvent.html
+%%DATADIR%%/javadoc/robocode/SkippedTurnEvent.html
+%%DATADIR%%/javadoc/robocode/TeamRobot.html
+%%DATADIR%%/javadoc/robocode/TurnCompleteCondition.html
+%%DATADIR%%/javadoc/robocode/WinEvent.html
+%%DATADIR%%/javadoc/robocode/_AdvancedRadiansRobot.html
+%%DATADIR%%/javadoc/robocode/_AdvancedRobot.html
+%%DATADIR%%/javadoc/robocode/_Robot.html
+%%DATADIR%%/javadoc/robocode/package-frame.html
+%%DATADIR%%/javadoc/robocode/package-summary.html
+%%DATADIR%%/javadoc/robocode/package-tree.html
+%%DATADIR%%/javadoc/robocode/package-use.html
+%%DATADIR%%/javadoc/serialized-form.html
+%%DATADIR%%/javadoc/stylesheet.css
+%%DATADIR%%/license/cpl-v10.html
+%%DATADIR%%/robocode.ico
+%%DATADIR%%/robocode.jar
+%%DATADIR%%/robots/sample/Corners.class
+%%DATADIR%%/robots/sample/Corners.java
+%%DATADIR%%/robots/sample/Corners.properties
+%%DATADIR%%/robots/sample/Crazy.class
+%%DATADIR%%/robots/sample/Crazy.java
+%%DATADIR%%/robots/sample/Crazy.properties
+%%DATADIR%%/robots/sample/Fire.class
+%%DATADIR%%/robots/sample/Fire.java
+%%DATADIR%%/robots/sample/Fire.properties
+%%DATADIR%%/robots/sample/MyFirstRobot.class
+%%DATADIR%%/robots/sample/MyFirstRobot.java
+%%DATADIR%%/robots/sample/MyFirstRobot.properties
+%%DATADIR%%/robots/sample/RamFire.class
+%%DATADIR%%/robots/sample/RamFire.java
+%%DATADIR%%/robots/sample/RamFire.properties
+%%DATADIR%%/robots/sample/SittingDuck.data/count.dat
+%%DATADIR%%/robots/sample/SittingDuck.class
+%%DATADIR%%/robots/sample/SittingDuck.html
+%%DATADIR%%/robots/sample/SittingDuck.java
+%%DATADIR%%/robots/sample/SittingDuck.properties
+%%DATADIR%%/robots/sample/SpinBot.class
+%%DATADIR%%/robots/sample/SpinBot.java
+%%DATADIR%%/robots/sample/SpinBot.properties
+%%DATADIR%%/robots/sample/Target$1.class
+%%DATADIR%%/robots/sample/Target.class
+%%DATADIR%%/robots/sample/Target.java
+%%DATADIR%%/robots/sample/Target.properties
+%%DATADIR%%/robots/sample/TrackFire.class
+%%DATADIR%%/robots/sample/TrackFire.java
+%%DATADIR%%/robots/sample/TrackFire.properties
+%%DATADIR%%/robots/sample/Tracker.class
+%%DATADIR%%/robots/sample/Tracker.java
+%%DATADIR%%/robots/sample/Tracker.properties
+%%DATADIR%%/robots/sample/Walls.class
+%%DATADIR%%/robots/sample/Walls.java
+%%DATADIR%%/robots/sample/Walls.properties
+%%DATADIR%%/robots/sampleteam/MyFirstDroid.class
+%%DATADIR%%/robots/sampleteam/MyFirstDroid.java
+%%DATADIR%%/robots/sampleteam/MyFirstLeader.class
+%%DATADIR%%/robots/sampleteam/MyFirstLeader.java
+%%DATADIR%%/robots/sampleteam/MyFirstTeam.team
+%%DATADIR%%/robots/sampleteam/Point.class
+%%DATADIR%%/robots/sampleteam/Point.java
+%%DATADIR%%/robots/sampleteam/RobotColors.class
+%%DATADIR%%/robots/sampleteam/RobotColors.java
+%%DATADIR%%/templates/newjavafile.tpt
+%%DATADIR%%/templates/newrobot.tpt
+%%DATADIR%%/versions.txt
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/robots/sampleteam
+@dirrm %%DATADIR%%/robots/sample/SittingDuck.data
+@dirrm %%DATADIR%%/robots/sample
+@dirrm %%DATADIR%%/robots
+@dirrm %%DATADIR%%/license
+@dirrm %%DATADIR%%/javadoc/resources
+@dirrm %%DATADIR%%/javadoc/robocode/class-use
+@dirrm %%DATADIR%%/javadoc/robocode
+@dirrm %%DATADIR%%/javadoc
+@dirrm %%DATADIR%%/battles
+@dirrm %%DATADIR%%