From 0a9ffec167135b80a1aef5a0ae197d0c95de907e Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Fri, 4 Sep 2015 21:33:16 +0000
Subject: - Switch to options helpers - Drop 8.x support

---
 net/pfinger/Makefile  | 20 +++++---------------
 net/pfinger/pkg-plist |  2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'net')

diff --git a/net/pfinger/Makefile b/net/pfinger/Makefile
index 853d21f2273f..f22db79de15c 100644
--- a/net/pfinger/Makefile
+++ b/net/pfinger/Makefile
@@ -12,26 +12,16 @@ COMMENT=	Highly configurable, secure, and portable finger daemon
 
 CONFLICTS=	gnu-finger-1.*
 
-OPTIONS_DEFINE=	X11
-
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_GNOME=	gtk12
-PLIST_SUB+=	WITHOUT_X11=""
-.else
-CONFIGURE_ARGS+=--without-client
-PLIST_SUB+=	WITHOUT_X11="@comment "
-.endif
+OPTIONS_DEFINE=	X11
+OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
+X11_USE=	GNOME=gtk12
+X11_CONFIGURE_OFF=	--without-client
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/src/configfile.c
-.if ${OSVERSION} >= 900007
 	@${REINPLACE_CMD} -e 's|<utmp.h>|<utmpx.h>|' ${WRKSRC}/configure
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pfinger/pkg-plist b/net/pfinger/pkg-plist
index b3bce17074df..99cd2a3e6e39 100644
--- a/net/pfinger/pkg-plist
+++ b/net/pfinger/pkg-plist
@@ -1,5 +1,5 @@
 bin/finger
-%%WITHOUT_X11%%bin/pfinger
+%%X11%%bin/pfinger
 man/man1/finger.1.gz
 man/man1/pfinger.1.gz
 man/man5/fingerconf.5.gz
-- 
cgit