From flz@innercity.xbsd.org  Tue Apr  1 15:48:52 2008
Return-Path: <flz@innercity.xbsd.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C2E91065672
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <flz@xbsd.org>
Reply-To: Florent Thoumie <flz@xbsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Mk/bsd.port.mk: remove USE_XLIB dependency when USE_XORG and USE_IMAKE are defined
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 01 15:50:04 UTC 2008
>Closed-Date:    Fri Jan 23 19:02:51 UTC 2009
>Last-Modified:  Fri Jan 23 19:02:51 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Apr 1 15:50:31 UTC 2008 
Responsible-Changed-Why:  
bsd.port.mk is portmgr territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122340 

From: Pav Lucistnik <pav@FreeBSD.org>
To: bug-followup@FreeBSD.org, flz@xbsd.org
Cc:  
Subject: Re: ports/122340: Mk/bsd.port.mk: remove USE_XLIB dependency when
	USE_XORG and USE_IMAKE are defined
Date: Tue, 01 Apr 2008 21:47:53 +0200

 This looks counterintuitive to me.
 
 How about converting all ports that define USE_IMAKE today to USE_XORG
 and then dropping the USE_X_PREFIX assignment completely?
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 Linux is a happy free-for-all chaos.
 

From: "Florent Thoumie" <flz@xbsd.org>
To: pav@freebsd.org
Cc: bug-followup@freebsd.org
Subject: Re: ports/122340: Mk/bsd.port.mk: remove USE_XLIB dependency when USE_XORG and USE_IMAKE are defined
Date: Wed, 2 Apr 2008 02:14:12 +0200

 On Tue, Apr 1, 2008 at 9:47 PM, Pav Lucistnik <pav@freebsd.org> wrote:
 > This looks counterintuitive to me.
 >
 >  How about converting all ports that define USE_IMAKE today to USE_XORG
 >  and then dropping the USE_X_PREFIX assignment completely?
 
 It is the same, except we get the benefits of the conversion gradually
 at the cost of introducing a temporary test.
 
 Obviously, I forgot to mention that all ports defining USE_IMAKE and
 USE_XORG will need to have a PORTREVISION bump.
 
 On principle I'm not against your proposal, I'm just giving Martin
 some time to breathe :-)
 
 -- 
 Florent Thoumie
 flz@FreeBSD.org
 FreeBSD Committer
State-Changed-From-To: open->analyzed 
State-Changed-By: pav 
State-Changed-When: Thu Apr 10 22:47:23 UTC 2008 
State-Changed-Why:  
Being tested in an exprun 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122340 
State-Changed-From-To: analyzed->feedback 
State-Changed-By: pav 
State-Changed-When: Thu Apr 24 08:18:18 UTC 2008 
State-Changed-Why:  
A bunch of ports failed in the exp run, they will need to be fixed before this 
can go in. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122340 
State-Changed-From-To: feedback->open 
State-Changed-By: flz 
State-Changed-When: Tue May 13 14:06:50 UTC 2008 
State-Changed-Why:  
Re-open, ports have been fixed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122340 
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Mon Jul 21 22:53:12 UTC 2008 
State-Changed-Why:  
A bunch of ports still fails. Logs sent to requestor in private mails 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122340 
State-Changed-From-To: feedback->closed 
State-Changed-By: flz 
State-Changed-When: Fri Jan 23 19:02:48 UTC 2009 
State-Changed-Why:  
This was commited during xorg 7.4 merge. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122340 
>Unformatted:
