aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11/XFree86-4/Makefile2
-rw-r--r--x11/XFree86-4/files/patch-DRI61
-rw-r--r--x11/XFree86-4/pkg-plist5
-rw-r--r--x11/XFree86-4/pkg-plist.alpha7
-rw-r--r--x11/XFree86-4/pkg-plist.pc985
-rw-r--r--x11/XFree86-4/scripts/configure2
6 files changed, 80 insertions, 2 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 2b37faa994f3..890a66127a18 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 4.0.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.0.2
diff --git a/x11/XFree86-4/files/patch-DRI b/x11/XFree86-4/files/patch-DRI
new file mode 100644
index 000000000000..efd3ad52a1ae
--- /dev/null
+++ b/x11/XFree86-4/files/patch-DRI
@@ -0,0 +1,61 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c~ Sat Jun 17 02:03:32 2000
++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c Fri Mar 30 02:50:04 2001
+@@ -41,7 +41,7 @@
+ #define MGA_NAME "mga"
+ #define MGA_DESC "Matrox g200/g400"
+ #define MGA_DATE "19991213"
+-#define MGA_MAJOR 1
++#define MGA_MAJOR 2
+ #define MGA_MINOR 0
+ #define MGA_PATCHLEVEL 0
+
+--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h.orig Sat Jun 17 02:03:28 2000
++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h Tue Apr 10 02:56:17 2001
+@@ -49,11 +49,11 @@
+ #include <sys/sysctl.h>
+ #include <sys/select.h>
+ #include <sys/bus.h>
+-#if __FreeBSD_version >= 500005
++#if __FreeBSD_version > 410000
+ #include <sys/taskqueue.h>
+ #endif
+
+-#if __FreeBSD_version >= 500006
++#if __FreeBSD_version > 410000
+ #define DRM_AGP
+ #endif
+
+@@ -128,7 +128,7 @@
+ * Fake out the module macros for versions of FreeBSD where they don't
+ * exist.
+ */
+-#if __FreeBSD_version < 500002
++#if __FreeBSD_version < 420000
+
+ #define MODULE_VERSION(a,b) struct __hack
+ #define MODULE_DEPEND(a,b,c,d,e) struct __hack
+@@ -517,7 +517,7 @@
+ int last_checked; /* Last context checked for DMA */
+ int last_context; /* Last current context */
+ int last_switch; /* Time at last context switch */
+-#if __FreeBSD_version >= 500005
++#if __FreeBSD_version >= 420000
+ struct task task;
+ #endif
+ struct timespec ctx_start;
+@@ -548,6 +548,8 @@
+ void *dev_private;
+ } drm_device_t;
+
++#undef SYSCTL_HANDLER_ARGS
++#define SYSCTL_HANDLER_ARGS (struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req)
+
+ /* Internal function definitions */
+
+--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd~ Sat Jun 17 02:03:28 2000
++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd Fri Mar 30 15:02:30 2001
+@@ -2,3 +2,3 @@
+
+-SUBDIR = drm tdfx gamma
++SUBDIR = drm tdfx gamma mga
+
diff --git a/x11/XFree86-4/pkg-plist b/x11/XFree86-4/pkg-plist
index a27ddf7bcd41..42311eaf5e3a 100644
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
@@ -4871,6 +4871,11 @@ X11/xkb/types/pc
X11/xkb/xkbcomp
X11/xserver/SecurityPolicy
X11/xsm/system.xsm
+@cwd /modules
+drm.ko
+gamma.ko
+mga.ko
+tdfx.ko
@unexec rmdir /etc/X11/app-defaults
@unexec rmdir /etc/X11/fs
@unexec rmdir /etc/X11/lbxproxy
diff --git a/x11/XFree86-4/pkg-plist.alpha b/x11/XFree86-4/pkg-plist.alpha
index 14a38df492b1..ce8c1f8da0df 100644
--- a/x11/XFree86-4/pkg-plist.alpha
+++ b/x11/XFree86-4/pkg-plist.alpha
@@ -1,4 +1,4 @@
-bin/SuperProbe
+/bin/SuperProbe
bin/X
bin/XFree86
bin/Xmark
@@ -4866,6 +4866,11 @@ X11/xserver/SecurityPolicy
X11/xsm/system.xsm
X11/xserver/SecurityPolicy
X11/xsm/system.xsm
+@cwd /modules
+drm.ko
+gamma.ko
+mga.ko
+tdfx.ko
@dirrm X11/app-defaults
@dirrm X11/fs
@dirrm X11/lbxproxy
diff --git a/x11/XFree86-4/pkg-plist.pc98 b/x11/XFree86-4/pkg-plist.pc98
index a27ddf7bcd41..42311eaf5e3a 100644
--- a/x11/XFree86-4/pkg-plist.pc98
+++ b/x11/XFree86-4/pkg-plist.pc98
@@ -4871,6 +4871,11 @@ X11/xkb/types/pc
X11/xkb/xkbcomp
X11/xserver/SecurityPolicy
X11/xsm/system.xsm
+@cwd /modules
+drm.ko
+gamma.ko
+mga.ko
+tdfx.ko
@unexec rmdir /etc/X11/app-defaults
@unexec rmdir /etc/X11/fs
@unexec rmdir /etc/X11/lbxproxy
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 85660a268a1f..a55ed41f1461 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -220,6 +220,8 @@ yesno YES "Do you want to compile with PAM support?"
echo "#define HasPam $answ" >> $F
echo "#define InstallXserverSetUID NO " >> $F
+echo "#define BuildXF86DRI YES" >> $F
+echo "#define BuildXF86DRM YES" >> $F
}
configure