Missing bits to make this build/work correctly on FreeBSD 5.x.

Not tested on 4.x, but changes should be trivial to commit...

11 files changed, 110 insertions, 84 deletions

diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index e63811036df..6e7e20dcad6 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/09/22 15:59:47 adam Exp $
+$NetBSD: distinfo,v 1.4 2004/10/08 03:35:25 xtraeme Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -7,6 +7,7 @@ Size (X11R6.8.1-src3.tar.gz) = 10014808 bytes
 SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
 SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
+SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
 SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
diff --git a/x11/xorg-imake/patches/patch-ad b/x11/xorg-imake/patches/patch-ad
new file mode 100644
index 00000000000..9431f1b6049
--- /dev/null
+++ b/x11/xorg-imake/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.3 2004/10/08 03:35:25 xtraeme Exp $
+
+--- config/cf/FreeBSD.cf.in.orig	Fri Oct  8 02:16:19 2004
++++ config/cf/FreeBSD.cf.in	Fri Oct  8 02:18:01 2004
+@@ -173,12 +173,12 @@
+ #endif
+ 
+ #ifndef CcCmd
+-#define CcCmd			cc
++#define CcCmd			@@PKGSRC_CC@@
+ #endif
+ #ifndef CplusplusCmd
+-#define CplusplusCmd		c++
++#define CplusplusCmd		@@PKGSRC_CXX@@
+ #endif
+-#define CppCmd			/usr/bin/cpp
++#define CppCmd			@@PKGSRC_CPP@@
+ #define PreProcessCmd		CppCmd
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+@@ -466,7 +466,7 @@
+ /* 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 GccAliasingArgs
++#define DefaultGcc2i386Opt @@PKGSRC_CFLAGS@@
+ #endif
+ #endif
+ 
+@@ -500,7 +500,7 @@
+  * Compress manual pages
+  */
+ #ifndef CompressManPages
+-# define CompressManPages	YES
++# define CompressManPages	NO
+ #endif
+ 
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
diff --git a/x11/xorg-libs/PLIST.FreeBSD b/x11/xorg-libs/PLIST.FreeBSD
index 0579d40d1fb..9c38b31643a 100644
--- a/x11/xorg-libs/PLIST.FreeBSD
+++ b/x11/xorg-libs/PLIST.FreeBSD
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+@comment $NetBSD: PLIST.FreeBSD,v 1.2 2004/10/08 03:35:25 xtraeme Exp $
 ${X11ROOT_PREFIX}/lib/libFS.a
 ${X11ROOT_PREFIX}/lib/libFS.so
 ${X11ROOT_PREFIX}/lib/libFS.so.6
