Convert most NO_INSTALL_MANPAGES to USES=imake:noman

With hat:	portmgr

46 files changed, 46 insertions, 145 deletions

diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index 34a2e4d..c2b7f90 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -15,13 +15,7 @@ LIB_DEPENDS=	libopenobex.so:${PORTSDIR}/comms/openobex \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		iconv readline
-PLIST_FILES=	bin/obexapp
-
-.if !defined(NO_INSTALL_MANPAGES)
-PLIST_FILES+=	man/man1/obexapp.1.gz
-.else
-MAKE_ENV+=	NO_MAN=yes
-.endif
+PLIST_FILES=	bin/obexapp man/man1/obexapp.1.gz
 
 MAKE_ENV+=	NO_WERROR=yes
 
diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index ebfa8d1..bedb889 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -52,9 +52,7 @@ do-install:
 .if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
-.if !defined(NO_INSTALL_MANPAGES)
 	${INSTALL_MAN} ${WRKSRC}/man/cscout.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/cswc.1 ${STAGEDIR}${PREFIX}/man/man1
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/cvs2cl/Makefile b/devel/cvs2cl/Makefile
index 4dfa700..bbbf52f 100644
--- a/devel/cvs2cl/Makefile
+++ b/devel/cvs2cl/Makefile
@@ -32,9 +32,7 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-.if !defined(NO_INSTALL_MANPAGES)
 	@pod2man ${WRKSRC}/${PORTNAME} > ${WRKSRC}/${PORTNAME}.1
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 3ceb6b6..5a6d897 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -48,12 +48,10 @@ PLIST_FILES=	bin/mtn bin/mtn-cleanup bin/mtnopt \
 		"@dirrmtry share/zsh/site-functions" \
 		"@dirrm share/monotone/scripts" \
 		"@dirrm share/monotone"
-.if !defined(NO_INSTALL_MANPAGES)
 INFO=		monotone
 PLIST_FILES+=	man/man1/mtn.1.gz \
 		man/man1/mtn-cleanup.1.gz \
 		man/man1/mtnopt.1.gz
-.endif
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS NLS
@@ -78,11 +76,6 @@ post-patch:
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -Ee '/^install-(contrib|examples)-data:/{' -e 'n' -e 'd' -e '}' ${WRKSRC}/Makefile.in
 .endif
-.if defined(NO_INSTALL_MANPAGES)
-	${REINPLACE_CMD} -Ee '/^install-(info|man): /s/ install-.*$$//' ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \
-	-e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in
-.endif
 	${REINPLACE_CMD} \
 		-e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \
 		-e "s/std::tr1::/std::/g" \
