diff options
| author | rene <rene@FreeBSD.org> | 2013-11-28 19:13:27 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2013-11-28 19:13:27 +0800 |
| commit | 93e177d8c346a66c56c68e2f69a06f1c2c3b9d92 (patch) | |
| tree | 64a3a5c81e859ba0fb01c7dd451d4e0771ec5258 /Mk/bsd.port.mk | |
| parent | 4660156e6b135d976bcb83b84b3c70e86dc0d936 (diff) | |
| download | freebsd-ports-gnome-93e177d8c346a66c56c68e2f69a06f1c2c3b9d92.tar.gz freebsd-ports-gnome-93e177d8c346a66c56c68e2f69a06f1c2c3b9d92.tar.zst freebsd-ports-gnome-93e177d8c346a66c56c68e2f69a06f1c2c3b9d92.zip | |
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
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index cd065f78c6c4..9fdb56661184 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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 emulators/linux_base-${USE_LINUX}, perhaps 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' |