From owner-freebsd-ports@FreeBSD.ORG Thu Jun 8 01:03:26 2006 Return-Path: X-Original-To: freebsd-ports@FreeBSD.org Delivered-To: freebsd-ports@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9E5816B621 for ; Wed, 7 Jun 2006 22:48:33 +0000 (UTC) (envelope-from bsam@bsam.ru) Received: from mail.kuban.ru (mail.kuban.ru [62.183.66.246]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06C4843D4C for ; Wed, 7 Jun 2006 22:48:32 +0000 (GMT) (envelope-from bsam@bsam.ru) Received: from bsam.ru ([83.239.48.148]) by mail.kuban.ru (8.9.1/8.9.1) with ESMTP id k57MmBQ3077958 for ; Thu, 8 Jun 2006 02:48:21 +0400 (MSD) Received: from bsam by bsam.ru with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1Fo6o8-0001LB-DF for freebsd-ports@FreeBSD.org; Thu, 08 Jun 2006 02:47:24 +0400 To: freebsd-ports@FreeBSD.org From: Boris Samorodov Date: Thu, 08 Jun 2006 02:47:23 +0400 Message-ID: <70960100@ho.ipt.ru> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Sender: "Boris B. Samorodov" Cc: Subject: [patch] bsd.ports.mk: X_WINDOW_SYSTEM and linux X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jun 2006 01:03:26 -0000 --=-=-= 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 --=-=-=--