From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 1 15:50:05 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E86F1065676 for ; Tue, 1 Apr 2008 15:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 173BF8FC21 for ; Tue, 1 Apr 2008 15:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m31Fo44N045223 for ; Tue, 1 Apr 2008 15:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m31Fo4ia045222; Tue, 1 Apr 2008 15:50:04 GMT (envelope-from gnats) Resent-Date: Tue, 1 Apr 2008 15:50:04 GMT Resent-Message-Id: <200804011550.m31Fo4ia045222@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Florent Thoumie Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C2E91065672 for ; Tue, 1 Apr 2008 15:48:52 +0000 (UTC) (envelope-from flz@innercity.xbsd.org) Received: from mail02.mail.esat.net (mail02.mail.esat.net [193.120.142.82]) by mx1.freebsd.org (Postfix) with ESMTP id C40AA8FC2A for ; Tue, 1 Apr 2008 15:48:51 +0000 (UTC) (envelope-from flz@innercity.xbsd.org) Received: from innercity.xbsd.org [193.120.13.132] by mail02.mail.esat.net with esmtp id 1JgiTr-0006DP-00; Tue, 01 Apr 2008 16:32:59 +0100 Received: from innercity.xbsd.org (localhost [127.0.0.1]) by innercity.xbsd.org (8.14.2/8.14.2) with ESMTP id m31FWkrI065966 for ; Tue, 1 Apr 2008 16:32:46 +0100 (IST) (envelope-from flz@innercity.xbsd.org) Received: (from flz@localhost) by innercity.xbsd.org (8.14.2/8.14.2/Submit) id m31FWkXD065965; Tue, 1 Apr 2008 16:32:46 +0100 (IST) (envelope-from flz) Message-Id: <200804011532.m31FWkXD065965@innercity.xbsd.org> Date: Tue, 1 Apr 2008 16:32:46 +0100 (IST) From: Florent Thoumie To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/122340: Mk/bsd.port.mk: remove USE_XLIB dependency when USE_XORG and USE_IMAKE are defined X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Florent Thoumie List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2008 15:50:05 -0000 >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: