Index: head/x11-servers/xorg-server/Makefile
===================================================================
--- head/x11-servers/xorg-server/Makefile	(revision 118439)
+++ head/x11-servers/xorg-server/Makefile	(revision 118440)
@@ -1,156 +1,156 @@
 # New ports collection makefile for:    xorg-server
 # Date created:		7 May 2004
 # Whom:			anholt@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	server
 PORTVERSION=	6.7.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
 		${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	R6.7/tars
 PKGNAMEPREFIX=	xorg-
 DISTFILES=	X11R6.7.0-src1.tar.gz \
 		X11R6.7.0-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.4 \
 		dmc.4 \
 		dynapro.4 \
 		elographics.4 \
 		fbdevhw.4 \
 		fpit.4 \
 		glint.4 \
 		js_x.4 \
 		kbd.4 \
 		keyboard.4 \
 		mga.4 \
 		microtouch.4 \
 		mouse.4 \
 		mutouch.4 \
 		palmax.4 \
 		penmount.4 \
 		r128.4 \
 		radeon.4 \
 		tdfx.4 \
 		tek4957.4 \
 		vga.4 \
 		void.4 \
 		wacom.4
 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=""
 MAN4+=		vesa.4
 .endif
 		
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
 .else
 PLIST_SUB+=	IA64_NA=""
 .endif
 
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64=""
 PLIST_SUB+=	SPARC64_NA="@comment "
 MAN4+=		sunbw2.4 \
 		suncg14.4 \
 		suncg3.4 \
 		suncg6.4 \
 		sunffb.4 \
 		sunleo.4 \
 		suntcx.4
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
 MAN4+=		cirrus.4 \
 		nv.4 \
 		rendition.4 \
 		s3virge.4 \
 		savage.4 \
 		siliconmotion.4
 .endif
 
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
 MAN1+=		scanpci.1
 MAN4+=		i740.4 \
 		i810.4 \
 		nsc.4 \
 		via.4 \
 		vmware.4
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	AMD64_I386=""
 MAN4+=		apm.4 \
 		chips.4 \
 		cyrix.4 \
 		i128.4 \
 		neomagic.4 \
 		sis.4 \
 		trident.4 \
 		tseng.4
 .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, which"
 	@${ECHO_MSG} "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.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/x11-servers/xorg-server/files/patch-xf86Events.c
===================================================================
--- head/x11-servers/xorg-server/files/patch-xf86Events.c	(revision 118439)
+++ head/x11-servers/xorg-server/files/patch-xf86Events.c	(revision 118440)
@@ -1,47 +1,76 @@
---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sat Dec  6 14:24:24 2003
-+++ programs/Xserver/hw/xfree86/common/xf86Events.c	Tue Aug 31 00:27:37 2004
+--- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sun Sep 26 04:17:42 2004
++++ programs/Xserver/hw/xfree86/common/xf86Events.c	Sun Sep 26 04:17:25 2004
 @@ -448,7 +448,7 @@
  #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
    static Bool first_time = TRUE;
  #endif
 -#if defined(__sparc__) && defined(__linux__)
 +#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
    static int  kbdSun = -1;
  #endif
    /* Disable any keyboard processing while in suspend */
 @@ -464,7 +464,7 @@
    }
  #endif
  
 -#if defined (__sparc__) && defined(__linux__)
 +#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
    if (kbdSun == -1) {
      if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
  	|| (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
 @@ -474,7 +474,7 @@
    }
    if (kbdSun)
      goto special;
 -#endif /* __sparc__ && __linux__ */
 +#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
  
  #ifdef __linux__
    if (xf86Info.kbdCustomKeycodes) {
-@@ -676,7 +676,7 @@
+@@ -525,6 +525,7 @@
+     } else
+ #endif /* i386 && SVR4 */
+     {
++      if (!xf86IsPc98()) {
+       switch (scanCode) {
+       case 0x59:        scanCode = KEY_0x59; break;
+       case 0x5a:        scanCode = KEY_0x5A; break;
+@@ -555,6 +556,7 @@
+       case 0x75:        scanCode = KEY_0x75; break;
+       case 0x76:        scanCode = KEY_0x76; break;
+       }
++      }  /*  end if (!xf86IsPc98())  */
      }
    }
+ 
+@@ -636,10 +638,12 @@
+    * they need to get the same key code as the base key on the same
+    * physical keyboard key.
+    */
++  if (!xf86IsPc98()) {
+   if (scanCode == KEY_SysReqest)
+     scanCode = KEY_Print;
+   else if (scanCode == KEY_Break)
+     scanCode = KEY_Pause;
++  }
  #endif
