- Update to version 1.8.0.0

- Add desktop entry file
- Respect DOCS global option
- Update pkg-message anf pkg-descr
- Give maintainership to submitter

PR:		ports/173910
Submitted by:	nemysis <nemysis@gmx.ch>

7 files changed, 91 insertions, 47 deletions

diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index 02e0b3647f54..aff9a0b0a1e5 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -2,43 +2,63 @@
 # $FreeBSD$
 
 PORTNAME=	robocode
-PORTVERSION=	1.7.4.2
+PORTVERSION=	1.8.0.0
 CATEGORIES=	games java
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}-setup
-EXTRACT_SUFX=	.jar
+MASTER_SITES=	SF \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}-setup.jar \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	java
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}-setup.jar
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A game for learning Java[tm] programming language
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Game for learning Java[tm] programming language
 
 LICENSE=	EPL
 
+USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.5+
 JAVA_EXTRACT=	yes
 JAVA_RUN=	yes
-
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-INSTFILES=	battles javadoc license robocode.ico \
-		libs robots templates versions.txt
+PORTDOCS=	ReadMe.html ReadMe.txt versions.md
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-SUB_FILES=	${PORTNAME}.sh
+SUB_FILES=	${PORTNAME}.sh pkg-message
+
+DESKTOP_ENTRIES="Robocode" "${COMMENT}" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" "Game;StrategyGame;" false
+
+.include <bsd.port.options.mk>
 
 do-install:
