DragonFly submit List (threaded) for 2004-03
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
XFree86-4 override
Hoi,
the attached patch to dfports removes the need for __FreeBSD__ for XFree86-4
(a DragonFly.cf is created for imake etc.). It works with CCVER=gcc2 and
CCVER=gcc3. There is still need for some work, but i think it will help
more than hurt especially those using CCVER=gcc3 (runs just fine).
The DragonFly.cf is still rather close to FreeBSD.cf but i think we should
restructure it a bit further so that stuff that belongs together is
together. Also some of the linking related stuff might be a bit overdone
but somehow it's a bit wierd with the new binutils (Joerg said it doesn't
respect the ld cache but i haven't had time to look closer)
If you get auto* errors try to "make install" directly in the offending port
(candidates fontconfig/libXft) it magically works then.
If /usr/ports/x11/XFree86-4-clients/Makefile fails, then this is because we
don't define FILESDIR anymore in bsd.port.mk, just delete the offending line
in the Makefile (ports', not dfports').
Next thought about XFree86 4.4 but i am not sure how to integrate it in the
dfports structure as we would be ahead of FreeBSD since Eric is not
available. Maybe we only update the -snap server.
(Someone an idea ?)
Have fun,
Andy
You can also get it here:
http://ftp.fortunaty.net/DragonFlyBSD/inofficial/dfports/dfports-XFree86.patch.bz2
And some packages:
http://ftp.fortunaty.net/DragonFlyBSD/inofficial/packages/
Index: devel/imake-4/Makefile
===================================================================
RCS file: /home/dcvs/dfports/devel/imake-4/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- devel/imake-4/Makefile 2 Dec 2003 08:49:05 -0000 1.1
+++ devel/imake-4/Makefile 23 Mar 2004 00:36:45 -0000
@@ -8,7 +8,7 @@
PORTNAME= imake
PORTVERSION= 4.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
Index: devel/imake-4/pkg-plist
===================================================================
RCS file: /home/dcvs/dfports/devel/imake-4/pkg-plist,v
retrieving revision 1.1
diff -u -p -r1.1 pkg-plist
--- devel/imake-4/pkg-plist 2 Dec 2003 08:49:05 -0000 1.1
+++ devel/imake-4/pkg-plist 24 Mar 2004 22:34:42 -0000
@@ -15,6 +15,7 @@ bin/rman
bin/xmkmf
lib/X11/config/Amoeba.cf
lib/X11/config/DGUX.cf
+lib/X11/config/DragonFly.cf
lib/X11/config/FreeBSD.cf
lib/X11/config/Imake.cf
lib/X11/config/Imake.rules
@@ -126,7 +127,6 @@ lib/X11/doc/html/lndir.1.html
lib/X11/doc/html/makedepend.1.html
lib/X11/doc/html/makeg.1.html
lib/X11/doc/html/makestrs.1.html
-lib/X11/doc/html/manindex1.html
lib/X11/doc/html/mergelib.1.html
lib/X11/doc/html/mkdirhier.1.html
lib/X11/doc/html/mkhtmlindex.1.html
Index: devel/imake-4/files/patch-DragonFly.cf
===================================================================
RCS file: devel/imake-4/files/patch-DragonFly.cf
diff -N devel/imake-4/files/patch-DragonFly.cf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/imake-4/files/patch-DragonFly.cf 25 Mar 2004 01:56:24 -0000
@@ -0,0 +1,331 @@
+--- cf/DragonFly.cf Wed Mar 22 22:12:35 2004
++++ cf/DragonFly.cf Tue Mar 23 22:07:40 2004
+@@ -0,0 +1,328 @@
++/* xc/config/cf/DragonFly.cf */
++
++#define UseElfFormat YES
++#define OSBinaryFormat [ELF]
++
++#ifndef OSName
++# define OSName DefaultOSName OSBinaryFormat
++#endif
++#ifndef OSVendor
++# define OSVendor /**/
++#endif
++#ifndef OSMajorVersion
++# define OSMajorVersion DefaultOSMajorVersion
++#endif
++#ifndef OSMinorVersion
++# define OSMinorVersion DefaultOSMinorVersion
++#endif
++#ifndef OSTeenyVersion
++# define OSTeenyVersion DefaultOSTeenyVersion
++#endif
++
++#ifndef OSRelVersion
++/* Include this to get finer-grained information about the OS version */
++#include "/usr/include/osreldate.h"
++#define OSRelVersion __DragonFly_version
++#endif
++
++XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion)
++
++
++#define HasCplusplus YES
++#define GccUsesGas YES
++#define UseGas YES
++#define GnuCpp YES
++#define HasNdbm YES
++#define HasPutenv YES
++#define HasSnprintf YES
++#define HasBSD44Sockets YES
++#define HasDlopen YES
++#define HasSetProcTitle YES
++#define HasLibCrypt YES
++#define HasShm YES
++#define HasWChar32 YES
++#define HasUsableFileMmap YES
++#define HasNCurses YES
++#define HasVarRun YES
++#define HasVarDb YES
++
++#define HasIssetugid YES
++#define HasPoll YES
++#define HasGetIfAddrs YES
++
++#define IPv6SocketsAlsoIPv4 NO
++#define InstallXloadSetGID NO
++#define HasWeakSymbols UseElfFormat
++
++/*
++ * Multi-thread safe libs
++ */
++#ifndef HasLibPthread
++# define HasLibPthread NO
++#endif
++#define HasPosixThreads YES
++#define ThreadedX YES
++#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
++#define HasThreadSafeAPI YES
++#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
++
++#if HasLibPthread
++# define ThreadsLibraries -lpthread
++#else
++#define BuildThreadStubLibrary YES
++#define NeedUIThrStubs YES
++#define ThreadsLibraries -pthread
++#define SharedX11Reqs $(LDPRELIB) -lXThrStub
++#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) -lXThrStub
++#endif
++
++#define AvoidNullMakeCommand YES
++#define StripInstalledPrograms YES
++#define CompressAllFonts YES
++#define Malloc0ReturnsNull YES
++#define NeedConstPrototypes YES
++#define NeedFunctionPrototypes YES
++#define NeedNestedPrototypes YES
++#define NeedVarargsPrototypes YES
++#define NeedWidePrototypes NO
++
++#define HasPlugin YES
++#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
++
++/*
++#define MkdirHierCmd mkdir -p
++
++#ifndef LexCmd
++#define LexCmd flex -l
++#endif
++#ifndef HasFlex
++#define HasFlex YES
++#endif
++
++#ifndef HasMktemp
++#define HasMktemp YES
++#endif
++
++#define CcCmd cc
++#define CplusplusCmd c++
++*/
++#define CppCmd cpp
++#define PreProcessCmd CppCmd
++
++#define StandardCppOptions -traditional
++#define StandardCppDefines /**/
++#ifndef DefaultCCOptions
++# if defined(UseInstalled)
++# define DefaultCCOptions /**/
++# else
++# if defined(HasGcc3) && HasGcc3
++# define NoSystemWarn -Wno-system-headers
++# else
++# define NoSystemWarn
++# endif
++# define DefaultCCOptions -ansi -Dasm=__asm NoSystemWarn
++# endif
++#endif
++
++#ifndef UseGnuMalloc
++# define UseGnuMalloc NO
++#endif
++
++#define HasSetUserContext YES
++#define HasGetpeereid YES
++#define HasMTRRSupport YES
++
++/*
++ * Drivers that don't need AGP can work with 4.0, but we don't have a
++ * mechanism for specifying a subset of drivers in the OS.cf files yet.
++ */
++#ifndef BuildXF86DRI
++# define BuildXF86DRI YES
++#endif
++
++#if defined(i386Architecture)
++#define HasAgpGart YES
++#endif
++
++/*
++ * SSE and 3DNow will be autodetected, so binutils is the only
++ * requirement for enabling this. By 4.2 they were all supported.
++ */
++#if defined(i386Architecture)
++# define HasX86Support YES
++# define HasMMXSupport YES
++# define Has3DNowSupport YES
++# define HasSSESupport YES
++#else
++# define HasX86Support NO
++# define HasMMXSupport NO
++# define Has3DNowSupport NO
++# define HasSSESupport NO
++#endif
++
++#ifndef UseRpath
++# define UseRpath YES
++#endif
++
++/* remove when linker is fixed */
++#ifndef RpathLoadFlags
++# if UseRpath
++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,/usr/local/lib -Wl,-rpath-link,/usr/lib/gcc3
++# else
++# define RpathLoadFlags /**/
++# endif
++#endif
++
++#ifndef ExtraLoadFlags
++# if !defined(UseInstalled)
++# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
++# else
++# define ExtraLoadFlags RpathLoadFlags
++# endif
++#endif
++
++#ifndef GnuMallocLibrary
++# define GnuMallocLibrary -lgnumalloc
++#endif
++
++#ifndef HasZlib
++# define HasZlib YES
++#endif
++
++#ifndef HasPam
++# define HasPam YES
++#endif
++
++#undef InstallCmd
++#define InstallCmd /usr/bin/install
++
++#define AsmElfDefines -D__ELF__
++
++#if GccUsesGas
++# define GccGasOption -DGCCUSESGAS
++# define AsmDefines -DUSE_GAS AsmElfDefines
++#else
++# define GccGasOption /**/
++# define AsmDefines AsmElfDefines
++#endif
++
++#ifdef i386Architecture
++# define ServerExtraDefines GccGasOption XFree86ServerDefines
++#endif
++#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \
++ defined(ia64Architecture) || defined(AMD64Architecture)
++# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
++#endif
++
++#ifdef Sparc64Architecture
++# define AsVISOption -Av9a
++# define AsOutputArchSize 64
++#endif
++
++#define StandardDefines -DCSRG_BASED
++
++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
++#define XawI18nDefines -DUSE_XWCHAR_STRING
++#define HasMakefileSafeInclude YES
++#define IncludeMakefile(file) @@# dependencies are in .depend
++#define DependFileName .depend
++#ifndef DoLoadableServer
++# define DoLoadableServer YES
++#endif
++#ifndef ForceNormalLib
++# define ForceNormalLib YES
++#endif
++#define HasMkstemp YES
++
++#ifdef i386Architecture
++# define OptimizedCDebugFlags -O
++#else
++# define OptimizedCDebugFlags -O
++#endif
++
++#ifndef PreIncDir
++# define PreIncDir /usr/include
++#endif
++
++#define HasGroff YES
++#define NroffCmd env GROFF_NO_SGR=y groff -Tascii
++#define SetTtyGroup YES
++
++#ifndef ExtraFilesToClean
++# define ExtraFilesToClean *.core
++#endif
++
++#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
++#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
++
++#ifndef SystemManDirectory
++# define SystemManDirectory /usr/share/man
++#endif
++
++#define InstKmemFlags -g kmem -m 2755
++
++#ifndef CompressManPages
++# define CompressManPages YES
++#endif
++
++#define HasBsdMake YES
++
++#ifndef StaticLibrary
++#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
++#endif
++
++#define DlLibrary -rdynamic
++
++#ifdef AlphaArchitecture
++# define IoLibrary -lio
++#else
++# define IoLibrary /**/
++#endif
++#define ServerExtraSysLibs IoLibrary
++
++#ifndef PamLibraries
++#define PamLibraries -lpam DlLibrary
++#endif
++
++#ifndef SharedLibXdmGreet
++# define SharedLibXdmGreet NO
++#endif
++
++/*
++ * On FreeBSD, the run-time loader will use the built-in "rpath" before
++ * LD_LIBRARY_PATH. This means that utilities like mkfontdir will load
++ * installed libraries (if they exist) in preference to the ones in the
++ * build tree, even though LD_LIBRARY_PATH points to the build tree.
++ * This can result in the build failing. One way to avoid this is to
++ * pre-load the libraries from the build tree.
++ *
++ * There should be a better way than this hack...
++ */
++
++/* Do we still need this?
++#if !defined(UseInstalled)
++#if UseElfFormat
++#ifndef PreloadFontSetup
++#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(XFONTPRELOADPATTERN))`"
++#endif
++#ifndef PreloadFreetypeSetup
++#define PreloadFreetypeSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN))`"
++#endif
++#ifndef PreloadXFTSetup
++#define PreloadXFTSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN) $(XFTPRELOADPATTERN) $(XRENDERPRELOADPATTERN) $(FCPRELOADPATTERN))`"
++#endif
++#endif
++#endif
++*/
++
++#ifndef HasCookieMaker
++/* Which versions have /dev/urandom? */
++#define HasCookieMaker YES
++#define MkCookieCmd \
++ 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
++#endif
++
++
++#include <bsdLib.rules>
++
++#include <xfree86.cf>
Index: devel/imake-4/files/patch-Imake.cf
===================================================================
RCS file: devel/imake-4/files/patch-Imake.cf
diff -N devel/imake-4/files/patch-Imake.cf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/imake-4/files/patch-Imake.cf 21 Mar 2004 16:50:59 -0000
@@ -0,0 +1,41 @@
+--- cf/Imake.cf Fri Mar 19 01:17:34 2004
++++ cf/Imake.cf Fri Mar 19 21:50:19 2004
+@@ -213,6 +213,38 @@
+ # endif
+ #endif /* NetBSD */
+
++#ifdef __DragonFly__
++# define MacroIncludeFile <DragonFly.cf>
++# define MacroFile DragonFly.cf
++# undef __DragonFly__
++# undef __FreeBSD__
++# define DragonFlyArchitecture
++# define FreeBSDArchitecture
++# ifdef __i386__
++# define i386BsdArchitecture
++# define i386Architecture
++# undef i386
++# endif
++# ifdef __alpha__
++# define AlphaBsdArchitecture
++# define AlphaArchitecture
++# undef __alpha__
++# endif
++# ifdef __sparc64__
++# define Sparc64Architecture
++# undef __sparc64__
++# endif
++# ifdef __ia64__
++# define ia64Architecture
++# undef __ia64__
++# endif
++# ifdef __amd64__
++# define x86_64Architecture
++# undef __amd64__
++# undef __x86_64__
++# endif
++#endif /* __DragonFly__ */
++
+ #ifdef __FreeBSD__
+ # define MacroIncludeFile <FreeBSD.cf>
+ # define MacroFile FreeBSD.cf
Index: devel/imake-4/files/patch-Imakefile
===================================================================
RCS file: devel/imake-4/files/patch-Imakefile
diff -N devel/imake-4/files/patch-Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/imake-4/files/patch-Imakefile 23 Mar 2004 01:24:38 -0000
@@ -0,0 +1,10 @@
+--- cf/Imakefile Tue Mar 23 01:03:34 2004
++++ cf/Imakefile Tue Mar 23 01:03:11 2004
+@@ -83,6 +83,7 @@
+ Imake.cf \
+ Amoeba.cf \
+ DGUX.cf \
++DragonFly.cf \
+ FreeBSD.cf \
+ Mips.cf \
+ NetBSD.cf \
Index: devel/imake-4/files/patch-imake.c
===================================================================
RCS file: /home/dcvs/dfports/devel/imake-4/files/patch-imake.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-imake.c
--- devel/imake-4/files/patch-imake.c 2 Dec 2003 08:49:06 -0000 1.1
+++ devel/imake-4/files/patch-imake.c 23 Mar 2004 01:25:24 -0000
@@ -1,5 +1,23 @@
---- imake/imake.c.orig Mon Dec 16 22:48:27 2002
-+++ imake/imake.c Tue Dec 2 08:27:43 2003
+--- imake/imake.c Mon Dec 16 22:48:27 2002
++++ imake/imake.c Tue Mar 23 00:57:50 2004
+@@ -145,7 +145,7 @@
+ * #include INCLUDE_IMAKEFILE
+ * <add any global targets like 'clean' and long dependencies>
+ */
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ /* This needs to be before _POSIX_SOURCE gets defined */
+ # include <sys/param.h>
+ # include <sys/types.h>
+@@ -1142,7 +1142,7 @@
+ }
+ #endif
+
+-#if defined __FreeBSD__
++#if defined __FreeBSD__ || defined __DragonFly__
+ static void
+ get_binary_format(FILE *inFile)
+ {
@@ -1165,8 +1165,7 @@
} else
strcpy (cmd, "objformat");
@@ -10,11 +28,19 @@
fgets(buf, sizeof(buf), objprog) != NULL &&
strncmp(buf, "elf", 3) == 0)
iself = 1;
-@@ -1384,6 +1383,19 @@
+@@ -1285,6 +1284,7 @@
+ defined(__NetBSD__) || \
+ defined(__OpenBSD__) || \
+ defined(__FreeBSD__) || \
++ defined(__DragonFly__) || \
+ defined(__APPLE__) || \
+ defined(__GNU__)
+ "/usr/bin/cc", /* for Linux PostIncDir */
+@@ -1384,6 +1384,19 @@
name = &uts_name;
}
#endif
-+# ifdef __FreeBSD__
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ /* Hack for FreeBSD ports "Cross Version" compiling system. */
+ {
+ char *e;
@@ -30,3 +56,15 @@
# if defined DEFAULT_OS_NAME
# if defined CROSSCOMPILE
+@@ -1564,9 +1577,9 @@
+ }
+ }
+ # endif
+-# if defined __FreeBSD__
++# if defined __FreeBSD__ || defined __DragonFly__
+ # if defined CROSSCOMPILE
+- if (sys == freeBSD)
++ if (sys == freeBSD || sys == dragonfly)
+ # endif
+ get_binary_format(inFile);
+ # endif
Index: devel/imake-4/files/patch-imakemdep.h
===================================================================
RCS file: devel/imake-4/files/patch-imakemdep.h
diff -N devel/imake-4/files/patch-imakemdep.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/imake-4/files/patch-imakemdep.h 23 Mar 2004 01:27:59 -0000
@@ -0,0 +1,67 @@
+--- imake/imakemdep.h Tue Dec 24 17:42:58 2002
++++ imake/imakemdep.h Tue Mar 23 00:56:00 2004
+@@ -281,7 +281,7 @@
+ #if defined(__386BSD__)
+ #define DEFAULT_CPP "/usr/libexec/cpp"
+ #endif
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define USE_CC_E
+ #endif
+ #if defined(__sgi) && defined(__ANSI_CPP__)
+@@ -345,7 +345,8 @@
+ #endif
+ #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+ defined(__FreeBSD__) || defined(MACH) || defined(linux) || \
+- defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__)
++ defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__) || \
++ defined(__DragonFly__)
+ # ifdef __i386__
+ "-D__i386__",
+ # if defined(__GNUC__) && (__GNUC__ >= 3)
+@@ -800,14 +801,14 @@
+ # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
+ # define DEFAULT_OS_TEENY_REV "v %[0-9]"
+ /* # define DEFAULT_OS_NAME "srm %[^\n]" */ /* Not useful on ISC */
+-# elif defined(__FreeBSD__) || defined(__OpenBSD__)
++# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ /* BSD/OS too? */
+ /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */
+ # define DEFAULT_OS_MAJOR_REV "r %[0-9]"
+ # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
+ # define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
+ # define DEFAULT_OS_NAME "srm %[^\n]"
+-# if defined(__FreeBSD__)
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
+ # ifndef CROSSCOMPILE_CPP
+ # define DEFAULT_OS_TEENY_REV_FROB(buf, size) \
+@@ -1205,6 +1206,9 @@
+ #ifdef __FreeBSD__
+ {"__FreeBSD__", "1"},
+ #endif
++#ifdef __DragonFly__
++ {"__DragonFly__", "1"},
++#endif
+ #ifdef __OpenBSD__
+ {"__OpenBSD__", "1"},
+ #endif
+@@ -1359,7 +1363,8 @@
+ netBSD,
+ LinuX,
+ emx,
+- win32
++ win32,
++ dragonfly,
+ } System;
+
+ # ifdef linux
+@@ -1372,6 +1377,8 @@
+ System sys = emx;
+ # elif defined WIN32
+ System sys = win32;
++# elif defined __DragonFly__
++System sys = dragonfly;
+ # else
+ System sys = unknown;
+ # endif
Index: graphics/dri/Makefile
===================================================================
RCS file: graphics/dri/Makefile
diff -N graphics/dri/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/Makefile 20 Mar 2004 02:19:41 -0000
@@ -0,0 +1,42 @@
+# New ports collection makefile for: dri
+# Date created: 08 Nov 2003
+# Whom: anholt@xxxxxxxxxxx
+#
+# $FreeBSD: ports/graphics/dri/Makefile,v 1.2 2003/11/22 23:58:06 anholt Exp $
+#
+
+PORTNAME= dri
+PORTVERSION= 4.3.0
+PORTEPOCH= 1
+CATEGORIES= graphics
+MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= ${PORTVERSION}
+DISTFILES= X430src-1.tgz \
+ X430src-2.tgz \
+ X430src-3.tgz
+
+MAINTAINER= anholt@xxxxxxxxxxx
+COMMENT= OpenGL hardware acceleration drivers for XFree86
+
+.for pf in \
+ patch-GL-Imakefile \
+ patch-radeondri \
+ patch-r200_vtxtmp_x86.S \
+ patch-radeon_vtxtmp_x86.S \
+ patch-dri_util.c
+EXTRA_PATCHES+= ${FILESDIR}/${pf}
+.endfor
+
+ONLY_FOR_ARCHS= i386 alpha
+
+XBUILD_DIRS= lib/GL
+XINSTALL_DIRS= lib/GL/mesa/src/drv
+
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
+.include <bsd.dfport.pre.mk>
+.if ${ARCH} == i386
+PLIST_SUB+= I386=""
+.else
+PLIST_SUB+= I386="@comment "
+.endif
+.include <bsd.dfport.post.mk>
Index: graphics/dri/distinfo
===================================================================
RCS file: graphics/dri/distinfo
diff -N graphics/dri/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/distinfo 9 Nov 2003 08:24:56 -0000
@@ -0,0 +1,4 @@
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
+MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
Index: graphics/dri/pkg-descr
===================================================================
RCS file: graphics/dri/pkg-descr
diff -N graphics/dri/pkg-descr
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/pkg-descr 9 Nov 2003 08:24:56 -0000
@@ -0,0 +1,8 @@
+This package contains the client drivers for the DRI, included with XFree86.
+With an X Server configured for the DRI they allow direct rendering of
+hardware-accelerated OpenGL.
+
+WWW: http://www.xfree86.org/
+
+- Eric Anholt
+anholt@xxxxxxxxxxx
Index: graphics/dri/pkg-plist
===================================================================
RCS file: graphics/dri/pkg-plist
diff -N graphics/dri/pkg-plist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/pkg-plist 9 Nov 2003 08:24:56 -0000
@@ -0,0 +1,8 @@
+lib/modules/dri/gamma_dri.so
+%%I386%%lib/modules/dri/i810_dri.so
+%%I386%%lib/modules/dri/i830_dri.so
+lib/modules/dri/mga_dri.so
+lib/modules/dri/r128_dri.so
+lib/modules/dri/r200_dri.so
+lib/modules/dri/radeon_dri.so
+lib/modules/dri/tdfx_dri.so
Index: graphics/dri/files/patch-GL-Imakefile
===================================================================
RCS file: graphics/dri/files/patch-GL-Imakefile
diff -N graphics/dri/files/patch-GL-Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/files/patch-GL-Imakefile 9 Nov 2003 08:24:56 -0000
@@ -0,0 +1,11 @@
+--- lib/GL/Imakefile.orig Sat Nov 8 23:54:33 2003
++++ lib/GL/Imakefile Sat Nov 8 23:55:05 2003
+@@ -106,7 +106,7 @@
+ #if BuildXF86DRI && GlxUseBuiltInDRIDriver
+ SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
+ #else
+-SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
++SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(DRIVERDIRS)
+ #endif
+
+ MakeSubdirs($(SUBDIRS))
Index: graphics/dri/files/patch-dri_util.c
===================================================================
RCS file: graphics/dri/files/patch-dri_util.c
diff -N graphics/dri/files/patch-dri_util.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/files/patch-dri_util.c 9 Nov 2003 08:24:56 -0000
@@ -0,0 +1,26 @@
+Index: lib/GL/dri/dri_util.c
+===================================================================
+RCS file: /home/ncvs/xfree/xc/lib/GL/dri/dri_util.c,v
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -u -r1.6 -r1.7
+--- lib/GL/dri/dri_util.c 15 Feb 2003 22:12:29 -0000 1.6
++++ lib/GL/dri/dri_util.c 28 Apr 2003 17:01:25 -0000 1.7
+@@ -921,7 +921,7 @@
+ int directCapable;
+ __DRIscreenPrivate *psp;
+ drmHandle hFB, hSAREA;
+- char *BusID, *driverName;
++ char *BusID, *driverName = NULL;
+ drmMagic magic;
+
+ if (!XF86DRIQueryDirectRenderingCapable(dpy, scrn, &directCapable)) {
+@@ -1010,6 +1010,8 @@
+ (void)XF86DRICloseConnection(dpy, scrn);
+ return NULL;
+ }
++ if (driverName)
++ Xfree(driverName);
+
+ /* install driver's callback functions */
+ memcpy(&psp->DriverAPI, driverAPI, sizeof(struct __DriverAPIRec));
Index: graphics/dri/files/patch-drm.h
===================================================================
RCS file: graphics/dri/files/patch-drm.h
diff -N graphics/dri/files/patch-drm.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/files/patch-drm.h 19 Mar 2004 19:53:25 -0000
@@ -0,0 +1,13 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h Wed Jan 15 03:36:27 2003
++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h Fri Mar 19 01:44:59 2004
+@@ -44,8 +44,8 @@
+ #define DRM_IOC_WRITE _IOC_WRITE
+ #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
+ #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+-#if defined(__FreeBSD__) && defined(XFree86Server)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(XFree86Server)
+ /* Prevent name collision when including sys/ioccom.h */
+ #undef ioctl
+ #include <sys/ioccom.h>
Index: graphics/dri/files/patch-r200_vtxtmp_x86.S
===================================================================
RCS file: graphics/dri/files/patch-r200_vtxtmp_x86.S
diff -N graphics/dri/files/patch-r200_vtxtmp_x86.S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/files/patch-r200_vtxtmp_x86.S 9 Nov 2003 08:24:56 -0000
@@ -0,0 +1,11 @@
+--- lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S.orig Wed Jul 16 13:48:41 2003
++++ lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S Wed Jul 16 13:48:56 2003
+@@ -28,7 +28,7 @@
+
+ #define GLOBL( x ) \
+ .globl x; \
+-x##:
++x:
+
+ .data
+ .align 4
Index: graphics/dri/files/patch-radeon_vtxtmp_x86.S
===================================================================
RCS file: graphics/dri/files/patch-radeon_vtxtmp_x86.S
diff -N graphics/dri/files/patch-radeon_vtxtmp_x86.S
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/files/patch-radeon_vtxtmp_x86.S 9 Nov 2003 08:24:56 -0000
@@ -0,0 +1,11 @@
+--- lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S.orig Wed Jul 16 13:47:09 2003
++++ lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S Wed Jul 16 13:47:10 2003
+@@ -28,7 +28,7 @@
+
+ #define GLOBL( x ) \
+ .globl x; \
+-x##:
++x:
+
+ .data
+ .align 4
Index: graphics/dri/files/patch-radeondri
===================================================================
RCS file: graphics/dri/files/patch-radeondri
diff -N graphics/dri/files/patch-radeondri
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/files/patch-radeondri 9 Nov 2003 08:24:56 -0000
@@ -0,0 +1,234 @@
+diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_context.c lib/GL/mesa/src/drv/r200/r200_context.c
+--- lib/GL/mesa/src/drv.orig/r200/r200_context.c Tue Mar 11 17:51:23 2003
++++ lib/GL/mesa/src/drv/r200/r200_context.c Tue Mar 11 17:46:57 2003
+@@ -391,6 +391,7 @@
+ */
+ _tnl_destroy_pipeline( ctx );
+ _tnl_install_pipeline( ctx, r200_pipeline );
++ ctx->Driver.FlushVertices = r200FlushVertices;
+
+ /* Try and keep materials and vertices separate:
+ */
+diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c lib/GL/mesa/src/drv/r200/r200_swtcl.c
+--- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c Tue Mar 11 17:51:29 2003
++++ lib/GL/mesa/src/drv/r200/r200_swtcl.c Tue Mar 11 17:46:57 2003
+@@ -44,6 +44,7 @@
+ #include "math/m_translate.h"
+ #include "tnl/tnl.h"
+ #include "tnl/t_context.h"
++#include "tnl/t_imm_exec.h"
+ #include "tnl/t_pipeline.h"
+
+ #include "r200_context.h"
+@@ -1220,6 +1221,14 @@
+ r200ChooseVertexState( ctx );
+ }
+
++
++void r200FlushVertices( GLcontext *ctx, GLuint flags )
++{
++ _tnl_flush_vertices( ctx, flags );
++
++ if (flags & FLUSH_STORED_VERTICES)
++ R200_FIREVERTICES( R200_CONTEXT( ctx ) );
++}
+
+ /**********************************************************************/
+ /* Initialization. */
+diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h lib/GL/mesa/src/drv/r200/r200_swtcl.h
+--- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h Tue Mar 11 17:51:29 2003
++++ lib/GL/mesa/src/drv/r200/r200_swtcl.h Tue Mar 11 17:46:57 2003
+@@ -42,6 +42,7 @@
+ extern void r200InitSwtcl( GLcontext *ctx );
+ extern void r200DestroySwtcl( GLcontext *ctx );
+
++extern void r200FlushVertices( GLcontext *ctx, GLuint flags );
+ extern void r200ChooseRenderState( GLcontext *ctx );
+ extern void r200ChooseVertexState( GLcontext *ctx );
+
+diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c lib/GL/mesa/src/drv/r200/r200_vtxfmt.c
+--- lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c Tue Mar 11 17:51:29 2003
++++ lib/GL/mesa/src/drv/r200/r200_vtxfmt.c Tue Mar 11 17:47:00 2003
+@@ -38,6 +38,7 @@
+ #include "r200_ioctl.h"
+ #include "r200_tex.h"
+ #include "r200_tcl.h"
++#include "r200_swtcl.h"
+ #include "r200_vtxfmt.h"
+
+ #include "api_noop.h"
+@@ -59,7 +60,7 @@
+
+ struct r200_vb vb;
+
+-static void r200FlushVertices( GLcontext *, GLuint );
++static void r200VtxFmtFlushVertices( GLcontext *, GLuint );
+
+ static void count_func( const char *name, struct dynfn *l )
+ {
+@@ -357,12 +358,13 @@
+ fprintf(stderr, "%s from %s\n", __FUNCTION__, caller);
+
+ if (ctx->Driver.NeedFlush)
+- r200FlushVertices( ctx, ctx->Driver.NeedFlush );
++ r200VtxFmtFlushVertices( ctx, ctx->Driver.NeedFlush );
+
+ if (ctx->NewState)
+ _mesa_update_state( ctx ); /* clear state so fell_back sticks */
+
+ _tnl_wakeup_exec( ctx );
++ ctx->Driver.FlushVertices = r200FlushVertices;
+
+ assert( rmesa->dma.flush == 0 );
+ rmesa->vb.fell_back = GL_TRUE;
+@@ -404,6 +406,7 @@
+ prim = rmesa->vb.prim[0];
+ ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
+ _tnl_wakeup_exec( ctx );
++ ctx->Driver.FlushVertices = r200FlushVertices;
+
+ assert(rmesa->dma.flush == 0);
+ rmesa->vb.fell_back = GL_TRUE;
+@@ -756,7 +759,7 @@
+ fprintf(stderr, "reinstall (new install)\n");
+
+ _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
+- ctx->Driver.FlushVertices = r200FlushVertices;
++ ctx->Driver.FlushVertices = r200VtxFmtFlushVertices;
+ ctx->Driver.NewList = r200NewList;
+ rmesa->vb.installed = GL_TRUE;
+ vb.context = ctx;
+@@ -772,6 +775,7 @@
+ if (rmesa->dma.flush)
+ rmesa->dma.flush( rmesa );
+ _tnl_wakeup_exec( ctx );
++ ctx->Driver.FlushVertices = r200FlushVertices;
+ rmesa->vb.installed = GL_FALSE;
+ vb.context = 0;
+ }
+@@ -931,7 +935,7 @@
+ return GL_TRUE;
+ }
+
+-static void r200FlushVertices( GLcontext *ctx, GLuint flags )
++static void r200VtxFmtFlushVertices( GLcontext *ctx, GLuint flags )
+ {
+ r200ContextPtr rmesa = R200_CONTEXT( ctx );
+
+diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_context.c lib/GL/mesa/src/drv/radeon/radeon_context.c
+--- lib/GL/mesa/src/drv.orig/radeon/radeon_context.c Tue Mar 11 17:51:29 2003
++++ lib/GL/mesa/src/drv/radeon/radeon_context.c Tue Mar 11 17:47:00 2003
+@@ -382,6 +382,7 @@
+ */
+ _tnl_destroy_pipeline( ctx );
+ _tnl_install_pipeline( ctx, radeon_pipeline );
++ ctx->Driver.FlushVertices = radeonFlushVertices;
+
+ /* Try and keep materials and vertices separate:
+ */
+diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c lib/GL/mesa/src/drv/radeon/radeon_swtcl.c
+--- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c Tue Mar 11 17:51:29 2003
++++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.c Tue Mar 11 17:47:00 2003
+@@ -45,6 +45,7 @@
+ #include "math/m_translate.h"
+ #include "tnl/tnl.h"
+ #include "tnl/t_context.h"
++#include "tnl/t_imm_exec.h"
+ #include "tnl/t_pipeline.h"
+
+ #include "radeon_context.h"
+@@ -1133,6 +1134,14 @@
+ }
+ }
++
++void radeonFlushVertices( GLcontext *ctx, GLuint flags )
++{
++ _tnl_flush_vertices( ctx, flags );
++
++ if (flags & FLUSH_STORED_VERTICES)
++ RADEON_FIREVERTICES( RADEON_CONTEXT( ctx ) );
++}
+
+ /**********************************************************************/
+ /* Initialization. */
+diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h lib/GL/mesa/src/drv/radeon/radeon_swtcl.h
+--- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h Tue Mar 11 17:51:29 2003
++++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.h Tue Mar 11 17:47:00 2003
+@@ -43,6 +43,7 @@
+ extern void radeonInitSwtcl( GLcontext *ctx );
+ extern void radeonDestroySwtcl( GLcontext *ctx );
+
++extern void radeonFlushVertices( GLcontext *ctx, GLuint flags );
+ extern void radeonChooseRenderState( GLcontext *ctx );
+ extern void radeonChooseVertexState( GLcontext *ctx );
+
+diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c
+--- lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c Tue Mar 11 17:51:29 2003
++++ lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c Tue Mar 11 17:47:01 2003
+@@ -38,6 +38,7 @@
+ #include "radeon_ioctl.h"
+ #include "radeon_tex.h"
+ #include "radeon_tcl.h"
++#include "radeon_swtcl.h"
+ #include "radeon_vtxfmt.h"
+
+ #include "api_noop.h"
+@@ -59,7 +60,7 @@
+
+ struct radeon_vb vb;
+
+-static void radeonFlushVertices( GLcontext *, GLuint );
++static void radeonVtxfmtFlushVertices( GLcontext *, GLuint );
+
+ static void count_func( const char *name, struct dynfn *l )
+ {
+@@ -336,12 +337,13 @@
+ fprintf(stderr, "%s from %s\n", __FUNCTION__, caller);
+
+ if (ctx->Driver.NeedFlush)
+- radeonFlushVertices( ctx, ctx->Driver.NeedFlush );
++ radeonVtxfmtFlushVertices( ctx, ctx->Driver.NeedFlush );
+
+ if (ctx->NewState)
+ _mesa_update_state( ctx ); /* clear state so fell_back sticks */
+
+ _tnl_wakeup_exec( ctx );
++ ctx->Driver.FlushVertices = radeonFlushVertices;
+
+ assert( rmesa->dma.flush == 0 );
+ rmesa->vb.fell_back = GL_TRUE;
+@@ -382,6 +384,7 @@
+ prim = rmesa->vb.prim[0];
+ ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
+ _tnl_wakeup_exec( ctx );
++ ctx->Driver.FlushVertices = radeonFlushVertices;
+
+ assert(rmesa->dma.flush == 0);
+ rmesa->vb.fell_back = GL_TRUE;
+@@ -731,7 +734,7 @@
+ fprintf(stderr, "reinstall (new install)\n");
+
+ _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
+- ctx->Driver.FlushVertices = radeonFlushVertices;
++ ctx->Driver.FlushVertices = radeonVtxfmtFlushVertices;
+ ctx->Driver.NewList = radeonNewList;
+ rmesa->vb.installed = GL_TRUE;
+ vb.context = ctx;
+@@ -747,6 +750,7 @@
+ if (rmesa->dma.flush)
+ rmesa->dma.flush( rmesa );
+ _tnl_wakeup_exec( ctx );
++ ctx->Driver.FlushVertices = radeonFlushVertices;
+ rmesa->vb.installed = GL_FALSE;
+ vb.context = 0;
+ }
+@@ -905,7 +909,7 @@
+ return GL_TRUE;
+ }
+
+-static void radeonFlushVertices( GLcontext *ctx, GLuint flags )
++static void radeonVtxfmtFlushVertices( GLcontext *ctx, GLuint flags )
+ {
+ radeonContextPtr rmesa = RADEON_CONTEXT( ctx );
+
Index: graphics/dri/scripts/configure
===================================================================
RCS file: graphics/dri/scripts/configure
diff -N graphics/dri/scripts/configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/dri/scripts/configure 19 Mar 2004 21:18:34 -0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# This script does the following:
+# (1) cp xf86site.def, installed by imake-4 port,
+# to ${WRKDIR}/xc/config/cf.
+# this provides settings for the ports system.
+# (2) Create a host.def for this specific port, using
+# host.def as a base.
+
+ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
+DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
+ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
+LOCALDEF=$WRKDIR/.config
+HOSTDEF=$WRKDIR/xc/config/cf/host.def
+
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
+echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+echo "#define X11ProjectRoot $PREFIX" >> $LOCALDEF
+
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+
+echo "#define BuildXF86DRI YES" >> $LOCALDEF
+echo "#define BuildXF86DRM NO" >> $LOCALDEF
+echo "#define HasGlide3 YES" >> $LOCALDEF
+
+echo "#define BuildGLXLibrary YES" >> $LOCALDEF
+echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+echo "#define UseInstalled YES" >> $LOCALDEF
+echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF
+
+exit 0
Index: x11/XFree86-4-clients/Makefile
===================================================================
RCS file: x11/XFree86-4-clients/Makefile
diff -N x11/XFree86-4-clients/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/Makefile 25 Mar 2004 02:49:26 -0000
@@ -0,0 +1,76 @@
+# New ports collection makefile for: XFree86-clients
+# Date created: 10 Oct 1999
+# Whom: taguchi@xxxxxxxxxxxxxxxx
+#
+# $FreeBSD: ports/x11/XFree86-4-clients/Makefile,v 1.123 2004/03/18 02:58:52 des Exp $
+#
+
+PORTNAME= clients
+PORTVERSION= 4.3.0
+PORTREVISION= 7
+CATEGORIES= x11
+MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= 4.3.0
+PKGNAMEPREFIX= XFree86-
+DISTFILES= X430src-1.tgz \
+ X430src-2.tgz \
+ X430src-3.tgz \
+ X430src-4.tgz
+
+MAINTAINER= x11@xxxxxxxxxxx
+COMMENT= XFree86-4 client programs and related files
+
+LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
+ expat.5:${PORTSDIR}/textproc/expat2 \
+ Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \
+ png.5:${PORTSDIR}/graphics/png \
+ Xft.2:${PORTSDIR}/x11-fonts/libXft
+
+SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \
+ InstallXinitConfig=${InstallXinitConfig} \
+ InstallAppDefFiles=${InstallAppDefFiles}
+
+MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \
+ PORTNAME=${PORTNAME} \
+ PORTVERSION=${PORTVERSION}
+XBUILD_DIRS= lib/xtrans lib/lbxutil programs fonts/util
+XINSTALL_DIRS= programs fonts/util
+XINSTALL_MAN_DIRS= programs
+
+.for pf in patch-bdftruncate.pl patch-ucs2any.pl \
+ patch-Xres.cpp patch-Imake.rules patch-mkfontscale.c
+EXTRA_PATCHES+= ${FILESDIR}/${pf}
+.endfor
+
+# ---
+# XFree86 User Config:
+# Name Default Meaning
+# ----------------------------------------------------------------------------
+# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later)
+# HasPam YES support PAM (require FreeBSD-3.1 or later)
+# InstallXdmConfig YES install config files for xdm.
+# InstallXinitConfig YES install config files for xinit.
+# InstallAppDefFiles YES install resource files.
+# ----------------------------------------------------------------------------
+# DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4
+#
+InstallXdmConfig?= DEFAULT
+InstallXinitConfig?= DEFAULT
+InstallAppDefFiles?= DEFAULT
+
+.if !defined(WITH_SETUID_LUIT)
+pre-everything::
+ @${ECHO_MSG} "If you want to use xterm with locales in a secure manner, luit must be installed"
+ @${ECHO_MSG} "setuid. If you want to do this, hit Ctrl-C now and use \"make WITH_SETUID_LUIT=yes\""
+.endif
+
+.if defined(WITH_SETUID_LUIT)
+post-install:
+ ${CHOWN} root:wheel ${PREFIX}/bin/luit
+ ${CHMOD} 04711 ${PREFIX}/bin/luit
+.endif
+
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
+.include <bsd.dfport.pre.mk>
+.include "${FILESDIR}/manpages"
+.include <bsd.dfport.post.mk>
Index: x11/XFree86-4-clients/distinfo
===================================================================
RCS file: x11/XFree86-4-clients/distinfo
diff -N x11/XFree86-4-clients/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/distinfo 11 Mar 2003 23:38:06 -0000
@@ -0,0 +1,4 @@
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
Index: x11/XFree86-4-clients/pkg-descr
===================================================================
RCS file: x11/XFree86-4-clients/pkg-descr
diff -N x11/XFree86-4-clients/pkg-descr
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/pkg-descr 12 Jun 2001 14:59:47 -0000
@@ -0,0 +1,6 @@
+This package contains XFree86-4 Client Environments.
+xterm, ico, twm, oclock and other client programs are
+included this package. Also library files and resource
+files are included.
+
+WWW: http://www.xfree86.org/
Index: x11/XFree86-4-clients/pkg-plist
===================================================================
RCS file: x11/XFree86-4-clients/pkg-plist
diff -N x11/XFree86-4-clients/pkg-plist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/pkg-plist 11 Mar 2003 23:38:06 -0000
@@ -0,0 +1,721 @@
+bin/Xmark
+bin/appres
+bin/atobm
+bin/bdftopcf
+bin/bdftruncate
+bin/beforelight
+bin/bitmap
+bin/bmtoa
+bin/cxpm
+bin/dga
+bin/dpsexec
+bin/dpsinfo
+bin/editres
+bin/fslsfonts
+bin/fstobdf
+bin/glxgears
+bin/glxinfo
+bin/iceauth
+bin/ico
+bin/lbxproxy
+bin/listres
+bin/luit
+bin/makepsres
+bin/mkcfm
+bin/mkfontdir
+bin/mkfontscale
+bin/oclock
+bin/proxymngr
+bin/resize
+bin/rstart
+bin/rstartd
+bin/sessreg
+bin/setxkbmap
+bin/showfont
+bin/showrgb
+bin/smproxy
+bin/startx
+bin/sxpm
+bin/texteroids
+bin/twm
+bin/ucs2any
+bin/uxterm
+bin/viewres
+bin/x11perf
+bin/x11perfcomp
+bin/xauth
+bin/xbiff
+bin/xcalc
+bin/xclipboard
+bin/xclock
+bin/xcmsdb
+bin/xconsole
+bin/xcursorgen
+bin/xcutsel
+bin/xditview
+bin/xdm
+bin/xdpyinfo
+bin/xedit
+bin/xev
+bin/xeyes
+bin/xfd
+bin/xfindproxy
+bin/xfontsel
+bin/xfsinfo
+bin/xfwp
+bin/xgamma
+bin/xgc
+bin/xhost
+bin/xinit
+bin/xkbbell
+bin/xkbcomp
+bin/xkbevd
+bin/xkbprint
+bin/xkbvleds
+bin/xkbwatch
+bin/xkill
+bin/xload
+bin/xlogo
+bin/xlsatoms
+bin/xlsclients
+bin/xlsfonts
+bin/xmag
+bin/xman
+bin/xmessage
+bin/xmh
+bin/xmodmap
+bin/xon
+bin/xprop
+bin/xrandr
+bin/xrdb
+bin/xrefresh
+bin/xset
+bin/xsetmode
+bin/xsetpointer
+bin/xsetroot
+bin/xsm
+bin/xstdcmap
+bin/xterm
+bin/xtrapchar
+bin/xtrapin
+bin/xtrapinfo
+bin/xtrapout
+bin/xtrapproto
+bin/xtrapreset
+bin/xtrapstats
+bin/xvidtune
+bin/xvinfo
+bin/xwd
+bin/xwininfo
+bin/xwud
+include/X11/bitmaps/Dashes
+include/X11/bitmaps/Down
+include/X11/bitmaps/Excl
+include/X11/bitmaps/FlipHoriz
+include/X11/bitmaps/FlipVert
+include/X11/bitmaps/Fold
+include/X11/bitmaps/Left
+include/X11/bitmaps/Right
+include/X11/bitmaps/RotateLeft
+include/X11/bitmaps/RotateRight
+include/X11/bitmaps/Stipple
+include/X11/bitmaps/Term
+include/X11/bitmaps/Up
+include/X11/bitmaps/black6
+include/X11/bitmaps/box6
+include/X11/bitmaps/ldblarrow
+include/X11/bitmaps/rdblarrow
+lib/X11/app-defaults/Beforelight
+lib/X11/app-defaults/Bitmap
+lib/X11/app-defaults/Bitmap-color
+lib/X11/app-defaults/Chooser
+lib/X11/app-defaults/Clock-color
+lib/X11/app-defaults/Editres
+lib/X11/app-defaults/Editres-color
+lib/X11/app-defaults/UXTerm
+lib/X11/app-defaults/Viewres
+lib/X11/app-defaults/XCalc
+lib/X11/app-defaults/XCalc-color
+lib/X11/app-defaults/XClipboard
+lib/X11/app-defaults/XClock
+lib/X11/app-defaults/XConsole
+lib/X11/app-defaults/XFontSel
+lib/X11/app-defaults/XLoad
+lib/X11/app-defaults/XLogo
+lib/X11/app-defaults/XLogo-color
+lib/X11/app-defaults/XSm
+lib/X11/app-defaults/XTerm
+lib/X11/app-defaults/XTerm-color
+lib/X11/app-defaults/Xditview
+lib/X11/app-defaults/Xditview-chrtr
+lib/X11/app-defaults/Xedit
+lib/X11/app-defaults/Xedit-color
+lib/X11/app-defaults/Xfd
+lib/X11/app-defaults/Xgc
+lib/X11/app-defaults/Xmag
+lib/X11/app-defaults/Xman
+lib/X11/app-defaults/Xmessage
+lib/X11/app-defaults/Xmessage-color
+lib/X11/app-defaults/Xmh
+lib/X11/app-defaults/Xvidtune
+lib/X11/etc/xterm.termcap
+lib/X11/etc/xterm.terminfo
+lib/X11/fonts/util/map-ISO8859-1
+lib/X11/fonts/util/map-ISO8859-10
+lib/X11/fonts/util/map-ISO8859-11
+lib/X11/fonts/util/map-ISO8859-13
+lib/X11/fonts/util/map-ISO8859-14
+lib/X11/fonts/util/map-ISO8859-15
+lib/X11/fonts/util/map-ISO8859-16
+lib/X11/fonts/util/map-ISO8859-2
+lib/X11/fonts/util/map-ISO8859-3
+lib/X11/fonts/util/map-ISO8859-4
+lib/X11/fonts/util/map-ISO8859-5
+lib/X11/fonts/util/map-ISO8859-7
+lib/X11/fonts/util/map-ISO8859-8
+lib/X11/fonts/util/map-ISO8859-9
+lib/X11/fonts/util/map-JISX0201.1976-0
+lib/X11/fonts/util/map-KOI8-R
+lib/X11/icons/default/index.theme
+lib/X11/icons/handhelds/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/handhelds/cursors/X_cursor
+lib/X11/icons/handhelds/cursors/arrow
+lib/X11/icons/handhelds/cursors/based_arrow_down
+lib/X11/icons/handhelds/cursors/based_arrow_up
+lib/X11/icons/handhelds/cursors/bottom_left_corner
+lib/X11/icons/handhelds/cursors/bottom_right_corner
+lib/X11/icons/handhelds/cursors/bottom_side
+lib/X11/icons/handhelds/cursors/bottom_tee
+lib/X11/icons/handhelds/cursors/center_ptr
+lib/X11/icons/handhelds/cursors/circle
+lib/X11/icons/handhelds/cursors/cross
+lib/X11/icons/handhelds/cursors/cross_reverse
+lib/X11/icons/handhelds/cursors/crosshair
+lib/X11/icons/handhelds/cursors/dot
+lib/X11/icons/handhelds/cursors/dotbox
+lib/X11/icons/handhelds/cursors/double_arrow
+lib/X11/icons/handhelds/cursors/draft_large
+lib/X11/icons/handhelds/cursors/draft_small
+lib/X11/icons/handhelds/cursors/draped_box
+lib/X11/icons/handhelds/cursors/fleur
+lib/X11/icons/handhelds/cursors/gumby
+lib/X11/icons/handhelds/cursors/hand2
+lib/X11/icons/handhelds/cursors/left_ptr
+lib/X11/icons/handhelds/cursors/left_ptr_watch
+lib/X11/icons/handhelds/cursors/left_side
+lib/X11/icons/handhelds/cursors/left_tee
+lib/X11/icons/handhelds/cursors/ll_angle
+lib/X11/icons/handhelds/cursors/pencil
+lib/X11/icons/handhelds/cursors/plus
+lib/X11/icons/handhelds/cursors/right_ptr
+lib/X11/icons/handhelds/cursors/right_side
+lib/X11/icons/handhelds/cursors/right_tee
+lib/X11/icons/handhelds/cursors/sb_h_double_arrow
+lib/X11/icons/handhelds/cursors/sb_right_arrow
+lib/X11/icons/handhelds/cursors/sb_up_arrow
+lib/X11/icons/handhelds/cursors/sb_v_double_arrow
+lib/X11/icons/handhelds/cursors/shuttle
+lib/X11/icons/handhelds/cursors/tcross
+lib/X11/icons/handhelds/cursors/top_left_arrow
+lib/X11/icons/handhelds/cursors/top_left_corner
+lib/X11/icons/handhelds/cursors/top_right_corner
+lib/X11/icons/handhelds/cursors/top_side
+lib/X11/icons/handhelds/cursors/top_tee
+lib/X11/icons/handhelds/cursors/watch
+lib/X11/icons/handhelds/cursors/xterm
+lib/X11/icons/redglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/redglass/cursors/X_cursor
+lib/X11/icons/redglass/cursors/arrow
+lib/X11/icons/redglass/cursors/based_arrow_down
+lib/X11/icons/redglass/cursors/based_arrow_up
+lib/X11/icons/redglass/cursors/bottom_left_corner
+lib/X11/icons/redglass/cursors/bottom_right_corner
+lib/X11/icons/redglass/cursors/bottom_side
+lib/X11/icons/redglass/cursors/bottom_tee
+lib/X11/icons/redglass/cursors/center_ptr
+lib/X11/icons/redglass/cursors/circle
+lib/X11/icons/redglass/cursors/cross
+lib/X11/icons/redglass/cursors/cross_reverse
+lib/X11/icons/redglass/cursors/crosshair
+lib/X11/icons/redglass/cursors/dot
+lib/X11/icons/redglass/cursors/dotbox
+lib/X11/icons/redglass/cursors/double_arrow
+lib/X11/icons/redglass/cursors/draft_large
+lib/X11/icons/redglass/cursors/draft_small
+lib/X11/icons/redglass/cursors/draped_box
+lib/X11/icons/redglass/cursors/fleur
+lib/X11/icons/redglass/cursors/gumby
+lib/X11/icons/redglass/cursors/hand2
+lib/X11/icons/redglass/cursors/left_ptr
+lib/X11/icons/redglass/cursors/left_ptr_watch
+lib/X11/icons/redglass/cursors/left_side
+lib/X11/icons/redglass/cursors/left_tee
+lib/X11/icons/redglass/cursors/ll_angle
+lib/X11/icons/redglass/cursors/pencil
+lib/X11/icons/redglass/cursors/plus
+lib/X11/icons/redglass/cursors/right_ptr
+lib/X11/icons/redglass/cursors/right_side
+lib/X11/icons/redglass/cursors/right_tee
+lib/X11/icons/redglass/cursors/sb_h_double_arrow
+lib/X11/icons/redglass/cursors/sb_right_arrow
+lib/X11/icons/redglass/cursors/sb_up_arrow
+lib/X11/icons/redglass/cursors/sb_v_double_arrow
+lib/X11/icons/redglass/cursors/shuttle
+lib/X11/icons/redglass/cursors/tcross
+lib/X11/icons/redglass/cursors/top_left_arrow
+lib/X11/icons/redglass/cursors/top_left_corner
+lib/X11/icons/redglass/cursors/top_right_corner
+lib/X11/icons/redglass/cursors/top_side
+lib/X11/icons/redglass/cursors/top_tee
+lib/X11/icons/redglass/cursors/watch
+lib/X11/icons/redglass/cursors/xterm
+lib/X11/icons/whiteglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/whiteglass/cursors/X_cursor
+lib/X11/icons/whiteglass/cursors/arrow
+lib/X11/icons/whiteglass/cursors/base_arrow_down
+lib/X11/icons/whiteglass/cursors/base_arrow_up
+lib/X11/icons/whiteglass/cursors/boat
+lib/X11/icons/whiteglass/cursors/bottom_left_corner
+lib/X11/icons/whiteglass/cursors/bottom_right_corner
+lib/X11/icons/whiteglass/cursors/bottom_side
+lib/X11/icons/whiteglass/cursors/bottom_tee
+lib/X11/icons/whiteglass/cursors/center_ptr
+lib/X11/icons/whiteglass/cursors/circle
+lib/X11/icons/whiteglass/cursors/cross
+lib/X11/icons/whiteglass/cursors/cross_reverse
+lib/X11/icons/whiteglass/cursors/crosshair
+lib/X11/icons/whiteglass/cursors/dot
+lib/X11/icons/whiteglass/cursors/dot_box_mask
+lib/X11/icons/whiteglass/cursors/double_arrow
+lib/X11/icons/whiteglass/cursors/draft_large
+lib/X11/icons/whiteglass/cursors/draft_small
+lib/X11/icons/whiteglass/cursors/draped_box
+lib/X11/icons/whiteglass/cursors/exchange
+lib/X11/icons/whiteglass/cursors/fleur
+lib/X11/icons/whiteglass/cursors/gumby
+lib/X11/icons/whiteglass/cursors/hand1
+lib/X11/icons/whiteglass/cursors/hand2
+lib/X11/icons/whiteglass/cursors/left_ptr
+lib/X11/icons/whiteglass/cursors/left_ptr_watch
+lib/X11/icons/whiteglass/cursors/left_side
+lib/X11/icons/whiteglass/cursors/left_tee
+lib/X11/icons/whiteglass/cursors/ll_angle
+lib/X11/icons/whiteglass/cursors/lr_angle
+lib/X11/icons/whiteglass/cursors/pencil
+lib/X11/icons/whiteglass/cursors/pirate
+lib/X11/icons/whiteglass/cursors/plus
+lib/X11/icons/whiteglass/cursors/question_arrow
+lib/X11/icons/whiteglass/cursors/right_ptr
+lib/X11/icons/whiteglass/cursors/right_side
+lib/X11/icons/whiteglass/cursors/right_tee
+lib/X11/icons/whiteglass/cursors/sailboat
+lib/X11/icons/whiteglass/cursors/sb_down_arrow
+lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
+lib/X11/icons/whiteglass/cursors/sb_left_arrow
+lib/X11/icons/whiteglass/cursors/sb_right_arrow
+lib/X11/icons/whiteglass/cursors/sb_up_arrow
+lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
+lib/X11/icons/whiteglass/cursors/shuttle
+lib/X11/icons/whiteglass/cursors/sizing
+lib/X11/icons/whiteglass/cursors/target
+lib/X11/icons/whiteglass/cursors/tcross
+lib/X11/icons/whiteglass/cursors/top_left_arrow
+lib/X11/icons/whiteglass/cursors/top_left_corner
+lib/X11/icons/whiteglass/cursors/top_right_corner
+lib/X11/icons/whiteglass/cursors/top_side
+lib/X11/icons/whiteglass/cursors/top_tee
+lib/X11/icons/whiteglass/cursors/trek
+lib/X11/icons/whiteglass/cursors/ul_angle
+lib/X11/icons/whiteglass/cursors/ur_angle
+lib/X11/icons/whiteglass/cursors/watch
+lib/X11/icons/whiteglass/cursors/xterm
+lib/X11/lbxproxy/AtomControl
+lib/X11/proxymngr/pmconfig
+lib/X11/rgb.txt
+lib/X11/rstart/commands/@List
+lib/X11/rstart/commands/ListContexts
+lib/X11/rstart/commands/ListGenericCommands
+lib/X11/rstart/commands/x
+lib/X11/rstart/commands/x11
+lib/X11/rstart/commands/x11r6/@List
+lib/X11/rstart/commands/x11r6/LoadMonitor
+lib/X11/rstart/commands/x11r6/Terminal
+lib/X11/rstart/config
+lib/X11/rstart/contexts/@List
+lib/X11/rstart/contexts/default
+lib/X11/rstart/contexts/x
+lib/X11/rstart/contexts/x11
+lib/X11/rstart/contexts/x11r6
+lib/X11/rstart/rstartd.real
+lib/X11/twm/system.twmrc
+lib/X11/x11perfcomp/fillblnk
+lib/X11/x11perfcomp/perfboth
+lib/X11/x11perfcomp/perfratio
+lib/X11/xdm/GiveConsole
+lib/X11/xdm/TakeConsole
+lib/X11/xdm/Xaccess
+lib/X11/xdm/Xresources
+lib/X11/xdm/Xservers
+lib/X11/xdm/Xsession
+lib/X11/xdm/Xsetup_0
+lib/X11/xdm/Xwilling
+lib/X11/xdm/chooser
+lib/X11/xdm/pixmaps/XFree86.xpm
+lib/X11/xdm/pixmaps/XFree86bw.xpm
+lib/X11/xdm/xdm-config
+lib/X11/xedit/lisp/indent.lsp
+lib/X11/xedit/lisp/lisp.lsp
+lib/X11/xedit/lisp/progmodes/c.lsp
+lib/X11/xedit/lisp/progmodes/html.lsp
+lib/X11/xedit/lisp/progmodes/imake.lsp
+lib/X11/xedit/lisp/progmodes/lisp.lsp
+lib/X11/xedit/lisp/progmodes/make.lsp
+lib/X11/xedit/lisp/progmodes/man.lsp
+lib/X11/xedit/lisp/progmodes/rpm.lsp
+lib/X11/xedit/lisp/progmodes/sgml.lsp
+lib/X11/xedit/lisp/progmodes/sh.lsp
+lib/X11/xedit/lisp/progmodes/xconf.lsp
+lib/X11/xedit/lisp/progmodes/xlog.lsp
+lib/X11/xedit/lisp/progmodes/xrdb.lsp
+lib/X11/xedit/lisp/syntax.lsp
+lib/X11/xedit/lisp/xedit.lsp
+lib/X11/xinit/xinitrc
+lib/X11/xkb/README
+lib/X11/xkb/README.config
+lib/X11/xkb/README.enhancing
+lib/X11/xkb/compat.dir
+lib/X11/xkb/compat/README
+lib/X11/xkb/compat/accessx
+lib/X11/xkb/compat/basic
+lib/X11/xkb/compat/complete
+lib/X11/xkb/compat/default
+lib/X11/xkb/compat/group_led
+lib/X11/xkb/compat/iso9995
+lib/X11/xkb/compat/japan
+lib/X11/xkb/compat/keypad
+lib/X11/xkb/compat/leds
+lib/X11/xkb/compat/misc
+lib/X11/xkb/compat/mousekeys
+lib/X11/xkb/compat/norepeat
+lib/X11/xkb/compat/pc
+lib/X11/xkb/compat/pc98
+lib/X11/xkb/compat/xfree86
+lib/X11/xkb/compat/xtest
+lib/X11/xkb/compiled/README
+lib/X11/xkb/geometry.dir
+lib/X11/xkb/geometry/README
+lib/X11/xkb/geometry/amiga
+lib/X11/xkb/geometry/ataritt
+lib/X11/xkb/geometry/dell
+lib/X11/xkb/geometry/digital/lk
+lib/X11/xkb/geometry/digital/pc
+lib/X11/xkb/geometry/digital/unix
+lib/X11/xkb/geometry/everex
+lib/X11/xkb/geometry/fujitsu
+lib/X11/xkb/geometry/hp
+lib/X11/xkb/geometry/keytronic
+lib/X11/xkb/geometry/kinesis
+lib/X11/xkb/geometry/macintosh
+lib/X11/xkb/geometry/microsoft
+lib/X11/xkb/geometry/nec
+lib/X11/xkb/geometry/northgate
+lib/X11/xkb/geometry/pc
+lib/X11/xkb/geometry/sgi/O2
+lib/X11/xkb/geometry/sgi/indigo
+lib/X11/xkb/geometry/sgi/indy
+lib/X11/xkb/geometry/sony
+lib/X11/xkb/geometry/sun
+lib/X11/xkb/geometry/winbook
+lib/X11/xkb/keycodes.dir
+lib/X11/xkb/keycodes/README
+lib/X11/xkb/keycodes/aliases
+lib/X11/xkb/keycodes/amiga
+lib/X11/xkb/keycodes/ataritt
+lib/X11/xkb/keycodes/digital/lk
+lib/X11/xkb/keycodes/digital/pc
+lib/X11/xkb/keycodes/fujitsu
+lib/X11/xkb/keycodes/hp
+lib/X11/xkb/keycodes/ibm
+lib/X11/xkb/keycodes/macintosh
+lib/X11/xkb/keycodes/powerpcps2
+lib/X11/xkb/keycodes/sgi/indigo
+lib/X11/xkb/keycodes/sgi/indy
+lib/X11/xkb/keycodes/sgi/iris
+lib/X11/xkb/keycodes/sony
+lib/X11/xkb/keycodes/sun
+lib/X11/xkb/keycodes/xfree86
+lib/X11/xkb/keycodes/xfree98
+lib/X11/xkb/keymap.dir
+lib/X11/xkb/keymap/README
+lib/X11/xkb/keymap/amiga
+lib/X11/xkb/keymap/ataritt
+lib/X11/xkb/keymap/digital/us
+lib/X11/xkb/keymap/macintosh
+lib/X11/xkb/keymap/sgi/be
+lib/X11/xkb/keymap/sgi/bg
+lib/X11/xkb/keymap/sgi/ca
+lib/X11/xkb/keymap/sgi/cz
+lib/X11/xkb/keymap/sgi/cz_qwerty
+lib/X11/xkb/keymap/sgi/de
+lib/X11/xkb/keymap/sgi/de_CH
+lib/X11/xkb/keymap/sgi/dk
+lib/X11/xkb/keymap/sgi/dvorak
+lib/X11/xkb/keymap/sgi/en_US
+lib/X11/xkb/keymap/sgi/es
+lib/X11/xkb/keymap/sgi/fi
+lib/X11/xkb/keymap/sgi/fr
+lib/X11/xkb/keymap/sgi/fr_CH
+lib/X11/xkb/keymap/sgi/gb
+lib/X11/xkb/keymap/sgi/hu
+lib/X11/xkb/keymap/sgi/it
+lib/X11/xkb/keymap/sgi/jp
+lib/X11/xkb/keymap/sgi/no
+lib/X11/xkb/keymap/sgi/pl
+lib/X11/xkb/keymap/sgi/pt
+lib/X11/xkb/keymap/sgi/ru
+lib/X11/xkb/keymap/sgi/se
+lib/X11/xkb/keymap/sgi/sk
+lib/X11/xkb/keymap/sgi/sk_qwerty
+lib/X11/xkb/keymap/sgi/th
+lib/X11/xkb/keymap/sgi/us
+lib/X11/xkb/keymap/sony
+lib/X11/xkb/keymap/sun/de
+lib/X11/xkb/keymap/sun/es
+lib/X11/xkb/keymap/sun/fi
+lib/X11/xkb/keymap/sun/fr
+lib/X11/xkb/keymap/sun/no
+lib/X11/xkb/keymap/sun/pl
+lib/X11/xkb/keymap/sun/ru
+lib/X11/xkb/keymap/sun/se
+lib/X11/xkb/keymap/sun/uk
+lib/X11/xkb/keymap/sun/us
+lib/X11/xkb/keymap/xfree86
+lib/X11/xkb/keymap/xfree98
+lib/X11/xkb/rules/README
+lib/X11/xkb/rules/sgi
+lib/X11/xkb/rules/sgi.lst
+lib/X11/xkb/rules/sun
+lib/X11/xkb/rules/sun.lst
+lib/X11/xkb/rules/xfree86
+lib/X11/xkb/rules/xfree86-it.lst
+lib/X11/xkb/rules/xfree86.lst
+lib/X11/xkb/rules/xfree86.xml
+lib/X11/xkb/semantics/basic
+lib/X11/xkb/semantics/complete
+lib/X11/xkb/semantics/default
+lib/X11/xkb/semantics/xtest
+lib/X11/xkb/symbols.dir
+lib/X11/xkb/symbols/README
+lib/X11/xkb/symbols/al
+lib/X11/xkb/symbols/altwin
+lib/X11/xkb/symbols/am
+lib/X11/xkb/symbols/ar
+lib/X11/xkb/symbols/az
+lib/X11/xkb/symbols/be
+lib/X11/xkb/symbols/ben
+lib/X11/xkb/symbols/bg
+lib/X11/xkb/symbols/br
+lib/X11/xkb/symbols/bs
+lib/X11/xkb/symbols/by
+lib/X11/xkb/symbols/ca
+lib/X11/xkb/symbols/ca_enhanced
+lib/X11/xkb/symbols/compose
+lib/X11/xkb/symbols/ctrl
+lib/X11/xkb/symbols/cz
+lib/X11/xkb/symbols/cz_qwerty
+lib/X11/xkb/symbols/czsk
+lib/X11/xkb/symbols/de
+lib/X11/xkb/symbols/de_CH
+lib/X11/xkb/symbols/dev
+lib/X11/xkb/symbols/digital/lk
+lib/X11/xkb/symbols/digital/pc
+lib/X11/xkb/symbols/digital/us
+lib/X11/xkb/symbols/digital/vt
+lib/X11/xkb/symbols/dk
+lib/X11/xkb/symbols/dvorak
+lib/X11/xkb/symbols/ee
+lib/X11/xkb/symbols/el
+lib/X11/xkb/symbols/en_US
+lib/X11/xkb/symbols/es
+lib/X11/xkb/symbols/fi
+lib/X11/xkb/symbols/fr
+lib/X11/xkb/symbols/fr_CH
+lib/X11/xkb/symbols/fujitsu/jp
+lib/X11/xkb/symbols/fujitsu/us
+lib/X11/xkb/symbols/gb
+lib/X11/xkb/symbols/ge_la
+lib/X11/xkb/symbols/ge_ru
+lib/X11/xkb/symbols/group
+lib/X11/xkb/symbols/guj
+lib/X11/xkb/symbols/gur
+lib/X11/xkb/symbols/hp/us
+lib/X11/xkb/symbols/hr
+lib/X11/xkb/symbols/hu
+lib/X11/xkb/symbols/hu_US
+lib/X11/xkb/symbols/hu_qwerty
+lib/X11/xkb/symbols/ie
+lib/X11/xkb/symbols/il
+lib/X11/xkb/symbols/il_phonetic
+lib/X11/xkb/symbols/inet
+lib/X11/xkb/symbols/ir
+lib/X11/xkb/symbols/is
+lib/X11/xkb/symbols/iso9995-3
+lib/X11/xkb/symbols/it
+lib/X11/xkb/symbols/iu
+lib/X11/xkb/symbols/jp
+lib/X11/xkb/symbols/kan
+lib/X11/xkb/symbols/keypad
+lib/X11/xkb/symbols/la
+lib/X11/xkb/symbols/level3
+lib/X11/xkb/symbols/lo
+lib/X11/xkb/symbols/lock
+lib/X11/xkb/symbols/lt
+lib/X11/xkb/symbols/lt_std
+lib/X11/xkb/symbols/lv
+lib/X11/xkb/symbols/macintosh/de
+lib/X11/xkb/symbols/macintosh/de_CH
+lib/X11/xkb/symbols/macintosh/dk
+lib/X11/xkb/symbols/macintosh/es
+lib/X11/xkb/symbols/macintosh/fi
+lib/X11/xkb/symbols/macintosh/fr
+lib/X11/xkb/symbols/macintosh/fr_CH
+lib/X11/xkb/symbols/macintosh/gb
+lib/X11/xkb/symbols/macintosh/it
+lib/X11/xkb/symbols/macintosh/nl
+lib/X11/xkb/symbols/macintosh/no
+lib/X11/xkb/symbols/macintosh/pt
+lib/X11/xkb/symbols/macintosh/se
+lib/X11/xkb/symbols/macintosh/us
+lib/X11/xkb/symbols/mk
+lib/X11/xkb/symbols/ml
+lib/X11/xkb/symbols/mm
+lib/X11/xkb/symbols/mt
+lib/X11/xkb/symbols/mt_us
+lib/X11/xkb/symbols/nec/jp
+lib/X11/xkb/symbols/nl
+lib/X11/xkb/symbols/no
+lib/X11/xkb/symbols/ogham
+lib/X11/xkb/symbols/ori
+lib/X11/xkb/symbols/pc/al
+lib/X11/xkb/symbols/pc/am
+lib/X11/xkb/symbols/pc/ar
+lib/X11/xkb/symbols/pc/be
+lib/X11/xkb/symbols/pc/ben
+lib/X11/xkb/symbols/pc/bg
+lib/X11/xkb/symbols/pc/br
+lib/X11/xkb/symbols/pc/by
+lib/X11/xkb/symbols/pc/cz
+lib/X11/xkb/symbols/pc/cz_qwerty
+lib/X11/xkb/symbols/pc/de
+lib/X11/xkb/symbols/pc/dev
+lib/X11/xkb/symbols/pc/dk
+lib/X11/xkb/symbols/pc/dvorak
+lib/X11/xkb/symbols/pc/ee
+lib/X11/xkb/symbols/pc/el
+lib/X11/xkb/symbols/pc/en_US
+lib/X11/xkb/symbols/pc/es
+lib/X11/xkb/symbols/pc/fi
+lib/X11/xkb/symbols/pc/fr
+lib/X11/xkb/symbols/pc/fr-latin9
+lib/X11/xkb/symbols/pc/gb
+lib/X11/xkb/symbols/pc/ge_la
+lib/X11/xkb/symbols/pc/ge_ru
+lib/X11/xkb/symbols/pc/guj
+lib/X11/xkb/symbols/pc/gur
+lib/X11/xkb/symbols/pc/hr
+lib/X11/xkb/symbols/pc/ie
+lib/X11/xkb/symbols/pc/il
+lib/X11/xkb/symbols/pc/il_phonetic
+lib/X11/xkb/symbols/pc/ir
+lib/X11/xkb/symbols/pc/is
+lib/X11/xkb/symbols/pc/it
+lib/X11/xkb/symbols/pc/iu
+lib/X11/xkb/symbols/pc/kan
+lib/X11/xkb/symbols/pc/la
+lib/X11/xkb/symbols/pc/latin
+lib/X11/xkb/symbols/pc/lo
+lib/X11/xkb/symbols/pc/lt
+lib/X11/xkb/symbols/pc/lv
+lib/X11/xkb/symbols/pc/mk
+lib/X11/xkb/symbols/pc/ml
+lib/X11/xkb/symbols/pc/mm
+lib/X11/xkb/symbols/pc/mt
+lib/X11/xkb/symbols/pc/mt_us
+lib/X11/xkb/symbols/pc/nl
+lib/X11/xkb/symbols/pc/no
+lib/X11/xkb/symbols/pc/ogham
+lib/X11/xkb/symbols/pc/ori
+lib/X11/xkb/symbols/pc/pc
+lib/X11/xkb/symbols/pc/pl
+lib/X11/xkb/symbols/pc/pl2
+lib/X11/xkb/symbols/pc/pt
+lib/X11/xkb/symbols/pc/ro
+lib/X11/xkb/symbols/pc/ru
+lib/X11/xkb/symbols/pc/sapmi
+lib/X11/xkb/symbols/pc/se
+lib/X11/xkb/symbols/pc/si
+lib/X11/xkb/symbols/pc/sk
+lib/X11/xkb/symbols/pc/sk_qwerty
+lib/X11/xkb/symbols/pc/sr
+lib/X11/xkb/symbols/pc/syr
+lib/X11/xkb/symbols/pc/syr_phonetic
+lib/X11/xkb/symbols/pc/tel
+lib/X11/xkb/symbols/pc/th
+lib/X11/xkb/symbols/pc/tj
+lib/X11/xkb/symbols/pc/tml
+lib/X11/xkb/symbols/pc/tr
+lib/X11/xkb/symbols/pc/ua
+lib/X11/xkb/symbols/pc/us
+lib/X11/xkb/symbols/pc/yu
+lib/X11/xkb/symbols/pc104
+lib/X11/xkb/symbols/pl
+lib/X11/xkb/symbols/pl2
+lib/X11/xkb/symbols/pt
+lib/X11/xkb/symbols/ralt
+lib/X11/xkb/symbols/ro
+lib/X11/xkb/symbols/ru
+lib/X11/xkb/symbols/ru_yawerty
+lib/X11/xkb/symbols/sapmi
+lib/X11/xkb/symbols/se
+lib/X11/xkb/symbols/se_FI
+lib/X11/xkb/symbols/se_NO
+lib/X11/xkb/symbols/se_SE
+lib/X11/xkb/symbols/sgi/jp
+lib/X11/xkb/symbols/si
+lib/X11/xkb/symbols/sk
+lib/X11/xkb/symbols/sk_qwerty
+lib/X11/xkb/symbols/sony/us
+lib/X11/xkb/symbols/sr
+lib/X11/xkb/symbols/srvr_ctrl
+lib/X11/xkb/symbols/sun/se
+lib/X11/xkb/symbols/sun/us
+lib/X11/xkb/symbols/syr
+lib/X11/xkb/symbols/syr_phonetic
+lib/X11/xkb/symbols/tel
+lib/X11/xkb/symbols/th
+lib/X11/xkb/symbols/tj
+lib/X11/xkb/symbols/tml
+lib/X11/xkb/symbols/tr
+lib/X11/xkb/symbols/tr_f
+lib/X11/xkb/symbols/ua
+lib/X11/xkb/symbols/us
+lib/X11/xkb/symbols/us_group2
+lib/X11/xkb/symbols/us_group3
+lib/X11/xkb/symbols/us_intl
+lib/X11/xkb/symbols/vn
+lib/X11/xkb/symbols/xfree68/amiga
+lib/X11/xkb/symbols/xfree68/ataritt
+lib/X11/xkb/symbols/yu
+lib/X11/xkb/types.dir
+lib/X11/xkb/types/README
+lib/X11/xkb/types/basic
+lib/X11/xkb/types/caps
+lib/X11/xkb/types/complete
+lib/X11/xkb/types/default
+lib/X11/xkb/types/extra
+lib/X11/xkb/types/iso9995
+lib/X11/xkb/types/mousekeys
+lib/X11/xkb/types/pc
+lib/X11/xkb/xkbcomp
+lib/X11/xman.help
+lib/X11/xsm/system.xsm
Index: x11/XFree86-4-clients/files/manpages
===================================================================
RCS file: x11/XFree86-4-clients/files/manpages
diff -N x11/XFree86-4-clients/files/manpages
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/files/manpages 11 Mar 2003 23:38:06 -0000
@@ -0,0 +1,105 @@
+MAN1= Xmark.1 \
+ appres.1 \
+ atobm.1 \
+ bdftopcf.1 \
+ beforelight.1 \
+ bitmap.1 \
+ bmtoa.1 \
+ cxpm.1 \
+ dga.1 \
+ dpsexec.1 \
+ dpsinfo.1 \
+ editres.1 \
+ fslsfonts.1 \
+ fstobdf.1 \
+ glxgears.1 \
+ glxinfo.1 \
+ iceauth.1 \
+ lbxproxy.1 \
+ listres.1 \
+ luit.1 \
+ makepsres.1 \
+ mkcfm.1 \
+ mkfontdir.1 \
+ mkfontscale.1 \
+ oclock.1 \
+ proxymngr.1 \
+ resize.1 \
+ rstart.1 \
+ rstartd.1 \
+ sessreg.1 \
+ setxkbmap.1 \
+ showfont.1 \
+ showrgb.1 \
+ smproxy.1 \
+ startx.1 \
+ sxpm.1 \
+ texteroids.1 \
+ twm.1 \
+ viewres.1 \
+ x11perf.1 \
+ x11perfcomp.1 \
+ xauth.1 \
+ xbiff.1 \
+ xcalc.1 \
+ xclipboard.1 \
+ xclock.1 \
+ xcmsdb.1 \
+ xconsole.1 \
+ xcursorgen.1 \
+ xcutsel.1 \
+ xditview.1 \
+ xdm.1 \
+ xdpyinfo.1 \
+ xedit.1 \
+ xev.1 \
+ xeyes.1 \
+ xfd.1 \
+ xfindproxy.1 \
+ xfontsel.1 \
+ xfsinfo.1 \
+ xfwp.1 \
+ xgamma.1 \
+ xgc.1 \
+ xhost.1 \
+ xinit.1 \
+ xkbcomp.1 \
+ xkbevd.1 \
+ xkbprint.1 \
+ xkill.1 \
+ xload.1 \
+ xlogo.1 \
+ xlsatoms.1 \
+ xlsclients.1 \
+ xlsfonts.1 \
+ xmag.1 \
+ xman.1 \
+ xmessage.1 \
+ xmh.1 \
+ xmodmap.1 \
+ xon.1 \
+ xprop.1 \
+ xrandr.1 \
+ xrdb.1 \
+ xrefresh.1 \
+ xset.1 \
+ xsetmode.1 \
+ xsetpointer.1 \
+ xsetroot.1 \
+ xsm.1 \
+ xstdcmap.1 \
+ xterm.1 \
+ xtrap.1 \
+ xtrapchar.1 \
+ xtrapin.1 \
+ xtrapinfo.1 \
+ xtrapout.1 \
+ xtrapproto.1 \
+ xtrapreset.1 \
+ xtrapstats.1 \
+ xvidtune.1 \
+ xvinfo.1 \
+ xwd.1 \
+ xwininfo.1 \
+ xwud.1
Index: x11/XFree86-4-clients/files/patch-Imake.rules
===================================================================
RCS file: x11/XFree86-4-clients/files/patch-Imake.rules
diff -N x11/XFree86-4-clients/files/patch-Imake.rules
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/files/patch-Imake.rules 3 Jan 2004 21:35:04 -0000
@@ -0,0 +1,16 @@
+--- config/cf/Imake.rules.orig Sat Jan 3 16:16:06 2004
++++ config/cf/Imake.rules Sat Jan 3 16:18:47 2004
+@@ -3148,7 +3148,12 @@
+ * Also delete line numbers from the cpp output (-P is not portable, I guess).
+ */
+ #ifndef CppSedMagic
+-#define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
++#define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' \
++ -e '/^#line *[0-9][0-9]* *.*$$/d' \
++ -e '/^[ ]*XCOMM$$/s/XCOMM/#/' \
++ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' \
++ -e '/^[ ]*XHASH/s/XHASH/#/' \
++ -e '/\@\@$$/s/\@\@$$/\\/'
+ #endif /* CppSedMagic */
+
+ #ifndef CppFileTarget
Index: x11/XFree86-4-clients/files/patch-Xres.cpp
===================================================================
RCS file: x11/XFree86-4-clients/files/patch-Xres.cpp
diff -N x11/XFree86-4-clients/files/patch-Xres.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/files/patch-Xres.cpp 3 Jan 2004 21:35:04 -0000
@@ -0,0 +1,50 @@
+--- programs/xdm/config/Xres.cpp.orig Sat Jan 3 15:50:37 2004
++++ programs/xdm/config/Xres.cpp Sat Jan 3 15:53:22 2004
+@@ -28,7 +28,7 @@
+ #endif /* XPM */
+ xlogin*fail: Login incorrect
+ #ifdef XPM
+-/**/#if WIDTH > 800
++XHASHif WIDTH > 800
+ xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1
+ xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
+ xlogin*promptFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
+@@ -38,9 +38,9 @@
+ xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
+ xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
+ xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
+-/**/#endif
++XHASHendif
+ #endif /* XPM */
+-/**/#ifdef COLOR
++XHASHifdef COLOR
+ #ifndef XPM
+ xlogin*greetColor: CadetBlue
+ #else
+@@ -56,7 +56,7 @@
+ xlogin*failColor: red
+ *Foreground: black
+ *Background: #fffff0
+-/**/#else
++XHASHelse
+ #ifdef XPM
+ xlogin*borderWidth: 3
+ xlogin*frameWidth: 0
+@@ -68,13 +68,13 @@
+ xlogin*Foreground: black
+ xlogin*Background: white
+ #endif /* XPM */
+-/**/#endif
++XHASHendif
+ #ifdef XPM
+-/**/#if PLANES >= 8
++XHASHif PLANES >= 8
+ xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
+-/**/#else
++XHASHelse
+ xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
+-/**/#endif
++XHASHendif
+ xlogin*useShape: true
+ xlogin*logoPadding: 10
+ #endif /* XPM */
Index: x11/XFree86-4-clients/files/patch-bdftruncate.pl
===================================================================
RCS file: x11/XFree86-4-clients/files/patch-bdftruncate.pl
diff -N x11/XFree86-4-clients/files/patch-bdftruncate.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/files/patch-bdftruncate.pl 12 Dec 2003 23:19:06 -0000
@@ -0,0 +1,13 @@
+Index: fonts/util/bdftruncate.pl
+===================================================================
+RCS file: /home/ncvs/xfree/xc/fonts/util/bdftruncate.pl,v
+retrieving revision 1.3
+diff -u -r1.3 bdftruncate.pl
+--- fonts/util/bdftruncate.pl 12 Oct 2002 16:06:42 -0000 1.3
++++ fonts/util/bdftruncate.pl 12 Dec 2003 22:33:24 -0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ #
+ # bdftruncate.pl -- Markus Kuhn <mkuhn@xxxxxxx>
+ #
Index: x11/XFree86-4-clients/files/patch-ucs2any.pl
===================================================================
RCS file: x11/XFree86-4-clients/files/patch-ucs2any.pl
diff -N x11/XFree86-4-clients/files/patch-ucs2any.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/files/patch-ucs2any.pl 12 Dec 2003 23:19:06 -0000
@@ -0,0 +1,13 @@
+Index: fonts/util/ucs2any.pl
+===================================================================
+RCS file: /home/ncvs/xfree/xc/fonts/util/ucs2any.pl,v
+retrieving revision 1.5
+diff -u -r1.5 ucs2any.pl
+--- fonts/util/ucs2any.pl 12 Oct 2002 16:06:42 -0000 1.5
++++ fonts/util/ucs2any.pl 12 Dec 2003 22:25:18 -0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ #
+ # ucs2any.pl -- Markus Kuhn <mkuhn@xxxxxxx>
+ #
Index: x11/XFree86-4-clients/scripts/configure
===================================================================
RCS file: x11/XFree86-4-clients/scripts/configure
diff -N x11/XFree86-4-clients/scripts/configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-clients/scripts/configure 14 Oct 2003 00:45:30 -0000
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# This script does the following:
+# (1) cp xf86site.def, installed by imake-4 port,
+# to ${WRKDIR}/xc/config/cf.
+# this provides settings for the ports system.
+# (2) Create a host.def for this specific port, using
+# host.def as a base.
+
+ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
+DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
+ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
+LOCALDEF=$WRKDIR/.config
+HOSTDEF=$WRKDIR/xc/config/cf/host.def
+
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
+echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+
+# User Config.
+if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then
+echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
+fi
+if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then
+echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
+fi
+if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then
+echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
+fi
+
+# disable some options
+for i in \
+ InstallFSConfig \
+ BuildServer \
+ BuildFontServer \
+ BuildFonts \
+ Build75DpiFonts \
+ Build100DpiFonts \
+ BuildSpeedoFonts \
+ BuildType1Fonts \
+ BuildCIDFonts \
+ BuildCyrillicFonts \
+ BuildLatin2Fonts \
+ BuildPlugin \
+ LibHeaders \
+ LibInstall \
+ ForceNormalLib \
+ ModInstall \
+ XTrueTypeInstallCConvHeaders
+do \
+ echo "#define $i NO" >> $LOCALDEF
+done
+
+echo "#define FreeBSDCC ${CC}" >> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF
+
+echo "#define LibInstallBuild YES" >> $LOCALDEF
+echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF
+echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
+echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF
+echo "#define DontUseLibPathVar YES" >> $LOCALDEF
+echo "#define PreloadSetup" >> $LOCALDEF
+echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+echo "#define UseInstalledLibraries YES" >> $LOCALDEF
+
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF
+
+exit 0
Index: x11/XFree86-4-libraries/Makefile
===================================================================
RCS file: /home/dcvs/dfports/x11/XFree86-4-libraries/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- x11/XFree86-4-libraries/Makefile 2 Dec 2003 06:46:42 -0000 1.2
+++ x11/XFree86-4-libraries/Makefile 25 Mar 2004 00:10:20 -0000
@@ -2,7 +2,7 @@
# Date created: 10 Oct 1999
# Whom: taguchi@xxxxxxxxxxxxxxxx
#
-# $FreeBSD: ports/x11/XFree86-4-libraries/Makefile,v 1.129 2003/09/03 22:12:50 anholt Exp $
+# $FreeBSD: ports/x11/XFree86-4-libraries/Makefile,v 1.134 2004/02/06 04:41:48 marcus Exp $
# $DragonFly: dfports/x11/XFree86-4-libraries/Makefile,v 1.2 2003/12/02 06:46:42 dillon Exp $
#
@@ -23,7 +23,7 @@ EXTRACT_ONLY= X430src-1.tgz \
X430src-2.tgz \
X430src-3.tgz
-MAINTAINER= anholt@xxxxxxxxxxx
+MAINTAINER= x11@xxxxxxxxxxx
COMMENT= XFree86-4 libraries and headers
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
@@ -69,6 +69,13 @@ PLIST_SUB+= XTHRSTUB:="@comment "
PLIST_SUB+= XTHRSTUB:=""
.endif
+# amd64 also supplies libxkbfile.so*
+.if ${MACHINE_ARCH} == "amd64"
+PLIST_SUB+= AMD64:=""
+.else
+PLIST_SUB+= AMD64:="@comment "
+.endif
+
post-extract:
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
Index: x11/XFree86-4-libraries/Makefile.inc
===================================================================
RCS file: /home/dcvs/dfports/x11/XFree86-4-libraries/Makefile.inc,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.inc
--- x11/XFree86-4-libraries/Makefile.inc 2 Dec 2003 06:40:52 -0000 1.1
+++ x11/XFree86-4-libraries/Makefile.inc 25 Mar 2004 00:12:50 -0000
@@ -15,12 +15,12 @@
DIST_SUBDIR= xc
WRKSRC?= ${WRKDIR}/xc
USE_IMAKE= YES
+USE_REINPLACE= yes
XFREE86_HTML_MAN= yes
PATCHDIR?= ${.CURDIR}/../../x11/XFree86-4-libraries/files
SCRIPTS_ENV+= CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
-MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}"
XINSTALL_DIRS?= ${XBUILD_DIRS}
_XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS}
Index: x11/XFree86-4-libraries/pkg-plist
===================================================================
RCS file: /home/dcvs/dfports/x11/XFree86-4-libraries/pkg-plist,v
retrieving revision 1.1
diff -u -p -r1.1 pkg-plist
--- x11/XFree86-4-libraries/pkg-plist 2 Dec 2003 06:40:52 -0000 1.1
+++ x11/XFree86-4-libraries/pkg-plist 25 Mar 2004 00:28:06 -0000
@@ -618,5 +618,7 @@ lib/libpsres.so
lib/libpsres.so.1
lib/libxf86config.a
lib/libxkbfile.a
+%%AMD64:%%lib/libxkbfile.so
+%%AMD64:%%lib/libxkbfile.so.6
lib/libxkbui.a
libdata/pkgconfig/xcursor.pc
Index: x11/XFree86-4-libraries/files/patch-DragonFly.cf
===================================================================
RCS file: x11/XFree86-4-libraries/files/patch-DragonFly.cf
diff -N x11/XFree86-4-libraries/files/patch-DragonFly.cf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-libraries/files/patch-DragonFly.cf 25 Mar 2004 01:55:25 -0000
@@ -0,0 +1,331 @@
+--- config/cf/DragonFly.cf Wed Mar 22 22:12:35 2004
++++ config/cf/DragonFly.cf Tue Mar 23 22:07:40 2004
+@@ -0,0 +1,328 @@
++/* xc/config/cf/DragonFly.cf */
++
++#define UseElfFormat YES
++#define OSBinaryFormat [ELF]
++
++#ifndef OSName
++# define OSName DefaultOSName OSBinaryFormat
++#endif
++#ifndef OSVendor
++# define OSVendor /**/
++#endif
++#ifndef OSMajorVersion
++# define OSMajorVersion DefaultOSMajorVersion
++#endif
++#ifndef OSMinorVersion
++# define OSMinorVersion DefaultOSMinorVersion
++#endif
++#ifndef OSTeenyVersion
++# define OSTeenyVersion DefaultOSTeenyVersion
++#endif
++
++#ifndef OSRelVersion
++/* Include this to get finer-grained information about the OS version */
++#include "/usr/include/osreldate.h"
++#define OSRelVersion __DragonFly_version
++#endif
++
++XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion)
++
++
++#define HasCplusplus YES
++#define GccUsesGas YES
++#define UseGas YES
++#define GnuCpp YES
++#define HasNdbm YES
++#define HasPutenv YES
++#define HasSnprintf YES
++#define HasBSD44Sockets YES
++#define HasDlopen YES
++#define HasSetProcTitle YES
++#define HasLibCrypt YES
++#define HasShm YES
++#define HasWChar32 YES
++#define HasUsableFileMmap YES
++#define HasNCurses YES
++#define HasVarRun YES
++#define HasVarDb YES
++
++#define HasIssetugid YES
++#define HasPoll YES
++#define HasGetIfAddrs YES
++
++#define IPv6SocketsAlsoIPv4 NO
++#define InstallXloadSetGID NO
++#define HasWeakSymbols UseElfFormat
++
++/*
++ * Multi-thread safe libs
++ */
++#ifndef HasLibPthread
++# define HasLibPthread NO
++#endif
++#define HasPosixThreads YES
++#define ThreadedX YES
++#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
++#define HasThreadSafeAPI YES
++#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
++
++#if HasLibPthread
++# define ThreadsLibraries -lpthread
++#else
++#define BuildThreadStubLibrary YES
++#define NeedUIThrStubs YES
++#define ThreadsLibraries -pthread
++#define SharedX11Reqs $(LDPRELIB) -lXThrStub
++#define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) -lXThrStub
++#endif
++
++#define AvoidNullMakeCommand YES
++#define StripInstalledPrograms YES
++#define CompressAllFonts YES
++#define Malloc0ReturnsNull YES
++#define NeedConstPrototypes YES
++#define NeedFunctionPrototypes YES
++#define NeedNestedPrototypes YES
++#define NeedVarargsPrototypes YES
++#define NeedWidePrototypes NO
++
++#define HasPlugin YES
++#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
++
++/*
++#define MkdirHierCmd mkdir -p
++
++#ifndef LexCmd
++#define LexCmd flex -l
++#endif
++#ifndef HasFlex
++#define HasFlex YES
++#endif
++
++#ifndef HasMktemp
++#define HasMktemp YES
++#endif
++
++#define CcCmd cc
++#define CplusplusCmd c++
++*/
++#define CppCmd cpp
++#define PreProcessCmd CppCmd
++
++#define StandardCppOptions -traditional
++#define StandardCppDefines /**/
++#ifndef DefaultCCOptions
++# if defined(UseInstalled)
++# define DefaultCCOptions /**/
++# else
++# if defined(HasGcc3) && HasGcc3
++# define NoSystemWarn -Wno-system-headers
++# else
++# define NoSystemWarn
++# endif
++# define DefaultCCOptions -ansi -Dasm=__asm NoSystemWarn
++# endif
++#endif
++
++#ifndef UseGnuMalloc
++# define UseGnuMalloc NO
++#endif
++
++#define HasSetUserContext YES
++#define HasGetpeereid YES
++#define HasMTRRSupport YES
++
++/*
++ * Drivers that don't need AGP can work with 4.0, but we don't have a
++ * mechanism for specifying a subset of drivers in the OS.cf files yet.
++ */
++#ifndef BuildXF86DRI
++# define BuildXF86DRI YES
++#endif
++
++#if defined(i386Architecture)
++#define HasAgpGart YES
++#endif
++
++/*
++ * SSE and 3DNow will be autodetected, so binutils is the only
++ * requirement for enabling this. By 4.2 they were all supported.
++ */
++#if defined(i386Architecture)
++# define HasX86Support YES
++# define HasMMXSupport YES
++# define Has3DNowSupport YES
++# define HasSSESupport YES
++#else
++# define HasX86Support NO
++# define HasMMXSupport NO
++# define Has3DNowSupport NO
++# define HasSSESupport NO
++#endif
++
++#ifndef UseRpath
++# define UseRpath YES
++#endif
++
++/* remove when linker is fixed */
++#ifndef RpathLoadFlags
++# if UseRpath
++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,/usr/local/lib -Wl,-rpath-link,/usr/lib/gcc3
++# else
++# define RpathLoadFlags /**/
++# endif
++#endif
++
++#ifndef ExtraLoadFlags
++# if !defined(UseInstalled)
++# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
++# else
++# define ExtraLoadFlags RpathLoadFlags
++# endif
++#endif
++
++#ifndef GnuMallocLibrary
++# define GnuMallocLibrary -lgnumalloc
++#endif
++
++#ifndef HasZlib
++# define HasZlib YES
++#endif
++
++#ifndef HasPam
++# define HasPam YES
++#endif
++
++#undef InstallCmd
++#define InstallCmd /usr/bin/install
++
++#define AsmElfDefines -D__ELF__
++
++#if GccUsesGas
++# define GccGasOption -DGCCUSESGAS
++# define AsmDefines -DUSE_GAS AsmElfDefines
++#else
++# define GccGasOption /**/
++# define AsmDefines AsmElfDefines
++#endif
++
++#ifdef i386Architecture
++# define ServerExtraDefines GccGasOption XFree86ServerDefines
++#endif
++#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \
++ defined(ia64Architecture) || defined(AMD64Architecture)
++# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
++#endif
++
++#ifdef Sparc64Architecture
++# define AsVISOption -Av9a
++# define AsOutputArchSize 64
++#endif
++
++#define StandardDefines -DCSRG_BASED
++
++#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
++#define XawI18nDefines -DUSE_XWCHAR_STRING
++#define HasMakefileSafeInclude YES
++#define IncludeMakefile(file) @@# dependencies are in .depend
++#define DependFileName .depend
++#ifndef DoLoadableServer
++# define DoLoadableServer YES
++#endif
++#ifndef ForceNormalLib
++# define ForceNormalLib YES
++#endif
++#define HasMkstemp YES
++
++#ifdef i386Architecture
++# define OptimizedCDebugFlags -O
++#else
++# define OptimizedCDebugFlags -O
++#endif
++
++#ifndef PreIncDir
++# define PreIncDir /usr/include
++#endif
++
++#define HasGroff YES
++#define NroffCmd env GROFF_NO_SGR=y groff -Tascii
++#define SetTtyGroup YES
++
++#ifndef ExtraFilesToClean
++# define ExtraFilesToClean *.core
++#endif
++
++#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
++#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
++
++#ifndef SystemManDirectory
++# define SystemManDirectory /usr/share/man
++#endif
++
++#define InstKmemFlags -g kmem -m 2755
++
++#ifndef CompressManPages
++# define CompressManPages YES
++#endif
++
++#define HasBsdMake YES
++
++#ifndef StaticLibrary
++#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
++#endif
++
++#define DlLibrary -rdynamic
++
++#ifdef AlphaArchitecture
++# define IoLibrary -lio
++#else
++# define IoLibrary /**/
++#endif
++#define ServerExtraSysLibs IoLibrary
++
++#ifndef PamLibraries
++#define PamLibraries -lpam DlLibrary
++#endif
++
++#ifndef SharedLibXdmGreet
++# define SharedLibXdmGreet NO
++#endif
++
++/*
++ * On FreeBSD, the run-time loader will use the built-in "rpath" before
++ * LD_LIBRARY_PATH. This means that utilities like mkfontdir will load
++ * installed libraries (if they exist) in preference to the ones in the
++ * build tree, even though LD_LIBRARY_PATH points to the build tree.
++ * This can result in the build failing. One way to avoid this is to
++ * pre-load the libraries from the build tree.
++ *
++ * There should be a better way than this hack...
++ */
++
++/* Do we still need this?
++#if !defined(UseInstalled)
++#if UseElfFormat
++#ifndef PreloadFontSetup
++#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(XFONTPRELOADPATTERN))`"
++#endif
++#ifndef PreloadFreetypeSetup
++#define PreloadFreetypeSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN))`"
++#endif
++#ifndef PreloadXFTSetup
++#define PreloadXFTSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo $(FT2PRELOADPATTERN) $(XFTPRELOADPATTERN) $(XRENDERPRELOADPATTERN) $(FCPRELOADPATTERN))`"
++#endif
++#endif
++#endif
++*/
++
++#ifndef HasCookieMaker
++/* Which versions have /dev/urandom? */
++#define HasCookieMaker YES
++#define MkCookieCmd \
++ 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
++#endif
++
++
++#include <bsdLib.rules>
++
++#include <xfree86.cf>
Index: x11/XFree86-4-libraries/files/patch-FreeBSD.cf
===================================================================
RCS file: x11/XFree86-4-libraries/files/patch-FreeBSD.cf
diff -N x11/XFree86-4-libraries/files/patch-FreeBSD.cf
--- x11/XFree86-4-libraries/files/patch-FreeBSD.cf 2 Dec 2003 06:40:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,130 +0,0 @@
---- config/cf/FreeBSD.cf Wed Jan 15 02:52:12 2003
-+++ config/cf/FreeBSD.cf Tue Dec 2 06:25:50 2003
-@@ -4,6 +4,8 @@
- XCOMM
- XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.128 2003/01/15 02:52:12 dawes Exp $
-
-+#define NormalLibXThrStub YES
-+
- #ifndef UseElfFormat
- #define UseElfFormat DefaultToElfFormat
- #endif
-@@ -21,13 +23,13 @@
- #define OSVendor /**/
- #endif
- #ifndef OSMajorVersion
--#define OSMajorVersion DefaultOSMajorVersion
-+#define OSMajorVersion 4
- #endif
- #ifndef OSMinorVersion
--#define OSMinorVersion DefaultOSMinorVersion
-+#define OSMinorVersion 8
- #endif
- #ifndef OSTeenyVersion
--#define OSTeenyVersion DefaultOSTeenyVersion
-+#define OSTeenyVersion 0
- #endif
-
- #ifndef OSRelVersion
-@@ -162,11 +164,11 @@
- * ld: warning: libXThrStub.so.6, needed by libX11.so, not found
- */
- #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
--# define CcCmd $(CLIENTENVSETUP) cc
--# define CplusplusCmd $(CLIENTENVSETUP) c++
-+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC
-+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX
- #else
--# define CcCmd cc
--# define CplusplusCmd c++
-+# define CcCmd FreeBSDCC
-+# define CplusplusCmd FreeBSDCXX
- #endif
-
- #define CppCmd /usr/bin/cpp
-@@ -177,7 +179,12 @@
- #if defined(UseInstalled)
- #define DefaultCCOptions /**/
- #else
--#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions
-+#if defined(HasGcc3) && HasGcc3
-+#define NoSystemWarn -Wno-system-headers
-+#else
-+#define NoSystemWarn
-+#endif
-+#define DefaultCCOptions -ansi -Dasm=__asm NoSystemWarn GccWarningOptions
- #endif
- #endif
- #ifndef ExtraLibraries
-@@ -228,21 +235,25 @@
- #endif
-
- /*
-- * 4.1/i386 and 5.0/i386 have the AGP driver.
-+ * 4.1/i386 and 5.0/i386,alpha,ia64,amd64 have the AGP driver.
- */
- #ifndef HasAgpGart
- #if defined(i386Architecture) && \
- (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1))
- #define HasAgpGart YES
- #endif
-+#if (defined(AlphaArchitecture) || defined(ia64Architecture) || \
-+ defined(x86_64Architecture)) && (OSMajorVersion >= 5)
-+#define HasAgpGart YES
-+#endif
- #endif
-
- /*
- * SSE and 3DNow will be autodetected, so binutils is the only
- * requirement for enabling this. By 4.2 they were all supported.
- */
--#if defined(i386Architecture) && \
-- (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))
-+#if defined(x86_64Architecture) || (defined(i386Architecture) && \
-+ (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2)))
- # define HasX86Support YES
- # define HasMMXSupport YES
- # define Has3DNowSupport YES
-@@ -299,7 +310,7 @@
-
- #ifndef SharedLibraryLoadFlags
- #if UseElfFormat
--#define SharedLibraryLoadFlags -shared -rpath $(USRLIBDIRPATH)
-+#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH)
- #else
- #define SharedLibraryLoadFlags -Bshareable -R $(USRLIBDIRPATH)
- #endif
-@@ -455,10 +466,8 @@
- #ifdef i386Architecture
- #define ServerExtraDefines GccGasOption XFree86ServerDefines
- #endif
--#ifdef AlphaArchitecture
--#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
--#endif
--#ifdef Sparc64Architecture
-+#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \
-+ defined(ia64Architecture) || defined(x86_64Architecture)
- #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
- #endif
-
-@@ -482,18 +491,8 @@
- #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
- #endif
-
--/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
--#ifndef DefaultGcc2i386Opt
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2
--#endif
--#endif
--
--#ifdef i386Architecture
--# define OptimizedCDebugFlags DefaultGcc2i386Opt
--#else
--# define OptimizedCDebugFlags -O
--#endif
-+#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags FreeBSDCFLAGS
-
- #ifndef PreIncDir
- # define PreIncDir /usr/include
Index: x11/XFree86-4-libraries/files/patch-Imake.cf
===================================================================
RCS file: /home/dcvs/dfports/x11/XFree86-4-libraries/files/patch-Imake.cf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Imake.cf
--- x11/XFree86-4-libraries/files/patch-Imake.cf 2 Dec 2003 06:40:54 -0000 1.1
+++ x11/XFree86-4-libraries/files/patch-Imake.cf 19 Mar 2004 22:56:14 -0000
@@ -1,9 +1,30 @@
---- config/cf/Imake.cf.orig Tue Feb 18 08:51:45 2003
-+++ config/cf/Imake.cf Tue Jul 15 20:02:05 2003
-@@ -232,6 +232,15 @@
- # define Sparc64Architecture
- # undef __sparc64__
+--- config/cf/Imake.cf Fri Mar 19 01:17:34 2004
++++ config/cf/Imake.cf Fri Mar 19 21:50:19 2004
+@@ -213,6 +213,38 @@
# endif
+ #endif /* NetBSD */
+
++#ifdef __DragonFly__
++# define MacroIncludeFile <DragonFly.cf>
++# define MacroFile DragonFly.cf
++# undef __DragonFly__
++# undef __FreeBSD__
++# define DragonFlyArchitecture
++# define FreeBSDArchitecture
++# ifdef __i386__
++# define i386BsdArchitecture
++# define i386Architecture
++# undef i386
++# endif
++# ifdef __alpha__
++# define AlphaBsdArchitecture
++# define AlphaArchitecture
++# undef __alpha__
++# endif
++# ifdef __sparc64__
++# define Sparc64Architecture
++# undef __sparc64__
++# endif
+# ifdef __ia64__
+# define ia64Architecture
+# undef __ia64__
@@ -13,6 +34,8 @@
+# undef __amd64__
+# undef __x86_64__
+# endif
- #endif /* __FreeBSD__ */
-
- #ifdef AMOEBA
++#endif /* __DragonFly__ */
++
+ #ifdef __FreeBSD__
+ # define MacroIncludeFile <FreeBSD.cf>
+ # define MacroFile FreeBSD.cf
Index: x11/XFree86-4-libraries/files/patch-Xos_r.h
===================================================================
RCS file: x11/XFree86-4-libraries/files/patch-Xos_r.h
diff -N x11/XFree86-4-libraries/files/patch-Xos_r.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-libraries/files/patch-Xos_r.h 19 Mar 2004 19:58:14 -0000
@@ -0,0 +1,20 @@
+--- include/Xos_r.h Wed Aug 28 23:08:22 2002
++++ include/Xos_r.h Fri Mar 19 18:59:57 2004
+@@ -257,7 +257,7 @@
+ */
+
+ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
+- defined(__APPLE__)
++ defined(__APPLE__) || defined(__DragonFly__)
+ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
+ {
+ memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
+@@ -427,7 +427,7 @@
+ /* UnixWare 2.0, or other systems with thread support but no _r API. */
+ /* WARNING: The h_addr_list and s_aliases values are *not* copied! */
+
+-#if defined(__NetBSD__) || defined(__FreeBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/param.h>
+ #endif
+
Index: x11/XFree86-4-libraries/files/patch-drm.h
===================================================================
RCS file: x11/XFree86-4-libraries/files/patch-drm.h
diff -N x11/XFree86-4-libraries/files/patch-drm.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-libraries/files/patch-drm.h 21 Mar 2004 16:29:23 -0000
@@ -0,0 +1,26 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h Wed Jan 15 03:36:27 2003
++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h Fri Mar 19 01:44:59 2004
+@@ -44,8 +44,8 @@
+ #define DRM_IOC_WRITE _IOC_WRITE
+ #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
+ #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+-#if defined(__FreeBSD__) && defined(XFree86Server)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(XFree86Server)
+ /* Prevent name collision when including sys/ioccom.h */
+ #undef ioctl
+ #include <sys/ioccom.h>
+--- programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h Wed Jan 15 03:36:27 2003
++++ programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm.h Fri Mar 19 01:44:59 2004
+@@ -44,8 +44,8 @@
+ #define DRM_IOC_WRITE _IOC_WRITE
+ #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
+ #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+-#if defined(__FreeBSD__) && defined(XFree86Server)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(XFree86Server)
+ /* Prevent name collision when including sys/ioccom.h */
+ #undef ioctl
+ #include <sys/ioccom.h>
Index: x11/XFree86-4-libraries/files/patch-imake.c
===================================================================
RCS file: /home/dcvs/dfports/x11/XFree86-4-libraries/files/patch-imake.c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-imake.c
--- x11/XFree86-4-libraries/files/patch-imake.c 2 Dec 2003 08:31:27 -0000 1.2
+++ x11/XFree86-4-libraries/files/patch-imake.c 25 Mar 2004 00:23:07 -0000
@@ -1,21 +1,11 @@
---- config/imake/imake.c.orig Mon Dec 16 22:48:27 2002
-+++ config/imake/imake.c Tue Dec 2 08:27:43 2003
-@@ -1165,8 +1165,7 @@
- } else
- strcpy (cmd, "objformat");
-
-- if (osrel >= 300004 &&
-- (objprog = popen(cmd, "r")) != NULL &&
-+ if ((objprog = popen(cmd, "r")) != NULL &&
- fgets(buf, sizeof(buf), objprog) != NULL &&
- strncmp(buf, "elf", 3) == 0)
- iself = 1;
-@@ -1384,6 +1383,19 @@
+--- config/imake/imake.c.orig Tue Dec 17 04:21:38 2002
++++ config/imake/imake.c Sat Jan 4 15:57:23 2003
+@@ -1384,6 +1384,19 @@
name = &uts_name;
}
#endif
-+# ifdef __FreeBSD__
-+ /* Hack for FreeBSD ports "Cross Version" compiling system. */
++# ifdef __DragonFly__
++ /* Hack for DragonFly ports "Cross Version" compiling system. */
+ {
+ char *e;
+ if ((e = getenv("OSREL")) != NULL &&
Index: x11/XFree86-4-libraries/files/patch-luit
===================================================================
RCS file: /home/dcvs/dfports/x11/XFree86-4-libraries/files/patch-luit,v
retrieving revision 1.1
diff -u -p -r1.1 patch-luit
--- x11/XFree86-4-libraries/files/patch-luit 2 Dec 2003 06:40:54 -0000 1.1
+++ x11/XFree86-4-libraries/files/patch-luit 25 Mar 2004 00:24:58 -0000
#endif
installHandler(SIGCHLD, sigchldHandler);
-+ rc = copyTermios(0, pty);
++ /*rc = copyTermios(0, pty);
+ if(rc < 0)
+ FatalError("Couldn't copy terminal settings\n");
-+
++ */ /* Disabled, appears to break luit. */
rc = setRawTermios();
if(rc < 0)
FatalError("Couldn't set terminal to raw\n");
Index: x11/XFree86-4-libraries/files/patch-os-support-Imakefile
===================================================================
RCS file: x11/XFree86-4-libraries/files/patch-os-support-Imakefile
diff -N x11/XFree86-4-libraries/files/patch-os-support-Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/XFree86-4-libraries/files/patch-os-support-Imakefile 19 Mar 2004 01:50:11 -0000
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/os-support/Imakefile Fri Mar 19 01:38:57 2004
++++ programs/Xserver/hw/xfree86/os-support/Imakefile Fri Mar 19 01:40:17 2004
+@@ -59,7 +59,7 @@
+ #endif
+
+ #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || \
+- defined(OpenBSDArchitecture)
++ defined(OpenBSDArchitecture) || defined(DragonFlyArchitecture)
+ OS_SUBDIR = bsd
+ #endif
+
Index: x11/XFree86-4-libraries/files/patch-xfree86.cf
===================================================================
RCS file: /home/dcvs/dfports/x11/XFree86-4-libraries/files/patch-xfree86.cf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-xfree86.cf
--- x11/XFree86-4-libraries/files/patch-xfree86.cf 2 Dec 2003 06:40:54 -0000 1.1
+++ x11/XFree86-4-libraries/files/patch-xfree86.cf 19 Mar 2004 01:38:19 -0000
@@ -4,7 +4,7 @@
#ifndef XFree86ConsoleDefines
# if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture)
# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT
-+# elif defined(FreeBSDArchitecture)
++# elif defined(FreeBSDArchitecture) || defined(DragonFlyArchitecture)
+# define XFree86ConsoleDefines -DSYSCONS_SUPPORT
# else
# define XFree86ConsoleDefines /**/
Index: x11/XFree86-4-libraries/scripts/configure
===================================================================
RCS file: /home/dcvs/dfports/x11/XFree86-4-libraries/scripts/configure,v
retrieving revision 1.1
diff -u -p -r1.1 configure
--- x11/XFree86-4-libraries/scripts/configure 2 Dec 2003 06:40:55 -0000 1.1
+++ x11/XFree86-4-libraries/scripts/configure 19 Mar 2004 21:33:43 -0000
@@ -48,10 +48,6 @@ do \
echo "#define $i NO" >> $LOCALDEF
done
-echo "#define FreeBSDCC ${CC}" >> $LOCALDEF
-echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF
-echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF
-
echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF
echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF
echo "#define UseInstalledPrograms YES" >> $LOCALDEF
Index: x11-servers/XFree86-4-FontServer/Makefile
===================================================================
RCS file: x11-servers/XFree86-4-FontServer/Makefile
diff -N x11-servers/XFree86-4-FontServer/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11-servers/XFree86-4-FontServer/Makefile 24 Mar 2004 19:48:17 -0000
@@ -0,0 +1,28 @@
+# New ports collection makefile for: XFree86-FontServer
+# Date created: 10 Oct 1999
+# Whom: taguchi@xxxxxxxxxxxxxxxx
+#
+# $FreeBSD: ports/x11-servers/XFree86-4-FontServer/Makefile,v 1.23 2003/12/12 23:50:09 anholt Exp $
+#
+
+PORTNAME= FontServer
+PORTVERSION= 4.3.0
+PORTREVISION= 3
+CATEGORIES= x11-servers x11-fonts
+MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR= ${PORTVERSION}
+PKGNAMEPREFIX= XFree86-
+DISTFILES= X430src-1.tgz \
+ X430src-2.tgz \
+ X430src-3.tgz
+
+MAINTAINER= x11@xxxxxxxxxxx
+COMMENT= XFree86-4 font server
+
+MAN1= xfs.1
+XBUILD_DIRS= programs/xfs
+XINCLUDE_DIRS= lib/xtrans programs/Xserver
+XINSTALL_MAN_DIRS= programs/xfs
+
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
+.include <bsd.dfport.mk>
Index: x11-servers/XFree86-4-FontServer/distinfo
===================================================================
RCS file: x11-servers/XFree86-4-FontServer/distinfo
diff -N x11-servers/XFree86-4-FontServer/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11-servers/XFree86-4-FontServer/distinfo 11 Mar 2003 23:38:09 -0000
@@ -0,0 +1,3 @@
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
Index: x11-servers/XFree86-4-FontServer/pkg-descr
===================================================================
RCS file: x11-servers/XFree86-4-FontServer/pkg-descr
diff -N x11-servers/XFree86-4-FontServer/pkg-descr
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11-servers/XFree86-4-FontServer/pkg-descr 8 Jun 2000 10:41:52 -0000
@@ -0,0 +1,3 @@
+This package contains Font Server.
+
+WWW: http://www.xfree86.org/
Index: x11-servers/XFree86-4-FontServer/pkg-plist
===================================================================
RCS file: x11-servers/XFree86-4-FontServer/pkg-plist
diff -N x11-servers/XFree86-4-FontServer/pkg-plist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11-servers/XFree86-4-FontServer/pkg-plist 25 Mar 2001 23:04:50 -0000
@@ -0,0 +1,2 @@
+bin/xfs
+lib/X11/fs/config
Index: x11-servers/XFree86-4-FontServer/scripts/configure
===================================================================
RCS file: x11-servers/XFree86-4-FontServer/scripts/configure
diff -N x11-servers/XFree86-4-FontServer/scripts/configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11-servers/XFree86-4-FontServer/scripts/configure 11 Mar 2003 23:38:09 -0000
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# This script does the following:
+# (1) cp xf86site.def, installed by imake-4 port,
+# to ${WRKDIR}/xc/config/cf.
+# this provides settings for the ports system.
+# (2) Create a host.def for this specific port, using
+# host.def as a base.
+
+ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
+DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
+ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
+LOCALDEF=$WRKDIR/.config
+HOSTDEF=$WRKDIR/xc/config/cf/host.def
+
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
+echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+
+# disable some options
+for i in BuildFonts \
+ Build75DpiFonts \
+ Build100DpiFonts \
+ BuildSpeedoFonts \
+ BuildType1Fonts \
+ BuildCIDFonts \
+ BuildCyrillicFonts \
+ BuildLatin2Fonts \
+ XF86Server \
+ XnestServer \
+ XVirtualFramebufferServer \
+ XprtServer \
+ LibHeaders \
+ ForceNormalLib \
+ XTrueTypeInstallCConvHeaders
+do \
+ echo "#define $i NO" >> $LOCALDEF
+done
+
+echo "#define BuildServer YES" >> $LOCALDEF
+echo "#define BuildFontServer YES" >> $LOCALDEF
+echo "#define BuildServersOnly YES" >> $LOCALDEF
+if [ X$InstallFSConfig = "X" ]; then
+ InstallFSConfig=YES
+fi
+echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
+echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF
+echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+echo "#define FreeBSDCC ${CC}" >> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF
+
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF
+
+exit 0
Index: x11-servers/XFree86-4-Server/Makefile
===================================================================
RCS file: /home/dcvs/dfports/x11-servers/XFree86-4-Server/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- x11-servers/XFree86-4-Server/Makefile 20 Feb 2004 21:31:52 -0000 1.1
+++ x11-servers/XFree86-4-Server/Makefile 25 Mar 2004 00:36:13 -0000
@@ -27,7 +27,6 @@ MAINTAINER= x11@xxxxxxxxxxx
COMMENT= XFree86-4 X server and related programs
EXTRA_PATCHES+= \
- ${FILESDIR}/patch-FreeBSD.cf \
${FILESDIR}/patch-Pci.h \
${FILESDIR}/patch-Sbus.c \
${FILESDIR}/patch-alpha_video.c \
@@ -42,6 +41,7 @@ EXTRA_PATCHES+= \
${FILESDIR}/patch-ftfuncs.c \
${FILESDIR}/patch-int10-generic.c \
${FILESDIR}/patch-libc_wrapper.c \
+ ${FILESDIR}/patch-lnx_agp.c \
${FILESDIR}/patch-loader-Imakefile \
${FILESDIR}/patch-loader-elfloader.c \
${FILESDIR}/patch-loader.c \
@@ -61,6 +61,7 @@ EXTRA_PATCHES+= \
${FILESDIR}/patch-xf86-common-Imakefile \
${FILESDIR}/patch-xf86Events.c \
${FILESDIR}/patch-xf86Sbus.h \
+ ${FILESDIR}/patch-xf86_OSlib.h \
${FILESDIR}/patch-xf86sym.c \
${FILESDIR}/patch-xkbInit.c
SCRIPTS_ENV= OSVERSION=${OSVERSION} \
@@ -121,14 +122,14 @@ NOT_FOR_ARCHS= ia64
.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
.include <bsd.dfport.pre.mk>
-.if ${ARCH} == i386 || ${ARCH} == alpha
-RUN_DEPENDS+= ${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri
-BuildXF86DRI= YES
-PLIST_SUB+= DRI=""
-.else
+#.if ${ARCH} == i386 || ${ARCH} == alpha
+#RUN_DEPENDS+= ${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri
+#BuildXF86DRI= YES
+#PLIST_SUB+= DRI=""
+#.else
BuildXF86DRI= NO
PLIST_SUB+= DRI="@comment "
-.endif
+#.endif
.if ${ARCH} == ia64
PLIST_SUB+= IA64_NA="@comment "
@@ -149,6 +150,7 @@ MAN4+= glint.4 \
s3virge.4 \
savage.4 \
siliconmotion.4 \
+ sis.4 \
tdfx.4 \
vga.4
.endif
@@ -165,7 +167,6 @@ MAN4+= apm.4 \
i810.4 \
neomagic.4 \
nsc.4 \
- sis.4 \
trident.4 \
tseng.4 \
vesa.4 \
@@ -188,4 +189,4 @@ post-install::
${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \
fi;
-.include <bsd.dfport.post.mk>
+.include <bsd.port.post.mk>
Index: x11-servers/XFree86-4-Server/pkg-plist
===================================================================
RCS file: /home/dcvs/dfports/x11-servers/XFree86-4-Server/pkg-plist,v
retrieving revision 1.1
diff -u -p -r1.1 pkg-plist
--- x11-servers/XFree86-4-Server/pkg-plist 20 Feb 2004 21:31:52 -0000 1.1
+++ x11-servers/XFree86-4-Server/pkg-plist 25 Mar 2004 00:36:13 -0000
@@ -129,7 +129,7 @@ lib/modules/drivers/radeon_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o
-%%I386%%lib/modules/drivers/sis_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/sis_drv.o
%%SPARC64%%lib/modules/drivers/sunffb_drv.o
%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o
Index: x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf
===================================================================
RCS file: x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf
diff -N x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf
--- x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf 20 Feb 2004 21:31:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- config/cf/FreeBSD.cf.orig Tue May 20 05:10:21 2003
-+++ config/cf/FreeBSD.cf Tue May 20 03:41:35 2003
-@@ -464,6 +464,8 @@
- #endif
- #ifdef Sparc64Architecture
- #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
-+#define AsVISOption -Av9a
-+#define AsOutputArchSize 64
- #endif
- #ifdef ia64Architecture
- #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
Index: x11-servers/XFree86-4-Server/files/patch-Xserver_Imakefile
===================================================================
RCS file: x11-servers/XFree86-4-Server/files/patch-Xserver_Imakefile
diff -N x11-servers/XFree86-4-Server/files/patch-Xserver_Imakefile
--- x11-servers/XFree86-4-Server/files/patch-Xserver_Imakefile 20 Feb 2004 21:31:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- Imakefile.orig Fri Feb 20 21:41:24 2004
-+++ Imakefile Fri Feb 20 21:41:27 2004
-@@ -147,6 +147,7 @@
- LIBREGEX = RegexLibrary
-
- #if DoLoadableServer
-+ LOCAL_LDFLAGS = -export-dynamic
- LIBCWRAPPER = os/libcwrapper.o
- #endif
-
Index: x11-servers/XFree86-4-Server/files/patch-alpha_video.c
===================================================================
RCS file: /home/dcvs/dfports/x11-servers/XFree86-4-Server/files/patch-alpha_video.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-alpha_video.c
--- x11-servers/XFree86-4-Server/files/patch-alpha_video.c 20 Feb 2004 21:31:52 -0000 1.1
+++ x11-servers/XFree86-4-Server/files/patch-alpha_video.c 25 Mar 2004 03:32:07 -0000
@@ -1,11 +1,11 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Tue Oct 29 15:19:13 2002
-+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Tue Mar 4 16:28:04 2003
+--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Tue Oct 29 23:19:13 2002
++++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Thu Mar 25 03:31:17 2004
@@ -33,7 +33,10 @@
#include <sys/param.h>
#ifndef __NetBSD__
# include <sys/sysctl.h>
-# else
-+# ifdef __FreeBSD__
++# ifdef __DragonFly__
+# include <machine/sysarch.h>
+# endif
+#else
@@ -33,3 +33,32 @@
}
void
+@@ -383,7 +388,7 @@
+ }
+
+
+-#if defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(DragonFly)
+
+ extern int ioperm(unsigned long from, unsigned long num, int on);
+
+@@ -474,8 +479,8 @@
+ static void
+ writeSparse32(int Value, pointer Base, register unsigned long Offset);
+
+-#ifdef __FreeBSD__
+-extern int sysarch(int, char *);
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++extern int sysarch(int, void *);
+ #endif
+
+ struct parms {
+@@ -485,7 +490,7 @@
+ static int
+ sethae(u_int64_t hae)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ struct parms p;
+ p.hae = hae;
+ return (sysarch(ALPHA_SETHAE, (char *)&p));
Index: x11-servers/XFree86-4-Server/files/patch-lnx_agp.c
===================================================================
RCS file: x11-servers/XFree86-4-Server/files/patch-lnx_agp.c
diff -N x11-servers/XFree86-4-Server/files/patch-lnx_agp.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11-servers/XFree86-4-Server/files/patch-lnx_agp.c 24 Mar 2004 20:28:07 -0000
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c Fri Mar 19 19:11:34 2004
++++ programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c Fri Mar 19 19:12:35 2004
+@@ -18,7 +18,7 @@
+ #if defined(linux)
+ #include <asm/ioctl.h>
+ #include <linux/agpgart.h>
+-#elif defined(__FreeBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <sys/ioctl.h>
+ #include <sys/agpio.h>
+ #endif
Index: x11-servers/XFree86-4-Server/files/patch-xf86_OSlib.h
===================================================================
RCS file: x11-servers/XFree86-4-Server/files/patch-xf86_OSlib.h
diff -N x11-servers/XFree86-4-Server/files/patch-xf86_OSlib.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11-servers/XFree86-4-Server/files/patch-xf86_OSlib.h 21 Mar 2004 22:40:03 -0000
@@ -0,0 +1,32 @@
+--- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Sun Mar 21 22:36:30 2004
++++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Sun Mar 21 22:38:40 2004
+@@ -410,7 +410,7 @@
+ /* 386BSD and derivatives, BSD/386 */
+ /**************************************************************************/
+
+-#if defined(__386BSD__) && (defined(__FreeBSD__) || defined(__NetBSD__))
++#if defined(__386BSD__) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
+ # undef __386BSD__
+ #endif
+
+@@ -445,9 +445,9 @@
+ # if defined(__NetBSD__) || defined(__OpenBSD__)
+ # include <machine/console.h>
+ # else
+-# if defined(__FreeBSD__)
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <osreldate.h>
+-# if __FreeBSD_version >= 410000
++# if __FreeBSD_version >= 410000 || defined(__DragonFly__)
+ # include <sys/consio.h>
+ # include <sys/kbio.h>
+ # else
+@@ -461,7 +461,7 @@
+ # if defined(PCVT_SUPPORT)
+ # if !defined(SYSCONS_SUPPORT)
+ /* no syscons, so include pcvt specific header file */
+-# if defined(__FreeBSD__)
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <machine/pcvt_ioctl.h>
+ # else
+ # if defined(__NetBSD__) || defined(__OpenBSD__)
Index: x11-servers/XFree86-4-Server/scripts/configure
===================================================================
RCS file: /home/dcvs/dfports/x11-servers/XFree86-4-Server/scripts/configure,v
retrieving revision 1.1
diff -u -p -r1.1 configure
--- x11-servers/XFree86-4-Server/scripts/configure 20 Feb 2004 21:31:53 -0000 1.1
+++ x11-servers/XFree86-4-Server/scripts/configure 25 Mar 2004 00:36:13 -0000
@@ -86,7 +86,7 @@ cat >> $LOCALDEF <<END
#elif defined(ia64Architecture)
# define XF86CardDrivers mga nv tdfx glint ati vga
#elif defined(AlphaArchitecture)
-# define XF86CardDrivers mga glint nv tga s3 s3virge rendition \
+# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
tdfx savage cirrus ati siliconmotion vga
#elif defined(Sparc64Architecture)
# define XF86CardDrivers nv ati sunffb
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
