Index: head/graphics/quat-gui/Makefile
===================================================================
--- head/graphics/quat-gui/Makefile	(revision 342321)
+++ head/graphics/quat-gui/Makefile	(revision 342322)
@@ -1,74 +1,71 @@
 # Created by: David Yeske <dyeske@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	quat
 PORTVERSION=	1.20
 PORTREVISION=	12
 CATEGORIES=	graphics
 #MASTER_SITES=	http://www.physcip.uni-stuttgart.de/phy11733/download/
 MASTER_SITES=	http://www.sourcefiles.org/Graphics/Fractals/
 PKGNAMESUFFIX=	-gui
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Three-dimensional fractal creator (X11 GUI)
 
 LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
 
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 USE_XORG=	xext
 USE_GL=		gl glut
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	FLUID="${LOCALBASE}/bin/fluid"
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/doc
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 PORTDOCS=	*
 PLIST_FILES=	bin/quat
 
 DESKTOP_ENTRIES="Quat" "3D Fractal Generator" "" "${PORTNAME}" "" ""
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e \
 		's,-(march=pentium|O3|ffast-math),,g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -E -e \
 		's|-I\.[[:space:]]+-I\$$\(srcdir\)[[:space:]]+||' \
 		${WRKSRC}/gui/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|<FL/fl_file_chooser.H>|<FL/Fl_File_Chooser.H>| ; \
 		 s|/doc/quat/|/doc/${UNIQUENAME}/|' \
 		${WRKSRC}/gui/MainWindow.cxx
 # disable data file installation since distfile does not do
 # The Right Thing(TM)
 	@${REINPLACE_CMD} -E -e \
 		's|^(install-data-am:).*$$|\1| ; \
 		 s|^(SUBDIRS.*)doc|\1|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|@PACKAGE@|${UNIQUENAME}|' \
 		${WRKSRC}/doc/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.endif
 
 .include <bsd.port.mk>
Index: head/lang/arena/Makefile
===================================================================
--- head/lang/arena/Makefile	(revision 342321)
+++ head/lang/arena/Makefile	(revision 342322)
@@ -1,22 +1,20 @@
 # Created by: Roman Bogorodskiy <novel@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	arena
 PORTVERSION=	0.9.13
 PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.minimalinux.org/arena/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	C-like scripting language with automatic memory management
 
 GNU_CONFIGURE=	yes
-MAN1=		arena.1
 
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=	--enable-pcre
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: head/lang/arena/pkg-plist
===================================================================
--- head/lang/arena/pkg-plist	(revision 342321)
+++ head/lang/arena/pkg-plist	(revision 342322)
@@ -1,4 +1,5 @@
 bin/arena
 %%DOCSDIR%%/manual.asc
 %%DOCSDIR%%/transform
+man/man1/arena.1.gz
 @dirrm %%DOCSDIR%%
Index: head/lang/slisp/Makefile
===================================================================
--- head/lang/slisp/Makefile	(revision 342321)
+++ head/lang/slisp/Makefile	(revision 342322)
@@ -1,19 +1,18 @@
 # Created by: Patrick Li <pat@databits.net>
 # $FreeBSD$
 
 PORTNAME=	slisp
 PORTVERSION=	1.2
 CATEGORIES=	lang lisp
 MASTER_SITES=	http://www.sigala.it/sandro/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple Lisp interpreter
 
 GNU_CONFIGURE=	yes
 
-MAN1=		${PORTNAME}.1
 INFO=		slisp
-PLIST_FILES=	bin/slisp
+PLIST_FILES=	bin/slisp \
+		man/man1/slisp.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: head/mail/jmba/Makefile
===================================================================
--- head/mail/jmba/Makefile	(revision 342321)
+++ head/mail/jmba/Makefile	(revision 342322)
@@ -1,21 +1,19 @@
 # Created by: Romain Tartiere <romain@blogreen.org>
 # $FreeBSD$
 
 PORTNAME=	jmba
 PORTVERSION=	0.5.5
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Junk Mail Buffering Agent
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=	gmake
 
-MAN1=	jmba.1
-PLIST_FILES=	bin/jmba
-MANCOMPRESSED=	yes
+PLIST_FILES=	bin/jmba \
+		man/man1/jmba.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: head/math/wcalc/Makefile
===================================================================
--- head/math/wcalc/Makefile	(revision 342321)
+++ head/math/wcalc/Makefile	(revision 342322)
@@ -1,28 +1,26 @@
 # Created by: Amarendra Godbole <amarendra.godbole@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	wcalc
 PORTVERSION=	2.4
 PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	SF/w-calc/Wcalc/${PORTVERSION}
 DISTNAME=	wcalc-${PORTVERSION}
 
 MAINTAINER=	amarendra.godbole@gmail.com
 COMMENT=	A natural-expression command-line calculator
 
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 		mpfr.4:${PORTSDIR}/math/mpfr
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN1=		wcalc.1
+PLIST_FILES=	bin/wcalc \
+		man/man1/wcalc.1.gz
 
-PLIST_FILES=	bin/wcalc
-
-NO_STAGE=	yes
 .include <bsd.port.mk>