diff --git a/games/linux-enemyterritory-jaymod-21/Makefile b/games/linux-enemyterritory-jaymod-21/Makefile
index 3c657adebce6..a96b0647f613 100644
--- a/games/linux-enemyterritory-jaymod-21/Makefile
+++ b/games/linux-enemyterritory-jaymod-21/Makefile
@@ -1,4 +1,4 @@
-# Created by:	alepulver
+# Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	jaymod
diff --git a/games/linux-enemyterritory-jaymod/Makefile b/games/linux-enemyterritory-jaymod/Makefile
index 022e867f7e83..8a313ae80b88 100644
--- a/games/linux-enemyterritory-jaymod/Makefile
+++ b/games/linux-enemyterritory-jaymod/Makefile
@@ -1,4 +1,4 @@
-# Created by:	alepulver
+# Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	jaymod
diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index 22d7dc3e307b..2ba30a853d2d 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -1,4 +1,4 @@
-# Created by:	alepulver
+# Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	omni-bot
@@ -26,6 +26,8 @@ NO_WRKSUBDIR=	yes
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}-${VERSTR}
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}-${VERSTR}
 
+.include <bsd.port.options.mk>
+
 do-build:
 .for f in et etded
 	@(${ECHO_CMD} "#!/bin/sh"; \
@@ -43,7 +45,7 @@ do-install:
 	cd ${WRKSRC}/omni-bot && ${CP} -R et global_scripts ${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/omnibot/qagame.mp.i386.so ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/omnibot/omnibot_et.pk3 ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .   for f in *.txt omni-bot/*.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index a12b5aedeec4..e4b02d56cfb8 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -1,4 +1,4 @@
-# Created by:	alepulver
+# Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	omni-bot
diff --git a/www/xpi-clear_cache_button/Makefile b/www/xpi-clear_cache_button/Makefile
index 6f1ff4a15f5e..59e1f65f0c7e 100644
--- a/www/xpi-clear_cache_button/Makefile
+++ b/www/xpi-clear_cache_button/Makefile
@@ -1,4 +1,4 @@
-# Created by:	Barbara Guida <bar@FreeBSD.org>
+# Created by: Barbara Guida <bar@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	clear_cache_button
diff --git a/www/xpi-flashblock/Makefile b/www/xpi-flashblock/Makefile
index 5d6182490296..63c7ca602d2f 100644
--- a/www/xpi-flashblock/Makefile
+++ b/www/xpi-flashblock/Makefile
@@ -1,4 +1,4 @@
-# Created by:	Simon Olofsson
+# Created by: Simon Olofsson
 # $FreeBSD$
 
 PORTNAME=	flashblock
diff --git a/www/xpi-server_spy/Makefile b/www/xpi-server_spy/Makefile
index d0e6580c75a0..6e8e2d49bbee 100644
--- a/www/xpi-server_spy/Makefile
+++ b/www/xpi-server_spy/Makefile
@@ -1,4 +1,4 @@
-# Created by:	Barbara Guida <bar@FreeBSD.org>
+# Created by: Barbara Guida <bar@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	server_spy
diff --git a/www/xpi-showip/Makefile b/www/xpi-showip/Makefile
index ed6402c94801..cab94214a781 100644
--- a/www/xpi-showip/Makefile
+++ b/www/xpi-showip/Makefile
@@ -1,4 +1,4 @@
-# Created by:	Barbara Guida <bar@FreeBSD.org>
+# Created by: Barbara Guida <bar@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	showip