diff --git a/games/robocode-naval/Makefile b/games/robocode-naval/Makefile
index e00483e22b9d..74f826913135 100644
--- a/games/robocode-naval/Makefile
+++ b/games/robocode-naval/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	robocode
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-setup
 CATEGORIES=	games education java
 MASTER_SITES=	SF/${PORTNAME}/naval-robocode/${PORTVERSION}
 PKGNAMESUFFIX=	-naval
 EXTRACT_SUFX=	.jar
 DIST_SUBDIR=	java
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Game for learning Java[tm] programming language
 
 LICENSE=	EPL
 
 PORTSCOUT=	limit:^\d+\.\d+\.\d+$$
 
 USES=		cpe dos2unix zip
 CPE_VENDOR=	${PORTNAME}_project
 DOS2UNIX_GLOB=	*.css *.team *.properties package-list MANIFEST.MF
 USE_JAVA=	yes
 JAVA_EXTRACT=	yes
 JAVA_RUN=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}${PKGNAMESUFFIX}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-SUB_FILES=	${PORTNAME}-NavalRobocode pkg-deinstall pkg-message
+SUB_FILES=	${PORTNAME}-NavalRobocode pkg-message
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-NavalRobocode \
 		${STAGEDIR}${PREFIX}/bin/
 
 .for d in battles compilers javadoc libs license roborumble robots \
 	templates theme
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 
 .for f in *.ico *.sh ReadMe.* naval-robocode-versions.md
 	@(${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/desktop/robocodeRobocode.desktop \
 		${STAGEDIR}${DESKTOPDIR}/robocodeNavalRobocode.desktop
 	${INSTALL_DATA} ${WRKSRC}/desktop/robocode.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/robocode-naval.png
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}/config
 
 .include <bsd.port.mk>
diff --git a/games/robocode-naval/files/pkg-deinstall.in b/games/robocode-naval/files/pkg-deinstall.in
deleted file mode 100644
index a3c5ddb86cd6..000000000000
--- a/games/robocode-naval/files/pkg-deinstall.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-    echo ""
-    echo ""
-    echo "==============================================================================="
-    echo ""
-    echo "After deinstallation, some files may stay in %%DATADIR%%,"
-    echo "you can delete them with"
-    echo ""
-    echo "    /bin/rm -fr %%DATADIR%%"
-    echo ""
-    echo "==============================================================================="
-    echo ""
-fi
diff --git a/games/robocode-naval/files/pkg-message.in b/games/robocode-naval/files/pkg-message.in
index 8d19243f6475..6d3bf10b07da 100644
--- a/games/robocode-naval/files/pkg-message.in
+++ b/games/robocode-naval/files/pkg-message.in
@@ -1,18 +1,30 @@
 [
 { type: install
   message: <<EOM
 Naval Robocode has been installed.
 
 Naval Robocode requires a java compiler. By default Naval Robocode will
 look for the IBM Jikes compiler.
 
 You can override this in the Naval Robocode compiler preferences menu:
 
     Robot -> Editor -> Compiler -> Options -> Preferences
 
 Attention not all with Rumble games works, this is work in Progress.
 
 Have fun!
 EOM
+},
+{ type: remove
+  message: <<EOM
+===============================================================================
+
+After deinstallation, some files may stay in %%DATADIR%%,
+you can delete them with
+
+    /bin/rm -fr %%DATADIR%%
+
+===============================================================================
+EOM
 }
 ]
diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index 50781ba76b6b..c254c0346d73 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	robocode
 PORTVERSION=	1.9.4.5
+PORTREVISION=	1
 CATEGORIES=	games education java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${DISTVERSION}-setup.jar
 EXTRACT_SUFX=	# empty
 DIST_SUBDIR=	java
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Game for learning Java[tm] programming language
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/license/epl-v10.html
 
 USES=		cpe dos2unix zip:infozip
 CPE_VENDOR=	${PORTNAME}_project
 DOS2UNIX_GLOB=	*.css *.team *.properties package-list MANIFEST.MF
 USE_JAVA=	yes
 JAVA_EXTRACT=	yes
 JAVA_RUN=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 SUB_FILES=	${PORTNAME}-MeleeRumble ${PORTNAME}-RoboRumble \
 		${PORTNAME}-Robocode ${PORTNAME}-TeamRumble \
-		${PORTNAME}-TwinDuel pkg-deinstall pkg-message
+		${PORTNAME}-TwinDuel pkg-message
 
 do-install:
 	cd ${WRKDIR} && ${INSTALL_SCRIPT} ${SUB_FILES:Mrobocode-*} \
 		${STAGEDIR}${PREFIX}/bin/
 
 .for d in battles compilers javadoc libs license roborumble robots \
 	templates theme
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 
 .for f in *.ico *.sh ReadMe.* versions.md
 	@(${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR})
 .endfor
 
 	${INSTALL_DATA} ${WRKSRC}/desktop/*.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/desktop/*.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}/config
 
 .include <bsd.port.mk>
diff --git a/games/robocode/files/pkg-deinstall.in b/games/robocode/files/pkg-deinstall.in
deleted file mode 100644
index a3c5ddb86cd6..000000000000
--- a/games/robocode/files/pkg-deinstall.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-    echo ""
-    echo ""
-    echo "==============================================================================="
-    echo ""
-    echo "After deinstallation, some files may stay in %%DATADIR%%,"
-    echo "you can delete them with"
-    echo ""
-    echo "    /bin/rm -fr %%DATADIR%%"
-    echo ""
-    echo "==============================================================================="
-    echo ""
-fi
diff --git a/games/robocode/files/pkg-message.in b/games/robocode/files/pkg-message.in
index 2e2deb1b920c..134496daba38 100644
--- a/games/robocode/files/pkg-message.in
+++ b/games/robocode/files/pkg-message.in
@@ -1,19 +1,31 @@
 [
 { type: install
   message: <<EOM
 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
 
 
 Attention not all with Rumble games works, this is work in Progress.
 
 Have fun!
 EOM
+},
+{ type: remove
+  message: <<EOM
+===============================================================================
+
+After deinstallation, some files may stay in %%DATADIR%%,
+you can delete them with
+
+    /bin/rm -fr %%DATADIR%%
+
+===============================================================================
+EOM
 }
 ]