From owner-svn-ports-all@freebsd.org Mon Nov 9 03:47:52 2015 Return-Path: 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 BD213A29409; Mon, 9 Nov 2015 03:47:52 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B12CC10FB; Mon, 9 Nov 2015 03:47:52 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id AFF4D186E; Mon, 9 Nov 2015 03:47:52 +0000 (UTC) Date: Mon, 9 Nov 2015 03:47:52 +0000 From: Alexey Dokuchaev To: Pawel Pekala Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r401004 - head/editors/wordgrinder Message-ID: <20151109034752.GA64153@FreeBSD.org> References: <201511071619.tA7GJ5V4097100@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201511071619.tA7GJ5V4097100@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2015 03:47:52 -0000 On Sat, Nov 07, 2015 at 04:19:05PM +0000, Pawel Pekala wrote: > New Revision: 401004 > URL: https://svnweb.freebsd.org/changeset/ports/401004 > > +X11_DESC= Support running in an X window in addition to console IMHO default X11_DESC reads better and more concise, thus overriding it is a pessimisation. > +X11_PLIST_FILES=bin/xwordgrinder > +X11_USE= xorg=x11,xft > +X11_USES= pkgconfig > +X11_ALL_TARGET_OFF=unix > + > +.include This line would not be needed if [see below]. > -pre-install: > - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/wordgrinder > + ${REINPLACE_CMD} \ > + -e '/#include + ${WRKSRC}/src/c/arch/unix/x11/x11.h > +.if ! ${PORT_OPTIONS:MX11} You should've used option helpers here (pre-install-X11-OFF) as pre-install can be "smart" together with other _OPTIONS_TARGETS. > + # This is not strictly speaking required, but it cuts > + # down on some unnecessary work and error messages. Comments are badly indented (they will be interpreted as part of the recipe and executed by make(1)). > + ${REINPLACE_CMD} \ > + -e '/$$(eval $$(build-wordgrinder-x11))/d' \ > + ${WRKSRC}/Makefile > +.endif > > post-install: > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wordgrinder > +.if ${PORT_OPTIONS:MX11} Ditto. There'be been a lot of conversions to option-targets recently, did you see them? > + ${INSTALL_PROGRAM} ${WRKSRC}/bin/xwordgrinder ${STAGEDIR}${PREFIX}/bin > +.endif ./danfe