Index: head/games/omega/Makefile
===================================================================
--- head/games/omega/Makefile	(revision 332783)
+++ head/games/omega/Makefile	(revision 332784)
@@ -1,45 +1,32 @@
 # Created by: Andrey Zakhvatov <andy@icc.surw.chel.su>
 # $FreeBSD$
 
 PORTNAME=	omega
 PORTVERSION=	0.90.4
 CATEGORIES=	games
 MASTER_SITES=	http://www.alcyone.com/binaries/omega/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complex rogue-style game of dungeon exploration
 
-USES=		gmake	# to allow -jX builds (rules with multiple outputs)
+USES=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	# empty
 CFLAGS+=	-Wno-return-type
-MAN6=		omega.6
 
 MYPORTDOCS=	buglist.txt docs/compile.all docs/omega.txt docs/readme.1st \
 		docs/readme3 docs/readme4
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/omega ${PREFIX}/bin/omega-game
-	@${CHOWN} root:games ${PREFIX}/bin/omega-game
-	@${CHMOD} 2711 ${PREFIX}/bin/omega-game
-	${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${MANPREFIX}/man/man6
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}
-	@${RM} ${DATADIR}/license.old
-	@${CHMOD} 0460 ${DATADIR}/omega.hi
-	@${CHMOD} 0460 ${DATADIR}/omega.log
-	${CP} ${DATADIR}/omega.hi ${DATADIR}/omegahi.bak
-	@${CHMOD} 0460 ${DATADIR}/omegahi.bak
-	@${CHOWN} -R root:games ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${MYPORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/omega ${STAGEDIR}${PREFIX}/bin/omega-game
+	${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${STAGEDIR}${MANPREFIX}/man/man6
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
+	${CP} ${STAGEDIR}${DATADIR}/omega.hi ${STAGEDIR}${DATADIR}/omegahi.bak
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${MYPORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/omega/pkg-plist
===================================================================
--- head/games/omega/pkg-plist	(revision 332783)
+++ head/games/omega/pkg-plist	(revision 332784)
@@ -1,65 +1,69 @@
-@owner games
 @group games
-@mode 4711
+@mode 2711
 bin/omega-game
-@mode 666
+@mode
+@group
+@mode 460
 %%DATADIR%%/omega.hi
 %%DATADIR%%/omega.log
-@mode 600
 %%DATADIR%%/omegahi.bak
 @mode
+man/man6/omega.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/buglist.txt
 %%PORTDOCS%%%%DOCSDIR%%/compile.all
 %%PORTDOCS%%%%DOCSDIR%%/omega.txt
 %%PORTDOCS%%%%DOCSDIR%%/readme.1st
 %%PORTDOCS%%%%DOCSDIR%%/readme3
 %%PORTDOCS%%%%DOCSDIR%%/readme4
+@group games
 %%DATADIR%%/abyss.dat
 %%DATADIR%%/abyss.txt
 %%DATADIR%%/arena.dat
 %%DATADIR%%/circle.dat
 %%DATADIR%%/city.dat
 %%DATADIR%%/country.dat
 %%DATADIR%%/court.dat
 %%DATADIR%%/dlair.dat
 %%DATADIR%%/help1.txt
 %%DATADIR%%/help10.txt
 %%DATADIR%%/help11.txt
 %%DATADIR%%/help12.txt
 %%DATADIR%%/help13.txt
 %%DATADIR%%/help2.txt
 %%DATADIR%%/help3.txt
 %%DATADIR%%/help4.txt
 %%DATADIR%%/help5.txt
 %%DATADIR%%/help6.txt
 %%DATADIR%%/help7.txt
 %%DATADIR%%/help8.txt
 %%DATADIR%%/help9.txt
 %%DATADIR%%/home1.dat
 %%DATADIR%%/home2.dat
 %%DATADIR%%/home3.dat
 %%DATADIR%%/intro.txt
 %%DATADIR%%/lgpl.txt
+%%DATADIR%%/license.old
 %%DATADIR%%/license.txt
 %%DATADIR%%/maze1.dat
 %%DATADIR%%/maze2.dat
 %%DATADIR%%/maze3.dat
 %%DATADIR%%/maze4.dat
 %%DATADIR%%/misle.dat
 %%DATADIR%%/motd.txt
 %%DATADIR%%/scroll1.txt
 %%DATADIR%%/scroll2.txt
 %%DATADIR%%/scroll3.txt
 %%DATADIR%%/scroll4.txt
 %%DATADIR%%/speak.dat
 %%DATADIR%%/temple.dat
 %%DATADIR%%/thanks.txt
 %%DATADIR%%/update.txt
 %%DATADIR%%/village1.dat
 %%DATADIR%%/village2.dat
 %%DATADIR%%/village3.dat
 %%DATADIR%%/village4.dat
 %%DATADIR%%/village5.dat
 %%DATADIR%%/village6.dat
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
+@group
+%%PORTDOCS%%@dirrm %%DOCSDIR%%