Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 08 Jun 2006 02:47:23 +0400
From:      Boris Samorodov <bsam@ipt.ru>
To:        freebsd-ports@FreeBSD.org
Subject:   [patch] bsd.ports.mk: X_WINDOW_SYSTEM and linux
Message-ID:  <70960100@ho.ipt.ru>

next in thread | raw e-mail | index | archive | help
--=-=-=

Hello dear port users and portmgr members,


let me introduce a tiny patch to bsd.ports.mk.

As you know, there are two X_WINDOW_SYSTEMs used with FreeBSD. They
may be choosed (auto or by hand). So far our ports have had only one
to use with linux (linux-XFree86-libs). Five weeks ago netchild@
committed a new one (linux-xorg-libs).

Now the question is how to configure the needed linux X libraries. My
suggestion is to use a new variable LINUX_X_WINDOW_SYSTEM which by
default equals to X_WINDOW_SYSTEM. That will give us flexibility and
may prevent (by defining at make.conf) unnecessary immediate
rebuilding of all linux ports using X-libs when this patch is
committed.

The proposed patch compares the variable with the string "xorg". In
that case linux-xorg-libs will be used as linux X libraries.
Otherwise (eg.):

LINUX_X_WINDOW_SYSTEM=
LINUX_X_WINDOW_SYSTEM=1
LINUX_X_WINDOW_SYSTEM=XFree86
LINUX_X_WINDOW_SYSTEM=xfree86-4

...linux-XFree86-libs will be used.

Since modern systems use XOrg as default X library *and* linux-XFree86-libs
it may be a good idea not only to mention this fact at UPDATING but
also mail a heads-up message to ports@, emulation@ and x11@.

I know that I should file a PR, but I'd like to listen to your
comments and suggestions first. See the attached patch. Thanks.


WBR
-- 
Boris B. Samorodov, Research Engineer
InPharmTech Co,     http://www.ipt.ru
Telephone & Internet Service Provider

--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=bsd.port.mk.patch
Content-Description: introduce LINUX_X_WINDOW_SYSTEM to bsd.ports.mk

--- bsd.port.mk.orig	Thu Jun  8 01:35:34 2006
+++ bsd.port.mk	Thu Jun  8 01:59:27 2006
@@ -1414,6 +1414,8 @@
 X_WINDOW_SYSTEM ?= xfree86-3
 .endif
 
+LINUX_X_WINDOW_SYSTEM ?= ${X_WINDOW_SYSTEM}
+
 # Location of mounted CDROM(s) to search for files
 CD_MOUNTPTS?=	/cdrom ${CD_MOUNTPT}
 
@@ -1848,7 +1850,11 @@
 
 .if defined(USE_XLIB)
 .	if defined(USE_LINUX)
+.		if ${LINUX_X_WINDOW_SYSTEM:L} == xorg
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs
+.		else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+.		endif
 .	else
 LIB_DEPENDS+=	X11.6:${X_LIBRARIES_PORT}
 .	endif

--=-=-=--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?70960100>