Date: Mon, 21 May 2007 16:27:25 +0200 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Florent Thoumie <flz@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/Mk bsd.port.mk Message-ID: <86r6pas14i.fsf@dwp.des.no> In-Reply-To: <4651A262.2070905@FreeBSD.org> (Florent Thoumie's message of "Mon\, 21 May 2007 14\:45\:06 %2B0100") References: <200705211021.l4LALdGa025468@repoman.freebsd.org> <86k5v2tnhv.fsf@dwp.des.no> <4651884F.3080207@FreeBSD.org> <867ir2tibr.fsf@dwp.des.no> <4651A262.2070905@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86r6pas14i.fsf>