14 files changed, 52 insertions, 56 deletions

diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 4d2d7bacfdc8..91f7d9536e1e 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -13,15 +13,12 @@ COMMENT=	A tool for adjusting the volume of wave/MP3 files to a standard level
 LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
 
 USE_BZIP2=		yes
-NO_STAGE=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-helper-search
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		normalize.1 normalize-mp3.1
-
 OPTIONS_DEFINE=	XMMS MP3 OGG FLAC NLS
 OPTIONS_DEFAULT=	MP3
 XMMS_DESC=	XMMS plugin
diff --git a/audio/normalize/pkg-plist b/audio/normalize/pkg-plist
index 2fa30b9482e2..12f593669bd3 100644
--- a/audio/normalize/pkg-plist
+++ b/audio/normalize/pkg-plist
@@ -5,3 +5,5 @@ bin/normalize-ogg
 %%NLS%%share/locale/fr/LC_MESSAGES/normalize.mo
 %%XMMS%%lib/xmms/Effect/librva.la
 %%XMMS%%lib/xmms/Effect/librva.so
+man/man1/normalize-mp3.1.gz
+man/man1/normalize.1.gz
diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
index bda09c845047..bc6a14738846 100644
--- a/audio/shorten/Makefile
+++ b/audio/shorten/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Fast and optionally lossless compression for waveform files
 RESTRICTED=	May not be sold, may not be used commercially.
 
 GNU_CONFIGURE=	yes
-NO_STAGE=	yes
 
-MAN1=		shorten.1
-PLIST_FILES=	bin/shorten
+PLIST_FILES=	bin/shorten \
+		man/man1/shorten.1.gz
 
 .include <bsd.port.mk>
diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 07b43254a899..afce23b90958 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -10,11 +10,9 @@ MASTER_SITES=	SF \
 MAINTAINER=	brg@dgate.org
 COMMENT=	MIPS R3000 simulator
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
-MAN1=		vmips.1 vmipstool.1
 INFO=		vmips
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/emulators/vmips/pkg-plist b/emulators/vmips/pkg-plist
index cbec002a9430..c6e224b5c514 100644
--- a/emulators/vmips/pkg-plist
+++ b/emulators/vmips/pkg-plist
@@ -5,4 +5,6 @@ include/vmips/asm_regnames.h
 @dirrm include/vmips
 %%DATADIR%%/ld.script
 %%DATADIR%%/setup.S
+man/man1/vmips.1.gz
+man/man1/vmipstool.1.gz
 @dirrm %%DATADIR%%
diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile
index 31ea476c078c..b297f8801aa4 100644
--- a/graphics/flam3/Makefile
+++ b/graphics/flam3/Makefile
@@ -15,14 +15,10 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
-MAN1=		flam3-animate.1 flam3-genome.1 flam3-render.1 flam3-convert.1
-MANCOMPRESSED=	no
-
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig
 
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CFLAGS+=	-I${LOCALBASE}/include/libpng15 -I${LOCALBASE}/include
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/graphics/flam3/pkg-plist b/graphics/flam3/pkg-plist
index 0e19af660400..661b56848b52 100644
--- a/graphics/flam3/pkg-plist
+++ b/graphics/flam3/pkg-plist
@@ -9,4 +9,8 @@ lib/libflam3.la
 lib/libflam3.a
 libdata/pkgconfig/flam3.pc
 share/flam3/flam3-palettes.xml
+man/man1/flam3-animate.1.gz
+man/man1/flam3-convert.1.gz
+man/man1/flam3-genome.1.gz
+man/man1/flam3-render.1.gz
 @dirrm share/flam3
diff --git a/mail/mlmmj/Makefile b/mail/mlmmj/Makefile
index af170a3804b8..b19f510c3527 100644
--- a/mail/mlmmj/Makefile
+++ b/mail/mlmmj/Makefile
@@ -13,9 +13,7 @@ COMMENT=	Mailing list managing made joyful
 
 LICENSE=	MIT
 
