From owner-svn-ports-all@freebsd.org  Fri Sep  4 21:33:17 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54EEC9CB600;
 Fri,  4 Sep 2015 21:33:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3BD2610FB;
 Fri,  4 Sep 2015 21:33:17 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t84LXGfE068036;
 Fri, 4 Sep 2015 21:33:16 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t84LXGDh068033;
 Fri, 4 Sep 2015 21:33:16 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509042133.t84LXGDh068033@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 4 Sep 2015 21:33:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396137 - head/net/pfinger
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Sep 2015 21:33:17 -0000

Author: amdmi3
Date: Fri Sep  4 21:33:16 2015
New Revision: 396137
URL: https://svnweb.freebsd.org/changeset/ports/396137

Log:
  - Switch to options helpers
  - Drop 8.x support

Modified:
  head/net/pfinger/Makefile
  head/net/pfinger/pkg-plist

Modified: head/net/pfinger/Makefile
==============================================================================
--- head/net/pfinger/Makefile	Fri Sep  4 21:33:10 2015	(r396136)
+++ head/net/pfinger/Makefile	Fri Sep  4 21:33:16 2015	(r396137)
@@ -12,26 +12,16 @@ COMMENT=	Highly configurable, secure, an
 
 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>

Modified: head/net/pfinger/pkg-plist
==============================================================================
--- head/net/pfinger/pkg-plist	Fri Sep  4 21:33:10 2015	(r396136)
+++ head/net/pfinger/pkg-plist	Fri Sep  4 21:33:16 2015	(r396137)
@@ -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