@@ -44,9 +44,6 @@ ${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/libXfontcache.a
-${X11ROOT_PREFIX}/lib/libXfontcache.so
-${X11ROOT_PREFIX}/lib/libXfontcache.so.1
 ${X11ROOT_PREFIX}/lib/libXi.a
 ${X11ROOT_PREFIX}/lib/libXi.so
 ${X11ROOT_PREFIX}/lib/libXi.so.6
@@ -112,3 +109,18 @@ ${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 c4c29a67a57..0c6a9085f03 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/09/22 15:59:30 adam Exp $
+$NetBSD: distinfo,v 1.5 2004/10/08 03:35:25 xtraeme Exp $
 
 SHA1 (X11R6.8.1-src1.tar.gz) = 027d16317e07d9df166c0176a1f28b2614f38cc9
 Size (X11R6.8.1-src1.tar.gz) = 30562401 bytes
@@ -8,6 +8,7 @@ SHA1 (X11R6.8.1-src3.tar.gz) = e17afc90b0c43f4f40b2ff7410f4ff5d4297de28
 Size (X11R6.8.1-src3.tar.gz) = 10014808 bytes
 SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
 SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
+SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
 SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
diff --git a/x11/xorg-libs/patches/patch-ad b/x11/xorg-libs/patches/patch-ad
new file mode 100644
index 00000000000..9431f1b6049
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.3 2004/10/08 03:35:25 xtraeme Exp $
+
+--- config/cf/FreeBSD.cf.in.orig	Fri Oct  8 02:16:19 2004
++++ config/cf/FreeBSD.cf.in	Fri Oct  8 02:18:01 2004
+@@ -173,12 +173,12 @@
+ #endif
+ 
+ #ifndef CcCmd
+-#define CcCmd			cc
++#define CcCmd			@@PKGSRC_CC@@
+ #endif
+ #ifndef CplusplusCmd
+-#define CplusplusCmd		c++
++#define CplusplusCmd		@@PKGSRC_CXX@@
+ #endif
+-#define CppCmd			/usr/bin/cpp
++#define CppCmd			@@PKGSRC_CPP@@
+ #define PreProcessCmd		CppCmd
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+@@ -466,7 +466,7 @@
+ /* 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 GccAliasingArgs
++#define DefaultGcc2i386Opt @@PKGSRC_CFLAGS@@
+ #endif
+ #endif
+ 
+@@ -500,7 +500,7 @@
+  * Compress manual pages
+  */
+ #ifndef CompressManPages
+-# define CompressManPages	YES
++# define CompressManPages	NO
+ #endif
+ 
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 7e1d29c126b..eebe4dc1445 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:18:40 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/08 03:35:25 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-server-${XORG_VER}
-PKGREVISION=	1
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz \
diff --git a/x11/xorg-server/PLIST.FreeBSD b/x11/xorg-server/PLIST.FreeBSD
index 0ea427f60cf..896a1a43544 100644
--- a/x11/xorg-server/PLIST.FreeBSD
+++ b/x11/xorg-server/PLIST.FreeBSD
@@ -1,74 +1,8 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/07/29 04:52:40 xtraeme Exp $
+@comment $NetBSD: PLIST.FreeBSD,v 1.2 2004/10/08 03:35:25 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}
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/Makefile
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/ati_pcigart.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drmP.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_agpsupport.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_auth.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_bufs.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_context.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_dma.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_drawable.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_drv.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_fops.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_ioctl.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_irq.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_lock.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_memory.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_memory_debug.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_os_freebsd.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_os_netbsd.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_pci.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_sarea.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_scatter.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_sysctl.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_vm.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga/Makefile
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_dma.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drm.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drv.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drv.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_irq.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_state.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_ucode.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_warp.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128/Makefile
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_cce.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drm.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drv.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drv.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_irq.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_state.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon/Makefile
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_cp.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drm.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drv.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drv.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_irq.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_mem.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_state.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis/Makefile
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drm.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drv.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drv.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_ds.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_ds.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_mm.c
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx.h
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx/Makefile
-${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx_drv.c
-@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx
-@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis
-@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon
-@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128
-@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga
-@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel
-@dirrm ${X11ROOT_PREFIX}/src/bsd/drm
 @dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
+@dirrm ${X11ROOT_PREFIX}/etc/rc.d
diff --git a/x11/xorg-server/PLIST.Linux b/x11/xorg-server/PLIST.Linux
index 6c7e123ab53..1ba1237ead7 100644
--- a/x11/xorg-server/PLIST.Linux
+++ b/x11/xorg-server/PLIST.Linux
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
+@comment $NetBSD: PLIST.Linux,v 1.3 2004/10/08 03:35:25 xtraeme Exp $
+${X11ROOT_PREFIX}/etc/init.d/xprint
 ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/fonts
 ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config
 ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/fonts
@@ -23,3 +24,4 @@ ${X11ROOT_PREFIX}/${KERNMAN_DIR}/v4l.${KERNMAN_SUFFIX}
 @dirrm ${X11ROOT_PREFIX}/lib/modules/drivers/linux
 @dirrm ${X11ROOT_PREFIX}/lib/modules/input/linux
 @dirrm ${X11ROOT_PREFIX}/lib/modules/linux
+@dirrm ${X11ROOT_PREFIX}/etc/init.d
diff --git a/x11/xorg-server/PLIST.NetBSD b/x11/xorg-server/PLIST.NetBSD
index 1b6575ff5a9..fc669b6e029 100644
--- a/x11/xorg-server/PLIST.NetBSD
+++ b/x11/xorg-server/PLIST.NetBSD
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/07/29 04:52:39 xtraeme Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/10/08 03:35:25 xtraeme Exp $
 ${X11ROOT_PREFIX}/bin/kbd_mode
+${X11ROOT_PREFIX}/etc/init.d/xprint
 ${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
+@dirrm ${X11ROOT_PREFIX}/etc/init.d
diff --git a/x11/xorg-server/PLIST.common b/x11/xorg-server/PLIST.common
index 11112376d53..85e5cc0adfe 100644
--- a/x11/xorg-server/PLIST.common
+++ b/x11/xorg-server/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2004/09/21 17:38:53 xtraeme Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2004/10/08 03:35:25 xtraeme Exp $
 ${X11ROOT_PREFIX}/bin/X
 ${X11ROOT_PREFIX}/bin/XFree86
 ${X11ROOT_PREFIX}/bin/Xnest
@@ -21,7 +21,6 @@ ${X11ROOT_PREFIX}/bin/pcitweak
 ${X11ROOT_PREFIX}/bin/scanpci
 ${X11ROOT_PREFIX}/bin/xorgcfg
 ${X11ROOT_PREFIX}/bin/xorgconfig
-${X11ROOT_PREFIX}/etc/init.d/xprint
 ${X11ROOT_PREFIX}/include/X11/bitmaps/card.xbm
 ${X11ROOT_PREFIX}/include/X11/bitmaps/down.xbm
 ${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard.xbm
diff --git a/x11/xorg-server/PLIST.common_end b/x11/xorg-server/PLIST.common_end
index d2a11524493..734549360dc 100644
--- a/x11/xorg-server/PLIST.common_end
+++ b/x11/xorg-server/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.1 2004/09/21 17:38:53 xtraeme Exp $
+@comment $NetBSD: PLIST.common_end,v 1.2 2004/10/08 03:35:25 xtraeme Exp $
 @dirrm ${X11ROOT_PREFIX}/lib/modules/input
 @dirrm ${X11ROOT_PREFIX}/lib/modules/fonts
 @dirrm ${X11ROOT_PREFIX}/lib/modules/extensions
@@ -29,4 +29,3 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver
 @dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig
 @dirrm ${X11ROOT_PREFIX}/include/X11/pixmaps
-@dirrm ${X11ROOT_PREFIX}/etc/init.d