From owner-freebsd-x11@FreeBSD.ORG  Tue Feb 20 05:30:14 2007
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
X-Original-To: freebsd-x11@hub.freebsd.org
Delivered-To: freebsd-x11@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3A8D0172C8B
	for <freebsd-x11@hub.freebsd.org>; Tue, 20 Feb 2007 05:30:14 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40])
	by mx1.freebsd.org (Postfix) with ESMTP id 2691D13C46B
	for <freebsd-x11@hub.freebsd.org>; Tue, 20 Feb 2007 05:30:14 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1K5UDVn004630
	for <freebsd-x11@freefall.freebsd.org>; Tue, 20 Feb 2007 05:30:13 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1K5UDcw004629;
	Tue, 20 Feb 2007 05:30:13 GMT (envelope-from gnats)
Date: Tue, 20 Feb 2007 05:30:13 GMT
Message-Id: <200702200530.l1K5UDcw004629@freefall.freebsd.org>
To: freebsd-x11@FreeBSD.org
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Cc: 
Subject: Re: ports/109091: make Xorg from x11-servers/xorg-server port to
	work on 7-CURRENT
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Feb 2007 05:30:14 -0000

The following reply was made to PR ports/109091; it has been noted by GNATS.

From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109091: make Xorg from x11-servers/xorg-server port to work on 7-CURRENT
Date: Tue, 20 Feb 2007 08:21:38 +0300

 Mon, Feb 19, 2007 at 10:58:56AM +0300, Eygene Ryabinkin wrote:
 >
 > OK, I was in rush and made a mistake. Attaching the proper patch
 > to the files/patch-FreeBSD.cf
 
 I was in a rush again. Here is the correct version of my patch to
 files/patch-FreeBSD.cf that will enable the patched patch to find
 the file to patch ;))
 
 --- patch-patch-FreeBSD.cf begins here ---
 --- patch-FreeBSD.cf.orig	Mon Feb 19 10:46:16 2007
 +++ patch-FreeBSD.cf	Mon Feb 19 10:45:52 2007
 @@ -1,5 +1,5 @@
 ---- config/cf/FreeBSD.cf.orig	Sun Aug 15 10:03:36 2004
 -+++ config/cf/FreeBSD.cf	Sun Feb  6 03:56:59 2005
 +--- config/cf/FreeBSD.cf.orig	Wed May  4 08:14:57 2005
 ++++ config/cf/FreeBSD.cf	Mon Feb 19 10:39:59 2007
  @@ -78,6 +78,7 @@
   #define HasIssetugid		YES
   #define HasPoll			YES
 @@ -59,9 +59,9 @@
   #  else
   #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
   #  endif
 -@@ -442,7 +444,9 @@
 - #define AsVISOption		-Av9a
 - #define AsOutputArchSize	64
 +@@ -446,7 +448,9 @@
 + #ifdef PpcArchitecture
 + #define XF86INT10_BUILD		X86INT10_STUB
   #endif
  -
  +#ifdef PpcArchitecture
 @@ -70,7 +70,7 @@
   #define StandardDefines	-DCSRG_BASED
   
   #if OSMajorVersion > 1
 -@@ -463,18 +467,8 @@
 +@@ -467,18 +471,8 @@
   #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
   #endif
   
 @@ -91,3 +91,18 @@
   
   #ifndef PreIncDir
   # define PreIncDir	/usr/include
 +@@ -576,6 +570,14 @@
 + #if (GccMajorVersion == 2 && GccMinorVersion == 95)
 + #define GccOptBug295
 + #endif
 ++
 ++/*
 ++ * Add --export-dynamic flag for FreeBSD 7.x and later.
 ++ */
 ++#if OSMajorVersion >= 7
 ++#define ExtraLoadOptions -Wl,--export-dynamic
 ++#endif
 ++
 + 
 + #include <bsdLib.rules>
 + 
 --- patch-patch-FreeBSD.cf ends here ---
 -- 
 Eygene