Date: Sun, 25 Nov 2012 17:05:17 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/173910: [PATCH] games/robocode: update to 1.7.4.4, take maintainership, OptionsNG, Desktop entry Message-ID: <20121125160520.B3AAC68B@hub.freebsd.org> Resent-Message-ID: <201211251610.qAPGA0cG057488@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173910
>Category: ports
>Synopsis: [PATCH] games/robocode: update to 1.7.4.4, take maintainership, OptionsNG, Desktop entry
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 25 16:10:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:
- Update to 1.7.4.4
- Take maintainership
Added file(s):
- files/pkg-message.in
Removed file(s):
- pkg-message
Makefile changed:
+EXTRACT_DEPENDS=winicontoppm:${PORTSDIR}/graphics/netpbm
+PORTDOCS=
+SUB_FILES= ${PORTNAME}.sh pkg-message
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>
+post-extract:
+.if ${PORT_OPTIONS:MDOCS}
Changed and refined:
do-install:
post-install:
pkg-message -> files/pkg-message.in
files/robocode.sh.in
pkg-descr
pkg-plist
Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
portlint -A
looks fine.
port test: clean
Can't give build log, because RedPorts not works at the time.
>Fix:
--- robocode-1.7.4.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/robocode/Makefile ./Makefile
--- /usr/ports/games/robocode/Makefile 2012-11-16 09:01:38.000000000 +0100
+++ ./Makefile 2012-11-25 16:50:26.000000000 +0100
@@ -2,43 +2,66 @@
# $FreeBSD: head/games/robocode/Makefile 307016 2012-11-05 16:12:25Z bdrewery $
PORTNAME= robocode
-PORTVERSION= 1.7.4.2
+PORTVERSION= 1.7.4.4
CATEGORIES= games java
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-setup
EXTRACT_SUFX= .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
+EXTRACT_DEPENDS=winicontoppm:${PORTSDIR}/graphics/netpbm
+
+USE_ZIP= yes
USE_JAVA= yes
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}" "${PORTNAME}" \
+ "${PORTNAME}" "Game;StrategyGame;" ${FALSE}
+
+.include <bsd.port.options.mk>
+
+post-extract:
+ @(cd ${WRKSRC} && \
+ ${LOCALBASE}/bin/winicontoppm -bestqual robocode.ico | \
+ ${LOCALBASE}/bin/pnmtopng > ${PORTNAME}.png)
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} ${WRKSRC}/${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 -ruN --exclude=CVS /usr/ports/games/robocode/distinfo ./distinfo
--- /usr/ports/games/robocode/distinfo 2012-11-16 09:01:38.000000000 +0100
+++ ./distinfo 2012-11-25 15:38:01.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (robocode-1.7.4.2-setup.jar) = f6bbdc998254ad19bd8dd6967473716c9a0e26f101c1ff2601509899be4c71c8
-SIZE (robocode-1.7.4.2-setup.jar) = 5127560
+SHA256 (robocode-1.7.4.4-setup.jar) = c972928e3f5c2e1cb2ef4ca044de8715d6cfa9ba2ab63164593a427b2dce783f
+SIZE (robocode-1.7.4.4-setup.jar) = 5187168
diff -ruN --exclude=CVS /usr/ports/games/robocode/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/games/robocode/files/pkg-message.in 1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-message.in 2012-11-25 15:00:53.000000000 +0100
@@ -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%%
+
+==============================================================================
\ No newline at end of file
diff -ruN --exclude=CVS /usr/ports/games/robocode/files/robocode.sh.in ./files/robocode.sh.in
--- /usr/ports/games/robocode/files/robocode.sh.in 2012-11-16 09:01:38.000000000 +0100
+++ ./files/robocode.sh.in 2012-11-25 14:30:51.000000000 +0100
@@ -1,6 +1,9 @@
#!/bin/sh
#
# $FreeBSD: head/games/robocode/files/robocode.sh.in 300896 2012-07-14 13:54:48Z beat $
+#
+
+export JAVA_VERSION="%%JAVA_VERSION%%"
-cd "%%DATADIR%%"
-JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar libs/robocode.jar "$@"
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \
+-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/libs/robocode.jar" "${@}"
diff -ruN --exclude=CVS /usr/ports/games/robocode/pkg-descr ./pkg-descr
--- /usr/ports/games/robocode/pkg-descr 2012-11-16 09:01:38.000000000 +0100
+++ ./pkg-descr 2012-11-24 23:15:59.000000000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/games/robocode/pkg-message ./pkg-message
--- /usr/ports/games/robocode/pkg-message 2012-11-16 09:01:38.000000000 +0100
+++ ./pkg-message 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/games/robocode/pkg-plist ./pkg-plist
--- /usr/ports/games/robocode/pkg-plist 2012-11-16 09:01:38.000000000 +0100
+++ ./pkg-plist 2012-11-25 16:51:56.000000000 +0100
@@ -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 @@
%%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 @@
%%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 @@
%%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 @@
%%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
@@ -259,5 +272,3 @@
@dirrm %%DATADIR%%/compilers
@dirrm %%DATADIR%%/battles
@dirrm %%DATADIR%%
-@exec mkdir -p %D/%%DATADIR%%/config
-@exec mkdir -p %D/%%DATADIR%%/compilers
--- robocode-1.7.4.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121125160520.B3AAC68B>