From owner-svn-ports-head@FreeBSD.ORG Thu Nov 28 11:13:27 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7D7F6D7; Thu, 28 Nov 2013 11:13:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 89FD6172A; Thu, 28 Nov 2013 11:13:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rASBDRoM003024; Thu, 28 Nov 2013 11:13:27 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rASBDRWD003023; Thu, 28 Nov 2013 11:13:27 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201311281113.rASBDRWD003023@svn.freebsd.org> From: Rene Ladan Date: Thu, 28 Nov 2013 11:13:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335087 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Nov 2013 11:13:27 -0000 Author: rene Date: Thu Nov 28 11:13:27 2013 New Revision: 335087 URL: http://svnweb.freebsd.org/changeset/ports/335087 Log: Replace deprecated USE_DISPLAY code with a single inclusion of USES=display and remove the comments describing USE_DISPLAY at the top. PR: ports/184167 Submitted by: myself Approved by: portmgr (bdrewery) Exp-run by: bdrewery Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Nov 28 11:03:59 2013 (r335086) +++ head/Mk/bsd.port.mk Thu Nov 28 11:13:27 2013 (r335087) @@ -365,12 +365,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # this is for users, not for port maintainers. This # should not be used in Makefile. ## -# USE_DISPLAY - If set, this ports requires a (virtual) X11 environment -# setup. If the environment variable DISPLAY Is not set, -# then an extra build dependency on Xvfb is added. Further, -# if PACKAGE_BUILDING is not set, then CONFIGURE_ENV and -# MAKE_ENV are extended with a DISPLAY variable. -# # USE_GL - A list of Mesa or GL related dependencies needed by the port. # Supported components are: egl, glesv2, glut, glu, glw, and gl. # If set to "yes", this is equivalent to "glu". Note that @@ -1908,16 +1902,8 @@ IGNORE= cannot be built: there is no em RUN_DEPENDS+= ${LINUX_BASE_PORT} .endif -.if defined(USE_DISPLAY) && !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \ - ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \ - ${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \ - ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ - xkbcomp:${PORTSDIR}/x11/xkbcomp -.if !defined(PACKAGE_BUILDING) -CONFIGURE_ENV+= DISPLAY="localhost:1001" -MAKE_ENV+= DISPLAY="localhost:1001" -.endif +.if defined(USE_DISPLAY) +USES+= display .endif PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'