Index: head/x11-servers/xorg-server/Makefile
===================================================================
--- head/x11-servers/xorg-server/Makefile	(revision 140591)
+++ head/x11-servers/xorg-server/Makefile	(revision 140592)
@@ -1,172 +1,167 @@
 # New ports collection makefile for:    xorg-server
 # Date created:		7 May 2004
 # Whom:			anholt@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xorg-server
 PORTVERSION=	6.8.2
 PORTREVISION=	3
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
 DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
 		X11R${PORTVERSION}-src3.tar.gz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
 .if !defined(WITH_MODULAR)
 USE_XLIB=	yes
 .else
 LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
 		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		GL.1:${PORTSDIR}/x11/libGL
 BUILD_DEPENDS=	${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
 		${LIB_PC_DEPENDS}
 RUN_DEPENDS=	${LIB_PC_DEPENDS}
 .endif
 
 CONFLICTS=	XFree86-Server-*
 
 SCRIPTS_ENV=	WITH_DEBUG="${WITH_DEBUG}"
 MAN1=		Xorg.1 \
 		getconfig.1 \
 		gtf.1 \
 		kbd_mode.1 \
 		pcitweak.1 \
 		xorgcfg.1 \
 		xorgconfig.1
 MAN4=		citron.4x \
 		dmc.4x \
 		dynapro.4x \
 		elographics.4x \
 		fbdevhw.4x \
 		fpit.4x \
 		glint.4x \
 		js_x.4x \
 		kbd.4x \
 		keyboard.4x \
 		mga.4x \
 		microtouch.4x \
 		mouse.4x \
 		mutouch.4x \
 		palmax.4x \
 		penmount.4x \
 		r128.4x \
 		radeon.4x \
 		tdfx.4x \
 		tek4957.4x \
 		vga.4x \
 		void.4x \
 		wacom.4x
 MAN5=		getconfig.5 \
 		xorg.conf.5
 
 XBUILD_DIRS=	lib/font programs/Xserver
 XINCLUDE_DIRS=	lib/xtrans
 XMAN_DIRS=	programs/Xserver
 
 NOT_FOR_ARCHS=	ia64
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE= is part of X.Org. For switching to X.Org, read UPDATING entry 20040723
 .endif
 
 .if ${ARCH} == alpha
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 .endif
 		
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
 .else
 PLIST_SUB+=	IA64_NA=""
 .endif
 
 .if ${ARCH} == powerpc
 PLIST_SUB+=	PPC_NA="@comment "
 MAN4+=		nv.4x
 .else
 PLIST_SUB+=	PPC_NA=""
 .endif
 
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64=""
 PLIST_SUB+=	SPARC64_NA="@comment "
 MAN4+=		sunbw2.4x \
 		suncg14.4x \
 		suncg3.4x \
 		suncg6.4x \
 		sunffb.4x \
 		sunleo.4x \
 		suntcx.4x
-# WITH_SPARC_KBD is meant to be used to ease fixing 'kbd' driver under sparc64.
-# Do not define it if you want your keyboard to work.
-.if !defined(WITH_SPARC_KBD)
-SCRIPTS_ENV+=	OLD_KEYBOARD=YES
-.endif
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
 .endif
 
 .if ${ARCH} != powerpc && ${ARCH} != sparc64
 MAN4+=		cirrus.4x \
 		nv.4x \
 		rendition.4x \
 		s3virge.4x \
 		savage.4x \
 		siliconmotion.4x
 .endif
 
 .if ${ARCH} != powerpc && ${ARCH} != alpha
 MAN4+=		vesa.4x
 .endif
 
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
 MAN1+=		scanpci.1
 MAN4+=		i740.4x \
 		nsc.4x \
 		via.4x \
 		vmware.4x
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	AMD64_I386=""
 MAN4+=		apm.4x \
 		chips.4x \
 		cyrix.4x \
 		i128.4x \
 		i810.4x \
 		neomagic.4x \
 		sis.4x \
 		trident.4x \
 		tseng.4x
 .else
 PLIST_SUB+=	AMD64_I386="@comment "
 .endif
 
 .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
 pre-everything::
 	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
 	@${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper"
 	@${ECHO_MSG} "port before handling them normally.  If you are concerned about the security"
 	@${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm,"
 	@${ECHO_MSG} "which will still run the server as root), you can cancel the build and set"
 	@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
 
 SCRIPTS_ENV+=	SUID_XSERVER=YES
 .else
 SCRIPTS_ENV+=	SUID_XSERVER=NO
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/x11-servers/xorg-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/x11-servers/xorg-server/files/patch-sparc64kbd
===================================================================
--- head/x11-servers/xorg-server/files/patch-sparc64kbd	(revision 140591)
+++ head/x11-servers/xorg-server/files/patch-sparc64kbd	(nonexistent)
@@ -1,22 +0,0 @@
---- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig	Wed Feb 23 23:28:28 2005
-+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	Thu Feb 24 00:12:20 2005
-@@ -571,6 +571,19 @@
-      }
-   }
- 
-+#if defined(__sparc__) && defined(__FreeBSD__)
-+  /*
-+   * Taken from xf86Events.c:
-+   * I really don't know what's wrong here, but passing the real
-+   * scanCode offsets by one from XKB's point of view.
-+   *
-+   * (ecd@skynet.be, 980405)
-+   */
-+  if (pKbd->sunKbd) {
-+    scanCode--;
-+  }
-+#endif
-+
- #ifndef TERMINATE_FALLBACK
- #define TERMINATE_FALLBACK 1
- #endif

Property changes on: head/x11-servers/xorg-server/files/patch-sparc64kbd
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/x11-servers/xorg-server/files/patch-kbd.c
===================================================================
--- head/x11-servers/xorg-server/files/patch-kbd.c	(nonexistent)
+++ head/x11-servers/xorg-server/files/patch-kbd.c	(revision 140592)
@@ -0,0 +1,36 @@
+Index: programs/Xserver/hw/xfree86/input/keyboard/kbd.c
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v
+retrieving revision 1.15
+retrieving revision 1.16
+diff -u -r1.15 -r1.16
+--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c	11 Jul 2005 02:38:00 -0000	1.15
++++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	13 Jul 2005 12:30:04 -0000	1.16
+@@ -553,6 +553,19 @@
+   if (xf86inSuspend)
+       return;
+ 
++  if (pKbd->sunKbd) {
++     /*
++      * XXX XXX XXX:
++      *
++      * I really don't know what's wrong here, but passing the real
++      * scanCode offsets by one from XKB's point of view.
++      *
++      * (ecd@skynet.be, 980405)
++      */
++      scanCode--;
++      goto sunKeyboards;
++  }
++
+   /*
+    * First do some special scancode remapping ...
+    */
+@@ -616,6 +629,7 @@
+   }
+ #endif
+ 
++sunKeyboards:
+   /*
+    * Now map the scancodes to real X-keycodes ...
+    */