-.if defined(.PARSEDIR)
-USE_GMAKE=	yes
-.endif
+USES=	gmake
 
 .if defined(WITH_PHP_WEBINTERFACE)
 USE_PHP=	yes
@@ -47,13 +45,10 @@ PLIST_SUB+=	WEB=""
 .endif
 
 USE_BZIP2=	yes
-
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 
-MAN1=		mlmmj-bounce.1 mlmmj-list.1 mlmmj-maintd.1 mlmmj-make-ml.sh.1 mlmmj-process.1 mlmmj-recieve.1 mlmmj-send.1 mlmmj-sub.1 mlmmj-unsub.1
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -61,30 +56,30 @@ post-patch:
 
 post-install:
 .if defined(WITH_PERL_WEBINTERFACE)
-	@${MKDIR} ${PREFIX}/www/mlmmj/perl-admin
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/README ${PREFIX}/www/mlmmj/perl-admin
-	@${MKDIR} ${PREFIX}/www/mlmmj/perl-admin/htdocs
-	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/web/perl-admin/htdocs/* ${PREFIX}/www/mlmmj/perl-admin/htdocs
-	@${MKDIR} ${PREFIX}/www/mlmmj/perl-admin/templates
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/templates/* ${PREFIX}/www/mlmmj/perl-admin/templates
-	@${MKDIR} ${PREFIX}/www/mlmmj/perl-admin/conf
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/conf/* ${PREFIX}/www/mlmmj/perl-admin/conf
-	@${MKDIR} ${PREFIX}/www/mlmmj/perl-user
-	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/web/perl-user/mlmmj.cgi ${PREFIX}/www/mlmmj/perl-user
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-user/config.pl ${PREFIX}/www/mlmmj/perl-user
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-user/example.html ${PREFIX}/www/mlmmj/perl-user
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/perl-admin
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/README ${STAGEDIR}${PREFIX}/www/mlmmj/perl-admin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/perl-admin/htdocs
+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/web/perl-admin/htdocs/* ${STAGEDIR}${PREFIX}/www/mlmmj/perl-admin/htdocs
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/perl-admin/templates
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/templates/* ${STAGEDIR}${PREFIX}/www/mlmmj/perl-admin/templates
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/perl-admin/conf
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-admin/conf/* ${STAGEDIR}${PREFIX}/www/mlmmj/perl-admin/conf
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/perl-user
+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/web/perl-user/mlmmj.cgi ${STAGEDIR}${PREFIX}/www/mlmmj/perl-user
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-user/config.pl ${STAGEDIR}${PREFIX}/www/mlmmj/perl-user
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/perl-user/example.html ${STAGEDIR}${PREFIX}/www/mlmmj/perl-user
 .endif
 .if defined(WITH_PHP_WEBINTERFACE)
-	@${MKDIR} ${PREFIX}/www/mlmmj/php-user
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-user/* ${PREFIX}/www/mlmmj/php-user
-	@${MKDIR} ${PREFIX}/www/mlmmj/php-admin
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/README ${PREFIX}/www/mlmmj/php-admin
-	@${MKDIR} ${PREFIX}/www/mlmmj/php-admin/htdocs
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/htdocs/* ${PREFIX}/www/mlmmj/php-admin/htdocs
-	@${MKDIR} ${PREFIX}/www/mlmmj/php-admin/templates
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/templates/* ${PREFIX}/www/mlmmj/php-admin/templates
-	@${MKDIR} ${PREFIX}/www/mlmmj/php-admin/conf
-	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/conf/* ${PREFIX}/www/mlmmj/php-admin/conf
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/php-user
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-user/* ${STAGEDIR}${PREFIX}/www/mlmmj/php-user
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/php-admin
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/README ${STAGEDIR}${PREFIX}/www/mlmmj/php-admin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/php-admin/htdocs
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/htdocs/* ${STAGEDIR}${PREFIX}/www/mlmmj/php-admin/htdocs
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/php-admin/templates
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/templates/* ${STAGEDIR}${PREFIX}/www/mlmmj/php-admin/templates
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/mlmmj/php-admin/conf
+	@${INSTALL_DATA} ${WRKSRC}/contrib/web/php-admin/conf/* ${STAGEDIR}${PREFIX}/www/mlmmj/php-admin/conf
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/mlmmj/pkg-plist b/mail/mlmmj/pkg-plist
index 3bd13d826ecc..8b1a85c6fda2 100644
--- a/mail/mlmmj/pkg-plist
+++ b/mail/mlmmj/pkg-plist
@@ -382,6 +382,15 @@ bin/mlmmj-unsub
 %%PERLWEB%%@dirrm www/mlmmj/perl-admin/conf
 %%PERLWEB%%@dirrm www/mlmmj/perl-admin
 %%WEB%%@dirrm www/mlmmj
+man/man1/mlmmj-bounce.1.gz
+man/man1/mlmmj-list.1.gz
+man/man1/mlmmj-maintd.1.gz
+man/man1/mlmmj-make-ml.sh.1.gz
+man/man1/mlmmj-process.1.gz
+man/man1/mlmmj-recieve.1.gz
+man/man1/mlmmj-send.1.gz
+man/man1/mlmmj-sub.1.gz
+man/man1/mlmmj-unsub.1.gz
 @dirrm %%DATADIR%%/text.skel/cz
 @dirrm %%DATADIR%%/text.skel/da
 @dirrm %%DATADIR%%/text.skel/de
diff --git a/mail/movemail/Makefile b/mail/movemail/Makefile
index a0b4ea668826..d13e2cfd024e 100644
--- a/mail/movemail/Makefile
+++ b/mail/movemail/Makefile
@@ -10,9 +10,7 @@ MASTER_SITES=	http://wolfram.schneider.org/src/
 MAINTAINER=	wosch@FreeBSD.org
 COMMENT=	Move your mail box to another location
 
-MAN1=		movemail.1
-MANCOMPRESSED=	maybe
-PLIST_FILES=	bin/movemail
+PLIST_FILES=	bin/movemail \
+		man/man1/movemail.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index fc7f998fd817..db31ae61f339 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -17,8 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		cufilter.1
-MAN3=           Mail::CheckUser.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-CheckUser/pkg-plist b/mail/p5-Mail-CheckUser/pkg-plist
index 9d72ea31fdba..497cea77f5ca 100644
--- a/mail/p5-Mail-CheckUser/pkg-plist
+++ b/mail/p5-Mail-CheckUser/pkg-plist
@@ -1,6 +1,8 @@
 %%SITE_PERL%%/Mail/CheckUser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser/.packlist
 bin/cufilter
+%%PERL5_MAN3%%/Mail::CheckUser.3.gz
+man/man1/cufilter.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrmtry %%SITE_PERL%%/Mail
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 43fcba3d85f5..f7bebf69ac2c 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -18,10 +18,9 @@ AUTOMAKE_ARGS=	-a -i
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-MAN1=		geg.1
-PLIST_FILES=	bin/geg
+PLIST_FILES=	bin/geg \
+		man/man1/geg.1.gz
 
-NO_STAGE=	yes
 pre-configure:
 	@cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal
 
diff --git a/misc/stan/Makefile b/misc/stan/Makefile
index 1a45c75527ed..629f47107f2a 100644
--- a/misc/stan/Makefile
+++ b/misc/stan/Makefile
@@ -11,10 +11,9 @@ COMMENT=	Generate several statistical informations of a stream
 
 GNU_CONFIGURE=	yes
 
-MAN1=		stan.1
-PLIST_FILES=	bin/stan
+PLIST_FILES=	bin/stan \
+		man/man1/stan.1.gz
 
-NO_STAGE=	yes
 pre-configure:
 	${REINPLACE_CMD} -e "s|^CFLAGS =|CFLAGS ?=|g" \
 	${WRKSRC}/src/Makefile.in