diff --git a/devel/pmccabe/Makefile b/devel/pmccabe/Makefile
index 9eab8e6..f808b9a 100644
--- a/devel/pmccabe/Makefile
+++ b/devel/pmccabe/Makefile
@@ -25,10 +25,8 @@ do-install:
 .for f in ${SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.if !defined(NO_INSTALL_MANPAGES)
-. for f in ${MANPAGE}
+.for f in ${MANPAGE}
 	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${MANPREFIX}/man/man1
-. endfor
-.endif
+.endfor
 
 .include <bsd.port.mk>
diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index a6e6224..36ff867 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -37,8 +37,6 @@ USE_PYDISTUTILS=	yes
 PYDISTUTILS_INSTALLARGS+=	--install-data=${PREFIX}/share
 PYDISTUTILS_AUTOPLIST=	yes
 
-NO_INSTALL_MANPAGES=	yes
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/libnamebench/util.py
diff --git a/emulators/dynamips-devel/Makefile b/emulators/dynamips-devel/Makefile
index f08b936..cc1fc10 100644
--- a/emulators/dynamips-devel/Makefile
+++ b/emulators/dynamips-devel/Makefile
@@ -27,10 +27,8 @@ PLIST_FILES=	bin/${PORTNAME} bin/nvram_export
 .if !defined(NOPORTDOCS)
 PORTDOCS=	README README.hypervisor
 .endif
-.if !defined(NO_INSTALL_MANPAGES)
 MAN1=		${PORTNAME}.1 nvram_export.1
 MAN7=		hypervisor_mode.7
-.endif
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
@@ -68,10 +66,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.hypervisor ${DOCSDIR}
 .endif
-.if !defined(NO_INSTALL_MANPAGES)
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/nvram_export.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/hypervisor_mode.7 ${PREFIX}/man/man7
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/antipolix/Makefile b/games/antipolix/Makefile
index e85e263..a731934 100644
--- a/games/antipolix/Makefile
+++ b/games/antipolix/Makefile
@@ -13,9 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple multiplayer game for X Window System
 
 NO_WRKSUBDIR=	yes
-USES=		imake
+USES=		imake:noman
 USE_XORG=	x11
-NO_INSTALL_MANPAGES=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/games/cosmo/Makefile b/games/cosmo/Makefile
index c183018..64d845f 100644
--- a/games/cosmo/Makefile
+++ b/games/cosmo/Makefile
@@ -22,9 +22,8 @@ NO_CDROM=	Possible copyright infringement
 
 WRKSRC=		${WRKDIR}/cosmo2
 DIST_SUBDIR=	cosmo
-USES=		imake:notall
+USES=		imake:notall,noman
 USE_XORG=	x11 xext
-NO_INSTALL_MANPAGES=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/cosmo
diff --git a/games/wmeyes/Makefile b/games/wmeyes/Makefile
index ae08b29..be52c17 100644
--- a/games/wmeyes/Makefile
+++ b/games/wmeyes/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	http://www.bstern.org/wmeyes/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	World's most useless WindowMaker dock app
 
-USES=		imake
+USES=		imake:noman
 USE_XORG=	xpm xmu
-NO_INSTALL_MANPAGES=	yes
 
 PORTDOCS=	README
 PLIST_FILES=	bin/wmeyes
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index ff4f2fe..228bd81 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Block action game
 
 WRKSRC=		${WRKDIR}/xdeblo_v1.0
 
-USES=		imake
+USES=		imake:noman
 USE_XORG=	xpm
-NO_INSTALL_MANPAGES=	yes
 CFLAGS+=	-Wno-return-type
 
 post-patch:
diff --git a/games/xisola/Makefile b/games/xisola/Makefile
index 3f065fb..c6285cf 100644
--- a/games/xisola/Makefile
+++ b/games/xisola/Makefile
@@ -12,9 +12,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple board game for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USES=		imake
+USES=		imake:noman
 USE_XORG=	x11 xext xaw xmu xt sm ice
-NO_INSTALL_MANPAGES=	yes
 
 PLIST_FILES=	bin/xisola
 PORTDOCS=	README
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index ed91726..c075022 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -11,9 +11,8 @@ MASTER_SITE_SUBDIR=	X11/demos
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	O. J. Simpson Simulator root window demo
 
-USES=		imake tar:tgz
+USES=		imake:noman tar:tgz
 USE_XORG=	xaw
-NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xoj
 
 .include <bsd.port.mk>
diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile
index b758497..9bb82b9 100644
--- a/games/xpuzzletama/Makefile
+++ b/games/xpuzzletama/Makefile
@@ -17,9 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Puzzle tama, a Tetris like game
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USES=		imake
+USES=		imake:noman
 USE_XORG=	xpm
-NO_INSTALL_MANPAGES=	yes
 
 PLIST_FILES=	bin/xpuzzletama lib/X11/xpuzzletama/tama_score
 PLIST_DIRS=	lib/X11/xpuzzletama
diff --git a/games/xspacewarp/Makefile b/games/xspacewarp/Makefile
index 280e090..969d65f 100644
--- a/games/xspacewarp/Makefile
+++ b/games/xspacewarp/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	XCONTRIB/games
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Time Trek - like game for X Window System
 
-USES=		imake
+USES=		imake:noman
 USE_XORG=	x11 xaw xext xmu xt xpm sm ice
-NO_INSTALL_MANPAGES=	yes
 
 PLIST_FILES=	bin/xspacewarp \
 		lib/X11/app-defaults/XSpacewarp
diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile
index 5bb57f6..4c48b9a 100644
--- a/graphics/cfdg/Makefile
+++ b/graphics/cfdg/Makefile
@@ -20,7 +20,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 WRKSRC=		${WRKDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 USES=		gmake tar:tgz
-NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/cfdg
 
 PORTEXAMPLES=	*
diff --git a/graphics/py-graphy/Makefile b/graphics/py-graphy/Makefile
index f82f715..4a3e314 100644
--- a/graphics/py-graphy/Makefile
+++ b/graphics/py-graphy/Makefile
@@ -18,7 +18,6 @@ PORTDOCS=	README
 PORTEXAMPLES=	*
 
 NO_BUILD=	yes
-NO_INSTALL_MANPAGES=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 46e9761..03ab700 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -16,11 +16,10 @@ COMMENT=	Kana-to-Kanji conversion system, library part
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-USES=		imake:notall tar:bzip2
+USES=		imake:notall,noman tar:bzip2
 USE_LDCONFIG=	yes
 ALL_TARGET=	canna
 INSTALL_TARGET=	instsgs
-NO_INSTALL_MANPAGES=yes
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index 6bbfe1b..cf70718 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -18,9 +18,8 @@ COMMENT=	Japanese input method, library part
 LICENSE=	MIT
 LICENSE_FILE=	${FILESDIR}/COPYING
 
-USES=		imake
+USES=		imake:noman
 USE_LDCONFIG=	yes
-NO_INSTALL_MANPAGES=	yes
 SUB_FILES=	sj3_freebsd.tmpl
 SUB_LIST=	DESTDIR=${DESTDIR}
 
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 205c10b..e62a60a 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -49,7 +49,7 @@ PLIST_SUB=	TCL_VER=${TCL_VER} \
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTCLMAN} && !defined(NO_INSTALL_MANPAGES)
+.if ${PORT_OPTIONS:MTCLMAN}
 INSTALL_TARGET+=install-doc
 PLIST_SUB+=	MAN=""
 .else
diff --git a/lang/xotcl/Makefile b/lang/xotcl/Makefile
index ffe13f0..1aa1c5f 100644
--- a/lang/xotcl/Makefile
+++ b/lang/xotcl/Makefile
@@ -64,7 +64,7 @@ PLIST_SUB+=	TUTORIAL="@comment "
 
 INSTALL_TARGET+=	install-shells
 
-.if !defined(AOLSERVER_XOTCL) && !defined(NO_INSTALL_MANPAGES)
+.if !defined(AOLSERVER_XOTCL)
 MAN1=			xotclsh.1
 .endif
 
@@ -106,8 +106,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .endif
-.if !defined(NO_INSTALL_MANPAGES)
 	${INSTALL_MAN} ${WRKSRC}/man/xotclsh.1 ${PREFIX}/man/man1/
 .endif
-.endif
 .include <bsd.port.mk>
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index e0f276f..66c77df 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -108,7 +108,6 @@ PKGMESSAGE=	${WRKDIR}/POST-INSTALL-NOTES
 .else # !EXIMON_ONLY
 PLIST_SUB+=	EXIM="@comment "
 PORT_OPTIONS+=	EXIMON
-NO_INSTALL_MANPAGES=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 EXIM_INSTALL_ARG+=	"eximon" "eximon.bin"
 .endif # !EXIMON_ONLY
diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile
index 6962a21..fe9f725 100644
--- a/mail/jamlib/Makefile
+++ b/mail/jamlib/Makefile
@@ -12,7 +12,6 @@ COMMENT=	JAM subroutine library
 
 USES=		libtool
 GNU_CONFIGURE=	yes
-NO_INSTALL_MANPAGES=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 1aaf8cb..14851df 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -14,10 +14,9 @@ DISTFILES=	xpbiff-1.27-with-YOUBIN.tar.gz.uu
 MAINTAINER?=	sanpei@FreeBSD.org
 COMMENT?=	Replacement for xbiff that handles popup window with mail header
 
-USES=		imake
+USES=		imake:noman
 USE_GCC=	any
 USE_XORG=	xpm xaw xmu
-NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xpbiff
 WRKSRC=		${WRKDIR}/xpbiff
 
diff --git a/math/isabelle/Makefile b/math/isabelle/Makefile
index 359301e..c491e71 100644
--- a/math/isabelle/Makefile
+++ b/math/isabelle/Makefile
@@ -132,8 +132,6 @@ BUILD_DEPENDS+=	polyml>=5.2.1:${PORTSDIR}/lang/polyml
 RUN_DEPENDS+=	polyml>=5.2.1:${PORTSDIR}/lang/polyml
 .endif
 
-NO_INSTALL_MANPAGES=yes
-
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
diff --git a/multimedia/clive1/Makefile b/multimedia/clive1/Makefile
index 718eaa8..c973fc7 100644
--- a/multimedia/clive1/Makefile
+++ b/multimedia/clive1/Makefile
@@ -26,11 +26,7 @@ USES=	tar:bzip2
 # not compatible with 3.0
 USE_PYTHON=	2
 
-.if !defined(NO_INSTALL_MANPAGES)
 MAN1=	${PORTNAME}.1 ${PORTNAME}-passwd.1
-.else
-CONFIGURE_ARGS=	--with-doc=no
-.endif
 
 OPTIONS_DEFINE=	FEEDPARSER FFMPEG MPLAYER NEWT PYCRYPTO SQLITE3 VLC XCLIP XINE
 FEEDPARSER_DESC=	Feed parsing support
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile
index 40ca562..b486e9f 100644
--- a/multimedia/tunapie/Makefile
+++ b/multimedia/tunapie/Makefile
@@ -26,9 +26,7 @@ TOTEM_DESC=	use totem instead of mplayer
 VLC_DESC=	use vlc instead of mplayer
 XINE_DESC=	use xine instead of mplayer
 
-.if !defined(NO_INSTALL_MANPAGES)
 MAN1=	tunapie.1
-.endif
 
 PLIST_SUB+=	DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}"
 
