3 files changed, 25 insertions, 24 deletions

diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index 109ac7f56fda..82f98843c228 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -22,23 +22,22 @@ XFREE86_HTML_MAN=	no
 MAN8=		xmotd.8
 PLIST_FILES=	bin/xmotd
 
-OPTIONS=	HTML "Use HTML widget instead of ASCII text" off
-OPTIONS+=	MOTIF "Use Motif widget library" off
-OPTIONS+=	XPM "Allows colour XPM pixmaps" off
+OPTIONS_DEFINE=	HTML MOTIF XPM
+HTML_DESC=	Use HTML widget instead of ASCII text
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_HTML)
+.if ${PORT_OPTIONS:MHTML}
 MAKE_ARGS+=	-DHAVE_HTML
 BROKEN=		Does not compile when WITH_HTML is set
 .endif
 
-.if defined(WITH_MOTIF)
+.if ${PORT_OPTIONS:MMOTIF}
 MAKE_ARGS+=	-DMOTIF
 USE_MOTIF=	yes
 .endif
 
-.if defined(WITH_XPM)
+.if ${PORT_OPTIONS:MXPM}
 USE_XORG+=	xpm
 .endif
 
@@ -50,13 +49,13 @@ post-patch:
 .for file in libhtmlw/HTML-PSformat.c main.c textmode.c xmotd.c
 	@${REINPLACE_CMD} -e 's:malloc.h:stdlib.h:' ${WRKSRC}/${file}
 .endfor
-.if defined(WITH_HTML)
+.if ${PORT_OPTIONS:MHTML}
 	@${REINPLACE_CMD} -e 's:XCOMM #define HAVE_HTML:#define HAVE_HTML:g' ${WRKSRC}/Imakefile
 .endif
-.if defined (WITH_MOTIF)
+.if ${PORT_OPTIONS:MMOTIF}
 	@${REINPLACE_CMD} -e 's:XCOMM #define MOTIF:#define MOTIF:g' ${WRKSRC}/Imakefile
 .endif
-.if defined(WITH_XPM)
+.if ${PORT_OPTIONS:MXPM}
 	@${REINPLACE_CMD} -e 's:XCOMM #define HAVE_XPM:#define HAVE_XPM:g' ${WRKSRC}/Imakefile
 .endif
 
@@ -64,4 +63,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${LOCALBASE}/bin/xmotd
 	${INSTALL_MAN} ${WRKSRC}/xmotd.8 ${MANPREFIX}/man/man8
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index dbfe283875f6..3c9c2baf3ab3 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -16,7 +16,8 @@ MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Getting and setting Xv attributes
 
-OPTIONS=	GTK1 "GTK1 support (Default is GTK2)" off
+OPTIONS_DEFINE=	GTK1
+GTK1_DESC=	GTK1 support (Default is GTK2)
 
 USE_XORG=	x11 xv
 WANT_GNOME=	yes
@@ -26,9 +27,9 @@ PLIST_FILES=	bin/${PORTNAME} bin/g${PORTNAME}
 
 CFLAGS+=	-DVERSION=\"${PORTVERSION}\"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GTK1)
+.if ${PORT_OPTIONS:MGTK1}
 USE_GNOME+=	gtk12
 GTK_PC=		gtk+
 .else
@@ -50,4 +51,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/g${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index a90608f1c23b..0bfe11965826 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -19,37 +19,38 @@ LICENSE_COMB=	dual
 
 MAN1=		xvkbd.1
 
-OPTIONS=	XAW3D	"Xaw3d support" off \
-		XTEST	"XTEST extensions support" on \
-		I18N	"internationalization" on
+OPTIONS_DEFINE=	XAW3D XTEST NLS DOCS
+OPTIONS_DEFAULT=	XTEST
+XAW3D_DESC=	Xaw3d support
+XTEST_DESC=	XTEST extensions support
 
 USE_IMAKE=	yes
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 .include <bsd.port.pre.mk>
 
-.if	defined(WITH_XAW3D)
+.if ${PORT_OPTIONS:MXAW3D}
 BUILD_DEPENDS=	${LOCALBASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
 
-.if	defined(WITH_XAW3D)
+.if ${PORT_OPTIONS:MXAW3D}
 XK_DEFSUBST +=	-e 's/XCOMM define XAW3D/\#define XAW3D/;'
 .endif
-.if	defined(WITH_XTEST)
+.if ${PORT_OPTIONS:MXTEST}
 XK_DEFSUBST +=	-e 's/XCOMM define XTEST/\#define XTEST/;'
 USE_XORG+=	xtst
 .endif
-.if	defined(WITH_I18N)
+.if ${PORT_OPTIONS:MNLS}
 XK_DEFSUBST +=	-e 's/XCOMM define I18N/\#define I18N/;'
 .endif
 
 post-patch:
-.if	defined(XK_DEFSUBST)
+.if defined(XK_DEFSUBST)
 		${REINPLACE_CMD} ${XK_DEFSUBST} ${WRKSRC}/Imakefile
 .endif
 		${REINPLACE_CMD} -e "s@/usr/include/@${LOCALBASE}/include/@" ${WRKSRC}/XVkbd-small.ad
 
-.if	!defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 		${MKDIR} ${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/