Author: rmh
Date: 2003-11-20 09:12:37 -0500 (Thu, 20 Nov 2003)
New Revision: 776
Added:
people/rmh/
people/rmh/xfree86_gnu.diff
people/rmh/xfree86_kbsd.diff
Log:
Put my patches in people/rmh
Added: people/rmh/xfree86_gnu.diff
===================================================================
--- people/rmh/xfree86_gnu.diff 2003-11-16 04:26:00 UTC (rev 775)
+++ people/rmh/xfree86_gnu.diff 2003-11-20 14:12:37 UTC (rev 776)
@@ -0,0 +1,1189 @@
+diff -Nur sid.old/debian/changelog sid/debian/changelog
+--- sid.old/debian/changelog 2003-10-27 00:53:08.000000000 +0100
++++ sid/debian/changelog 2003-10-27 00:44:01.000000000 +0100
+@@ -138,6 +138,26 @@
+ - debian/patches/056_i810_make_i830_usable.diff: only access pI830 when
+ XF86DRI is defined.
+
++ * Split gnu.cf into gnu-common.cf (for common GNU/* stuff) and gnu.cf (for
++ GNU/Hurd stuff). It will be included by non-Linux only for now since
++ linux.cf has many kernel-specific kludges. [Robert Millan]
++ - debian/patches/001a_move-gnu-common.diff: Move gnu.cf to gnu-common.cf.
++ - debian/patches/001c_move-gnu-lib.diff: Ditto for gnuLib.*.
++ - debian/patches/001b_gnu_common_split.diff: Create a new gnu.cf that
++ includes gnu-common.cf and move Hurd-specific stuff into it.
++ - debian/patches/001d_gnu-lib_split.diff: Ditto for gnuLib.*.
++ - debian/patches/002_xdm_fixes.diff: Re-diff for new gnu.cf.
++ - debian/patches/003a_damn_cpp_3.3_to_hell.diff: s/gnu.cf/gnu-common.cf/g
++ - debian/patches/004_imake_manpage_handling_overhaul.diff: Likewise.
++ - debian/patches/800_gnu_config.diff: Likewise.
++
++ * More GNU/Hurd build fixes. [Robert Millan]
++ - debian/patches/800a_gnu_more_fixes.diff: Add new macros to gnu-common.cf
++ as pointed out by ISHIKAWA Mutsumi some time ago.
++ - debian/patches/803_gnu_xdm_chooser.diff: New. GNU/Hurd build fixes.
++ - debian/*.hurd-i386: Update to sync with MANIFEST.hurd-i386 (the MANIFEST
++ itself is unchanged).
++
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 22 Oct 2003 00:13:12 -0500
+
+ xfree86 (4.3.0-0pre1v3) experimental; urgency=high
+@@ -4505,6 +4525,6 @@
+ See /usr/share/doc/xfree86-common/changelog.Debian.old.gz in the
+ xfree86-common package for the remainder of this changelog.
+
+- $Id: changelog 695 2003-10-22 05:16:55Z branden $
++ $Id: changelog 696 2003-10-22 17:53:46Z rmh $
+
+ vim:set ai et sts=2 sw=2 tw=78:
+diff -Nur sid.old/debian/patches/001a_move-gnu-common.diff
sid/debian/patches/001a_move-gnu-common.diff
+--- sid.old/debian/patches/001a_move-gnu-common.diff 1970-01-01
01:00:00.000000000 +0100
++++ sid/debian/patches/001a_move-gnu-common.diff 2003-10-27
00:43:46.000000000 +0100
+@@ -0,0 +1,381 @@
++
++ Simply moves gnu.cf to gnu-common.cf, and nothing else.
++
++diff -Nur xc/config/cf.old/gnu-common.cf xc/config/cf/gnu-common.cf
++--- xc/config/cf.old/gnu-common.cf 1970-01-01 01:00:00.000000000 +0100
+++++ xc/config/cf/gnu-common.cf 2001-02-28 19:58:49.000000000 +0100
++@@ -0,0 +1,185 @@
+++XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49
dawes Exp $
+++
+++#ifndef OSName
+++#define OSName DefaultOSName
+++#endif
+++
+++#ifndef OSVendor
+++#define OSVendor /**/
+++#endif
+++#ifndef OSMajorVersion
+++#define OSMajorVersion DefaultOSMajorVersion
+++#endif
+++#ifndef OSMinorVersion
+++#define OSMinorVersion DefaultOSMinorVersion
+++#endif
+++#ifndef OSTeenyVersion
+++#define OSTeenyVersion DefaultOSTeenyVersion
+++#endif
+++XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+++
+++#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
+++ -D_POSIX_SOURCE -D_XOPEN_SOURCE \
+++ -D_BSD_SOURCE -D_SVID_SOURCE
+++
+++XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
+++
+++#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+++
+++XCOMM Enable this when we have pthreads.
+++XCOMM #define HasPosixThreads YES
+++XCOMM #define ThreadedX YES
+++XCOMM #define HasThreadSafeAPI YES
+++XCOMM #define ThreadsLibraries -lpthread
+++XCOMM #define SystemMTDefines -D_REENTRANT
+++
+++#ifndef HasLibCrypt
+++#define HasLibCrypt YES
+++#endif
+++
+++#ifndef BuildXF86RushExt
+++# define BuildXF86RushExt YES
+++#endif
+++
+++#define BuildLibPathVar LD_LIBRARY_PATH
+++#define GccUsesGas YES
+++#define UseGas YES
+++#define GnuCpp YES
+++#define HasDlopen YES
+++#ifndef HasShadowPasswd
+++# define HasShadowPasswd YES
+++#endif
+++#define HasPutenv YES
+++
+++XCOMM Not implemented and will always fail.
+++#define HasShm YES
+++
+++#define HasBSD44Sockets YES
+++#define HasSockets YES
+++#define HasSnprintf YES
+++#define HasMkstemp YES
+++#define HasUsableFileMmap YES
+++#ifndef HasNCurses
+++#define HasNCurses YES
+++#endif
+++
+++#define AvoidNullMakeCommand YES
+++#ifndef DebuggableLibraries
+++#define DebuggableLibraries NO
+++#endif
+++#define CompressAllFonts YES
+++#define Malloc0ReturnsNull YES
+++#define NeedConstPrototypes YES
+++#define NeedFunctionPrototypes YES
+++#define NeedNestedPrototypes YES
+++#define NeedVarargsPrototypes YES
+++#ifndef NeedWidePrototypes
+++#define NeedWidePrototypes NO
+++#endif
+++#define SetTtyGroup YES
+++
+++#ifndef UseStaticTermcapLib
+++#define UseStaticTermcapLib NO
+++#endif
+++
+++#define MkdirHierCmd mkdir -p
+++#ifndef CcCmd
+++#define CcCmd gcc
+++#endif
+++#ifndef AsCmd
+++#define AsCmd as
+++#endif
+++#ifndef LdCmd
+++#define LdCmd ld
+++#endif
+++
+++#define AsmDefines -D__ELF__
+++#define CplusplusCmd c++
+++#ifndef TermcapLibrary
+++#if UseStaticTermcapLib
+++#define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
+++#else
+++#define TermcapLibrary -lncurses
+++#endif
+++#endif
+++#ifndef DoLoadableServer
+++#define DoLoadableServer YES
+++#endif
+++#ifndef
+++#define CppCmd /lib/cpp
+++#endif
+++#define YaccCmd bison -y
+++#define LexCmd flex -l
+++#define HasFlex YES
+++#define LexLib -lfl
+++#define PreProcessCmd CcCmd -E
+++#define PostIncDir DefaultGccIncludeDir
+++#define LdCombineFlags -r
+++#ifndef LdPostLib
+++#define LdPostLib /* Never needed */
+++#endif
+++#define HasWChar32 YES
+++#define StandardCppOptions -traditional
+++#define StandardCppDefines StandardDefines
+++
+++#define HasVarRun YES
+++#define VarDbDirectory $(VARDIR)/lib
+++
+++XCOMM i386Architecture
+++#define OptimizedCDebugFlags DefaultGcc2i386Opt
+++#define GNUMachineDefines -D__i386__
+++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-DPART_NET
+++#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+++#define HasPlugin YES
+++#define VendorHasX11R6_3libXext YES
+++
+++#ifndef StandardDefines
+++#define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
+++#endif
+++
+++#define DlLibrary -rdynamic -ldl
+++
+++#define ServerExtraSysLibs /**/
+++
+++#define ConnectionFlags -DUNIXCONN -DTCPCONN
+++
+++/* Some of these man page defaults are overriden in the above OS sections */
+++#ifndef ManSuffix
+++# define ManSuffix 1x
+++#endif
+++#ifndef ManDir
+++# define ManDir $(MANSOURCEPATH)1
+++#endif
+++#ifndef LibManSuffix
+++# define LibManSuffix 3x
+++#endif
+++#ifndef LibmanDir
+++# define LibmanDir $(MANSOURCEPATH)3
+++#endif
+++#ifndef FileManSuffix
+++# define FileManSuffix 5x
+++#endif
+++#ifndef FileManDir
+++# define FileManDir $(MANSOURCEPATH)5
+++#endif
+++
+++#ifndef StaticLibrary
+++#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
+++#endif
+++
+++#define HasGnuMake YES
+++
+++#define MakeNamedTargetSubdir(dir,flags,subname)\
+++ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
+++
+++#define ArchitectureDefines -DGNU_ARCHITECTURE
+++
+++#define XserverNeedsSetUID YES
+++
+++#include <gnuLib.rules>
+++
+++XCOMM XXX Might need this if they are not careful with slashes.
+++XCOMM #define DirFailPrefix -
+++
+++#include <xfree86.cf>
+++
++diff -Nur xc/config/cf.old/gnu.cf xc/config/cf/gnu.cf
++--- xc/config/cf.old/gnu.cf 2001-02-28 19:58:49.000000000 +0100
+++++ xc/config/cf/gnu.cf 1970-01-01 01:00:00.000000000 +0100
++@@ -1,185 +0,0 @@
++-XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49
dawes Exp $
++-
++-#ifndef OSName
++-#define OSName DefaultOSName
++-#endif
++-
++-#ifndef OSVendor
++-#define OSVendor /**/
++-#endif
++-#ifndef OSMajorVersion
++-#define OSMajorVersion DefaultOSMajorVersion
++-#endif
++-#ifndef OSMinorVersion
++-#define OSMinorVersion DefaultOSMinorVersion
++-#endif
++-#ifndef OSTeenyVersion
++-#define OSTeenyVersion DefaultOSTeenyVersion
++-#endif
++-XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
++-
++-#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
++- -D_POSIX_SOURCE -D_XOPEN_SOURCE \
++- -D_BSD_SOURCE -D_SVID_SOURCE
++-
++-XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
++-
++-#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
++-
++-XCOMM Enable this when we have pthreads.
++-XCOMM #define HasPosixThreads YES
++-XCOMM #define ThreadedX YES
++-XCOMM #define HasThreadSafeAPI YES
++-XCOMM #define ThreadsLibraries -lpthread
++-XCOMM #define SystemMTDefines -D_REENTRANT
++-
++-#ifndef HasLibCrypt
++-#define HasLibCrypt YES
++-#endif
++-
++-#ifndef BuildXF86RushExt
++-# define BuildXF86RushExt YES
++-#endif
++-
++-#define BuildLibPathVar LD_LIBRARY_PATH
++-#define GccUsesGas YES
++-#define UseGas YES
++-#define GnuCpp YES
++-#define HasDlopen YES
++-#ifndef HasShadowPasswd
++-# define HasShadowPasswd YES
++-#endif
++-#define HasPutenv YES
++-
++-XCOMM Not implemented and will always fail.
++-#define HasShm YES
++-
++-#define HasBSD44Sockets YES
++-#define HasSockets YES
++-#define HasSnprintf YES
++-#define HasMkstemp YES
++-#define HasUsableFileMmap YES
++-#ifndef HasNCurses
++-#define HasNCurses YES
++-#endif
++-
++-#define AvoidNullMakeCommand YES
++-#ifndef DebuggableLibraries
++-#define DebuggableLibraries NO
++-#endif
++-#define CompressAllFonts YES
++-#define Malloc0ReturnsNull YES
++-#define NeedConstPrototypes YES
++-#define NeedFunctionPrototypes YES
++-#define NeedNestedPrototypes YES
++-#define NeedVarargsPrototypes YES
++-#ifndef NeedWidePrototypes
++-#define NeedWidePrototypes NO
++-#endif
++-#define SetTtyGroup YES
++-
++-#ifndef UseStaticTermcapLib
++-#define UseStaticTermcapLib NO
++-#endif
++-
++-#define MkdirHierCmd mkdir -p
++-#ifndef CcCmd
++-#define CcCmd gcc
++-#endif
++-#ifndef AsCmd
++-#define AsCmd as
++-#endif
++-#ifndef LdCmd
++-#define LdCmd ld
++-#endif
++-
++-#define AsmDefines -D__ELF__
++-#define CplusplusCmd c++
++-#ifndef TermcapLibrary
++-#if UseStaticTermcapLib
++-#define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
++-#else
++-#define TermcapLibrary -lncurses
++-#endif
++-#endif
++-#ifndef DoLoadableServer
++-#define DoLoadableServer YES
++-#endif
++-#ifndef
++-#define CppCmd /lib/cpp
++-#endif
++-#define YaccCmd bison -y
++-#define LexCmd flex -l
++-#define HasFlex YES
++-#define LexLib -lfl
++-#define PreProcessCmd CcCmd -E
++-#define PostIncDir DefaultGccIncludeDir
++-#define LdCombineFlags -r
++-#ifndef LdPostLib
++-#define LdPostLib /* Never needed */
++-#endif
++-#define HasWChar32 YES
++-#define StandardCppOptions -traditional
++-#define StandardCppDefines StandardDefines
++-
++-#define HasVarRun YES
++-#define VarDbDirectory $(VARDIR)/lib
++-
++-XCOMM i386Architecture
++-#define OptimizedCDebugFlags DefaultGcc2i386Opt
++-#define GNUMachineDefines -D__i386__
++-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-DPART_NET
++-#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
++-#define HasPlugin YES
++-#define VendorHasX11R6_3libXext YES
++-
++-#ifndef StandardDefines
++-#define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
++-#endif
++-
++-#define DlLibrary -rdynamic -ldl
++-
++-#define ServerExtraSysLibs /**/
++-
++-#define ConnectionFlags -DUNIXCONN -DTCPCONN
++-
++-/* Some of these man page defaults are overriden in the above OS sections */
++-#ifndef ManSuffix
++-# define ManSuffix 1x
++-#endif
++-#ifndef ManDir
++-# define ManDir $(MANSOURCEPATH)1
++-#endif
++-#ifndef LibManSuffix
++-# define LibManSuffix 3x
++-#endif
++-#ifndef LibmanDir
++-# define LibmanDir $(MANSOURCEPATH)3
++-#endif
++-#ifndef FileManSuffix
++-# define FileManSuffix 5x
++-#endif
++-#ifndef FileManDir
++-# define FileManDir $(MANSOURCEPATH)5
++-#endif
++-
++-#ifndef StaticLibrary
++-#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
++-#endif
++-
++-#define HasGnuMake YES
++-
++-#define MakeNamedTargetSubdir(dir,flags,subname)\
++- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
++-
++-#define ArchitectureDefines -DGNU_ARCHITECTURE
++-
++-#define XserverNeedsSetUID YES
++-
++-#include <gnuLib.rules>
++-
++-XCOMM XXX Might need this if they are not careful with slashes.
++-XCOMM #define DirFailPrefix -
++-
++-#include <xfree86.cf>
++-
+diff -Nur sid.old/debian/patches/001b_gnu_common_split.diff
sid/debian/patches/001b_gnu_common_split.diff
+--- sid.old/debian/patches/001b_gnu_common_split.diff 1970-01-01
01:00:00.000000000 +0100
++++ sid/debian/patches/001b_gnu_common_split.diff 2003-10-27
00:43:47.000000000 +0100
+@@ -0,0 +1,68 @@
++
++ - Fixes gnu-common.cf to provide only the rules common to all GNU variants
++ (I.e, GNU userland and Glibc on non-gnu kernel)
++ - Adds gnu.cf which includes gnu-common.cf and adds rules specific to the
++ GNU system (I.e: GNU userland, Glibc and the Hurd).
++
++ -- Robert Millan <[EMAIL PROTECTED]>
++
++diff -Nur xc/config/cf.old/gnu-common.cf xc/config/cf/gnu-common.cf
++--- xc/config/cf.old/gnu-common.cf 2003-10-15 01:47:38.000000000 +0200
+++++ xc/config/cf/gnu-common.cf 2003-10-15 01:57:49.000000000 +0200
++@@ -26,13 +26,6 @@
++
++ #define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
++
++-XCOMM Enable this when we have pthreads.
++-XCOMM #define HasPosixThreads YES
++-XCOMM #define ThreadedX YES
++-XCOMM #define HasThreadSafeAPI YES
++-XCOMM #define ThreadsLibraries -lpthread
++-XCOMM #define SystemMTDefines -D_REENTRANT
++-
++ #ifndef HasLibCrypt
++ #define HasLibCrypt YES
++ #endif
++@@ -54,7 +47,7 @@
++ XCOMM Not implemented and will always fail.
++ #define HasShm YES
++
++-#define HasBSD44Sockets YES
+++XCOMM #define HasBSD44Sockets YES
++ #define HasSockets YES
++ #define HasSnprintf YES
++ #define HasMkstemp YES
++@@ -133,8 +126,9 @@
++ #define HasPlugin YES
++ #define VendorHasX11R6_3libXext YES
++
+++XCOMM see gnu.cf for the missing -D__GNU__
++ #ifndef StandardDefines
++-#define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
+++#define StandardDefines GNUMachineDefines GNUSourceDefines
++ #endif
++
++ #define DlLibrary -rdynamic -ldl
++diff -Nur xc/config/cf.old/gnu.cf xc/config/cf/gnu.cf
++--- xc/config/cf.old/gnu.cf 1970-01-01 01:00:00.000000000 +0100
+++++ xc/config/cf/gnu.cf 2003-10-15 01:55:59.000000000 +0200
++@@ -0,0 +1,19 @@
+++
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-common.cf>
+++
+++XCOMM Below, rules specific to the GNU system (with the Hurd)
+++
+++XCOMM Enable this when we have pthreads.
+++XCOMM #define HasPosixThreads YES
+++XCOMM #define ThreadedX YES
+++XCOMM #define HasThreadSafeAPI YES
+++XCOMM #define ThreadsLibraries -lpthread
+++XCOMM #define SystemMTDefines -D_REENTRANT
+++
+++#define HasBSD44Sockets YES
+++
+++XCOMM we don't need -D__GNU__, so this define stays in gnu-common.cf
+++XCOMM #ifndef StandardDefines
+++XCOMM #define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
+++XCOMM #endif
+diff -Nur sid.old/debian/patches/001c_move-gnu-lib.diff
sid/debian/patches/001c_move-gnu-lib.diff
+--- sid.old/debian/patches/001c_move-gnu-lib.diff 1970-01-01
01:00:00.000000000 +0100
++++ sid/debian/patches/001c_move-gnu-lib.diff 2003-10-27 00:43:48.000000000
+0100
+@@ -0,0 +1,441 @@
++
++ Simply moves gnuLib.* to gnu-commonLib.*, and nothing else.
++
++diff -Nur xc/config/cf.old/gnu-commonLib.rules
xc/config/cf/gnu-commonLib.rules
++--- xc/config/cf.old/gnu-commonLib.rules 1970-01-01 01:00:00.000000000
+0100
+++++ xc/config/cf/gnu-commonLib.rules 2002-01-16 01:39:59.000000000 +0100
++@@ -0,0 +1,181 @@
+++/*
+++ * GNU/Hurd shared library rules
+++ *
+++ * $XFree86: xc/config/cf/gnuLib.rules,v 1.5 2002/01/16 00:39:59 keithp Exp $
+++ */
+++
+++/*
+++ * GNU/Hurd shared library rules
+++ * Cloned from Linux (ELF) shared library rules
+++ *
+++ */
+++
+++#ifndef HasSharedLibraries
+++#define HasSharedLibraries YES
+++#endif
+++#ifndef ForceNormalLib
+++#define ForceNormalLib NO
+++#endif
+++
+++#ifndef SharedOldX
+++#define SharedOldX NO
+++#endif
+++
+++#undef SpecialMalloc
+++#define SpecialMalloc NO
+++
+++#define BaseShLibReqs -lc
+++
+++#ifndef SharedDataSeparation
+++#define SharedDataSeparation NO
+++#endif
+++#ifndef SharedCodeDef
+++#define SharedCodeDef /**/
+++#endif
+++#ifndef SharedLibraryDef
+++#define SharedLibraryDef /**/
+++#endif
+++#ifndef ShLibIncludeFile
+++#define ShLibIncludeFile <gnuLib.tmpl>
+++#endif
+++#ifndef SharedLibraryLoadFlags
+++XCOMM XXX To rpath or not to rpath...
+++XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
+++#define SharedLibraryLoadFlags -shared
+++#endif
+++#ifndef PositionIndependentCFlags
+++#define PositionIndependentCFlags -fPIC
+++#endif
+++#ifndef PositionIndependentCplusplusFlags
+++#define PositionIndependentCplusplusFlags -fPIC
+++#endif
+++#ifndef ExtraLoadFlags
+++#ifdef UseInstalled
+++XCOMM XXX Maybe superfluous.
+++#define ExtraLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
+++#else
+++#define ExtraLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
+++#endif
+++#endif
+++
+++/*
+++ * InstallSharedLibrary - generate rules to install the shared library.
+++ * NOTE: file must be executable, hence "INSTBINFLAGS"
+++ */
+++#ifndef InstallSharedLibrary
+++#define InstallSharedLibrary(libname,rev,dest)
@@\
+++install:: Concat(lib,libname.so.rev)
@@\
+++ MakeDir($(DESTDIR)dest) @@\
+++ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev)
$(DESTDIR)dest @@\
+++ @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed
's/\.[^\.]*$$//'`;\
+++ set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
+++ @if $(SOSYMLINK); then (set -x; \
+++ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
+++ $(LN) Concat(lib,libname.so.rev)
Concat($(DESTDIR)dest/lib,libname.so)); fi
+++#endif /* InstallSharedLibrary */
+++
+++/*
+++ * InstallSharedLibraryData - generate rules to install the shared library
data
+++ */
+++#ifndef InstallSharedLibraryData
+++#define InstallSharedLibraryData(libname,rev,dest)
+++#endif /* InstallSharedLibraryData */
+++
+++
+++/*
+++ * SharedLibraryTarget - generate rules to create a shared library;
+++ * build it into a different name so that we do not hose people by having
+++ * the library gone for long periods.
+++ */
+++#ifndef SharedLibraryTarget
+++#ifdef UseInstalled
+++#define LinkBuildSonameLibrary(lib) true
+++#else
+++#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+++ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+++#endif
+++
+++#define SharedLibraryTarget(libname,rev,solist,down,up)
@@\
+++AllTarget(Concat(lib,libname.so.rev))
@@\
+++ @@\
+++Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS)
@@\
+++ $(RM) [EMAIL PROTECTED]
@@\
+++ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
+++ (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+++ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
+++ LinkBuildSonameLibrary($$SONAME) @@\
+++ $(RM) $@ @@\
+++ $(MV) [EMAIL PROTECTED] $@
@@\
+++ @if $(SOSYMLINK); then (set -x; \ @@\
+++ $(RM) Concat(lib,libname.so); \ @@\
+++ $(LN) $@ Concat(lib,libname.so)); fi @@\
+++ LinkBuildLibrary($@) @@\
+++ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
+++ @@\
+++clean::
@@\
+++ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
+++ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
+++ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+++
+++#endif /* SharedLibraryTarget */
+++
+++/*
+++ * SharedDepLibraryTarget - generate rules to create a shared library.
+++ */
+++#ifndef SharedDepLibraryTarget
+++#ifdef UseInstalled
+++#ifndef LinkBuildSonameLibrary
+++#define LinkBuildSonameLibrary(lib) true
+++#endif
+++#else
+++#ifndef LinkBuildSonameLibrary
+++#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+++ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+++#endif
+++#endif
+++
+++#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
+++AllTarget(Concat(lib,libname.so.rev))
@@\
+++ @@\
+++Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
+++ $(RM) [EMAIL PROTECTED]
@@\
+++ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
+++ (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+++ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
+++ LinkBuildSonameLibrary($$SONAME) @@\
+++ $(RM) $@ @@\
+++ $(MV) [EMAIL PROTECTED] $@
@@\
+++ @if $(SOSYMLINK); then (set -x; \ @@\
+++ $(RM) Concat(lib,libname.so); \ @@\
+++ $(LN) $@ Concat(lib,libname.so)); fi @@\
+++ LinkBuildLibrary($@) @@\
+++ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
+++ @@\
+++clean::
@@\
+++ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
+++ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
+++ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+++
+++#endif /* SharedDepLibraryTarget */
+++
+++#ifndef SharedDepModuleTarget
+++#define SharedDepModuleTarget(name,deps,solist)
@@\
+++AllTarget(name)
@@\
+++ @@\
+++name: deps @@\
+++ $(RM) [EMAIL PROTECTED]
@@\
+++ $(CC) -o [EMAIL PROTECTED] $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)
BaseShLibReqs @@\
+++ $(RM) $@ @@\
+++ $(MV) [EMAIL PROTECTED] $@
@@\
+++ @@\
+++clean::
@@\
+++ $(RM) name
+++
+++#endif /* SharedDepModuleTarget */
+++
+++/*
+++ * SharedLibraryDataTarget - generate rules to create shlib data file;
+++ */
+++#ifndef SharedLibraryDataTarget
+++#define SharedLibraryDataTarget(libname,rev,salist)
+++#endif /* SharedLibraryTarget */
++diff -Nur xc/config/cf.old/gnu-commonLib.tmpl xc/config/cf/gnu-commonLib.tmpl
++--- xc/config/cf.old/gnu-commonLib.tmpl 1970-01-01 01:00:00.000000000
+0100
+++++ xc/config/cf/gnu-commonLib.tmpl 2000-11-14 19:20:31.000000000 +0100
++@@ -0,0 +1,30 @@
+++/*
+++ * GNU Hurd shared library template
+++ *
+++ * $XFree86: xc/config/cf/gnuLib.tmpl,v 1.3 2000/11/14 18:20:31 dawes Exp $
+++ */
+++
+++#ifndef FixupLibReferences
+++#define FixupLibReferences() @@\
+++XMULIBONLY = -lXmu @@\
+++XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+++#endif
+++
+++#ifndef XawClientLibs
+++#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+++#endif
+++
+++#define CplusplusLibC
+++
+++#define SharedX11Reqs
+++#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
+++#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
+++#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+++#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB)
$(XLIB)
+++#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
+++#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
+++#define SharedXiReqs $(LDPRELIB) $(XLIB)
+++#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
+++#define SharedXtstReqs $(LDPRELIB) $(XLIB)
+++#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
+++#define SharedSMReqs $(LDPRELIB) $(ICELIB)
++diff -Nur xc/config/cf.old/gnuLib.rules xc/config/cf/gnuLib.rules
++--- xc/config/cf.old/gnuLib.rules 2002-01-16 01:39:59.000000000 +0100
+++++ xc/config/cf/gnuLib.rules 1970-01-01 01:00:00.000000000 +0100
++@@ -1,181 +0,0 @@
++-/*
++- * GNU/Hurd shared library rules
++- *
++- * $XFree86: xc/config/cf/gnuLib.rules,v 1.5 2002/01/16 00:39:59 keithp Exp $
++- */
++-
++-/*
++- * GNU/Hurd shared library rules
++- * Cloned from Linux (ELF) shared library rules
++- *
++- */
++-
++-#ifndef HasSharedLibraries
++-#define HasSharedLibraries YES
++-#endif
++-#ifndef ForceNormalLib
++-#define ForceNormalLib NO
++-#endif
++-
++-#ifndef SharedOldX
++-#define SharedOldX NO
++-#endif
++-
++-#undef SpecialMalloc
++-#define SpecialMalloc NO
++-
++-#define BaseShLibReqs -lc
++-
++-#ifndef SharedDataSeparation
++-#define SharedDataSeparation NO
++-#endif
++-#ifndef SharedCodeDef
++-#define SharedCodeDef /**/
++-#endif
++-#ifndef SharedLibraryDef
++-#define SharedLibraryDef /**/
++-#endif
++-#ifndef ShLibIncludeFile
++-#define ShLibIncludeFile <gnuLib.tmpl>
++-#endif
++-#ifndef SharedLibraryLoadFlags
++-XCOMM XXX To rpath or not to rpath...
++-XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
++-#define SharedLibraryLoadFlags -shared
++-#endif
++-#ifndef PositionIndependentCFlags
++-#define PositionIndependentCFlags -fPIC
++-#endif
++-#ifndef PositionIndependentCplusplusFlags
++-#define PositionIndependentCplusplusFlags -fPIC
++-#endif
++-#ifndef ExtraLoadFlags
++-#ifdef UseInstalled
++-XCOMM XXX Maybe superfluous.
++-#define ExtraLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
++-#else
++-#define ExtraLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
++-#endif
++-#endif
++-
++-/*
++- * InstallSharedLibrary - generate rules to install the shared library.
++- * NOTE: file must be executable, hence "INSTBINFLAGS"
++- */
++-#ifndef InstallSharedLibrary
++-#define InstallSharedLibrary(libname,rev,dest)
@@\
++-install:: Concat(lib,libname.so.rev)
@@\
++- MakeDir($(DESTDIR)dest) @@\
++- $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev)
$(DESTDIR)dest @@\
++- @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed
's/\.[^\.]*$$//'`;\
++- set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
++- @if $(SOSYMLINK); then (set -x; \
++- $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
++- $(LN) Concat(lib,libname.so.rev)
Concat($(DESTDIR)dest/lib,libname.so)); fi
++-#endif /* InstallSharedLibrary */
++-
++-/*
++- * InstallSharedLibraryData - generate rules to install the shared library
data
++- */
++-#ifndef InstallSharedLibraryData
++-#define InstallSharedLibraryData(libname,rev,dest)
++-#endif /* InstallSharedLibraryData */
++-
++-
++-/*
++- * SharedLibraryTarget - generate rules to create a shared library;
++- * build it into a different name so that we do not hose people by having
++- * the library gone for long periods.
++- */
++-#ifndef SharedLibraryTarget
++-#ifdef UseInstalled
++-#define LinkBuildSonameLibrary(lib) true
++-#else
++-#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
++- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
++-#endif
++-
++-#define SharedLibraryTarget(libname,rev,solist,down,up)
@@\
++-AllTarget(Concat(lib,libname.so.rev))
@@\
++- @@\
++-Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS)
@@\
++- $(RM) [EMAIL PROTECTED]
@@\
++- @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
++- (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
++- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
++- LinkBuildSonameLibrary($$SONAME) @@\
++- $(RM) $@ @@\
++- $(MV) [EMAIL PROTECTED] $@
@@\
++- @if $(SOSYMLINK); then (set -x; \ @@\
++- $(RM) Concat(lib,libname.so); \ @@\
++- $(LN) $@ Concat(lib,libname.so)); fi @@\
++- LinkBuildLibrary($@) @@\
++- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
++- @@\
++-clean::
@@\
++- @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
++- set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
++- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++-
++-#endif /* SharedLibraryTarget */
++-
++-/*
++- * SharedDepLibraryTarget - generate rules to create a shared library.
++- */
++-#ifndef SharedDepLibraryTarget
++-#ifdef UseInstalled
++-#ifndef LinkBuildSonameLibrary
++-#define LinkBuildSonameLibrary(lib) true
++-#endif
++-#else
++-#ifndef LinkBuildSonameLibrary
++-#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
++- cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
++-#endif
++-#endif
++-
++-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
++-AllTarget(Concat(lib,libname.so.rev))
@@\
++- @@\
++-Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
++- $(RM) [EMAIL PROTECTED]
@@\
++- @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
++- (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
++- $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
++- LinkBuildSonameLibrary($$SONAME) @@\
++- $(RM) $@ @@\
++- $(MV) [EMAIL PROTECTED] $@
@@\
++- @if $(SOSYMLINK); then (set -x; \ @@\
++- $(RM) Concat(lib,libname.so); \ @@\
++- $(LN) $@ Concat(lib,libname.so)); fi @@\
++- LinkBuildLibrary($@) @@\
++- LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
++- @@\
++-clean::
@@\
++- @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
++- set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
++- $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++-
++-#endif /* SharedDepLibraryTarget */
++-
++-#ifndef SharedDepModuleTarget
++-#define SharedDepModuleTarget(name,deps,solist)
@@\
++-AllTarget(name)
@@\
++- @@\
++-name: deps @@\
++- $(RM) [EMAIL PROTECTED]
@@\
++- $(CC) -o [EMAIL PROTECTED] $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)
BaseShLibReqs @@\
++- $(RM) $@ @@\
++- $(MV) [EMAIL PROTECTED] $@
@@\
++- @@\
++-clean::
@@\
++- $(RM) name
++-
++-#endif /* SharedDepModuleTarget */
++-
++-/*
++- * SharedLibraryDataTarget - generate rules to create shlib data file;
++- */
++-#ifndef SharedLibraryDataTarget
++-#define SharedLibraryDataTarget(libname,rev,salist)
++-#endif /* SharedLibraryTarget */
++diff -Nur xc/config/cf.old/gnuLib.tmpl xc/config/cf/gnuLib.tmpl
++--- xc/config/cf.old/gnuLib.tmpl 2000-11-14 19:20:31.000000000 +0100
+++++ xc/config/cf/gnuLib.tmpl 1970-01-01 01:00:00.000000000 +0100
++@@ -1,30 +0,0 @@
++-/*
++- * GNU Hurd shared library template
++- *
++- * $XFree86: xc/config/cf/gnuLib.tmpl,v 1.3 2000/11/14 18:20:31 dawes Exp $
++- */
++-
++-#ifndef FixupLibReferences
++-#define FixupLibReferences() @@\
++-XMULIBONLY = -lXmu @@\
++-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
++-#endif
++-
++-#ifndef XawClientLibs
++-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
++-#endif
++-
++-#define CplusplusLibC
++-
++-#define SharedX11Reqs
++-#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
++-#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
++-#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
++-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB)
$(XLIB)
++-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
++-#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
++-#define SharedXiReqs $(LDPRELIB) $(XLIB)
++-#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
++-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
++-#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
++-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
+diff -Nur sid.old/debian/patches/001d_gnu-lib_split.diff
sid/debian/patches/001d_gnu-lib_split.diff
+--- sid.old/debian/patches/001d_gnu-lib_split.diff 1970-01-01
01:00:00.000000000 +0100
++++ sid/debian/patches/001d_gnu-lib_split.diff 2003-10-27 00:43:45.000000000
+0100
+@@ -0,0 +1,22 @@
++diff -Nur xc/config/cf.old/gnuLib.rules xc/config/cf/gnuLib.rules
++--- xc/config/cf.old/gnuLib.rules 1970-01-01 01:00:00.000000000 +0100
+++++ xc/config/cf/gnuLib.rules 2003-10-15 20:08:04.000000000 +0200
++@@ -0,0 +1,7 @@
+++
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-commonLib.rules>
+++
+++XCOMM Below, rules specific to the GNU system (with the Hurd)
+++
+++XCOMM (nothing yet)
++diff -Nur xc/config/cf.old/gnuLib.tmpl xc/config/cf/gnuLib.tmpl
++--- xc/config/cf.old/gnuLib.tmpl 1970-01-01 01:00:00.000000000 +0100
+++++ xc/config/cf/gnuLib.tmpl 2003-10-15 20:08:23.000000000 +0200
++@@ -0,0 +1,7 @@
+++
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-commonLib.tmpl>
+++
+++XCOMM Below, rules specific to the GNU system (with the Hurd)
+++
+++XCOMM (nothing yet)
+diff -Nur sid.old/debian/patches/002_xdm_fixes.diff
sid/debian/patches/002_xdm_fixes.diff
+--- sid.old/debian/patches/002_xdm_fixes.diff 2003-10-27 00:52:28.000000000
+0100
++++ sid/debian/patches/002_xdm_fixes.diff 2003-10-27 00:43:52.000000000
+0100
+@@ -1,4 +1,4 @@
+-$Id: 002_xdm_fixes.diff 663 2003-10-16 18:07:07Z branden $
++$Id: 002_xdm_fixes.diff 696 2003-10-22 17:53:46Z rmh $
+
+ This patch by Branden Robinson, Matthieu Herrb, and Richard Braakman.
+
+@@ -133,18 +133,15 @@
+ - (cosmetic) Don't capitalize or put periods at the ends of log
+ messages, since they aren't sentences.
+
+---- xc/config/cf/gnu.cf~ 2003-09-21 15:53:53.000000000 -0500
+-+++ xc/config/cf/gnu.cf 2003-09-21 15:53:35.000000000 -0500
+-@@ -33,6 +33,9 @@
+- XCOMM #define ThreadsLibraries -lpthread
+- XCOMM #define SystemMTDefines -D_REENTRANT
+-
++--- xc/config/cf/gnu.cf.orig 2003-10-15 02:07:11.000000000 +0200
+++++ xc/config/cf/gnu.cf 2003-10-15 02:08:15.000000000 +0200
++@@ -17,3 +17,6 @@
++ XCOMM #ifndef StandardDefines
++ XCOMM #define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
++ XCOMM #endif
+++
+ +#define HasDevRandom YES
+ +#define PollDevRandom YES
+-+
+- #ifndef HasLibCrypt
+- #define HasLibCrypt YES
+- #endif
+ --- xc/config/cf/linux.cf~ 2003-09-21 15:40:11.000000000 -0500
+ +++ xc/config/cf/linux.cf 2003-09-21 15:41:15.000000000 -0500
+ @@ -86,6 +86,12 @@
+diff -Nur sid.old/debian/patches/003a_damn_cpp_3.3_to_hell.diff
sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff
+--- sid.old/debian/patches/003a_damn_cpp_3.3_to_hell.diff 2003-10-27
00:52:21.000000000 +0100
++++ sid/debian/patches/003a_damn_cpp_3.3_to_hell.diff 2003-10-27
00:43:48.000000000 +0100
+@@ -1,4 +1,4 @@
+-$Id: 003a_damn_cpp_3.3_to_hell.diff 564 2003-09-21 22:15:53Z branden $
++$Id: 003a_damn_cpp_3.3_to_hell.diff 696 2003-10-22 17:53:46Z rmh $
+
+ GNU CPP 3.3 doesn't handle the -traditional flag correctly. This causes
+ bustication of xdm, xrdb, and probably manpage generation as well.
+@@ -7,8 +7,8 @@
+ stuff using cpp in the tree probably needs to be "ported" to work when
+ -traditional is not set, if possible.
+
+---- xc/config/cf/gnu.cf~ 2003-05-26 23:27:33.000000000 -0500
+-+++ xc/config/cf/gnu.cf 2003-05-26 23:29:16.000000000 -0500
++--- xc/config/cf/gnu-common.cf~ 2003-05-26 23:27:33.000000000 -0500
+++++ xc/config/cf/gnu-common.cf 2003-05-26 23:29:16.000000000 -0500
+ @@ -108,9 +108,7 @@
+ #ifndef DoLoadableServer
+ #define DoLoadableServer YES
+diff -Nur sid.old/debian/patches/004_imake_manpage_handling_overhaul.diff
sid/debian/patches/004_imake_manpage_handling_overhaul.diff
+--- sid.old/debian/patches/004_imake_manpage_handling_overhaul.diff
2003-10-27 00:52:23.000000000 +0100
++++ sid/debian/patches/004_imake_manpage_handling_overhaul.diff
2003-10-27 00:43:46.000000000 +0100
+@@ -1,4 +1,4 @@
+-$Id: 004_imake_manpage_handling_overhaul.diff 564 2003-09-21 22:15:53Z
branden $
++$Id: 004_imake_manpage_handling_overhaul.diff 696 2003-10-22 17:53:46Z rmh $
+
+ This patch is a complete overhaul of how Imake deals with X's manpages.
+
+@@ -269,8 +269,8 @@
+ #endif
+ INSTBINFLAGS = InstBinFlags /* install flags for programs */
+ INSTUIDFLAGS = InstUidFlags /* install flags for setuid programs */
+---- xc/config/cf/gnu.cf.orig Mon Jan 13 17:22:45 2003
+-+++ xc/config/cf/gnu.cf Mon Jan 13 17:22:51 2003
++--- xc/config/cf/gnu-common.cf.orig Mon Jan 13 17:22:45 2003
+++++ xc/config/cf/gnu-common.cf Mon Jan 13 17:22:51 2003
+ @@ -144,26 +144,6 @@
+
+ #define ConnectionFlags -DUNIXCONN -DTCPCONN
+diff -Nur sid.old/debian/patches/800a_gnu_more_fixes.diff
sid/debian/patches/800a_gnu_more_fixes.diff
+--- sid.old/debian/patches/800a_gnu_more_fixes.diff 1970-01-01
01:00:00.000000000 +0100
++++ sid/debian/patches/800a_gnu_more_fixes.diff 2003-10-27
00:43:46.000000000 +0100
+@@ -0,0 +1,31 @@
++
++ More fixes for gnu-common.cf as pointed out by Ishikawa some time ago.
++ -- Robert Millan <[EMAIL PROTECTED]>
++
++--- xc/config/cf.old/gnu-common.cf 2003-10-15 20:01:04.000000000 +0200
+++++ xc/config/cf/gnu-common.cf 2003-10-15 20:42:40.000000000 +0200
++@@ -88,6 +88,24 @@
++ # define BuildTrueTypeFonts NO
++ # define BuildBethMarduthoFonts NO
++
+++# define HasXftLibrary YES
+++
+++# define BuildXcursorLibrary NO
+++# define HasXcursorLibrary YES
+++# define BuildRenderLibrary NO
+++# define HasRenderLibrary YES
+++
+++# ifdef UseInstalled
+++# define RenderLibraryDir /usr/X11R6
+++# define XftLibraryDir /usr/X11R6
+++# define XcursorLibraryDir /usr
+++# else
+++/* for Debian xfree86 build hack */
+++# define RenderLibraryDir $(TOP)/../../debian/local/exports
+++# define XftLibraryDir $(TOP)/../../debian/local/exports
+++# define XcursorLibraryDir $(TOP)/../../debian/local/exports
+++# endif
+++
++ #define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
++ -D_POSIX_SOURCE -D_XOPEN_SOURCE \
++ -D_BSD_SOURCE -D_SVID_SOURCE
+diff -Nur sid.old/debian/patches/800_gnu_config.diff
sid/debian/patches/800_gnu_config.diff
+--- sid.old/debian/patches/800_gnu_config.diff 2003-10-27 00:52:16.000000000
+0100
++++ sid/debian/patches/800_gnu_config.diff 2003-10-27 00:43:47.000000000
+0100
+@@ -1,15 +1,15 @@
+-$Id: 800_gnu_config.diff 535 2003-09-16 18:28:31Z branden $
++$Id: 800_gnu_config.diff 696 2003-10-22 17:53:46Z rmh $
+
+ This patch by Marcus Brinkmann <[EMAIL PROTECTED]>.
+
+-Adds Debian specific configuration to gnu.cf (mostly from linux.cf).
++Adds Debian specific configuration to gnu-common.cf (mostly from linux.cf).
+
+ Original patch by Marcus Brinkmann <[EMAIL PROTECTED]>, updated by
+-Robert Millan <[EMAIL PROTECTED]> and
++Robert Millan <[EMAIL PROTECTED]> and
+ Daniel Stone <[EMAIL PROTECTED]>.
+
+---- xc/config/cf/gnu.cf.orig Fri Aug 24 04:16:54 2001
+-+++ xc/config/cf/gnu.cf Sun Apr 13 11:19:47 2003
++--- xc/config/cf/gnu-common.cf.orig Fri Aug 24 04:16:54 2001
+++++ xc/config/cf/gnu-common.cf Sun Apr 13 11:19:47 2003
+ @@ -18,6 +18,76 @@
+ #endif
+ XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+diff -Nur sid.old/debian/patches/803_gnu_xdm_chooser.diff
sid/debian/patches/803_gnu_xdm_chooser.diff
+--- sid.old/debian/patches/803_gnu_xdm_chooser.diff 1970-01-01
01:00:00.000000000 +0100
++++ sid/debian/patches/803_gnu_xdm_chooser.diff 2003-10-27
00:43:48.000000000 +0100
+@@ -0,0 +1,85 @@
++
++ Weird.. code for "__GNU__" does actualy fail on GNU/Hurd, whereas code for
++ "! __GNU__" does at least _compile_ on that platform.
++
++ I see no reason not to use the same code for all Glibc-based systems, so
++ we'll just stick with the code that works on GNU/Linux. I'll have to check
++ with upstream to see what they intended to do when adding this kludge.
++ -- Robert Millan <[EMAIL PROTECTED]>
++
++--- xc/programs/xdm/chooser.c.orig 2003-10-17 01:22:35.000000000 +0200
+++++ xc/programs/xdm/chooser.c 2003-10-17 01:28:55.000000000 +0200
++@@ -130,9 +130,7 @@
++ # include <sync/queue.h>
++ # include <sync/sema.h>
++ #endif
++-#ifndef __GNU__
++-# include <net/if.h>
++-#endif /* __GNU__ */
+++#include <net/if.h>
++ #endif /* hpux */
++
++ #include <netdb.h>
++@@ -550,8 +548,6 @@
++ * addresses on the local host.
++ */
++
++-#if !defined(__GNU__)
++-
++ /* Handle variable length ifreq in BNR2 and later */
++ #ifdef VARIABLE_IFREQ
++ #define ifr_size(p) (sizeof (struct ifreq) + \
++@@ -712,53 +708,6 @@
++ QUERY);
++ }
++ }
++-#else /* __GNU__ */
++-static void
++-RegisterHostname (char *name)
++-{
++- struct hostent *hostent;
++- struct sockaddr_in in_addr;
++-
++- if (!strcmp (name, BROADCAST_HOSTNAME))
++- {
++- in_addr.sin_addr.s_addr= htonl(0xFFFFFFFF);
++- in_addr.sin_port = htons (XDM_UDP_PORT);
++- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
++- BROADCAST_QUERY);
++- }
++- else
++- {
++-
++- /* address as hex string, e.g., "12180022" (deprecated) */
++- if (strlen(name) == 8 &&
++- FromHex(name, (char *)&in_addr.sin_addr, strlen(name)) == 0)
++- {
++- in_addr.sin_family = AF_INET;
++- in_addr.sin_port = htons (XDM_UDP_PORT);
++- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
++- QUERY);
++- } else {
++- /* Per RFC 1123, check first for IP address in dotted-decimal form */
++- else if ((in_addr.sin_addr.s_addr = inet_addr(name)) != -1)
++- in_addr.sin_family = AF_INET;
++- else
++- {
++- hostent = gethostbyname (name);
++- if (!hostent)
++- return;
++- if (hostent->h_addrtype != AF_INET || hostent->h_length != 4)
++- return;
++- in_addr.sin_family = hostent->h_addrtype;
++- memmove( &in_addr.sin_addr, hostent->h_addr, 4);
++- }
++- in_addr.sin_port = htons (XDM_UDP_PORT);
++- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
++- QUERY);
++- }
++-
++- }
++-}
++-#endif /* __GNU__ */
++
++ static ARRAYofARRAY8 AuthenticationNames;
++
Added: people/rmh/xfree86_kbsd.diff
===================================================================
--- people/rmh/xfree86_kbsd.diff 2003-11-16 04:26:00 UTC (rev 775)
+++ people/rmh/xfree86_kbsd.diff 2003-11-20 14:12:37 UTC (rev 776)
@@ -0,0 +1,610 @@
+diff -Nur xfree86-4.3.0/debian.old/patches/820_gnu-freebsd_config.diff
xfree86-4.3.0/debian/patches/820_gnu-freebsd_config.diff
+--- xfree86-4.3.0/debian.old/patches/820_gnu-freebsd_config.diff
2003-10-28 10:03:36.000000000 +0100
++++ xfree86-4.3.0/debian/patches/820_gnu-freebsd_config.diff 2003-10-28
10:25:35.000000000 +0100
+@@ -1,17 +1,6 @@
+ $Id: 820_gnu-freebsd_config.diff 535 2003-09-16 18:28:31Z branden $
+
+
+- adds GNU/FreeBSD build defines to xc/config/cf. they're basicaly
+- copied and adapted from the defines for GNU OS.
+-
+- not for submitting upstream yet, the defines in linux.cf, gnu.cf
+- and gnu-freebsd.cf (specialy the last two) share a large amount
+- of common lines. i want to split these into a gnu-common.cf file
+- so gnu.cf and gnu-freebsd.cf don't get easily outdated.
+-
+- also the debian-specific lines in linux.cf should be moved somewhere
+- else. i suggested using site.def. --Robert Millan <[EMAIL PROTECTED]>
+-
+ diff -Nur xc/config/cf.old/Imake.cf xc/config/cf/Imake.cf
+ --- xc/config/cf.old/Imake.cf 2003-02-27 07:34:03.000000000 +0100
+ +++ xc/config/cf/Imake.cf 2003-05-31 15:00:51.000000000 +0200
+@@ -19,470 +8,60 @@
+ # endif
+ #endif /* NetBSD */
+
+-+#ifdef __GNU_FreeBSD__
+-+#define MacroIncludeFile <gnu-freebsd.cf>
+-+#define MacroFile gnu-freebsd.cf
+-+#define GNUFreeBSDArchitecture
+++#ifdef __GNU_KFreeBSD__
+++#define MacroIncludeFile <gnu-kfreebsd.cf>
+++#define MacroFile gnu-kfreebsd.cf
+++#define GNUKFreeBSDArchitecture
+ +#endif
+ +
+ #ifdef __FreeBSD__
+ # define MacroIncludeFile <FreeBSD.cf>
+ # define MacroFile FreeBSD.cf
+-diff -Nur xc/config/cf.old/gfbLib.rules xc/config/cf/gfbLib.rules
+---- xc/config/cf.old/gfbLib.rules 1970-01-01 01:00:00.000000000 +0100
+-+++ xc/config/cf/gfbLib.rules 2003-05-31 15:00:39.000000000 +0200
+-@@ -0,0 +1,181 @@
+-+/*
+-+ * GNU/Hurd shared library rules
+-+ *
+-+ * $XFree86: xc/config/cf/gnuLib.rules,v 1.5 2002/01/16 00:39:59 keithp Exp $
+-+ */
+-+
+-+/*
+-+ * GNU/FreeBSD shared library rules
+-+ * Cloned from GNU (ELF) shared library rules
+-+ *
+-+ */
+-+
+-+#ifndef HasSharedLibraries
+-+#define HasSharedLibraries YES
+-+#endif
+-+#ifndef ForceNormalLib
+-+#define ForceNormalLib NO
+-+#endif
+-+
+-+#ifndef SharedOldX
+-+#define SharedOldX NO
+-+#endif
+-+
+-+#undef SpecialMalloc
+-+#define SpecialMalloc NO
+-+
+-+#define BaseShLibReqs -lc
+-+
+-+#ifndef SharedDataSeparation
+-+#define SharedDataSeparation NO
+-+#endif
+-+#ifndef SharedCodeDef
+-+#define SharedCodeDef /**/
+-+#endif
+-+#ifndef SharedLibraryDef
+-+#define SharedLibraryDef /**/
+-+#endif
+-+#ifndef ShLibIncludeFile
+-+#define ShLibIncludeFile <gfbLib.tmpl>
+-+#endif
+-+#ifndef SharedLibraryLoadFlags
+-+XCOMM XXX To rpath or not to rpath...
+-+XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
+-+#define SharedLibraryLoadFlags -shared
+-+#endif
+-+#ifndef PositionIndependentCFlags
+-+#define PositionIndependentCFlags -fPIC
+-+#endif
+-+#ifndef PositionIndependentCplusplusFlags
+-+#define PositionIndependentCplusplusFlags -fPIC
+-+#endif
+-+#ifndef ExtraLoadFlags
+-+#ifdef UseInstalled
+-+XCOMM XXX Maybe superfluous.
+-+#define ExtraLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
+-+#else
+-+#define ExtraLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
+-+#endif
+-+#endif
+-+
+-+/*
+-+ * InstallSharedLibrary - generate rules to install the shared library.
+-+ * NOTE: file must be executable, hence "INSTBINFLAGS"
+-+ */
+-+#ifndef InstallSharedLibrary
+-+#define InstallSharedLibrary(libname,rev,dest)
@@\
+-+install:: Concat(lib,libname.so.rev)
@@\
+-+ MakeDir($(DESTDIR)dest) @@\
+-+ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev)
$(DESTDIR)dest @@\
+-+ @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed
's/\.[^\.]*$$//'`;\
+-+ set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
+-+ @if $(SOSYMLINK); then (set -x; \
+-+ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
+-+ $(LN) Concat(lib,libname.so.rev)
Concat($(DESTDIR)dest/lib,libname.so)); fi
+-+#endif /* InstallSharedLibrary */
+-+
+-+/*
+-+ * InstallSharedLibraryData - generate rules to install the shared library
data
+-+ */
+-+#ifndef InstallSharedLibraryData
+-+#define InstallSharedLibraryData(libname,rev,dest)
+-+#endif /* InstallSharedLibraryData */
+-+
+-+
+-+/*
+-+ * SharedLibraryTarget - generate rules to create a shared library;
+-+ * build it into a different name so that we do not hose people by having
+-+ * the library gone for long periods.
+-+ */
+-+#ifndef SharedLibraryTarget
+-+#ifdef UseInstalled
+-+#define LinkBuildSonameLibrary(lib) true
+-+#else
+-+#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+-+ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+-+#endif
+-+
+-+#define SharedLibraryTarget(libname,rev,solist,down,up)
@@\
+-+AllTarget(Concat(lib,libname.so.rev))
@@\
+-+ @@\
+-+Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS)
@@\
+-+ $(RM) [EMAIL PROTECTED]
@@\
+-+ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
+-+ (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+-+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
+-+ LinkBuildSonameLibrary($$SONAME) @@\
+-+ $(RM) $@ @@\
+-+ $(MV) [EMAIL PROTECTED] $@
@@\
+-+ @if $(SOSYMLINK); then (set -x; \ @@\
+-+ $(RM) Concat(lib,libname.so); \ @@\
+-+ $(LN) $@ Concat(lib,libname.so)); fi @@\
+-+ LinkBuildLibrary($@) @@\
+-+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
+-+ @@\
+-+clean::
@@\
+-+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
+-+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
+-+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+-+
+-+#endif /* SharedLibraryTarget */
+-+
+-+/*
+-+ * SharedDepLibraryTarget - generate rules to create a shared library.
+-+ */
+-+#ifndef SharedDepLibraryTarget
+-+#ifdef UseInstalled
+-+#ifndef LinkBuildSonameLibrary
+-+#define LinkBuildSonameLibrary(lib) true
+-+#endif
+-+#else
+-+#ifndef LinkBuildSonameLibrary
+-+#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+-+ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+-+#endif
+-+#endif
+-+
+-+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
+-+AllTarget(Concat(lib,libname.so.rev))
@@\
+-+ @@\
+-+Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
+-+ $(RM) [EMAIL PROTECTED]
@@\
+-+ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
+-+ (cd down; $(CC) -o up/[EMAIL PROTECTED] $(SHLIBLDFLAGS)
-Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+-+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
+-+ LinkBuildSonameLibrary($$SONAME) @@\
+-+ $(RM) $@ @@\
+-+ $(MV) [EMAIL PROTECTED] $@
@@\
+-+ @if $(SOSYMLINK); then (set -x; \ @@\
+-+ $(RM) Concat(lib,libname.so); \ @@\
+-+ $(LN) $@ Concat(lib,libname.so)); fi @@\
+-+ LinkBuildLibrary($@) @@\
+-+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
+-+ @@\
+-+clean::
@@\
+-+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
+-+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
+-+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+-+
+-+#endif /* SharedDepLibraryTarget */
+-+
+-+#ifndef SharedDepModuleTarget
+-+#define SharedDepModuleTarget(name,deps,solist)
@@\
+-+AllTarget(name)
@@\
+-+ @@\
+-+name: deps @@\
+-+ $(RM) [EMAIL PROTECTED]
@@\
+-+ $(CC) -o [EMAIL PROTECTED] $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)
BaseShLibReqs @@\
+-+ $(RM) $@ @@\
+-+ $(MV) [EMAIL PROTECTED] $@
@@\
+-+ @@\
+-+clean::
@@\
+-+ $(RM) name
+-+
+-+#endif /* SharedDepModuleTarget */
+-+
+-+/*
+-+ * SharedLibraryDataTarget - generate rules to create shlib data file;
+-+ */
+-+#ifndef SharedLibraryDataTarget
+-+#define SharedLibraryDataTarget(libname,rev,salist)
+-+#endif /* SharedLibraryTarget */
+-diff -Nur xc/config/cf.old/gfbLib.tmpl xc/config/cf/gfbLib.tmpl
+---- xc/config/cf.old/gfbLib.tmpl 1970-01-01 01:00:00.000000000 +0100
+-+++ xc/config/cf/gfbLib.tmpl 2003-05-31 15:00:39.000000000 +0200
+-@@ -0,0 +1,29 @@
+-+/*
+-+ * GNU/FreeBSD shared library template
+-+ *
+-+ */
+-+
+-+#ifndef FixupLibReferences
+-+#define FixupLibReferences() @@\
+-+XMULIBONLY = -lXmu @@\
+-+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+-+#endif
+-+
+-+#ifndef XawClientLibs
+-+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+-+#endif
+-+
+-+#define CplusplusLibC
+-+
+-+#define SharedX11Reqs
+-+#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
+-+#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
+-+#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+-+#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB)
$(XLIB)
+-+#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
+-+#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
+-+#define SharedXiReqs $(LDPRELIB) $(XLIB)
+-+#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
+-+#define SharedXtstReqs $(LDPRELIB) $(XLIB)
+-+#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
+-+#define SharedSMReqs $(LDPRELIB) $(ICELIB)
+-diff -Nur xc/config/cf.old/gnu-freebsd.cf xc/config/cf/gnu-freebsd.cf
+---- xc/config/cf.old/gnu-freebsd.cf 1970-01-01 01:00:00.000000000 +0100
+-+++ xc/config/cf/gnu-freebsd.cf 2003-05-31 15:01:56.000000000 +0200
+-@@ -0,0 +1,236 @@
+-+XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49
dawes Exp $
+-+
+-+#ifndef OSName
+-+#define OSName DefaultOSName
+-+#endif
+-+
+-+#ifndef OSVendor
+-+#define OSVendor /**/
+-+#endif
+-+#ifndef OSMajorVersion
+-+#define OSMajorVersion DefaultOSMajorVersion
+-+#endif
+-+#ifndef OSMinorVersion
+-+#define OSMinorVersion DefaultOSMinorVersion
+-+#endif
+-+#ifndef OSTeenyVersion
+-+#define OSTeenyVersion DefaultOSTeenyVersion
+-+#endif
+-+XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
++diff -Nur xc/config/cf.old/gnu-kfreebsd.cf xc/config/cf/gnu-kfreebsd.cf
++--- xc/config/cf.old/gnu-kfreebsd.cf 1970-01-01 01:00:00.000000000 +0100
+++++ xc/config/cf/gnu-kfreebsd.cf 2003-10-28 10:25:08.000000000 +0100
++@@ -0,0 +1,22 @@
+ +
+-+#define HasPam YES
+-+#define PamLibraries -lpam -rdynamic -ldl
+-+#define XFree86Devel YES
+-+#define SystemManDirectory /usr/share/man
+-+#define HasTk YES
+-+#define TkLibDir /usr/lib
+-+#define TkIncDir /usr/include
+-+#define TkLibName tk8.3
+-+#define XF86SetupUsesStaticTk NO
+-+#define HasTcl YES
+-+#define TclLibDir /usr/lib
+-+#define TclIncDir /usr/include
+-+#define TclLibName tcl8.3
+-+#define XF86SetupUsesStaticTcl NO
+-+#define InstallXinitConfig YES
+-+#define InstallXdmConfig YES
+-+#define InstallFSConfig YES
+-+#define HasXdmAuth YES
+-+#define DebuggableLibraries YES
+-+#define ForceNormalLib YES
+-+#define BuildSpecsDocs YES
+-+#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
+-+#define BuildAllSpecsDocs YES
+-+#define HasLatex YES
+-+/* We build-dep on expat, fontconfig, freetype and Xft. */
+-+#define BuildFreetype2Library NO
+-+#define HasFreetype2 YES
+-+#define Freetype2Dir /usr
+-+#define BuildExpatLibrary NO
+-+#define HasExpat YES
+-+#define ExpatIncDirStandard YES
+-+#define BuildFontconfigLibrary NO
+-+#define HasFontconfig YES
+-+#define UseFontconfig YES
+-+#define FontconfigIncDir /usr/include/fontconfig
+-+#define BuildXftLibrary NO
+-+#define BuildXft1Library YES
+-+#define XAppLoadDir EtcX11Directory/app-defaults
+-+#define XFileSearchPathDefault
Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
+-+/* the relative symlink created by this rule causes problems for us */
+-+#if InstallAppDefFiles
+-+# define InstallAppDefaultsLong(file,class) @@\
+-+InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
+-+#else
+-+# define InstallAppDefaultsLong(file,class) @@\
+-+InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
+-+#endif /* InstallAppDefFiles */
+-+#ifndef BuilderEMailAddr
+-+# define BuilderEMailAddr "[EMAIL PROTECTED]"
+-+#endif
+-+#define SharedLibXdmGreet NO
+-+#define LinkGLToUsrInclude NO
+-+#define LinkGLToUsrLib NO
+-+#define SharedLibFont NO
+-+#define HasZlib YES
+-+#define SharedLibGlu YES
+-+#define NormalLibGlu YES
+-+#define BuildRman NO
+-+#define BuildHtmlManPages NO
+-+#define FSUseSyslog YES
+-+#ifndef HasKatmaiSupport
+-+# define HasKatmaiSupport NO
+-+#endif
+-+#define ProjectManSuffix x
+-+#define IconDir Concat(ProjectRoot,/lib/X11/icons)
+-+
+-+/* The TT/Meltho fonts are all under non-free licenses. */
+-+# define BuildTrueTypeFonts NO
+-+# define BuildBethMarduthoFonts NO
+-+
+-+#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
+-+ -D_POSIX_SOURCE -D_XOPEN_SOURCE \
+-+ -D_BSD_SOURCE -D_SVID_SOURCE
+-+
+-+XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-common.cf>
+ +
+-+#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+++XCOMM Below, rules specific to GNU/KFreeBSD
+ +
+-+XCOMM Enable this when we have pthreads.
+++XCOMM we have pthreads (linuxthreads)
+ +#define HasPosixThreads YES
+ +#define ThreadedX YES
+ +#define HasThreadSafeAPI YES
+ +#define ThreadsLibraries -lpthread
+ +#define SystemMTDefines -D_REENTRANT
+ +
+-+#ifndef HasLibCrypt
+-+#define HasLibCrypt YES
+-+#endif
+-+
+-+#ifndef BuildXF86RushExt
+-+# define BuildXF86RushExt YES
+-+#endif
+-+
+-+#define BuildLibPathVar LD_LIBRARY_PATH
+-+#define GccUsesGas YES
+-+#define UseGas YES
+-+#define GnuCpp YES
+-+#define HasDlopen YES
+-+#ifndef HasShadowPasswd
+-+# define HasShadowPasswd YES
+-+#endif
+-+#define HasPutenv YES
+-+
+-+XCOMM Not implemented and will always fail.
+-+#define HasShm YES
+-+
+ +XCOMM #define HasBSD44Sockets YES
+-+#define HasSockets YES
+-+#define HasSnprintf YES
+-+#define HasMkstemp YES
+-+#define HasUsableFileMmap YES
+-+#ifndef HasNCurses
+-+#define HasNCurses YES
+-+#endif
+-+
+-+#define AvoidNullMakeCommand YES
+-+#ifndef DebuggableLibraries
+-+#define DebuggableLibraries NO
+-+#endif
+-+#define CompressAllFonts YES
+-+#define Malloc0ReturnsNull YES
+-+#define NeedConstPrototypes YES
+-+#define NeedFunctionPrototypes YES
+-+#define NeedNestedPrototypes YES
+-+#define NeedVarargsPrototypes YES
+-+#ifndef NeedWidePrototypes
+-+#define NeedWidePrototypes NO
+-+#endif
+-+#define SetTtyGroup YES
+-+
+-+#ifndef UseStaticTermcapLib
+-+#define UseStaticTermcapLib NO
+-+#endif
+-+
+-+#define MkdirHierCmd mkdir -p
+-+#ifndef CcCmd
+-+#define CcCmd gcc
+-+#endif
+-+#ifndef AsCmd
+-+#define AsCmd as
+-+#endif
+-+#ifndef LdCmd
+-+#define LdCmd ld
+-+#endif
+-+
+-+#define AsmDefines -D__ELF__
+-+#define CplusplusCmd c++
+-+#ifndef TermcapLibrary
+-+#if UseStaticTermcapLib
+-+#define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
+-+#else
+-+#define TermcapLibrary -lncurses
+-+#endif
+-+#endif
+-+#ifndef DoLoadableServer
+-+#define DoLoadableServer YES
+-+#endif
+-+#ifndef
+-+#define CppCmd /lib/cpp
+-+#endif
+-+#define YaccCmd bison -y
+-+#define LexCmd flex -l
+-+#define HasFlex YES
+-+#define LexLib -lfl
+-+#define PreProcessCmd CcCmd -E
+-+#define PostIncDir DefaultGccIncludeDir
+-+#define LdCombineFlags -r
+-+#ifndef LdPostLib
+-+#define LdPostLib /* Never needed */
+-+#endif
+-+#define HasWChar32 YES
+-+#define StandardCppOptions -traditional
+-+#define StandardCppDefines StandardDefines
+-+
+-+#define HasVarRun YES
+-+#define VarDbDirectory $(VARDIR)/lib
+-+
+-+XCOMM i386Architecture
+-+#define OptimizedCDebugFlags DefaultGcc2i386Opt
+-+#define DefaultGcc2i386Opt -O2
+-+#define GNUMachineDefines -D__i386__
+-+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-DPART_NET
+-+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+-+#define HasPlugin YES
+-+#define VendorHasX11R6_3libXext YES
+-+
+-+#ifndef StandardDefines
+-+#define StandardDefines GNUMachineDefines GNUSourceDefines
+-+#endif
+-+
+-+#define DlLibrary -rdynamic -ldl
+-+
+-+#define ServerExtraSysLibs /**/
+-+
+-+#define ConnectionFlags -DUNIXCONN -DTCPCONN
+-+
+-+#ifndef StaticLibrary
+-+#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
+-+#endif
+-+
+-+#define HasGnuMake YES
+-+
+-+#define MakeNamedTargetSubdir(dir,flags,subname)\
+-+ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
+-+
+-+#define ArchitectureDefines -DGNU_ARCHITECTURE
+-+
+-+#define XserverNeedsSetUID YES
+ +
+-+#include <gnuLib.rules>
+++XCOMM we don't need -D__GNU__, so this define stays in gnu-common.cf
+++XCOMM #ifndef StandardDefines
+++XCOMM #define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
+++XCOMM #endif
+++
+++#define HasDevRandom YES
+++#define PollDevRandom YES
++diff -Nur xc/config/cf.old/gnu-kfreebsdLib.rules
xc/config/cf/gnu-kfreebsdLib.rules
++--- xc/config/cf.old/gnu-kfreebsdLib.rules 1970-01-01 01:00:00.000000000
+0100
+++++ xc/config/cf/gnu-kfreebsdLib.rules 2003-10-28 10:23:59.000000000
+0100
++@@ -0,0 +1,7 @@
+++
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-commonLib.rules>
+++
+++XCOMM Below, rules specific to GNU/KFreeBSD
+++
+++XCOMM (nothing yet)
++diff -Nur xc/config/cf.old/gnu-kfreebsdLib.tmpl
xc/config/cf/gnu-kfreebsdLib.tmpl
++--- xc/config/cf.old/gnu-kfreebsdLib.tmpl 1970-01-01 01:00:00.000000000
+0100
+++++ xc/config/cf/gnu-kfreebsdLib.tmpl 2003-10-28 10:24:11.000000000 +0100
++@@ -0,0 +1,7 @@
+ +
+-+XCOMM XXX Might need this if they are not careful with slashes.
+-+XCOMM #define DirFailPrefix -
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-commonLib.tmpl>
+ +
+-+#include <xfree86.cf>
+++XCOMM Below, rules specific to GNU/KFreeBSD
+ +
+++XCOMM (nothing yet)
+diff -Nur xfree86-4.3.0/debian.old/patches/822_gnu-freebsd_xload.diff
xfree86-4.3.0/debian/patches/822_gnu-freebsd_xload.diff
+--- xfree86-4.3.0/debian.old/patches/822_gnu-freebsd_xload.diff
2003-10-28 10:03:37.000000000 +0100
++++ xfree86-4.3.0/debian/patches/822_gnu-freebsd_xload.diff 2003-10-28
10:31:02.000000000 +0100
+@@ -21,7 +21,7 @@
+ #else /* not KVM_ROUTINES */
+
+ -#ifdef linux
+-+#if defined(linux) || defined(__GNU_FreeBSD__)
+++#if defined(linux) || defined(__FreeBSD_kernel__)
+
+ void InitLoadPoint()
+ {
+diff -Nur xfree86-4.3.0/debian.old/patches/830_gnu-knetbsd_config.diff
xfree86-4.3.0/debian/patches/830_gnu-knetbsd_config.diff
+--- xfree86-4.3.0/debian.old/patches/830_gnu-knetbsd_config.diff
1970-01-01 01:00:00.000000000 +0100
++++ xfree86-4.3.0/debian/patches/830_gnu-knetbsd_config.diff 2003-10-28
10:30:18.000000000 +0100
+@@ -0,0 +1,64 @@
++diff -Nur xc/config/cf.old/Imake.cf xc/config/cf/Imake.cf
++--- xc/config/cf.old/Imake.cf 2003-10-28 10:20:50.000000000 +0100
+++++ xc/config/cf/Imake.cf 2003-10-28 10:27:35.000000000 +0100
++@@ -219,6 +219,12 @@
++ #define GNUKFreeBSDArchitecture
++ #endif
++
+++#ifdef __GNU_KNetBSD__
+++#define MacroIncludeFile <gnu-knetbsd.cf>
+++#define MacroFile gnu-knetbsd.cf
+++#define GNUKNetBSDArchitecture
+++#endif
+++
++ #ifdef __FreeBSD__
++ # define MacroIncludeFile <FreeBSD.cf>
++ # define MacroFile FreeBSD.cf
++diff -Nur xc/config/cf.old/gnu-knetbsd.cf xc/config/cf/gnu-knetbsd.cf
++--- xc/config/cf.old/gnu-knetbsd.cf 1970-01-01 01:00:00.000000000 +0100
+++++ xc/config/cf/gnu-knetbsd.cf 2003-10-28 10:29:01.000000000 +0100
++@@ -0,0 +1,22 @@
+++
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-common.cf>
+++
+++XCOMM Below, rules specific to GNU/KNetBSD
+++
+++XCOMM we don't have pthreads yet
+++XCOMM #define HasPosixThreads YES
+++XCOMM #define ThreadedX YES
+++XCOMM #define HasThreadSafeAPI YES
+++XCOMM #define ThreadsLibraries -lpthread
+++XCOMM #define SystemMTDefines -D_REENTRANT
+++
+++XCOMM #define HasBSD44Sockets YES
+++
+++XCOMM we don't need -D__GNU__, so this define stays in gnu-common.cf
+++XCOMM #ifndef StandardDefines
+++XCOMM #define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
+++XCOMM #endif
+++
+++#define HasDevRandom YES
+++#define PollDevRandom YES
++diff -Nur xc/config/cf.old/gnu-knetbsdLib.rules
xc/config/cf/gnu-knetbsdLib.rules
++--- xc/config/cf.old/gnu-knetbsdLib.rules 1970-01-01 01:00:00.000000000
+0100
+++++ xc/config/cf/gnu-knetbsdLib.rules 2003-10-28 10:29:18.000000000 +0100
++@@ -0,0 +1,7 @@
+++
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-commonLib.rules>
+++
+++XCOMM Below, rules specific to GNU/KNetBSD
+++
+++XCOMM (nothing yet)
++diff -Nur xc/config/cf.old/gnu-knetbsdLib.tmpl
xc/config/cf/gnu-knetbsdLib.tmpl
++--- xc/config/cf.old/gnu-knetbsdLib.tmpl 1970-01-01 01:00:00.000000000
+0100
+++++ xc/config/cf/gnu-knetbsdLib.tmpl 2003-10-28 10:29:26.000000000 +0100
++@@ -0,0 +1,7 @@
+++
+++XCOMM Include rules common to all GNU variants
+++#include <gnu-commonLib.tmpl>
+++
+++XCOMM Below, rules specific to GNU/KNetBSD
+++
+++XCOMM (nothing yet)
