Index: head/x11-toolkits/gai/Makefile
===================================================================
--- head/x11-toolkits/gai/Makefile	(revision 360686)
+++ head/x11-toolkits/gai/Makefile	(revision 360687)
@@ -1,52 +1,52 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	gai
 PORTVERSION=	0.5.10
 PORTREVISION=	14
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	SF/${PORTNAME}/GAI%20-%20Library/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@freebsd.org
 COMMENT=	General Applet Interface Library
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_BZIP2=	yes
 USES=		pkgconfig
 USE_GL=		gl
 USE_SDL=	sdl
 USE_GNOME=	libgnomeui
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDLCONF=${SDL_CONFIG}
 CONFIGURE_ARGS=	--disable-gnome
 CPPFLAGS+=	`pkg-config --cflags libgnomeui-2.0`
 
 PLIST_FILES=	include/gai/gai.h lib/libgai.so.${PORTVERSION} \
 		lib/libgai.so.0 lib/libgai.so libdata/pkgconfig/gai.pc \
 		share/locale/de/LC_MESSAGES/gai.mo
 PLIST_DIRS=	include/gai
 PORTDOCS=	*
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|sdl-config --|${SDL_CONFIG} --|g; \
 		s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/docs && \
 	${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
 	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \;
-.endif
 .for dir in docking examples templates
 	cd ${WRKSRC} && \
 	${FIND} ${dir} -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \
 	${FIND} ${dir} -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${EXAMPLESDIR}/{}" \;
 .endfor
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type f | \
 		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR} -type d | ${SORT} -r | \
 		${SED} "s,^${STAGEDIR}${PREFIX}/,@dirrm ," >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/hs-wxc/Makefile
===================================================================
--- head/x11-toolkits/hs-wxc/Makefile	(revision 360686)
+++ head/x11-toolkits/hs-wxc/Makefile	(revision 360687)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	wxc
 PORTVERSION=	0.90.0.4
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	wxHaskell C++ wrapper
 
 USE_CABAL=	wxdirect>=0.90
 
 BROKEN=		does not build with any of the supported wx
 
 USES=		dos2unix
 USE_WX=		3.0
 WX_COMPS=	wx
 WX_UNICODE=	yes
 
-NOPORTDOCS=	yes
+OPTIONS_EXCLUDE=DOCS
 
 post-patch::
 	@${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-2.9-config"| ; \
 	    s|/sbin/ldconfig -n|/sbin/ldconfig -m| ' ${WRKSRC}/Setup.hs
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
Index: head/x11-toolkits/slingshot/Makefile
===================================================================
--- head/x11-toolkits/slingshot/Makefile	(revision 360686)
+++ head/x11-toolkits/slingshot/Makefile	(revision 360687)
@@ -1,40 +1,42 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	slingshot
 PORTVERSION=	2.1
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		http://komquats.com/distfiles/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=     cy
 
 DISTNAME=	SlingShot${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Supplemental Libraries to extend Xview
 
 LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/sspkg2.1
 USE_LDCONFIG=	yes
 USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV=	OPENWINHOME=${LOCALBASE}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.options.mk>
+
 IMAKECPPFLAGS+=	-DXVDestDir=${STAGEDIR}${PREFIX}
 MAKE_ARGS=	STAGEDIR=${STAGEDIR}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${STAGEDIR}${DOCSDIR}
 	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/README ${STAGEDIR}${DOCSDIR}/*.ps
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>