Index: head/x11-servers/xorg-server-snap/Makefile =================================================================== --- head/x11-servers/xorg-server-snap/Makefile (revision 137896) +++ head/x11-servers/xorg-server-snap/Makefile (revision 137897) @@ -1,174 +1,174 @@ # New ports collection makefile for: xorg-server # Date created: 7 May 2004 # Whom: anholt@FreeBSD.org # # $FreeBSD$ # PORTNAME= xorg-server -PORTVERSION= 6.8.99.10 +PORTVERSION= 6.8.99.12 CATEGORIES= x11-servers MASTER_SITES= http://xorg.freedesktop.org/snapshots/ DISTNAME= xorg-x11-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server development snapshot and related programs USE_BZIP2= yes .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-* xorg-server-6.[79].* xorg-server-6.8.[012]* 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 LATEST_LINK= ${PORTNAME}-snap NOT_FOR_ARCHS= ia64 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include .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 .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 \ imstt.4x \ newport.4x \ nsc.4x \ via.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 \ vmware.4x .else PLIST_SUB+= AMD64_I386="@comment " .endif pre-everything:: @${ECHO_MSG} "This X Server installs with development DRI DDX drivers. These drivers are" @${ECHO_MSG} "considered insecure by their authors and may allow privilege escalation by" @${ECHO_MSG} "local X clients with DRI privileges." @${ECHO_MSG} "" .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 Property changes on: head/x11-servers/xorg-server-snap/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-snap/distinfo =================================================================== --- head/x11-servers/xorg-server-snap/distinfo (revision 137896) +++ head/x11-servers/xorg-server-snap/distinfo (revision 137897) @@ -1,2 +1,2 @@ -MD5 (xorg/xorg-x11-6.8.99.10.tar.bz2) = c740f5137e0b7baba99e7b7cd2aca6c9 -SIZE (xorg/xorg-x11-6.8.99.10.tar.bz2) = 44933624 +MD5 (xorg/xorg-x11-6.8.99.12.tar.bz2) = 4d717b2c0bb1214e8f85ad3992690d2c +SIZE (xorg/xorg-x11-6.8.99.12.tar.bz2) = 44997357 Property changes on: head/x11-servers/xorg-server-snap/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/x11-servers/xorg-server-snap/files/patch-drm-Imakefile =================================================================== --- head/x11-servers/xorg-server-snap/files/patch-drm-Imakefile (nonexistent) +++ head/x11-servers/xorg-server-snap/files/patch-drm-Imakefile (revision 137897) @@ -0,0 +1,38 @@ +Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile,v +retrieving revision 1.3 +diff -u -r1.3 Imakefile +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile 16 Jun 2004 09:39:15 -0000 1.3 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile 22 Jun 2005 23:22:13 -0000 +@@ -15,8 +15,6 @@ + #endif + + #if defined(FreeBSDArchitecture) +-COMPATSRC = xf86drmCompat.c +-COMPATOBJ = xf86drmCompat.o + OS_SUBDIR = freebsd + #elif defined(NetBSDArchitecture) + OS_SUBDIR = netbsd +@@ -30,14 +28,12 @@ + xf86drmHash.c \ + xf86drmRandom.c \ + xf86drmSL.c \ +- $(COMPATSRC) \ + $(MSRC) + + OBJS = xf86drm.o \ + xf86drmHash.o \ + xf86drmRandom.o \ + xf86drmSL.o \ +- $(COMPATOBJ) \ + $(MOBJ) + + INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ +@@ -63,6 +59,5 @@ + LinkSourceFile(xf86drmHash.c,$(XF86OSSRC)/linux/drm) + LinkSourceFile(xf86drmRandom.c,$(XF86OSSRC)/linux/drm) + LinkSourceFile(xf86drmSL.c,$(XF86OSSRC)/linux/drm) +-LinkSourceFile(xf86drmCompat.c,$(XF86OSSRC)/linux/drm) + + InstallDriverSDKLibraryModule(drm,$(DRIVERSDKMODULEDIR),$(OS_SUBDIR)) Property changes on: head/x11-servers/xorg-server-snap/files/patch-drm-Imakefile ___________________________________________________________________ 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-snap/files/patch-radeon_driver.c =================================================================== --- head/x11-servers/xorg-server-snap/files/patch-radeon_driver.c (nonexistent) +++ head/x11-servers/xorg-server-snap/files/patch-radeon_driver.c (revision 137897) @@ -0,0 +1,15 @@ +Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v +retrieving revision 1.54 +diff -u -r1.54 radeon_driver.c +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 15 Jun 2005 23:40:50 -0000 1.54 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 22 Jun 2005 22:37:22 -0000 +@@ -2501,6 +2501,7 @@ + case PCI_CHIP_RV370_5464: + info->IsMobility = TRUE; + case PCI_CHIP_RV370_5B60: ++ case PCI_CHIP_RV370_5B62: + case PCI_CHIP_RV370_5B64: + case PCI_CHIP_RV370_5B65: + info->ChipFamily = CHIP_FAMILY_RV380; Property changes on: head/x11-servers/xorg-server-snap/files/patch-radeon_driver.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.4 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property