Date: Fri, 22 Nov 2013 11:10:01 GMT From: Rene Ladan <rene@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/184167: [exp-run] [bsd.port.mk] replace USE_DISPLAY implementation Message-ID: <201311221110.rAMBA1Dp088127@oldred.freebsd.org> Resent-Message-ID: <201311221120.rAMBK0pO078385@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184167
>Category: ports
>Synopsis: [exp-run] [bsd.port.mk] replace USE_DISPLAY implementation
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 22 11:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Rene Ladan
>Release: FreeBSD 10.0-BETA3-amd64
>Organization:
>Environment:
FreeBSD 10.0-BETA3-amd64
Ports r334571
>Description:
bsd.port.mk still has its own implementation of USE_DISPLAY, which is deprecated in favor of USES=display.
Replace the code in bsd.port.mk by a single inclusion of this USES file, and remove the comments describing USE_DISPLAY at the top.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk (revision 334495)
+++ Mk/bsd.port.mk (working copy)
@@ -363,12 +357,6 @@
# 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
@@ -1898,17 +1841,9 @@
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"
+.if defined(USE_DISPLAY)
+USES+= display
.endif
-.endif
PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist'
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311221110.rAMBA1Dp088127>