Date: Mon, 10 Sep 2007 09:00:52 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/116244: [patch] bsd.port.mk - Make USE_DISPAY more general Message-ID: <20070909230052.B6B29546@k7.mavetju> Resent-Message-ID: <200709092310.l89NA3UQ072334@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116244
>Category: ports
>Synopsis: [patch] bsd.port.mk - Make USE_DISPAY more general
>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: Sun Sep 09 23:10:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 6.2-RELEASE-p4 i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:55:55 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/SMP i386
>Description:
Improve USE_DISPLAY
- USE_DISPLAY is not comments in the bsd.port.mk comment section.
- Change the behaviour a little bit after comparions with gnome@
managed ports:
- Do not only use it while PACKAGE_BUILDING is set, do it when
USE_DISPLAY (port specific option) is set and DISPLAY (user
environment) isn't set.
- Add the DISPLAY variable to CONFIGURE_ENV and MAKE_ENV.
>How-To-Repeat:
>Fix:
retrieving revision 1.582
diff -u -r1.582 bsd.port.mk
--- bsd.port.mk 9 Sep 2007 01:02:15 -0000 1.582
+++ bsd.port.mk 9 Sep 2007 22:57:12 -0000
@@ -373,6 +373,11 @@
# USE_X_PREFIX - If set, this port installs in ${X11BASE}. Implies USE_XLIB.
# USE_XLIB - If set, this port uses the X libraries. In the USE_LINUX
# case the linux X libraries are referenced.
+# 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_FREETYPE - If set, this port uses the freetype print libraries.
# USE_GL - A list of Mesa or GL related dependencies needed by the port.
@@ -1875,10 +1882,14 @@
BUILD_DEPENDS+= imake:${X_IMAKE_PORT}
.endif
-.if defined(PACKAGE_BUILDING) && defined(USE_DISPLAY)
+.if defined(USE_DISPLAY) && !defined(DISPLAY)
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
+.if !defined(PACKAGE_BUILDING)
+CONFIGURE_ENV+= DISPLAY="localhost:1001"
+MAKE_ENV+= DISPLAY="localhost:1001"
+.endif
.endif
.if ${X_WINDOW_SYSTEM:L} == xfree86-4
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070909230052.B6B29546>