@@ -48,9 +46,7 @@ post-patch:
 do-install:
 	@${MKDIR} ${DESKTOPDIR}
 	@cd ${WRKSRC} && ./install.sh ${ADULT_TVLIST}
-.if !defined(NO_INSTALL_MANPAGES)
 	@${CP} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
-.endif
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
diff --git a/net-mgmt/ourmon/Makefile b/net-mgmt/ourmon/Makefile
index b366100..43db221 100644
--- a/net-mgmt/ourmon/Makefile
+++ b/net-mgmt/ourmon/Makefile
@@ -23,7 +23,6 @@ WRKSRC=			${WRKDIR}/mrourmon
 USES=			perl5
 USE_APACHE_RUN=		22+
 NO_BUILD=		yes
-NO_INSTALL_MANPAGES=	yes
 IS_INTERACTIVE=		yes
 
 SUB_FILES=	pkg-message
diff --git a/net-mgmt/pandorafms_agent/Makefile b/net-mgmt/pandorafms_agent/Makefile
index 325fe24..41b6d76 100644
--- a/net-mgmt/pandorafms_agent/Makefile
+++ b/net-mgmt/pandorafms_agent/Makefile
@@ -45,11 +45,6 @@ post-patch:
 		-e '/TENTACLE_SERVER/s/^/#/' \
 		${WRKSRC}/pandora_agent_installer
 .endif
