diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 67e4fa91019a..ae25ededba80 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -12,22 +12,16 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ GUI development framework for X11 and Microsoft Windows
 
-USES=		gmake
+USES=		dos2unix gmake
 USE_XORG=	x11 xt xmu xaw
 MAKE_ENV=	INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
-USE_DOS2UNIX=	yes
 
 WRKSRC=		${WRKDIR}/home/vgui
 
 OPTIONS_DEFINE=	OPENGL # DOCS (commented out, see below)
 OPTIONS_DEFAULT=	OPENGL
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENGL}
-USE_GL=		glu
-.endif
+OPENGL_USE=	GL=glu
 
 post-patch:
 # For gmake>=3.82
@@ -45,37 +39,24 @@ pre-build:
 	@${MKDIR} ${WRKSRC}/obj/bsd ${WRKSRC}/objm/bsd ${WRKSRC}/lib/bsd \
 		${WRKSRC}/bin/bsd
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/viconedx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/b2v ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/icondemox ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/protox ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/tutappx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/vdrawx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/vdrawexx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/vgenx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/vtestlibx ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/lib/libVx.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/libVxgl.a ${PREFIX}/lib
-	@${MKDIR} ${PREFIX}/include/v
-	${INSTALL_DATA} ${WRKSRC}/includex/v/*.h ${PREFIX}/include/v
-	${INSTALL_DATA} ${WRKSRC}/includex/v/*.cxx ${PREFIX}/include/v
+post-build:
+	${RANLIB} ${WRKSRC}/lib/libVx.a
+	${RANLIB} ${WRKSRC}/lib/libVxgl.a
 
-post-install:
-	${RANLIB} ${PREFIX}/lib/libVx.a
-	${RANLIB} ${PREFIX}/lib/libVxgl.a
-#.if ${PORT_OPTIONS:MDOCS}
-#	@${ECHO_MSG} "==> Extra documentation WILL NOT be installed."
-#.else
-#	@${ECHO_MSG} "==> Installing extra docs under ${PREFIX}/share/doc/v..."
-##	@${MKDIR} ${PREFIX}/share/doc/v
-#	${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/v
-#	${FIND} ${PREFIX}/share/doc/v -type d -exec ${CHMOD} 755 {} \;
-#	${FIND} ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \;
-#	@${ECHO_MSG} "==> Extra docs installed.  Note, you will need *tex to read 'em."
-#.endif
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/viconedx ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/b2v ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/icondemox ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/protox ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/tutappx ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vdrawx ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vdrawexx ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vgenx ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vtestlibx ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/lib/libVx.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libVxgl.a ${STAGEDIR}${PREFIX}/lib
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/v
+	${INSTALL_DATA} ${WRKSRC}/includex/v/*.h ${STAGEDIR}${PREFIX}/include/v
+	${INSTALL_DATA} ${WRKSRC}/includex/v/*.cxx ${STAGEDIR}${PREFIX}/include/v
 
 .include <bsd.port.mk>