From e081d9b9ede78a2c05aaae34df25f8bb5ebd936f Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 21 Jul 2014 17:47:52 +0000
Subject: Remove some instances of WITHOUT_X11 and use an X11 OPTION instead.

---
 net/clusterit/Makefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'net/clusterit/Makefile')

diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile
index dbe68c59f754..da6e7f60dbae 100644
--- a/net/clusterit/Makefile
+++ b/net/clusterit/Makefile
@@ -11,17 +11,16 @@ COMMENT=	Collection of clustering tools
 
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=X11
+OPTIONS_SUB=	yes
 
-.if defined (WITHOUT_X11)
-PLIST_SUB+=	X11='@comment '
-.else
-PLIST_SUB+=	X11=''
-USE_XORG=	x11
-.endif
+X11_USE=	XORG=x11
+
+.include <bsd.port.options.mk>
 
 post-patch:
-.if defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 	${REINPLACE_CMD} -E 's,^(SUBDIRS) = .*,\1 = barrier dsh jsd pcp dtop tools,' ${WRKSRC}/Makefile.in
 .endif
 
-- 
cgit v1.2.3