- Update to version 0.531.

- Add ONLY_FOR_ARCHS_REASON.
- Remove unneeded OPTIONS (the only one was removed).

6 files changed, 12 insertions, 50 deletions

diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index d0eb3263c22c..cf362627591c 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	omni-bot
-PORTVERSION=	0.52
+PORTVERSION=	0.531
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
@@ -18,24 +18,14 @@ COMMENT=	Omni-Bot is a bot for Enemy Territory
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS_REASON=	is an i386 Linux binary
 USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	ETPUB "Enable ETPub support" off
-
 DATADIR=	${PREFIX}/lib/enemyterritory
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_ETPUB)
-RUN_DEPENDS+=	et-etpub:${PORTSDIR}/games/linux-enemyterritory-etpub
-PLIST_SUB+=	ETPUB=""
-.else
-PLIST_SUB+=	ETPUB="@comment "
-.endif
-
 do-build:
 .for f in et etded
 	@(${ECHO} "#!/bin/sh"; \
@@ -52,11 +42,6 @@ do-install:
 	${CP} -R ${WRKSRC}/omni-bot/et ${DATADIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/omnibot/qagame.mp.i386.so ${DATADIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/omnibot/omnibot_et.pk3 ${DATADIR}/${PORTNAME}
-.if defined(WITH_ETPUB)
-	cd ${DATADIR}/etpub && ${MV} qagame.mp.i386.so qagame.mp.i386.so.old
-	${INSTALL_PROGRAM} ${WRKSRC}/etpub/qagame.mp.i386.so ${DATADIR}/etpub
-	${INSTALL_DATA} ${WRKSRC}/etpub/omnibot_etpub.pk3 ${DATADIR}/etpub
-.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .   for f in *.txt omni-bot/*.txt
@@ -65,4 +50,4 @@ do-install:
 	${CP} -R ${WRKSRC}/omni-bot/docs ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/linux-enemyterritory-omni-bot-0660/distinfo b/games/linux-enemyterritory-omni-bot-0660/distinfo
index 4c37a376d40b..d0ad1b3d5f9d 100644
--- a/games/linux-enemyterritory-omni-bot-0660/distinfo
+++ b/games/linux-enemyterritory-omni-bot-0660/distinfo
@@ -1,3 +1,3 @@
-MD5 (omni-bot-0.52.zip) = 838f0a9f3850272cbe4a676cba39082e
-SHA256 (omni-bot-0.52.zip) = 483574eb92cc68c1a6a872b42648962dbbcce6f77cd98bc499324b3e5c8e88e2
-SIZE (omni-bot-0.52.zip) = 6209144
+MD5 (omni-bot-0.531.zip) = fce93e3ae84cf9d485b1d907f2e95ba5
+SHA256 (omni-bot-0.531.zip) = d5f9796594d40747f5de91ee280fde4ef83cc06cc8b756e1a7d7caab8f4d00dc
+SIZE (omni-bot-0.531.zip) = 3675469
diff --git a/games/linux-enemyterritory-omni-bot-0660/pkg-plist b/games/linux-enemyterritory-omni-bot-0660/pkg-plist
index da0117c7583b..e5b2e6d29b86 100644
--- a/games/linux-enemyterritory-omni-bot-0660/pkg-plist
+++ b/games/linux-enemyterritory-omni-bot-0660/pkg-plist
@@ -1,9 +1,5 @@
 bin/et-omni-bot
 bin/etded-omni-bot
-%%ETPUB%%@exec cd %D/%%DATADIR%%/etpub && mv qagame.mp.i386.so qagame.mp.i386.so.old
-%%ETPUB%%%%DATADIR%%/etpub/qagame.mp.i386.so
-%%ETPUB%%@unexec cd %D/%%DATADIR%%/etpub && mv qagame.mp.i386.so.old qagame.mp.i386.so
-%%ETPUB%%%%DATADIR%%/etpub/omnibot_etpub.pk3
 %%DATADIR%%/omni-bot/et/nav/et_custom_wps.zip
 %%DATADIR%%/omni-bot/et/nav/et_mapscripts.zip
 %%DATADIR%%/omni-bot/et/nav/et_official_wps.zip
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index d0eb3263c22c..cf362627591c 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	omni-bot
-PORTVERSION=	0.52
+PORTVERSION=	0.531
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alepulver
@@ -18,24 +18,14 @@ COMMENT=	Omni-Bot is a bot for Enemy Territory
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS_REASON=	is an i386 Linux binary
 USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	ETPUB "Enable ETPub support" off
-
 DATADIR=	${PREFIX}/lib/enemyterritory
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_ETPUB)
-RUN_DEPENDS+=	et-etpub:${PORTSDIR}/games/linux-enemyterritory-etpub
-PLIST_SUB+=	ETPUB=""
-.else
-PLIST_SUB+=	ETPUB="@comment "
-.endif
-
 do-build:
 .for f in et etded
 	@(${ECHO} "#!/bin/sh"; \
@@ -52,11 +42,6 @@ do-install:
 	${CP} -R ${WRKSRC}/omni-bot/et ${DATADIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/omnibot/qagame.mp.i386.so ${DATADIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/omnibot/omnibot_et.pk3 ${DATADIR}/${PORTNAME}
-.if defined(WITH_ETPUB)
-	cd ${DATADIR}/etpub && ${MV} qagame.mp.i386.so qagame.mp.i386.so.old
-	${INSTALL_PROGRAM} ${WRKSRC}/etpub/qagame.mp.i386.so ${DATADIR}/etpub
-	${INSTALL_DATA} ${WRKSRC}/etpub/omnibot_etpub.pk3 ${DATADIR}/etpub
-.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .   for f in *.txt omni-bot/*.txt
@@ -65,4 +50,4 @@ do-install:
 	${CP} -R ${WRKSRC}/omni-bot/docs ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/linux-enemyterritory-omni-bot/distinfo b/games/linux-enemyterritory-omni-bot/distinfo
index 4c37a376d40b..d0ad1b3d5f9d 100644
--- a/games/linux-enemyterritory-omni-bot/distinfo
+++ b/games/linux-enemyterritory-omni-bot/distinfo
@@ -1,3 +1,3 @@
-MD5 (omni-bot-0.52.zip) = 838f0a9f3850272cbe4a676cba39082e
-SHA256 (omni-bot-0.52.zip) = 483574eb92cc68c1a6a872b42648962dbbcce6f77cd98bc499324b3e5c8e88e2
-SIZE (omni-bot-0.52.zip) = 6209144
+MD5 (omni-bot-0.531.zip) = fce93e3ae84cf9d485b1d907f2e95ba5
+SHA256 (omni-bot-0.531.zip) = d5f9796594d40747f5de91ee280fde4ef83cc06cc8b756e1a7d7caab8f4d00dc
+SIZE (omni-bot-0.531.zip) = 3675469
diff --git a/games/linux-enemyterritory-omni-bot/pkg-plist b/games/linux-enemyterritory-omni-bot/pkg-plist
index da0117c7583b..e5b2e6d29b86 100644
--- a/games/linux-enemyterritory-omni-bot/pkg-plist
+++ b/games/linux-enemyterritory-omni-bot/pkg-plist
@@ -1,9 +1,5 @@
 bin/et-omni-bot
 bin/etded-omni-bot
-%%ETPUB%%@exec cd %D/%%DATADIR%%/etpub && mv qagame.mp.i386.so qagame.mp.i386.so.old
-%%ETPUB%%%%DATADIR%%/etpub/qagame.mp.i386.so
-%%ETPUB%%@unexec cd %D/%%DATADIR%%/etpub && mv qagame.mp.i386.so.old qagame.mp.i386.so
-%%ETPUB%%%%DATADIR%%/etpub/omnibot_etpub.pk3
 %%DATADIR%%/omni-bot/et/nav/et_custom_wps.zip
 %%DATADIR%%/omni-bot/et/nav/et_mapscripts.zip
 %%DATADIR%%/omni-bot/et/nav/et_official_wps.zip