Property changes on: head/x11-servers/xorg-server/files/patch-kbd.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/x11-servers/xorg-server/scripts/configure
===================================================================
--- head/x11-servers/xorg-server/scripts/configure	(revision 140591)
+++ head/x11-servers/xorg-server/scripts/configure	(revision 140592)
@@ -1,42 +1,38 @@
 #!/bin/sh
 
 LOCALDEF=$WRKDIR/.config
 
 rm -f $LOCALDEF
 echo "#define InstallXserverSetUID ${SUID_XSERVER}" >> $LOCALDEF
 echo "#define JoystickSupport NO"		>> $LOCALDEF
 echo "#define BuildLBX NO"			>> $LOCALDEF
 echo "#define XnestServer NO"			>> $LOCALDEF
 echo "#define BuildFontServer NO"		>> $LOCALDEF
 echo "#define XVirtualFramebufferServer NO"	>> $LOCALDEF
 echo "#define XprtServer NO"			>> $LOCALDEF
 echo "#define LibInstall NO"			>> $LOCALDEF
 echo "#define ForceNormalLib NO"		>> $LOCALDEF
 echo "#define XTrueTypeInstallCConvHeaders NO"	>> $LOCALDEF
 echo "#define BuildServer YES"			>> $LOCALDEF
 echo "#define BuildXprint NO"			>> $LOCALDEF
 echo "#define BuildLibraries NO"		>> $LOCALDEF
 echo "#define LibInstallBuild YES"		>> $LOCALDEF
 echo "#define ModInstall YES"			>> $LOCALDEF
 echo "#define XF86Server NO"			>> $LOCALDEF
 echo "#define BuildServersOnly YES"		>> $LOCALDEF
 echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
 echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
 echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
 echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF
 echo "#define DriverManDir \$(MANSOURCEPATH)4"	>> $LOCALDEF
 echo "#define DriverManSuffix 4x"		>> $LOCALDEF
 echo "#define MiscManDir \$(MANSOURCEPATH)7"	>> $LOCALDEF
 echo "#define MiscManSuffix 7x"			>> $LOCALDEF
 
-if [ X$OLD_KEYBOARD = XYES ]; then
-	echo "#define UseDeprecatedKeyboardDriver YES"	>> $LOCALDEF
-fi
-
 if [ X$WITH_DEBUG != X ]; then
 	export CFLAGS="-g $CFLAGS"
 	echo "#define InstPgmFlags"		>> $LOCALDEF
 	echo "#define MakeDllModules YES"	>> $LOCALDEF
 fi
 
 sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen

Property changes on: head/x11-servers/xorg-server/scripts/configure
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property