-	@cd ${WRKSRC} && \
-		${FIND} ${INSTFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \;
-	@cd ${WRKSRC} && \
-		${FIND} ${INSTFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+
+.for d in battles compilers javadoc libs license roborumble robots templates
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
+.endfor
+
+.for d in *.ico *.sh versions.md
+	@(${INSTALL_DATA} ${WRKSRC}/${d} ${DATADIR})
+.endfor
 
 post-install:
-	${MKDIR} -m a+rwx ${DATADIR}/compilers ${DATADIR}/config
-	${CAT} pkg-message
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+	${MKDIR} -m a+rwx ${DATADIR}/config
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/games/robocode/distinfo b/games/robocode/distinfo
index 1a076cbcbada..0abeee3dea2f 100644
--- a/games/robocode/distinfo
+++ b/games/robocode/distinfo
@@ -1,2 +1,4 @@
-SHA256 (robocode-1.7.4.2-setup.jar) = f6bbdc998254ad19bd8dd6967473716c9a0e26f101c1ff2601509899be4c71c8
-SIZE (robocode-1.7.4.2-setup.jar) = 5127560
+SHA256 (java/robocode-1.8.0.0-setup.jar) = d23ac510dbf67114d7598c842a4f2c215d1992cd2400d75b7db10707da143157
+SIZE (java/robocode-1.8.0.0-setup.jar) = 5249183
+SHA256 (java/robocode.png) = f828749aacde1f1ee58a0f838e1e0e60bf2950153e3891687ff8a1734d3fcfa7
+SIZE (java/robocode.png) = 1823
diff --git a/games/robocode/files/pkg-message.in b/games/robocode/files/pkg-message.in
new file mode 100644
index 000000000000..5a93609fdc05
--- /dev/null
+++ b/games/robocode/files/pkg-message.in
@@ -0,0 +1,18 @@
+==============================================================================
+
+Robocode has been installed.
+
+Robocode requires a java compiler. By default Robocode will look for
+the IBM Jikes compiler.
+
+You can override this in the Robocode compiler preferences menu:
+
+    Robot -> Editor -> Compiler -> Options -> Preferences
+
+
+After deinstallation, some files may stay in %%DATADIR%%,
+you can delete them with
+
+    /bin/rm -fr %%DATADIR%%
+
+==============================================================================
diff --git a/games/robocode/files/robocode.sh.in b/games/robocode/files/robocode.sh.in
index 2ec9adcb99c3..ba507f8d26f2 100644
--- a/games/robocode/files/robocode.sh.in
+++ b/games/robocode/files/robocode.sh.in
@@ -2,5 +2,7 @@
 #
 # $FreeBSD$
 
-cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar libs/robocode.jar "$@"
+export JAVA_VERSION="%%JAVA_VERSION%%"
+  
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
+-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/libs/robocode.jar" "${@}"
diff --git a/games/robocode/pkg-descr b/games/robocode/pkg-descr
index 4567c69ea3c5..f022a6e82306 100644
--- a/games/robocode/pkg-descr
+++ b/games/robocode/pkg-descr
@@ -1,6 +1,7 @@
-Build the best. Destroy the rest. In Robocode, you'll program a robotic
-battletank in Java[tm] for a fight to the finish. The game is designed to help
-you learn Java, and have fun doing it... from a simple 10 line robot to a very
-sophisticated, intelligent robot that destroys the competition!
+Robocode is a programming game, where the goal is to develop a robot battle tank
+to battle against other tanks in Java or .NET. The robot battles are running in
+real-time and on-screen.
+
+The motto of Robocode is: Build the best, destroy the rest!
 
 WWW: http://robocode.sourceforge.net/
diff --git a/games/robocode/pkg-message b/games/robocode/pkg-message
deleted file mode 100644
index 7bd01d2ff8a6..000000000000
--- a/games/robocode/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-
-	*****************************************************
-	This port requires a java compiler.  By default, 
-	robocode will look for the IBM Jikes compiler.
-
-	You can override this in the robocode compiler
-	preferences menu: 
-
-	Robot -> Editor -> Compiler -> Options -> Preferences
-	*****************************************************
diff --git a/games/robocode/pkg-plist b/games/robocode/pkg-plist
index c2abad54ef0d..416cf128065c 100644
--- a/games/robocode/pkg-plist
+++ b/games/robocode/pkg-plist
@@ -1,6 +1,8 @@
 bin/robocode
 %%DATADIR%%/battles/intro.battle
 %%DATADIR%%/battles/sample.battle
+%%DATADIR%%/compilers/CompilerTest.java
+%%DATADIR%%/compilers/ecj.jar
 %%DATADIR%%/javadoc/allclasses-frame.html
 %%DATADIR%%/javadoc/allclasses-noframe.html
 %%DATADIR%%/javadoc/constant-values.html
@@ -8,12 +10,10 @@ bin/robocode
 %%DATADIR%%/javadoc/help-doc.html
 %%DATADIR%%/javadoc/index-all.html
 %%DATADIR%%/javadoc/index.html
-%%DATADIR%%/javadoc/options
 %%DATADIR%%/javadoc/overview-frame.html
 %%DATADIR%%/javadoc/overview-summary.html
 %%DATADIR%%/javadoc/overview-tree.html
 %%DATADIR%%/javadoc/package-list
-%%DATADIR%%/javadoc/packages
 %%DATADIR%%/javadoc/resources/inherit.gif
 %%DATADIR%%/javadoc/robocode/AdvancedRobot.html
 %%DATADIR%%/javadoc/robocode/BattleEndedEvent.html
@@ -145,7 +145,7 @@ bin/robocode
 %%DATADIR%%/javadoc/serialized-form.html
 %%DATADIR%%/javadoc/stylesheet.css
 %%DATADIR%%/libs/codesize-1.1.jar
-%%DATADIR%%/libs/picocontainer-2.8.jar
+%%DATADIR%%/libs/picocontainer-2.14.2.jar
 %%DATADIR%%/libs/robocode.battle-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/robocode.core-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/robocode.host-%%PORTVERSION%%.jar
@@ -156,7 +156,16 @@ bin/robocode
 %%DATADIR%%/libs/robocode.ui.editor-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/roborumble.jar
 %%DATADIR%%/license/epl-v10.html
+%%DATADIR%%/meleerumble.sh
 %%DATADIR%%/robocode.ico
+%%DATADIR%%/robocode.sh
+%%DATADIR%%/roborumble.ico
+%%DATADIR%%/roborumble.sh
+%%DATADIR%%/roborumble/meleerumble.txt
+%%DATADIR%%/roborumble/roborumble.properties
+%%DATADIR%%/roborumble/roborumble.txt
+%%DATADIR%%/roborumble/teamrumble.txt
+%%DATADIR%%/roborumble/twinduel.txt
 %%DATADIR%%/robots/sample/Corners.class
 %%DATADIR%%/robots/sample/Corners.java
 %%DATADIR%%/robots/sample/Corners.properties
@@ -234,15 +243,19 @@ bin/robocode
 %%DATADIR%%/robots/sampleteam/Point.java
 %%DATADIR%%/robots/sampleteam/RobotColors.class
 %%DATADIR%%/robots/sampleteam/RobotColors.java
+%%DATADIR%%/teamrumble.sh
 %%DATADIR%%/templates/newjavafile.tpt
 %%DATADIR%%/templates/newjuniorrobot.tpt
 %%DATADIR%%/templates/newrobot.tpt
-%%DATADIR%%/versions.txt
+%%DATADIR%%/twinduel.sh
+%%DATADIR%%/versions.md
+share/pixmaps/robocode.png
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/robots/sampleteam
 @dirrm %%DATADIR%%/robots/sampleex
 @dirrm %%DATADIR%%/robots/sample
 @dirrm %%DATADIR%%/robots
+@dirrm %%DATADIR%%/roborumble
 @dirrm %%DATADIR%%/license
 @dirrm %%DATADIR%%/libs
 @dirrm %%DATADIR%%/javadoc/robocode/util
@@ -255,9 +268,7 @@ bin/robocode
 @dirrm %%DATADIR%%/javadoc/robocode
 @dirrm %%DATADIR%%/javadoc/resources
 @dirrm %%DATADIR%%/javadoc
-@dirrm %%DATADIR%%/config
+@dirrmtry %%DATADIR%%/config
 @dirrm %%DATADIR%%/compilers
 @dirrm %%DATADIR%%/battles
-@dirrm %%DATADIR%%
-@exec mkdir -p %D/%%DATADIR%%/config
-@exec mkdir -p %D/%%DATADIR%%/compilers
+@dirrmtry %%DATADIR%%