From owner-cvs-ports@FreeBSD.ORG  Mon May 21 14:27:30 2007
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
X-Original-To: cvs-ports@FreeBSD.org
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 71BA716A421;
	Mon, 21 May 2007 14:27:30 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (tim.des.no [194.63.250.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DC8513C465;
	Mon, 21 May 2007 14:27:30 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (localhost [127.0.0.1])
	by spam.des.no (Postfix) with ESMTP id 63E812084;
	Mon, 21 May 2007 16:27:26 +0200 (CEST)
X-Spam-Tests: AWL,UPPERCASE_25_50
X-Spam-Learn: disabled
X-Spam-Score: 0.0/3.0
X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on tim.des.no
Received: from dwp.des.no (des.no [80.203.243.180])
	by smtp.des.no (Postfix) with ESMTP id 48A132083;
	Mon, 21 May 2007 16:27:26 +0200 (CEST)
Received: by dwp.des.no (Postfix, from userid 1001)
	id 28BCE575B; Mon, 21 May 2007 16:27:26 +0200 (CEST)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Florent Thoumie <flz@FreeBSD.org>
References: <200705211021.l4LALdGa025468@repoman.freebsd.org>
	<86k5v2tnhv.fsf@dwp.des.no> <4651884F.3080207@FreeBSD.org>
	<867ir2tibr.fsf@dwp.des.no> <4651A262.2070905@FreeBSD.org>
Date: Mon, 21 May 2007 16:27:25 +0200
In-Reply-To: <4651A262.2070905@FreeBSD.org> (Florent Thoumie's message of
	"Mon\, 21 May 2007 14\:45\:06 +0100")
Message-ID: <86r6pas14i.fsf@dwp.des.no>
User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject: Re: cvs commit: ports/Mk bsd.port.mk
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 May 2007 14:27:30 -0000

Florent Thoumie <flz@FreeBSD.org> writes:
> Let's just set USE_XLIB=3Dyes if X_WINDOW_SYSTEM =3D=3D xfree86-4 and USE=
_XORG
> is defined.

Yes, that would be the easiest solution.

What about USE_X_PREFIX, BTW?  I assume that X.org-aware ports are not
supposed to define it?  Perhaps there should be a check for that,
issuing a warning (or aborting the build) if both USE_X_PREFIX and
USE_XORG are set at the same time.

> DES or I could prepare a bpm patch for this if there's an empty slot on
> pointyhat for a new exp-run.

Something like this?

@@ -1916,9 +1921,13 @@
        ${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
 .endif
=20
+.if defined(USE_XPM)
+USE_XORG+=3D                     xpm
+.endif
+
 .if ${X_WINDOW_SYSTEM:L} =3D=3D xfree86-4
=20
-.if defined(USE_XPM)
+.if defined(USE_XORG)
 USE_XLIB=3D                      yes
 .endif
=20
@@ -1927,14 +1936,6 @@
=20
 .else
=20
-.if defined(USE_XPM)
-LIB_DEPENDS+=3D                  Xpm.4:${PORTSDIR}/x11/libXpm
-# XXX - At some point we'll have to fix ports to use USE_XORG to
-# the right value and remove both USE_XPM and USE_XLIB. Hopefully
-# XFree86-4 will be gone in the meantime.
-USE_XLIB=3D                      yes
-.endif
-
 XAWVER=3D                                8
 PKG_IGNORE_DEPENDS?=3D           'this_port_does_not_exist'
=20

Note that the file numbers won't line up, because I have other patches
in my bsd.port.mk.

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no