-.if defined(NO_INSTALL_MANPAGES)
-	@${REINPLACE_CMD} \
-		-e '/PANDORA_MAN/s/^/#/' \
-		${WRKSRC}/pandora_agent_installer
-.endif
 	@${REINPLACE_CMD} -E \
 		-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%DATADIR%%|${DATADIR}|g' \
diff --git a/net-mgmt/pandorafms_server/Makefile b/net-mgmt/pandorafms_server/Makefile
index e471ecc..a68d2e7 100644
--- a/net-mgmt/pandorafms_server/Makefile
+++ b/net-mgmt/pandorafms_server/Makefile
@@ -106,11 +106,6 @@ IGNORE=		needs an existing installation of Perl built with WITH_THREADS=yes
 .endif
 
 post-patch:
-.if defined(NO_INSTALL_MANPAGES)
-	@${REINPLACE_CMD} -e \
-		-e '/%%MAN/s/^/#/ \
-		${WRKSRC}/pandora_server_installer
-.endif
 	@${REINPLACE_CMD} \
 		-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%DATADIR%%|${DATADIR}|g' \
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index 7e98a08..9e5a9b7 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -15,11 +15,10 @@ COMMENT=	Display X and Win32 desktops on remote X/Win32/Java displays
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/unix/vnc_unixsrc
-USES=		imake shebangfix perl5 tar:tgz
+USES=		imake:noman shebangfix perl5 tar:tgz
 SHEBANG_FILES=	vncserver
 USE_XORG=	ice sm x11 xaw xext xmu xt xpm
 ALL_TARGET=	World
