FreeBSD'ize the XFree86 v4 server configuration programs.

Sponsored by:	FreeBSD Mall, Inc.

4 files changed, 64 insertions, 1 deletions

diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index dc20237..05e15c9 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE} \
 		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@@ -26,6 +26,9 @@ USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
+.for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c
+EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
+.endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			HasXdmAuth=${HasXdmAuth} \
 			HasSecureRPC=${HasSecureRPC} \
diff --git a/x11-servers/XFree86-4-Server/files/patch-text-mode.c b/x11-servers/XFree86-4-Server/files/patch-text-mode.c
new file mode 100644
index 0000000..8b566c3
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-text-mode.c
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/xf86cfg/text-mode.c.orig	Wed Oct 31 14:50:30 2001
++++ programs/Xserver/hw/xfree86/xf86cfg/text-mode.c	Fri Jun  7 15:47:18 2002
+@@ -498,6 +498,8 @@
+     if (str == NULL)
+ #ifdef WSCONS_SUPPORT
+ 	str = "/dev/wsmouse";
++#elif defined(__FreeBSD__)
++	str = "/dev/sysmouse";
+ #else
+ 	str = "/dev/mouse";
+ #endif
diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86Configure.c b/x11-servers/XFree86-4-Server/files/patch-xf86Configure.c
new file mode 100644
index 0000000..79113ee
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-xf86Configure.c
@@ -0,0 +1,12 @@
+--- programs/Xserver/hw/xfree86/common/xf86Configure.c.orig	Sat Jun  8 18:48:54 2002
++++ programs/Xserver/hw/xfree86/common/xf86Configure.c	Sat Jun  8 18:50:09 2002
+@@ -79,6 +79,9 @@
+ #elif defined(__QNXNTO__)
+ static char *DFLT_MOUSE_PROTO = "OSMouse";
+ static char *DFLT_MOUSE_DEV = "/dev/devi/mouse0";
++#elif defined(__FreeBSD__)
++static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
++static char *DFLT_MOUSE_PROTO = "MouseSystems";
+ #else
+ static char *DFLT_MOUSE_DEV = "/dev/mouse";
+ static char *DFLT_MOUSE_PROTO = "auto";
diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86config.c b/x11-servers/XFree86-4-Server/files/patch-xf86config.c
new file mode 100644
index 0000000..bb986f1
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-xf86config.c
@@ -0,0 +1,37 @@
+--- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig	Sat Oct 27 20:34:09 2001
++++ programs/Xserver/hw/xfree86/xf86config/xf86config.c	Sat Jun  8 11:35:18 2002
+@@ -382,7 +382,7 @@
+ 
+ static char *mousetype_name[] = {
+ 	"Microsoft compatible (2-button protocol)",
+-	"Mouse Systems (3-button protocol)",
++	"Mouse Systems (3-button protocol) & FreeBSD moused protocol",
+ 	"Bus Mouse",
+ 	"PS/2 Mouse",
+ 	"Logitech Mouse (serial, old type, Logitech protocol)",
+@@ -401,6 +401,9 @@
+ #ifdef WSCONS_SUPPORT
+ "On systems with wscons, the default is /dev/wsmouse.\n"
+ #endif
++#ifdef __FreeBSD__
++"On FreeBSD, the default is /dev/sysmouse.\n"
++#endif
+ "\n";
+ 
+ static char *mousecomment_text =
+@@ -544,10 +547,12 @@
+ 	printf("Mouse device: ");
+ 	getstring(s);
+ 	if (strlen(s) == 0)
+-#ifndef WSCONS_SUPPORT
+-		config_pointerdevice = "/dev/mouse";
+-#else
++#ifdef WSCONS_SUPPORT
+ 		config_pointerdevice = "/dev/wsmouse";
++#elif defined(__FreeBSD__)
++		config_pointerdevice = "/dev/sysmouse";
++#else
++		config_pointerdevice = "/dev/mouse";
+ #endif
+ 	else {
+ 		config_pointerdevice = Malloc(strlen(s) + 1);