Index: head/games/xrubik/Makefile
===================================================================
--- head/games/xrubik/Makefile	(revision 514328)
+++ head/games/xrubik/Makefile	(revision 514329)
@@ -1,23 +1,22 @@
 # Created by: Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	xrubik
 PORTVERSION=	5.5.2
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games/xpuzzles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X-based rubik's cube(tm)
 
 WRKSRC=		${WRKDIR}/xrubik
 USES=		imake
 USE_XORG=	xt sm ice xext x11
-XFREE86_HTML_MAN=	no
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrubik ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/Rubik.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Rubik
 	${INSTALL_MAN} ${WRKSRC}/xrubik.man ${STAGEDIR}${PREFIX}/man/man1/xrubik.1
 
 .include <bsd.port.mk>
Index: head/textproc/docbook-to-man/Makefile
===================================================================
--- head/textproc/docbook-to-man/Makefile	(revision 514328)
+++ head/textproc/docbook-to-man/Makefile	(revision 514329)
@@ -1,43 +1,42 @@
 # Created by: Cyrille Lefevre <clefevre@citeweb.net>
 # $FreeBSD$
 
 PORTNAME=	docbook-to-man
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/tools/dtm/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DocBook SGML DTD into nroff/troff -man macros converter
 
 RUN_DEPENDS=	docbook>0:textproc/docbook
 
 USES=		imake
-XFREE86_HTML_MAN=	no
 
 MAKE_JOBS_UNSAFE=	yes
 
 # There are two ports that satisfy the nsgmls requirement.
 # Jade is preferred, but OpenJade can be selected if needed.
 OPTIONS_DEFINE=	OPENJADE
 OPENJADE_DESC=	Use OpenJade SGML/XML/DSSSL toolkit instead of Jade
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENJADE}
 RUN_DEPENDS+=	onsgmls:textproc/openjade
 NSGMLS=		onsgmls
 .else
 RUN_DEPENDS+=	nsgmls:textproc/jade
 NSGMLS=		nsgmls
 .endif
 
 post-extract:
 	@${MV} ${WRKSRC}/Doc/instant.1 ${WRKSRC}/Instant/oinstant.man
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}| ; \
 		s|%%NSGMLS%%|${NSGMLS}|' ${WRKSRC}/cmd/docbook-to-man.sh
 
 .include <bsd.port.mk>
Index: head/x11/xmotd/Makefile
===================================================================
--- head/x11/xmotd/Makefile	(revision 514328)
+++ head/x11/xmotd/Makefile	(revision 514329)
@@ -1,56 +1,55 @@
 # Created by: Matthew West <mwest@uct.ac.za>
 # $FreeBSD$
 
 PORTNAME=	xmotd
 DISTVERSION=	1.17.3b
 PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ee.ryerson.ca/~elf/pub/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Message-of-the-day browser for X11 and dumb-terminals
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GNU
 
 USES=		imake:noman
 USE_XORG=	ice sm x11 xaw xext xmu xt
-XFREE86_HTML_MAN=	no
 
 PLIST_FILES=	bin/xmotd \
 		man/man8/xmotd.8.gz
 
 OPTIONS_DEFINE=	HTML MOTIF XPM
 
 HTML_DESC=		Use HTML widget instead of ASCII text
 HTML_MAKE_ARGS=		-DHAVE_HTML
 HTML_BROKEN=		Does not compile when WITH_HTML is set
 
 MOTIF_MAKE_ARGS=	-DMOTIF
 MOTIF_USES=		motif
 
 XPM_USE=		XORG=xpm
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/xmotd.man
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:/usr/local/bin/::g' ${WRKSRC}/xmotd.8
 .for file in libhtmlw/HTML-PSformat.c main.c textmode.c xmotd.c
 	@${REINPLACE_CMD} -e 's:malloc.h:stdlib.h:' ${WRKSRC}/${file}
 .endfor
 
 post-patch-HTML-on:
 	@${REINPLACE_CMD} -e 's:XCOMM #define HAVE_HTML:#define HAVE_HTML:g' ${WRKSRC}/Imakefile
 
 post-patch-MOTIF-on:
 	@${REINPLACE_CMD} -e 's:XCOMM #define MOTIF:#define MOTIF:g' ${WRKSRC}/Imakefile
 
 post-patch-XPM-on:
 	@${REINPLACE_CMD} -e 's:XCOMM #define HAVE_XPM:#define HAVE_XPM:g' ${WRKSRC}/Imakefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${STAGEDIR}${LOCALBASE}/bin/xmotd
 	${INSTALL_MAN} ${WRKSRC}/xmotd.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: head/x11-wm/olvwm/Makefile
===================================================================
--- head/x11-wm/olvwm/Makefile	(revision 514328)
+++ head/x11-wm/olvwm/Makefile	(revision 514329)
@@ -1,37 +1,36 @@
 # Created by: smace
 # $FreeBSD$
 
 PORTNAME=	olvwm
 PORTVERSION=	4.2
 PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		XCONTRIB/window_managers \
 		http://komquats.com/distfiles/ \
 		LOCAL/cy
 DISTNAME=	${PORTNAME}4
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	olvwm4.Patch01.Z \
 		olvwm4.Patch02.Z
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	OpenLook Virtual Window manager
 
 LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 REINPLACE_ARGS= -i ""
 NO_WRKSUBDIR=	yes
 USES=		imake tar:Z
 USE_XORG=	xpm
-XFREE86_HTML_MAN=	no
 
 IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
 
 pre-configure:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
 	's|^#endif.*$$|#endif|;s|^#else.*$$|#else|;\
 	s|^/\*\*/#*|XCOMM |'
 
 .include <bsd.port.mk>