+   
+   /*
+@@ -676,7 +680,7 @@
+     }
+   }
+ #endif
 -#if defined (__sparc__) && defined(__linux__)
 +#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
  special:
    if (kbdSun) {
      switch (scanCode) {
-@@ -710,7 +710,7 @@
+@@ -710,7 +714,7 @@
       */
      scanCode--;
    }
 -#endif /* defined (__sparc__) && defined(__linux__) */
 +#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
  
  #ifdef XKB
    if ((xf86Info.ddxSpecialKeys == SKWhenNeeded &&

Property changes on: head/x11-servers/xorg-server/files/patch-xf86Events.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/x11-servers/xorg-server-snap/Makefile
===================================================================
--- head/x11-servers/xorg-server-snap/Makefile	(revision 118439)
+++ head/x11-servers/xorg-server-snap/Makefile	(revision 118440)
@@ -1,156 +1,156 @@
 # New ports collection makefile for:    xorg-server
 # Date created:		7 May 2004
 # Whom:			anholt@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	server
 PORTVERSION=	6.7.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
 		${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	R6.7/tars
 PKGNAMEPREFIX=	xorg-
 DISTFILES=	X11R6.7.0-src1.tar.gz \
 		X11R6.7.0-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.4 \
 		dmc.4 \
 		dynapro.4 \
 		elographics.4 \
 		fbdevhw.4 \
 		fpit.4 \
 		glint.4 \
 		js_x.4 \
 		kbd.4 \
 		keyboard.4 \
 		mga.4 \
 		microtouch.4 \
 		mouse.4 \
 		mutouch.4 \
 		palmax.4 \
 		penmount.4 \
 		r128.4 \
 		radeon.4 \
 		tdfx.4 \
 		tek4957.4 \
 		vga.4 \
 		void.4 \
 		wacom.4
 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=""
 MAN4+=		vesa.4
 .endif
 		
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
 .else
 PLIST_SUB+=	IA64_NA=""
 .endif
 
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64=""
 PLIST_SUB+=	SPARC64_NA="@comment "
 MAN4+=		sunbw2.4 \
 		suncg14.4 \
 		suncg3.4 \
 		suncg6.4 \
 		sunffb.4 \
 		sunleo.4 \
 		suntcx.4
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
 MAN4+=		cirrus.4 \
 		nv.4 \
 		rendition.4 \
 		s3virge.4 \
 		savage.4 \
 		siliconmotion.4
 .endif
 
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
 MAN1+=		scanpci.1
 MAN4+=		i740.4 \
 		i810.4 \
 		nsc.4 \
 		via.4 \
 		vmware.4
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	AMD64_I386=""
 MAN4+=		apm.4 \
 		chips.4 \
 		cyrix.4 \
 		i128.4 \
 		neomagic.4 \
 		sis.4 \
 		trident.4 \
 		tseng.4
 .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, which"
 	@${ECHO_MSG} "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-snap/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.16
\ No newline at end of property
+1.17
\ No newline at end of property
Index: head/x11-servers/xorg-server-snap/files/patch-xf86Events.c
===================================================================
--- head/x11-servers/xorg-server-snap/files/patch-xf86Events.c	(revision 118439)
+++ head/x11-servers/xorg-server-snap/files/patch-xf86Events.c	(revision 118440)
@@ -1,47 +1,76 @@
---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sat Dec  6 14:24:24 2003
-+++ programs/Xserver/hw/xfree86/common/xf86Events.c	Tue Aug 31 00:27:37 2004
+--- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sun Sep 26 04:17:42 2004
++++ programs/Xserver/hw/xfree86/common/xf86Events.c	Sun Sep 26 04:17:25 2004
 @@ -448,7 +448,7 @@
  #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
    static Bool first_time = TRUE;
  #endif
 -#if defined(__sparc__) && defined(__linux__)
 +#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
    static int  kbdSun = -1;
  #endif
    /* Disable any keyboard processing while in suspend */
 @@ -464,7 +464,7 @@
    }
  #endif
  
 -#if defined (__sparc__) && defined(__linux__)
 +#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
    if (kbdSun == -1) {
      if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
  	|| (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
 @@ -474,7 +474,7 @@
    }
    if (kbdSun)
      goto special;
 -#endif /* __sparc__ && __linux__ */
 +#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
  
  #ifdef __linux__
    if (xf86Info.kbdCustomKeycodes) {
-@@ -676,7 +676,7 @@
+@@ -525,6 +525,7 @@
+     } else
+ #endif /* i386 && SVR4 */
+     {
++      if (!xf86IsPc98()) {
+       switch (scanCode) {
+       case 0x59:        scanCode = KEY_0x59; break;
+       case 0x5a:        scanCode = KEY_0x5A; break;
+@@ -555,6 +556,7 @@
+       case 0x75:        scanCode = KEY_0x75; break;
+       case 0x76:        scanCode = KEY_0x76; break;
+       }
++      }  /*  end if (!xf86IsPc98())  */
      }
    }
+ 
+@@ -636,10 +638,12 @@
+    * they need to get the same key code as the base key on the same
+    * physical keyboard key.
+    */
++  if (!xf86IsPc98()) {
+   if (scanCode == KEY_SysReqest)
+     scanCode = KEY_Print;
+   else if (scanCode == KEY_Break)
+     scanCode = KEY_Pause;
++  }
  #endif
+   
+   /*
+@@ -676,7 +680,7 @@
+     }
+   }
+ #endif
 -#if defined (__sparc__) && defined(__linux__)
 +#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
  special:
    if (kbdSun) {
      switch (scanCode) {
-@@ -710,7 +710,7 @@
+@@ -710,7 +714,7 @@
       */
      scanCode--;
    }
 -#endif /* defined (__sparc__) && defined(__linux__) */
 +#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
  
  #ifdef XKB
    if ((xf86Info.ddxSpecialKeys == SKWhenNeeded &&

Property changes on: head/x11-servers/xorg-server-snap/files/patch-xf86Events.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property