Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Sep 2015 21:33:16 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396137 - head/net/pfinger
Message-ID:  <201509042133.t84LXGDh068033@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509042133.t84LXGDh068033>