diff -urN /usr/ports/games/nighthawk/Makefile games/nighthawk/Makefile
--- /usr/ports/games/nighthawk/Makefile	2013-11-06 22:01:24.000000000 +0900
+++ games/nighthawk/Makefile	2013-11-25 00:00:00.000000000 +0900
@@ -5,28 +5,24 @@
 PORTVERSION=	3.0.0
 PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	games/arcade
+MASTER_SITES=	SUNSITE/games/arcade
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An X11 shoot-'em up which requires some lateral thinking
+COMMENT=	X11 shoot-'em up which requires some lateral thinking
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
+USES=		gmake
 USE_GL=		glut
-USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" CPP="${CXX}" CC_FLAGS="${CXXFLAGS}" \
-		LIB_FLAGS="${LDFLAGS}"
-
-MAN6=		nighthawk.6
+		LIB_FLAGS="${LDFLAGS}" GCC="${CC}" CFLAGS="${CFLAGS}"
 
 CFLAGS+=	-DINSTALL_DIR=\\\"\${DATADIR}\\\" \
 		-DSCORES_FILE=\\\"/var/games/nighthawk.scores\\\" \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-lm -L${LOCALBASE}/lib -lX11 -lGL -lGLU -lglut
 
-NO_STAGE=	yes
 post-patch:
 	${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|make|$$(MAKE)|g ; \
@@ -36,16 +32,12 @@
 	${REINPLACE_CMD} -e 's|^|#|g' ${WRKSRC}/config.user
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/nighthawk ${PREFIX}/bin
-	${CHOWN} root:games ${PREFIX}/bin/nighthawk
-	${CHMOD} g+s ${PREFIX}/bin/nighthawk
-	${INSTALL_DATA} ${WRKSRC}/doc/nighthawk.6 ${MANPREFIX}/man/man6
-	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} nighthawk \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/doc &&  ${INSTALL_MAN} nighthawk.6 \
+		${STAGEDIR}${MANPREFIX}/man/man6)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} -C ${WRKSRC} --exclude ".xvpics" -cf - data | \
-		${TAR} -C ${DATADIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-	@${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-	@${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx
-	@${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
+		${TAR} -C ${STAGEDIR}${DATADIR} --unlink -xf -
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/nighthawk/pkg-plist games/nighthawk/pkg-plist
--- /usr/ports/games/nighthawk/pkg-plist	2013-11-06 22:01:24.000000000 +0900
+++ games/nighthawk/pkg-plist	2013-11-25 00:00:00.000000000 +0900
@@ -1,4 +1,11 @@
+@owner root
+@group games
+@mode 6755
 bin/nighthawk
+@owner
+@group
+@mode
+man/man6/nighthawk.6.gz
 %%DATADIR%%/data/Anoyle/Bridge.f
 %%DATADIR%%/data/Anoyle/Bridge.m
 %%DATADIR%%/data/Anoyle/Engineering.f
@@ -215,4 +222,4 @@
 @dirrm %%DATADIR%%/data/Anoyle
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@unexec if [ -s /var/games/nighthawk.scores ] || rm -f /var/games/nighthawk.scores
+@unexec if [ ! -s /var/games/nighthawk.scores ]; then rm -f /var/games/nighthawk.scores; fi