Date: Tue, 1 Apr 2008 16:32:46 +0100 (IST) From: Florent Thoumie <flz@xbsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/122340: Mk/bsd.port.mk: remove USE_XLIB dependency when USE_XORG and USE_IMAKE are defined Message-ID: <200804011532.m31FWkXD065965@innercity.xbsd.org> Resent-Message-ID: <200804011550.m31Fo4ia045222@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 122340
>Category: ports
>Synopsis: Mk/bsd.port.mk: remove USE_XLIB dependency when USE_XORG and USE_IMAKE are defined
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 01 15:50:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Florent Thoumie
>Release: FreeBSD 7.0-STABLE i386
>Organization:
Xbsd.org
>Environment:
System: FreeBSD laptop.xbsd.org 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu Mar 27 20:58:24 GMT 2008 flz@laptop.xbsd.org:/usr/obj/usr/src/sys/LAPTOP i386
>Description:
This patch was submitted by dinoex.
It helps getting rid of the dependency on USE_X_PREFIX/USE_XLIB if the port
defines USE_IMAKE and has already been converted to new USE_XORG world order.
>How-To-Repeat:
>Fix:
--- use-imake.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.591
diff -u -r1.591 bsd.port.mk
--- bsd.port.mk 11 Mar 2008 23:45:04 -0000 1.591
+++ bsd.port.mk 1 Apr 2008 10:29:28 -0000
@@ -1356,7 +1356,7 @@
SCRIPTDIR?= ${MASTERDIR}/scripts
PKGDIR?= ${MASTERDIR}
-.if defined(USE_IMAKE) && !defined(USE_X_PREFIX)
+.if defined(USE_IMAKE) && !defined(USE_X_PREFIX) && !defined(USE_XORG)
USE_X_PREFIX= yes
.endif
.if defined(USE_X_PREFIX) && ${USE_X_PREFIX} == "no"
--- use-imake.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804011532.m31FWkXD065965>