Apply patches from Todd Willey for DragonFlyBSD, this closes PR pkg/29042.

Thank you!

6 files changed, 429 insertions, 10 deletions

diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 80bf25db014..cc3a2d7eea7 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2005/01/24 10:57:27 hira Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/01/25 17:49:57 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -211,7 +211,9 @@ post-extract:
 	@${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf
 	@${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf
 
-	@${TOUCH} ${WRKSRC}/config/cf/DragonFly.cf
+.if ${OPSYS} == "DragonFly"
+	@${CP} ../../x11/xorg-libs/files/DragonFly.cf ${WRKSRC}/config/cf/
+.endif
 
 .  for F in ${SYSTEMS}
 	@${MV} ${WRKSRC}/config/cf/${F}.cf \
diff --git a/x11/xorg-libs/PLIST.DragonFly b/x11/xorg-libs/PLIST.DragonFly
new file mode 100644
index 00000000000..53afd12f49e
--- /dev/null
+++ b/x11/xorg-libs/PLIST.DragonFly
@@ -0,0 +1,123 @@
+@comment $NetBSD: PLIST.DragonFly,v 1.1 2005/01/25 17:49:57 xtraeme Exp $
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so
+${X11ROOT_PREFIX}/lib/liboldX.so.6
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
+${X11ROOT_PREFIX}/lib/libXaw.so.8
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+${X11ROOT_PREFIX}/lib/libXcomposite.so
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXdamage.so
+${X11ROOT_PREFIX}/lib/libXdamage.so.1
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXevie.so
+${X11ROOT_PREFIX}/lib/libXevie.so.1
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXfixes.so
+${X11ROOT_PREFIX}/lib/libXfixes.so.3
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 85e8d19cd80..982814ea9a0 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/01/07 16:57:36 reed Exp $
+$NetBSD: distinfo,v 1.10 2005/01/25 17:49:57 xtraeme Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -16,7 +16,7 @@ SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
 SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e
 SHA1 (patch-aj) = 78855dfdafe76695290636e170f69b6685ad23e1
-SHA1 (patch-ak) = d600481936a6b141dc1247e1af2270e224b03b22
+SHA1 (patch-ak) = 623d8e4f9cab4451a38447e8954a78158c83dfaa
 SHA1 (patch-al) = cb82cecd7147da8edd19d9f38a0789f07cddea87
 SHA1 (patch-am) = a907d42a4d2a72871e165b99afdba81945d656c7
 SHA1 (patch-an) = 513f8746bb66c954decdd7f2ca00888175c72834
diff --git a/x11/xorg-libs/files/DragonFly.cf b/x11/xorg-libs/files/DragonFly.cf
new file mode 100644
index 00000000000..86c9e305ccb
--- /dev/null
+++ b/x11/xorg-libs/files/DragonFly.cf
@@ -0,0 +1,280 @@
+/* xc/config/cf/DragonFly.cf */
+
+#ifndef LocalBase
+# define LocalBase	@LOCALBASE@
+#endif
+
+#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 
+ */	
+#define HasPosixThreads		YES
+#define ThreadedX		YES
+#define SystemMTDefines		-D_REENTRANT -D_THREAD_SAFE
+#define HasThreadSafeAPI	YES
+#define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+
+# define BuildThreadStubLibrary	YES
+# define NeedUIThrStubs		YES
+# define ThreadsLibraries	-pthread
+# define SharedX11Reqs		$(LDPRELIB)
+# define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
+
+#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 CcCmd                         cc
+#define OptimizedCDebugFlags         /* -O2 causes some files to die out */
+#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
+
+#define HasSetUserContext	YES
+#define HasGetpeereid		YES
+#define HasMTRRSupport		YES
+
+#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
+
+#ifndef RpathLoadFlags
+# if UseRpath
+#  define RpathLoadFlags	-Wl,-rpath,$(USRLIBDIRPATH)
+# else
+#  define RpathLoadFlags	/**/
+# endif
+#endif
+
+#ifndef ExtraLoadFlags
+# if !defined(UseInstalled)
+#  define ExtraLoadFlags	RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
+# else
+#  define ExtraLoadFlags	RpathLoadFlags
+# endif
+#endif
+
+#ifndef StaticLibrary
+# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
+#endif
+
+#define DlLibrary		-Wl,--export-dynamic
+
+#ifndef HasPam
+# define HasPam		YES
+#endif
+#ifndef PamLibraries
+# define PamLibraries		-lpam DlLibrary
+#endif
+
+#ifndef UseGnuMalloc
+# define UseGnuMalloc		NO
+#endif
+#ifndef GnuMallocLibrary
+# define GnuMallocLibrary	/**/
+#endif
+
+#ifndef HasZlib
+# define HasZlib		YES
+#endif
+
+#ifdef AlphaArchitecture
+# define IoLibrary		-lio
+#else
+# define IoLibrary		/**/
+#endif
+#define ServerExtraSysLibs	IoLibrary
+
+#ifndef HasExpat
+# define HasExpat		YES
+# define ExpatDir		LocalBase
+#endif
+
+#ifndef HasFreetype2
+# define HasFreetype2		YES
+# define Freetype2Dir		LocalBase
+#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
+
+#ifndef PreIncDir
+# define PreIncDir	/usr/include /* DefaultGccIncludeDir ? */
+#endif
+
+#define HasGroff	YES
+#define NroffCmd	env GROFF_NO_SGR=y groff -Tascii
+#define SetTtyGroup	YES
+
+#ifndef ExtraFilesToClean
+# define ExtraFilesToClean *.core
+#endif
+
+#define DefaultUserPath		/usr/pkg/bin/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
+#define DefaultSystemPath	/usr/pkg/sbin:/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	NO
+#endif
+
+#define HasBsdMake	YES
+
+#ifndef SharedLibXdmGreet
+# define SharedLibXdmGreet		NO
+#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 <xorg.cf>
diff --git a/x11/xorg-libs/patches/patch-ak b/x11/xorg-libs/patches/patch-ak
index 391c16fd8ae..da76ba7f95a 100644
--- a/x11/xorg-libs/patches/patch-ak
+++ b/x11/xorg-libs/patches/patch-ak
@@ -1,13 +1,19 @@
-$NetBSD: patch-ak,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
+$NetBSD: patch-ak,v 1.3 2005/01/25 17:49:57 xtraeme Exp $
 
---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	2004-09-14 10:59:24.000000000 +0200
-+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2004-09-14 11:00:01.000000000 +0200
-@@ -128,7 +128,7 @@
+--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	2005-01-21 19:27:21.000000000 +0000
++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2005-01-21 19:41:06.000000000 +0000
+@@ -127,10 +127,11 @@
+ DLLIB = DlLibrary
  #endif
  
- LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \
+-LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \
 -		  $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \
++LOCAL_LIBRARIES = -lxf86config $(XXF86MISCLIB) \
 +		  $(XXF86VMLIB) -lXaw $(XMULIB) $(XTOOLLIB) \
  		  $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(LOADERLIB) $(DLLIB) \
- 		  $(XLIB) $(CURSESLIB) RegexLibrary -lm
+-		  $(XLIB) $(CURSESLIB) RegexLibrary -lm
++		  $(XLIB) $(CURSESLIB) RegexLibrary -lm \
++		  $(XKBUILIB) $(XKBFILELIB)
  
+ NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),)
+ InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter)
diff --git a/x11/xorg-server/PLIST.DragonFly b/x11/xorg-server/PLIST.DragonFly
new file mode 100644
index 00000000000..311aab12f52
--- /dev/null
+++ b/x11/xorg-server/PLIST.DragonFly
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST.DragonFly,v 1.1 2005/01/25 17:49:57 xtraeme Exp $
+${X11ROOT_PREFIX}/etc/rc.d/xprint
+${X11ROOT_PREFIX}/bin/kbd_mode
+${X11ROOT_PREFIX}/lib/modules/freebsd/libdrm.a
+${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
+${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
+@dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
+@dirrm ${X11ROOT_PREFIX}/etc/rc.d