-NO_INSTALL_MANPAGES=	yes
 XFREE86_HTML_MAN=	no
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile
index 2a33299..24c6cca 100644
--- a/print/mftrace/Makefile
+++ b/print/mftrace/Makefile
@@ -34,17 +34,13 @@ PLIST_FILES=	\
 		bin/gf2pbm \
 		bin/mftrace \
 		%%PYTHON_SITELIBDIR%%/afm.py \
-		%%PYTHON_SITELIBDIR%%/tfm.py
-.if !defined(NO_INSTALL_MANPAGES)
-PLIST_FILES+=	man/man1/mftrace.1.gz
-.endif
+		%%PYTHON_SITELIBDIR%%/tfm.py \
+		man/man1/mftrace.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gf2pbm ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/mftrace ${STAGEDIR}${PREFIX}/bin
-.if !defined(NO_INSTALL_MANPAGES)
 	${INSTALL_MAN} ${WRKSRC}/mftrace.1 ${STAGEDIR}${MANPREFIX}/man/man1
-.endif
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tfm.py ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/afm.py ${STAGEDIR}${PYTHON_SITELIBDIR}
diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index e2cd342..e80562d 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Reference manager based on the BibTeX file format
 
 WRKSRC_SUBDIR=	src
 
-USES=		imake motif
+USES=		imake:noman motif
 USE_XORG=	ice sm x11 xext xmu xp xt xpm
-NO_INSTALL_MANPAGES=	yes
 
 PLIST_FILES=	bin/xmbibtex lib/X11/app-defaults/XmBibTeX
 
diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile
index 134875d..d185bac 100644
--- a/security/mailzu/Makefile
+++ b/security/mailzu/Makefile
@@ -17,8 +17,6 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:${PORTSDIR}/security/amavisd-new \
 		${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
 		${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode
 
-NO_INSTALL_MANPAGES=	yes
-
 PEARDIR?=	${LOCALBASE}/share/pear
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES=	pkg-message
@@ -41,6 +39,8 @@ PGSQL_USE=	PHP=pgsql
 IMAP_USE=	PHP=imap
 LDAP_USE=	PHP=ldap
 
+PORTDOCS=	*
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile
index c90c6f0..103d570 100644
--- a/security/oidentd/Makefile
+++ b/security/oidentd/Makefile
@@ -47,11 +47,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/oidentd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/oidentd.conf.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${FILESDIR}/oidentd_masq.conf.sample ${STAGEDIR}${PREFIX}/etc
-.if !defined(NO_INSTALL_MANPAGES)
 .for MANFILE in ${MANPAGES}
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/doc/${MANFILE}
 	${INSTALL_MAN} ${WRKSRC}/doc/${MANFILE} ${STAGEDIR}${PREFIX}/man/man${MANFILE:E}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/security/pam_abl/Makefile b/security/pam_abl/Makefile
index da562a0..197d9b1 100644
--- a/security/pam_abl/Makefile
+++ b/security/pam_abl/Makefile
@@ -60,10 +60,8 @@ pre-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-.if !defined(NO_INSTALL_MANPAGES)
 	@${MKDIR} ${MAN8PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKDIR}/pam_abl.8 ${MAN8PREFIX}/man/man8/
-.endif
 	@${MKDIR} ${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/190.clean-pam-abl ${PREFIX}/etc/periodic/daily/
 
diff --git a/sysutils/be_agent/Makefile b/sysutils/be_agent/Makefile
index c8665bc..9ef69ac 100644
--- a/sysutils/be_agent/Makefile
+++ b/sysutils/be_agent/Makefile
@@ -16,7 +16,6 @@ DOWNLOAD_URL=	http://www.symantec.com/business/support/index?page=content&id=TEC
 USE_LINUX=	yes
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
-NO_INSTALL_MANPAGES=	yes
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	be-agent
 PLIST_FILES=	bin/agent.be \
diff --git a/sysutils/fsbackup/Makefile b/sysutils/fsbackup/Makefile
index 8325687..75895f2 100644
--- a/sysutils/fsbackup/Makefile
+++ b/sysutils/fsbackup/Makefile
@@ -18,7 +18,6 @@ SHEBANG_FILES=	contrib/*.pl \
 		*.pl
 
 NO_BUILD=	yes
-NO_INSTALL_MANPAGES=yes
 
 do-install:
 	@cd ${WRKSRC};./install.pl --prefix=${PREFIX}/fsbackup --prefix-man=${MANPREFIX}/man/man1 --dest=${STAGEDIR}
diff --git a/sysutils/fusefs-gunzip/Makefile b/sysutils/fusefs-gunzip/Makefile
index 76facae..367319a 100644
--- a/sysutils/fusefs-gunzip/Makefile
+++ b/sysutils/fusefs-gunzip/Makefile
@@ -14,8 +14,6 @@ USES=		fuse
 
 PLIST_FILES=	bin/fuse.gunzip
 
-NO_INSTALL_MANPAGES=	yes
-
 do-build:
 	(cd ${WRKSRC} && \
 	${CC} ${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/fuse \
diff --git a/sysutils/ucspi-tcp/Makefile b/sysutils/ucspi-tcp/Makefile
index 0d11435..4518a2b 100644
--- a/sysutils/ucspi-tcp/Makefile
+++ b/sysutils/ucspi-tcp/Makefile
@@ -59,7 +59,6 @@ BROKEN=	SSL and LIMITS options cannot coexist, please choose one of them
 CFLAGS+=	-O
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES)
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:man \
 		${MASTER_SITE_LOCAL:S/$/:man/}
 MASTER_SITE_SUBDIR+=	garga/ucspi-tcp/:man
@@ -68,10 +67,6 @@ DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} \
 MAN_FILES=	addcr.1 argv0.1 date@.1 delcr.1 finger@.1 fixcrio.1 \
 		http@.1 mconnect.1 rblsmtpd.1 recordio.1 tcpcat.1 \
 		tcpclient.1 tcprules.1 tcprulescheck.1 tcpserver.1 who@.1
-PLIST_SUB=	MANPAGES=""
-.else
-PLIST_SUB=	MANPAGES="@comment "
-.endif
 
 .if ${PORT_OPTIONS:MRSS_DIFF}
 PATCH_SITES+=	http://www.qmail.org/:rss
@@ -131,10 +126,8 @@ do-install:
 .for file_name in ${SCRIPTS}
 	@${INSTALL_SCRIPT} ${WRKSRC}/${file_name} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.if !defined(NO_INSTALL_MANPAGES)
-. for file_name in ${MAN_FILES}
+.for file_name in ${MAN_FILES}
 	${INSTALL_MAN} ${WRKSRC}-man/${file_name} ${STAGEDIR}${MAN1PREFIX}/man/man1/
-. endfor
-.endif
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/ucspi-tcp/pkg-plist b/sysutils/ucspi-tcp/pkg-plist
index c44cafa..b409c02 100644
--- a/sysutils/ucspi-tcp/pkg-plist
+++ b/sysutils/ucspi-tcp/pkg-plist
@@ -15,19 +15,19 @@ bin/tcprules
 bin/tcprulescheck
 bin/tcpserver
 bin/who@
-%%MANPAGES%%man/man1/addcr.1.gz
-%%MANPAGES%%man/man1/argv0.1.gz
-%%MANPAGES%%man/man1/date@.1.gz
-%%MANPAGES%%man/man1/delcr.1.gz
-%%MANPAGES%%man/man1/finger@.1.gz
-%%MANPAGES%%man/man1/fixcrio.1.gz
-%%MANPAGES%%man/man1/http@.1.gz
-%%MANPAGES%%man/man1/mconnect.1.gz
-%%MANPAGES%%man/man1/rblsmtpd.1.gz
-%%MANPAGES%%man/man1/recordio.1.gz
-%%MANPAGES%%man/man1/tcpcat.1.gz
-%%MANPAGES%%man/man1/tcpclient.1.gz
-%%MANPAGES%%man/man1/tcprules.1.gz
-%%MANPAGES%%man/man1/tcprulescheck.1.gz
-%%MANPAGES%%man/man1/tcpserver.1.gz
-%%MANPAGES%%man/man1/who@.1.gz
+man/man1/addcr.1.gz
+man/man1/argv0.1.gz
+man/man1/date@.1.gz
+man/man1/delcr.1.gz
+man/man1/finger@.1.gz
+man/man1/fixcrio.1.gz
+man/man1/http@.1.gz
+man/man1/mconnect.1.gz
+man/man1/rblsmtpd.1.gz
+man/man1/recordio.1.gz
+man/man1/tcpcat.1.gz
+man/man1/tcpclient.1.gz
+man/man1/tcprules.1.gz
+man/man1/tcprulescheck.1.gz
+man/man1/tcpserver.1.gz
+man/man1/who@.1.gz
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 2ab11f2..5a2c504 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Laptop battery status display for X11
 
 ONLY_FOR_ARCHS=	i386
 
-USES=		imake
+USES=		imake:noman
 USE_XORG=	xpm xaw
-NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xbatt
 
 .include <bsd.port.mk>
diff --git a/textproc/csv2latex/Makefile b/textproc/csv2latex/Makefile
index db1758b..fd14df3 100644
--- a/textproc/csv2latex/Makefile
+++ b/textproc/csv2latex/Makefile
@@ -13,25 +13,17 @@ COMMENT=	Converts a well formed csv file to a LaTeX document
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST_FILES=	bin/csv2latex
+PLIST_FILES=	bin/csv2latex man/man1/${PORTNAME}.1.gz
 
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
+	docbook-to-man ${WRKSRC}/${PORTNAME}.sgml > ${WRKSRC}/${PORTNAME}.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
-.if ( defined(WITH_MAN) &&  !defined(NO_INSTALL_MANPAGES) )
-BUILD_DEPENDS +=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
-PLIST_FILES+=	man/man1/${PORTNAME}.1.gz
-
-post-build:
-	docbook-to-man ${WRKSRC}/${PORTNAME}.sgml > ${WRKSRC}/${PORTNAME}.1
-
-post-install:
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/oops/Makefile b/www/oops/Makefile
index 2391ae8..cf656126 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -40,9 +40,7 @@ GROUPS=		nobody
 
 OOPSVAR=	/var/run/oops
 OOPSLOG=	/var/log/oops
-.if !defined(NO_INSTALL_MANPAGES)
 MAN8=		oops.8 oopsctl.8
-.endif
 
 USE_RC_SUBR=	oops
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -89,10 +87,8 @@ pre-configure:
 	@cd ${WRKSRC} && ${AUTOHEADER}
 
 post-install:
-.if !defined(NO_INSTALL_MANPAGES)
 	@${INSTALL_MAN} ${WRKSRC}/doc/oops.8 ${PREFIX}/man/man8
 	@${INSTALL_MAN} ${WRKSRC}/doc/oopsctl.8 ${PREFIX}/man/man8
-.endif
 	@${MKDIR} -m 750 ${OOPSVAR}
 	@${CHOWN} oops ${OOPSVAR}
 	@${MKDIR} -m 750 ${OOPSLOG}
diff --git a/www/webstone/Makefile b/www/webstone/Makefile
index d937262..7f98384 100644
--- a/www/webstone/Makefile
+++ b/www/webstone/Makefile
@@ -14,7 +14,6 @@ USES=		tar:tgz
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/WebStone2.5/src
 ALL_TARGET=	install
-NO_INSTALL_MANPAGES=	yes
 
 do-install:
 	@${RM} ${WRKSRC}/../bin/runs/keepme
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index 6d65b79..8b15ad1 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	http://www.ee.ryerson.ca/~elf/pub/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	message-of-the-day browser for X11 and dumb-terminals
 
-USES=		imake
+USES=		imake:noman
 USE_XORG=	ice sm x11 xaw xext xmu xt
-NO_INSTALL_MANPAGES=	yes
 XFREE86_HTML_MAN=	no
 
 PLIST_FILES=	bin/xmotd \