diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2006-01-18 23:53:05 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2006-01-18 23:53:05 +0000 |
| commit | 94dbc0f920d7b6cd9f20364c3b262ca8d1a711ab (patch) | |
| tree | 5584f730d910a7a39140f2283f12af8a5923bd6f /x11/xorg-libs | |
| parent | c5619ad572e50a32ea92690835d3ce76b78031e7 (diff) | |
| download | pkgsrc-94dbc0f920d7b6cd9f20364c3b262ca8d1a711ab.tar.gz | |
Update meta-pkgs/xorg to 6.9.0.
The full list of changes:
http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html
Thanks to joerg@ and reed@ for testing on DragonFlyBSD.
Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386.
Diffstat (limited to 'x11/xorg-libs')
41 files changed, 593 insertions, 1696 deletions
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index c3dc4cdd9fc..cbd61e779e2 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2006/01/08 14:51:11 abs Exp $ +# $NetBSD: Makefile,v 1.30 2006/01/18 23:53:06 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} -PKGREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \ @@ -12,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org Libraries -BUILD_DEPENDS+= xorg-imake>=${XORG_VER}:../../x11/xorg-imake +BUILD_DEPENDS= xorg-imake-[0-9]*:../../x11/xorg-imake .include "../../mk/bsd.prefs.mk" diff --git a/x11/xorg-libs/PLIST b/x11/xorg-libs/PLIST index 13bd3518c57..587b1df386c 100644 --- a/x11/xorg-libs/PLIST +++ b/x11/xorg-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2005/10/16 16:56:22 tonio Exp $ +@comment $NetBSD: PLIST,v 1.5 2006/01/18 23:53:06 xtraeme Exp $ ${X11ROOT_PREFIX}/include/DPS/ColorSB.h ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h @@ -39,14 +39,33 @@ ${X11ROOT_PREFIX}/include/GL/glxmd.h ${X11ROOT_PREFIX}/include/GL/glxproto.h ${X11ROOT_PREFIX}/include/GL/glxtokens.h ${X11ROOT_PREFIX}/include/GL/osmesa.h +${X11ROOT_PREFIX}/include/X11/CallbackI.h +${X11ROOT_PREFIX}/include/X11/ConvertI.h +${X11ROOT_PREFIX}/include/X11/CreateI.h ${X11ROOT_PREFIX}/include/X11/Composite.h ${X11ROOT_PREFIX}/include/X11/CompositeP.h ${X11ROOT_PREFIX}/include/X11/ConstrainP.h ${X11ROOT_PREFIX}/include/X11/Constraint.h ${X11ROOT_PREFIX}/include/X11/Core.h ${X11ROOT_PREFIX}/include/X11/CoreP.h +${X11ROOT_PREFIX}/include/X11/EventI.h ${X11ROOT_PREFIX}/include/X11/DECkeysym.h ${X11ROOT_PREFIX}/include/X11/HPkeysym.h +${X11ROOT_PREFIX}/include/X11/HookObjI.h +${X11ROOT_PREFIX}/include/X11/ImUtil.h +${X11ROOT_PREFIX}/include/X11/InitialI.h +${X11ROOT_PREFIX}/include/X11/IntrinsicI.h +${X11ROOT_PREFIX}/include/X11/PassivGraI.h +${X11ROOT_PREFIX}/include/X11/ResourceI.h +${X11ROOT_PREFIX}/include/X11/SelectionI.h +${X11ROOT_PREFIX}/include/X11/ShellI.h +${X11ROOT_PREFIX}/include/X11/ThreadsI.h +${X11ROOT_PREFIX}/include/X11/TranslateI.h +${X11ROOT_PREFIX}/include/X11/VarargsI.h +${X11ROOT_PREFIX}/include/X11/XlibConf.h +${X11ROOT_PREFIX}/include/X11/Xregion.h +${X11ROOT_PREFIX}/include/X11/misc.h +${X11ROOT_PREFIX}/include/X11/os.h ${X11ROOT_PREFIX}/include/X11/ICE/ICE.h ${X11ROOT_PREFIX}/include/X11/ICE/ICEconn.h ${X11ROOT_PREFIX}/include/X11/ICE/ICElib.h @@ -344,6 +363,7 @@ ${X11ROOT_PREFIX}/include/X11/extensions/shapestr.h ${X11ROOT_PREFIX}/include/X11/extensions/shmstr.h ${X11ROOT_PREFIX}/include/X11/extensions/sync.h ${X11ROOT_PREFIX}/include/X11/extensions/syncstr.h +${X11ROOT_PREFIX}/include/X11/extensions/vldXvMC.h ${X11ROOT_PREFIX}/include/X11/extensions/xcmiscstr.h ${X11ROOT_PREFIX}/include/X11/extensions/xevieplaceholder.h ${X11ROOT_PREFIX}/include/X11/extensions/xf86bigfont.h @@ -368,8 +388,23 @@ ${X11ROOT_PREFIX}/include/X11/extensions/xtrapproto.h ${X11ROOT_PREFIX}/include/X11/fonts/FS.h ${X11ROOT_PREFIX}/include/X11/fonts/FSlib.h ${X11ROOT_PREFIX}/include/X11/fonts/FSproto.h +${X11ROOT_PREFIX}/include/X11/fonts/bdfint.h +${X11ROOT_PREFIX}/include/X11/fonts/bitmap.h +${X11ROOT_PREFIX}/include/X11/fonts/bufio.h +${X11ROOT_PREFIX}/include/X11/fonts/fntfil.h +${X11ROOT_PREFIX}/include/X11/fonts/fntfilio.h +${X11ROOT_PREFIX}/include/X11/fonts/fntfilst.h +${X11ROOT_PREFIX}/include/X11/fonts/font.h +${X11ROOT_PREFIX}/include/X11/fonts/fontencc.h +${X11ROOT_PREFIX}/include/X11/fonts/fontmisc.h +${X11ROOT_PREFIX}/include/X11/fonts/fontmod.h +${X11ROOT_PREFIX}/include/X11/fonts/fontshow.h +${X11ROOT_PREFIX}/include/X11/fonts/fontstruct.h +${X11ROOT_PREFIX}/include/X11/fonts/fontutil.h +${X11ROOT_PREFIX}/include/X11/fonts/fontxlfd.h ${X11ROOT_PREFIX}/include/X11/fonts/fontenc.h ${X11ROOT_PREFIX}/include/X11/fonts/fsmasks.h +${X11ROOT_PREFIX}/include/X11/fonts/pcf.h ${X11ROOT_PREFIX}/include/X11/keysym.h ${X11ROOT_PREFIX}/include/X11/keysymdef.h ${X11ROOT_PREFIX}/include/X11/xpm.h @@ -495,6 +530,42 @@ ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnregister.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnsetAttributes.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xaw.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xss.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86Misc.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86MiscGetKbdSettings.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86MiscGetMouseSettings.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86MiscGetSaver.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86MiscQueryExtension.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86MiscQueryVersion.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86MiscSetKbdSettings.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86MiscSetMouseSettings.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86MiscSetSaver.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidMode.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeDeleteModeLine.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetAllModeLines.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetDotClocks.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGamma.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGammaRamp.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetModeLine.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetMonitor.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetPermissions.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetViewPort.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeLockModeSwitch.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeModModeLine.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeQueryExtension.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeQueryVersion.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetClientVersion.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetGamma.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetGammaRamp.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetViewPort.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchMode.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchToMode.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeValidateModeLine.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XevieEnd.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XevieQueryVersion.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XevieSelectInput.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XevieSendEvent.${LIBMAN_SUFFIX} +${X11ROOT_PREFIX}/${LIBMAN_DIR}/XevieStart.${LIBMAN_SUFFIX} @comment begin Darwin ${DARWIN_QUARTZ}${X11ROOT_PREFIX}/include/X11/extensions/applewm.h ${DARWIN_QUARTZ}${X11ROOT_PREFIX}/include/X11/extensions/applewmstr.h @@ -660,6 +731,8 @@ ${X11ROOT_PREFIX}/lib/libxkbui.dylib ${DARWIN_QUARTZ}${X11ROOT_PREFIX}/man/man3/AppleWM.3 @comment end Darwin @comment begin DragonFly +${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h +${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h ${X11ROOT_PREFIX}/lib/libFS.a ${X11ROOT_PREFIX}/lib/libFS.so ${X11ROOT_PREFIX}/lib/libFS.so.6 @@ -691,11 +764,14 @@ ${X11ROOT_PREFIX}/lib/libXTrap.a ${X11ROOT_PREFIX}/lib/libXTrap.so ${X11ROOT_PREFIX}/lib/libXTrap.so.6 ${X11ROOT_PREFIX}/lib/libXau.a +${X11ROOT_PREFIX}/lib/libXau.so +${X11ROOT_PREFIX}/lib/libXau.so.6 ${X11ROOT_PREFIX}/lib/libXaw.a ${X11ROOT_PREFIX}/lib/libXaw.so -${X11ROOT_PREFIX}/lib/libXaw.so.6 -${X11ROOT_PREFIX}/lib/libXaw.so.7 +${X11ROOT_PREFIX}/lib/libXaw.so.8 ${X11ROOT_PREFIX}/lib/libXdmcp.a +${X11ROOT_PREFIX}/lib/libXdmcp.so +${X11ROOT_PREFIX}/lib/libXdmcp.so.6 ${X11ROOT_PREFIX}/lib/libXext.a ${X11ROOT_PREFIX}/lib/libXext.so ${X11ROOT_PREFIX}/lib/libXext.so.6 @@ -750,6 +826,7 @@ ${X11ROOT_PREFIX}/lib/libdps.so.1 ${X11ROOT_PREFIX}/lib/libdpstk.a ${X11ROOT_PREFIX}/lib/libdpstk.so ${X11ROOT_PREFIX}/lib/libdpstk.so.1 +${X11ROOT_PREFIX}/lib/libdmx.a ${X11ROOT_PREFIX}/lib/libfntstubs.a ${X11ROOT_PREFIX}/lib/libfontenc.a ${X11ROOT_PREFIX}/lib/libfontenc.so @@ -757,9 +834,6 @@ ${X11ROOT_PREFIX}/lib/libfontenc.so.1 ${X11ROOT_PREFIX}/lib/liboldX.a ${X11ROOT_PREFIX}/lib/liboldX.so ${X11ROOT_PREFIX}/lib/liboldX.so.6 -${X11ROOT_PREFIX}/lib/libpsres.a -${X11ROOT_PREFIX}/lib/libpsres.so -${X11ROOT_PREFIX}/lib/libpsres.so.1 ${X11ROOT_PREFIX}/lib/libxf86config.a ${X11ROOT_PREFIX}/lib/libxkbfile.a ${X11ROOT_PREFIX}/lib/libxkbfile.so @@ -884,9 +958,6 @@ ${X11ROOT_PREFIX}/lib/libfontenc.so.1 ${X11ROOT_PREFIX}/lib/liboldX.a ${X11ROOT_PREFIX}/lib/liboldX.so ${X11ROOT_PREFIX}/lib/liboldX.so.6 -${X11ROOT_PREFIX}/lib/libpsres.a -${X11ROOT_PREFIX}/lib/libpsres.so -${X11ROOT_PREFIX}/lib/libpsres.so.1 ${X11ROOT_PREFIX}/lib/libxf86config.a ${X11ROOT_PREFIX}/lib/libxkbfile.a ${X11ROOT_PREFIX}/lib/libxkbfile.so @@ -1034,10 +1105,6 @@ ${X11ROOT_PREFIX}/lib/libfontenc.so ${X11ROOT_PREFIX}/lib/libfontenc.so.1 ${X11ROOT_PREFIX}/lib/libfontenc.so.1.0 ${X11ROOT_PREFIX}/lib/liboldX.a -${X11ROOT_PREFIX}/lib/libpsres.a -${X11ROOT_PREFIX}/lib/libpsres.so -${X11ROOT_PREFIX}/lib/libpsres.so.1 -${X11ROOT_PREFIX}/lib/libpsres.so.1.0 ${X11ROOT_PREFIX}/lib/libxf86config.a ${X11ROOT_PREFIX}/lib/libxkbfile.so ${X11ROOT_PREFIX}/lib/libxkbfile.so.1 @@ -1066,7 +1133,7 @@ ${X11ROOT_PREFIX}/lib/libGLw.so.1.0 ${X11ROOT_PREFIX}/lib/libICE.a ${X11ROOT_PREFIX}/lib/libICE.so ${X11ROOT_PREFIX}/lib/libICE.so.6 -${X11ROOT_PREFIX}/lib/libICE.so.6.3 +${X11ROOT_PREFIX}/lib/libICE.so.6.4 ${X11ROOT_PREFIX}/lib/libOSMesa.a ${X11ROOT_PREFIX}/lib/libOSMesa.so ${X11ROOT_PREFIX}/lib/libOSMesa.so.4 @@ -1088,6 +1155,9 @@ ${X11ROOT_PREFIX}/lib/libXTrap.so ${X11ROOT_PREFIX}/lib/libXTrap.so.6 ${X11ROOT_PREFIX}/lib/libXTrap.so.6.4 ${X11ROOT_PREFIX}/lib/libXau.a +${X11ROOT_PREFIX}/lib/libXau.so +${X11ROOT_PREFIX}/lib/libXau.so.6 +${X11ROOT_PREFIX}/lib/libXau.so.6.0 ${X11ROOT_PREFIX}/lib/libXaw.a ${X11ROOT_PREFIX}/lib/libXaw.so ${X11ROOT_PREFIX}/lib/libXaw.so.6 @@ -1115,6 +1185,9 @@ ${X11ROOT_PREFIX}/lib/libXfixes.so.3.0 ${X11ROOT_PREFIX}/lib/libXprintAppUtil.a ${X11ROOT_PREFIX}/lib/libXprintUtil.a ${X11ROOT_PREFIX}/lib/libXdmcp.a +${X11ROOT_PREFIX}/lib/libXdmcp.so +${X11ROOT_PREFIX}/lib/libXdmcp.so.6 +${X11ROOT_PREFIX}/lib/libXdmcp.so.6.0 ${X11ROOT_PREFIX}/lib/libXext.a ${X11ROOT_PREFIX}/lib/libXext.so ${X11ROOT_PREFIX}/lib/libXext.so.6 @@ -1196,10 +1269,6 @@ ${X11ROOT_PREFIX}/lib/liboldX.a ${X11ROOT_PREFIX}/lib/liboldX.so ${X11ROOT_PREFIX}/lib/liboldX.so.6 ${X11ROOT_PREFIX}/lib/liboldX.so.6.0 -${X11ROOT_PREFIX}/lib/libpsres.a -${X11ROOT_PREFIX}/lib/libpsres.so -${X11ROOT_PREFIX}/lib/libpsres.so.1 -${X11ROOT_PREFIX}/lib/libpsres.so.1.0 ${X11ROOT_PREFIX}/lib/libxf86config.a ${X11ROOT_PREFIX}/lib/libxkbfile.a ${X11ROOT_PREFIX}/lib/libxkbfile.so @@ -1278,8 +1347,6 @@ ${X11ROOT_PREFIX}/lib/libfontenc.a ${X11ROOT_PREFIX}/lib/libfontenc.so.3.0 ${X11ROOT_PREFIX}/lib/liboldX.a ${X11ROOT_PREFIX}/lib/liboldX.so.8.0 -${X11ROOT_PREFIX}/lib/libpsres.a -${X11ROOT_PREFIX}/lib/libpsres.so.3.0 ${X11ROOT_PREFIX}/lib/libxf86config.a ${X11ROOT_PREFIX}/lib/libxkbfile.a ${X11ROOT_PREFIX}/lib/libxkbfile.so.2.0 @@ -1375,21 +1442,32 @@ ${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XI18N_OBJS ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XI18N_OBJS ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS +${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gb18030/XI18N_OBJS +${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gb18030/XLC_LOCALE +${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gb18030/Compose ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XI18N_OBJS ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XI18N_OBJS +${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS +${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE +${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5/XI18N_OBJS +${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5/Compose ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS +${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/Compose ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XI18N_OBJS ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XI18N_OBJS @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib/common @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib @comment end i18n +@dirrm ${X11ROOT_PREFIX}/${LIBMAN_DIR} @dirrm ${X11ROOT_PREFIX}/lib/pkgconfig @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW +@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.UTF-8 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5 +@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gb18030 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN @@ -1448,5 +1526,5 @@ ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XI18N_OBJS @dirrm ${X11ROOT_PREFIX}/include/X11/Xaw @dirrm ${X11ROOT_PREFIX}/include/X11/SM @dirrm ${X11ROOT_PREFIX}/include/X11/ICE -@dirrm ${X11ROOT_PREFIX}/include/GL @dirrm ${X11ROOT_PREFIX}/include/DPS +@dirrm ${X11ROOT_PREFIX}/include/GL diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk index 67c6f451ac7..0dbed424bd3 100644 --- a/x11/xorg-libs/buildlink3.mk +++ b/x11/xorg-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2005/09/18 19:33:42 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/01/18 23:53:06 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XORG_LIBS_BUILDLINK3_MK:= ${XORG_LIBS_BUILDLINK3_MK}+ @@ -18,10 +18,9 @@ BUILDLINK_PACKAGES:= xorg-libs ${BUILDLINK_PACKAGES} .if !empty(XORG_LIBS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.8.1 -BUILDLINK_RECOMMENDED.xorg-libs+= xorg-libs>=6.8.2nb2 +BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.9.0 BUILDLINK_PKGSRCDIR.xorg-libs?= ../../x11/xorg-libs -BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|" +BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|" .endif # XORG_LIBS_BUILDLINK3_MK diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index ee71155e784..2a30157c0ba 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,49 +1,36 @@ -$NetBSD: distinfo,v 1.26 2006/01/08 14:51:11 abs Exp $ +$NetBSD: distinfo,v 1.27 2006/01/18 23:53:06 xtraeme Exp $ -SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c -RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8 -Size (X11R6.8.2-src1.tar.gz) = 32373802 bytes -SHA1 (X11R6.8.2-src2.tar.gz) = af6190fd2619cc60e70c0a8c00dee6826e1fb726 -RMD160 (X11R6.8.2-src2.tar.gz) = 0c8bb311c279c9b26688f8a6ec5dfbe56c28801e -Size (X11R6.8.2-src2.tar.gz) = 5974936 bytes -SHA1 (X11R6.8.2-src3.tar.gz) = de1569856b8023c58fc92bd0b3c8406214451fce -RMD160 (X11R6.8.2-src3.tar.gz) = d3c90401ba81dfeea843373d0d0d386962b636a6 -Size (X11R6.8.2-src3.tar.gz) = 10379299 bytes +SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef +RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 +Size (X11R6.9.0-src1.tar.gz) = 33460996 bytes +SHA1 (X11R6.9.0-src2.tar.gz) = 9aa8f222c141c735656305945da3cad3b7f33101 +RMD160 (X11R6.9.0-src2.tar.gz) = c403e77ae557aa9908f8c65853b985618e97aef5 +Size (X11R6.9.0-src2.tar.gz) = 6056976 bytes +SHA1 (X11R6.9.0-src3.tar.gz) = 0c8a0d6f9471ec022e12e2688d1991c985a1efb2 +RMD160 (X11R6.9.0-src3.tar.gz) = 1a2d1855f7b204012627a6c6bf0eaf5245fff414 +Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1 -SHA1 (patch-ac) = 444f724a62ec435cc804c4f91e310893583e205a -SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b -SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d -SHA1 (patch-af) = ce9717e7122cb71e3ce42d528c22b49871470ed7 -SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac +SHA1 (patch-ac) = 682191f790eddb94917c486ec63818756fee8e8e +SHA1 (patch-ad) = f6bff42193905fd3158b3de52bf925b5fb5f002a +SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d +SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e +SHA1 (patch-ag) = d300aa92052bdfe13e799223cf055c7955e7bb8f SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e -SHA1 (patch-aj) = 78855dfdafe76695290636e170f69b6685ad23e1 -SHA1 (patch-ak) = 623d8e4f9cab4451a38447e8954a78158c83dfaa -SHA1 (patch-al) = cb82cecd7147da8edd19d9f38a0789f07cddea87 -SHA1 (patch-am) = a907d42a4d2a72871e165b99afdba81945d656c7 -SHA1 (patch-an) = 513f8746bb66c954decdd7f2ca00888175c72834 -SHA1 (patch-ao) = 3350204fda261f03ba69e475420f90141974c6b0 -SHA1 (patch-ap) = 4a69e2df26e850ee33c1f7e6acc45ac205a46cd5 -SHA1 (patch-aq) = 9321d85cabb8b04b6bd236557f8f4e893d5559f6 -SHA1 (patch-ar) = ba96209b55579f16c53f8a1c26337a3278d1808a -SHA1 (patch-as) = 80112c0604470d7a113bd70595401481e454b8c9 -SHA1 (patch-at) = bc375171b6f0a8141621009767b5457962967112 -SHA1 (patch-au) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d -SHA1 (patch-av) = 6713ed0ba746940cec658591583dc90c92d5b563 -SHA1 (patch-aw) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60 -SHA1 (patch-ay) = b154d0d4e95ea15c79921b605266701ee773d144 -SHA1 (patch-az) = 3fc898c7c91037710b0fd27eff55ca8b55a19b4b -SHA1 (patch-ba) = 710acb72c80c38e52ba949053a9e43c72c0205f6 -SHA1 (patch-bb) = 126e217b3bb0df8bb072f26f1575af9c610b9ba6 -SHA1 (patch-bc) = 6f2061570de06125fc556fb01c050bc51d9d3ddb -SHA1 (patch-bd) = f370cbbacbd9061f526f3a1d4924c55bd77559fb -SHA1 (patch-be) = 19573fbc5b27a6fd17366e51801ec5a84bd3a063 -SHA1 (patch-bf) = 0661e6e787e57c865844c10ba27b381f525673b5 -SHA1 (patch-bg) = 768fafea9066f7be420154e5c9e383d94bee5de5 -SHA1 (patch-bh) = 1d356a2e1a885476ed8e55f3e9db0fd5744772a5 -SHA1 (patch-bi) = 4afc732ca451004b600c431ef76956d64317654c -SHA1 (patch-bj) = 263336947f34b98c054b75dba204756c8b8f488f -SHA1 (patch-bk) = e8b5eca5ce2d3acc77797f16f956dfc9a2fcacc8 -SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec -SHA1 (patch-bm) = 7cd02712c1ae4ca070564d2f7b5cb4e3e5b6e93b -SHA1 (patch-bn) = aeacaa688e303c33ed55b886fc38173a8b1572d8 +SHA1 (patch-aj) = 970faef91ce945cd22838a7a271c63198cbfea3b +SHA1 (patch-ak) = c62ba3fe5ad42828e509e7e812a1c1b3fe32b211 +SHA1 (patch-al) = edfea125a835e564ba179a50b210f98d0f8e0402 +SHA1 (patch-am) = 9321d85cabb8b04b6bd236557f8f4e893d5559f6 +SHA1 (patch-an) = ba96209b55579f16c53f8a1c26337a3278d1808a +SHA1 (patch-ao) = 9711178265b3fe334279273ab75bde157f0aea6a +SHA1 (patch-ap) = 79d826e9d8d4a05f250378814d47f0383ab2eafe +SHA1 (patch-aq) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d +SHA1 (patch-ar) = 1343c744c3fde364b0407f24e09d0b11d5dcb8c4 +SHA1 (patch-as) = 492de38023ab7babebe0db8ab700d76e5f2b8a8b +SHA1 (patch-at) = de62c6d1eedda14bac4344978b18065d46de3efd +SHA1 (patch-au) = 3b76dbc381190ef18957a5af73208a72df687151 +SHA1 (patch-av) = 052de5919a40751062a008d6f590872f84284d9f +SHA1 (patch-aw) = 4289ec24e811efd6f74acca6c6842ee5f77cc5f7 +SHA1 (patch-ax) = fb3f8dcf42bf5fb7fd1eaa3997b84000ce659305 +SHA1 (patch-ay) = 4403bc18ab13f582e4a36d6f873bbd7aaaceacf5 +SHA1 (patch-az) = a236a896e4e58f0d21d5745fb4b452300f2b77c6 diff --git a/x11/xorg-libs/files/DragonFly.cf b/x11/xorg-libs/files/DragonFly.cf deleted file mode 100644 index bff8068defb..00000000000 --- a/x11/xorg-libs/files/DragonFly.cf +++ /dev/null @@ -1,284 +0,0 @@ -/* xc/config/cf/DragonFly.cf */ - -#define UseElfFormat YES -#define OSBinaryFormat [ELF] - -#ifndef OSName -# define OSName DefaultOSName OSBinaryFormat -#endif -#ifndef OSVendor -# define OSVendor /**/ -#endif -#ifndef OSMajorVersion -# define OSMajorVersion DefaultOSMajorVersion -#endif -#ifndef OSMinorVersion -# define OSMinorVersion DefaultOSMinorVersion -#endif -#ifndef OSTeenyVersion -# define OSTeenyVersion DefaultOSTeenyVersion -#endif - -/* #ifndef OSRelVersion */ -/* Include this to get finer-grained information about the OS version */ -#include "/usr/include/osreldate.h" -#define OSRelVersion __DragonFly_version -/* #endif */ - -XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion) - - -#define HasCplusplus YES -#define GccUsesGas YES -#define UseGas YES -#define GnuCpp YES -#define HasNdbm YES -#define HasPutenv YES -#define HasSnprintf YES -#define HasBSD44Sockets YES -#define HasDlopen YES -#define HasSetProcTitle YES -#define HasLibCrypt YES -#define HasShm YES -#define HasWChar32 YES -#define HasUsableFileMmap YES -#define HasNCurses YES -#define HasVarRun YES -#define HasVarDb YES -#define HasIssetugid YES -#define HasPoll YES -#define HasGetIfAddrs YES - -#define IPv6SocketsAlsoIPv4 NO -#define InstallXloadSetGID NO -#define HasWeakSymbols UseElfFormat - -/* - * Multi-thread safe libs - */ -#ifndef HasLibPthread -# define HasLibPthread NO -#endif -#define HasPosixThreads YES -#define ThreadedX YES -#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -#define HasThreadSafeAPI YES -#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI - -#if HasLibPthread -# define ThreadsLibraries -lpthread -#else -# define ThreadsLibraries -pthread -# define SharedX11Reqs $(LDPRELIB) -# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) -#endif - -#define AvoidNullMakeCommand YES -#define StripInstalledPrograms YES -#define CompressAllFonts YES -#define GzipFontCompression YES -#define Malloc0ReturnsNull YES -#define NeedConstPrototypes YES -#define NeedFunctionPrototypes YES -#define NeedNestedPrototypes YES -#define NeedVarargsPrototypes YES -#define NeedWidePrototypes NO - -#define HasPlugin YES -#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ - -#ifndef CcCmd -#define CcCmd @@PKGSRC_CC@@ -#endif -#ifndef CplusplusCmd -#define CplusplusCmd @@PKGSRC_CXX@@ -#endif -#define CppCmd @@PKGSRC_CPP@@ -#define PreProcessCmd CppCmd - -#define StandardCppOptions -traditional -#define StandardCppDefines /**/ -#ifndef DefaultCCOptions -# if defined(UseInstalled) -# define DefaultCCOptions /**/ -# else -# if defined(HasGcc3) && HasGcc3 -# define NoSystemWarn -Wno-system-headers -# else -# define NoSystemWarn -# endif -# define DefaultCCOptions -ansi -Dasm=__asm NoSystemWarn -# endif -#endif - -#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - -#define HasSetUserContext YES -#define HasGetpeereid YES -#define HasMTRRSupport YES - -#ifndef BuildXF86DRI -# define BuildXF86DRI YES -#endif - -#if defined(i386Architecture) -# define HasAgpGart YES -#endif - -/* - * SSE and 3DNow will be autodetected, so binutils is the only - * requirement for enabling this. By 4.2 they were all supported. - */ -#if defined(i386Architecture) -# define HasX86Support YES -# define HasMMXSupport YES -# define Has3DNowSupport YES -# define HasSSESupport YES -#else -# define HasX86Support NO -# define HasMMXSupport NO -# define Has3DNowSupport NO -# define HasSSESupport NO -#endif - -#ifndef UseRpath -# define UseRpath YES -#endif - -#ifndef RpathLoadFlags -# if UseRpath -# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -# else -# define RpathLoadFlags /**/ -# endif -#endif - -#ifndef ExtraLoadFlags -# if !defined(UseInstalled) -# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) -# else -# define ExtraLoadFlags RpathLoadFlags -# endif -#endif - -#ifndef StaticLibrary -# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic -#endif - -#define DlLibrary -Wl,--export-dynamic - -#ifndef HasPam -# define HasPam YES -#endif -#ifndef PamLibraries -# define PamLibraries -lpam DlLibrary -#endif - -#ifndef UseGnuMalloc -# define UseGnuMalloc NO -#endif -#ifndef GnuMallocLibrary -# define GnuMallocLibrary -lgnumalloc -#endif - -#ifndef HasZlib -# define HasZlib YES -#endif - -#ifdef AlphaArchitecture -# define IoLibrary -lio -#else -# define IoLibrary /**/ -#endif -#define ServerExtraSysLibs IoLibrary - -#ifndef HasExpat -# define HasExpat YES -#endif - -#ifndef HasFreetype2 -# define HasFreetype2 YES -#endif - -#undef InstallCmd -#define InstallCmd /usr/bin/install - -#define AsmElfDefines -D__ELF__ - -#if GccUsesGas -# define GccGasOption -DGCCUSESGAS -# define AsmDefines -DUSE_GAS AsmElfDefines -#else -# define GccGasOption /**/ -# define AsmDefines AsmElfDefines -#endif - -#ifdef i386Architecture -# define ServerExtraDefines GccGasOption XFree86ServerDefines -#endif -#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \ - defined(ia64Architecture) || defined(AMD64Architecture) -# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 -#endif - -#ifdef Sparc64Architecture -# define AsVISOption -Av9a -# define AsOutputArchSize 64 -#endif - -#define StandardDefines -DCSRG_BASED - -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -#define XawI18nDefines -DUSE_XWCHAR_STRING -#define HasMakefileSafeInclude YES -#define IncludeMakefile(file) @@# dependencies are in .depend -#define DependFileName .depend -#ifndef DoLoadableServer -# define DoLoadableServer YES -#endif -#ifndef ForceNormalLib -# define ForceNormalLib YES -#endif -#define HasMkstemp YES - -#ifndef PreIncDir -# define PreIncDir /usr/include -#endif - -#define HasGroff YES -#define NroffCmd env GROFF_NO_SGR=y groff -Tascii -#define SetTtyGroup YES - -#ifndef ExtraFilesToClean -# define ExtraFilesToClean *.core -#endif - -#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin -#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR) - -#ifndef SystemManDirectory -# define SystemManDirectory /usr/share/man -#endif - -#define InstKmemFlags -g kmem -m 2755 - -#ifndef CompressManPages -# define CompressManPages NO -#endif - -#define HasBsdMake YES - -#ifndef SharedLibXdmGreet -# define SharedLibXdmGreet NO -#endif - -#ifndef HasCookieMaker -/* Which versions have /dev/urandom? */ -#define HasCookieMaker YES -#define MkCookieCmd \ - 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"' -#endif - -#include <bsdLib.rules> - -#include <xorg.cf> diff --git a/x11/xorg-libs/files/host.def b/x11/xorg-libs/files/host.def index 9eb20e994ce..a42c0754c8f 100644 --- a/x11/xorg-libs/files/host.def +++ b/x11/xorg-libs/files/host.def @@ -1,4 +1,4 @@ -/* $NetBSD: host.def,v 1.3 2005/04/15 15:26:48 hira Exp $ */ +/* $NetBSD: host.def,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ @@ -34,6 +34,9 @@ #define BuildCyrillicFonts NO #define BuildLatin2Fonts NO #define BuildPlugin NO +#define BuildDPSLibrary YES +#define BuildDPSTkLibrary YES + #define DebuggableLibraries NO #define StandardIncludes -I@BLNK@/include @@ -57,6 +60,11 @@ # endif #endif +#ifdef NetBSDArchitecture +#define GlxDriverUsesMesa YES +#define GlxBuiltInXMesa NO +#endif + #define BuildRenderLibrary NO #define BuildExpatLibrary NO #define BuildFreetype2Library NO diff --git a/x11/xorg-libs/patches/patch-ac b/x11/xorg-libs/patches/patch-ac index f271cdff520..c71268e8dd5 100644 --- a/x11/xorg-libs/patches/patch-ac +++ b/x11/xorg-libs/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.6 2005/03/21 10:06:15 adam Exp $ +$NetBSD: patch-ac,v 1.7 2006/01/18 23:53:06 xtraeme Exp $ ---- config/cf/NetBSD.cf.in.orig 2004-08-15 09:03:36.000000000 +0900 -+++ config/cf/NetBSD.cf.in 2005-03-20 03:57:25.000000000 +0900 -@@ -123,7 +123,7 @@ - # define ThreadedX YES - # define HasThreadSafeAPI YES - # define ThreadsLibraries -lpthread --# define LibraryMTDefines -DUSE_NBSD_THREADLIB -+# define LibraryMTDefines @@NETBSD_THREADLIB@@ +--- config/cf/NetBSD.cf.in.orig 2005-12-06 10:56:30.000000000 +0100 ++++ config/cf/NetBSD.cf.in 2005-12-06 11:01:02.000000000 +0100 +@@ -126,7 +126,7 @@ + # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \ + (OSMajorVersion == 2 && OSMinorVersion < 99) || \ + (OSMajorVersion < 2)) +-# define LibraryMTDefines -DUSE_NBSD_THREADLIB ++# define LibraryMTDefines @@NETBSD_THREADLIB@@ + # endif # define SystemMTDefines -D_REENTRANT # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI - #else -@@ -146,7 +146,7 @@ +@@ -150,7 +150,7 @@ #define MkdirHierCmd mkdir -p #undef CcCmd @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.6 2005/03/21 10:06:15 adam Exp $ #ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ -@@ -162,7 +162,7 @@ +@@ -166,7 +166,7 @@ #endif #endif @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.6 2005/03/21 10:06:15 adam Exp $ #define StandardCppOptions -traditional #define StandardCppDefines /**/ #define PreProcessCmd CcCmd -E -@@ -191,7 +191,7 @@ +@@ -195,7 +195,7 @@ * Disabled for NetBSD/vax until I figure out the scheme. --CS */ #if ((OSMajorVersion > 0) && defined(i386Architecture)) || \ @@ -38,86 +38,18 @@ $NetBSD: patch-ac,v 1.6 2005/03/21 10:06:15 adam Exp $ # ifndef DoLoadableServer # define DoLoadableServer YES # endif -@@ -211,13 +211,7 @@ - #define HasWeakSymbols UseElfFormat - - #ifdef i386Architecture --# ifndef DefaultGcc2i386Opt --# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) -- /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ --# define DefaultGcc2i386Opt -O2 GccAliasingArgs --# endif --# endif --# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # if OSMajorVersion < 1 - # define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF - # else -@@ -227,7 +221,7 @@ - # define ServerExtraSysLibs -li386 - # endif - #else --# define OptimizedCDebugFlags -O2 -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - # if defined(SparcArchitecture) - # define ServerOSDefines -DDDXOSINIT - # elif defined(AlphaArchitecture) -@@ -236,11 +230,17 @@ - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME - # elif defined(PpcArchitecture) - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT -+# elif defined(AMD64Architecture) -+# undef OptimizedCDebugFlags -+# define OptimizedCDebugFlags -O2 -+# define ServerOSDefines XFree86ServerOSDefines - # else - # define ServerOSDefines /**/ - # endif - # if defined(AlphaArchitecture) - # define ServerExtraSysLibs -lalpha -+# elif defined(AMD64Architecture) -+# define ServerExtraSysLibs -lx86_64 - # else - # define ServerExtraSysLibs /**/ - # endif -@@ -280,10 +280,25 @@ - # ifndef XFree86ConsoleDefines - # define XFree86ConsoleDefines -DWSCONS_SUPPORT - # endif -+#elif defined(AMD64Architecture) -+# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 -+# ifndef XFree86ConsoleDefines -+# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT -+# endif - #else - # define ServerExtraDefines GccGasOption - #endif - -+ -+#if defined(AMD64Architecture) && \ -+ ((OSMajorVersion < 2) || \ -+ (OSMajorVersion == 2 && OSMinorVersion < 99) || \ -+ (OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 16)) -+#ifndef PassHintToMMAP -+#define PassHintToMMAP -+#endif -+#endif -+ - #define StandardDefines -DCSRG_BASED - /* Citrus mb locale were added in 1.5P */ - #if ((OSMajorVersion > 1) || \ -@@ -400,6 +415,10 @@ +@@ -404,6 +404,10 @@ # endif /* MTRRBuiltin */ #endif /* i386Architecture */ +#if defined(AMD64Architecture) -+# define HasMTRRBuiltin YES ++# define HasMTRRBuiltin YES +#endif + /* * agpgart support (NetBSD 1.5Y and up) */ -@@ -588,7 +607,7 @@ +@@ -590,7 +594,7 @@ # define BuildXInputLib YES #endif diff --git a/x11/xorg-libs/patches/patch-ad b/x11/xorg-libs/patches/patch-ad index 9431f1b6049..d6dc9c0a2b4 100644 --- a/x11/xorg-libs/patches/patch-ad +++ b/x11/xorg-libs/patches/patch-ad @@ -1,38 +1,45 @@ -$NetBSD: patch-ad,v 1.3 2004/10/08 03:35:25 xtraeme Exp $ +$NetBSD: patch-ad,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ ---- config/cf/FreeBSD.cf.in.orig Fri Oct 8 02:16:19 2004 -+++ config/cf/FreeBSD.cf.in Fri Oct 8 02:18:01 2004 -@@ -173,12 +173,12 @@ - #endif +--- config/cf/linux.cf.in.orig 2005-12-06 11:06:50.000000000 +0100 ++++ config/cf/linux.cf.in 2005-12-06 11:09:08.000000000 +0100 +@@ -609,10 +609,10 @@ + # if defined (i386Architecture) && ((GccMajorVersion >3) \ + || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) + # ifndef CcCmd +-# define CcCmd gcc -m32 ++# define CcCmd @@PKGSRC_CC@@ + # endif + # ifndef CplusplusCmd +-# define CplusplusCmd c++ -m32 ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # endif + # if defined (Ppc64Architecture) +@@ -624,8 +624,8 @@ + # endif + # endif + # ifndef CcCmd +-# define CcCmd gcc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # ifndef AsCmd + # define AsCmd CcCmd -c -x assembler +@@ -779,7 +779,6 @@ + #define YaccCmd bison -y + #define LexCmd flex -l + #define HasFlex YES +-#define LexLib -lfl + #define PreProcessCmd CcCmd -E + #define PostIncDir DefaultGccIncludeDir + #define LdCombineFlags -r +@@ -853,7 +852,7 @@ - #ifndef CcCmd --#define CcCmd cc -+#define CcCmd @@PKGSRC_CC@@ - #endif - #ifndef CplusplusCmd --#define CplusplusCmd c++ -+#define CplusplusCmd @@PKGSRC_CXX@@ - #endif --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -466,7 +466,7 @@ - /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ - #ifndef DefaultGcc2i386Opt - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs -+#define DefaultGcc2i386Opt @@PKGSRC_CFLAGS@@ - #endif - #endif - -@@ -500,7 +500,7 @@ - * Compress manual pages - */ - #ifndef CompressManPages --# define CompressManPages YES -+# define CompressManPages NO - #endif - - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) + #ifdef i386Architecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # endif + # define LinuxMachineDefines -D__i386__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME diff --git a/x11/xorg-libs/patches/patch-ae b/x11/xorg-libs/patches/patch-ae index d30142818b8..47e629d434c 100644 --- a/x11/xorg-libs/patches/patch-ae +++ b/x11/xorg-libs/patches/patch-ae @@ -1,41 +1,51 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ ---- config/cf/linux.cf.in.orig 2004-03-03 07:44:42.000000000 +0000 -+++ config/cf/linux.cf.in 2004-03-03 07:46:51.000000000 +0000 -@@ -549,15 +549,15 @@ - # if defined (i386Architecture) && ((GccMajorVersion >3) \ - || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) - # ifndef CcCmd --# define CcCmd gcc -m32 -+# define CcCmd @@PKGSRC_CC@@ - # endif - # ifndef CplusplusCmd --# define CplusplusCmd c++ -m32 -+# define CplusplusCmd @@PKGSRC_CXX@@ - # endif - # endif - # ifndef CcCmd --# define CcCmd gcc --# define CplusplusCmd c++ -+# define CcCmd @@PKGSRC_CC@@ -+# define CplusplusCmd @@PKGSRC_CXX@@ - # endif - # ifndef AsCmd - # define AsCmd CcCmd -c -x assembler -@@ -721,7 +721,6 @@ - #define YaccCmd bison -y - #define LexCmd flex -l - #define HasFlex YES --#define LexLib -lfl - #define PreProcessCmd CcCmd -E - #define PostIncDir DefaultGccIncludeDir - #define LdCombineFlags -r -@@ -791,7 +790,7 @@ +--- config/cf/darwin.cf.in.orig 2005-12-06 11:18:05.000000000 +0100 ++++ config/cf/darwin.cf.in 2005-12-06 11:20:10.000000000 +0100 +@@ -97,7 +97,7 @@ + * Turn off to build on raw Darwin systems. + */ + #ifndef DarwinQuartzSupport +-# define DarwinQuartzSupport YES ++# define DarwinQuartzSupport @@DARWIN_USE_QUARTZ@@ + #endif - #ifdef i386Architecture - # ifndef OptimizedCDebugFlags --# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + #if DarwinQuartzSupport +@@ -170,7 +170,7 @@ + * so we use the 3.1-based version in this case. + */ + #if (GccMajorVersion == 3) && (GccMinorVersion == 3) +-# define CppCmd /usr/bin/cpp3 ++# define CppCmd /usr/bin/cpp + #else + # define CppCmd /usr/bin/cpp + #endif +@@ -184,8 +184,8 @@ + #endif + + /* we have a gcc compatible compiler, but its not called gcc */ +-#define CcCmd /usr/bin/cc +-#define CplusplusCmd /usr/bin/c++ ++#define CcCmd @@PKGSRC_CC@@ ++#define CplusplusCmd @@PKGSRC_CXX@@ + + /* default flags to pass to cc */ + #ifndef DefaultCCOptions +@@ -213,7 +213,7 @@ + #ifdef PpcDarwinArchitecture + # define DarwinMachineDefines -D__powerpc__ + # if HasGcc3 +-# define OptimizedCDebugFlags -Os ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # else + # define OptimizedCDebugFlags -O2 + # endif +@@ -223,7 +223,7 @@ + #ifdef i386DarwinArchitecture + # define DarwinMachineDefines -D__i386__ + # if HasGcc3 +-# define OptimizedCDebugFlags -Os ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # else + # define OptimizedCDebugFlags -O2 -fno-strength-reduce # endif - # define LinuxMachineDefines -D__i386__ - # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME diff --git a/x11/xorg-libs/patches/patch-af b/x11/xorg-libs/patches/patch-af index 7819b887607..c9095282354 100644 --- a/x11/xorg-libs/patches/patch-af +++ b/x11/xorg-libs/patches/patch-af @@ -1,55 +1,31 @@ -$NetBSD: patch-af,v 1.4 2005/03/22 14:00:25 adam Exp $ +$NetBSD: patch-af,v 1.5 2006/01/18 23:53:06 xtraeme Exp $ ---- config/cf/darwin.cf.in.orig Wed Dec 15 05:53:05 2004 -+++ config/cf/darwin.cf.in -@@ -88,7 +88,7 @@ XCOMM operating system: OSName (OSMajor - * Turn off to build on raw Darwin systems. - */ - #ifndef DarwinQuartzSupport --# define DarwinQuartzSupport YES -+# define DarwinQuartzSupport @@DARWIN_USE_QUARTZ@@ - #endif - - #if DarwinQuartzSupport -@@ -161,10 +161,10 @@ XCOMM operating system: OSName (OSMajor - * so we use the 3.1-based version. - */ - #if OSMajorVersion >= 7 --# define CppCmd /usr/bin/cpp3 -+# define CppCmd /usr/bin/cpp -xassembler-with-cpp - # define StandardCppOptions -traditional -D__GNUC__ - #else --# define CppCmd /usr/bin/cpp -+# define CppCmd /usr/bin/cpp -xassembler-with-cpp - #endif - #if HasGcc3 - # define RawCppCmd CppCmd -undef -@@ -173,8 +173,8 @@ XCOMM operating system: OSName (OSMajor - #endif - - /* we have a gcc compatible compiler, but its not called gcc */ --#define CcCmd /usr/bin/cc --#define CplusplusCmd /usr/bin/c++ -+#define CcCmd @@PKGSRC_CC@@ -+#define CplusplusCmd @@PKGSRC_CXX@@ - - /* default flags to pass to cc */ - #ifndef DefaultCCOptions -@@ -202,7 +202,7 @@ XCOMM operating system: OSName (OSMajor - #ifdef PpcDarwinArchitecture - # define DarwinMachineDefines -D__powerpc__ - # if HasGcc3 --# define OptimizedCDebugFlags -Os -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig 2006-01-02 13:23:48.000000000 +0100 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2006-01-02 13:24:23.000000000 +0100 +@@ -6750,7 +6750,7 @@ + vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */ # else - # define OptimizedCDebugFlags -O2 + /* Save mode * & fonts & cmap */ +- vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS); ++ vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL); # endif -@@ -212,7 +212,7 @@ XCOMM operating system: OSName (OSMajor - #ifdef i386DarwinArchitecture - # define DarwinMachineDefines -D__i386__ - # if HasGcc3 --# define OptimizedCDebugFlags -Os -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + vgaHWLock(hwp); + } +@@ -6826,7 +6826,7 @@ + */ + vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE ); # else - # define OptimizedCDebugFlags -O2 -fno-strength-reduce +- vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS ); ++ vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL ); # endif + vgaHWLock(hwp); + } else { +@@ -6841,7 +6841,7 @@ + #if defined(__powerpc__) + vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE); + #else +- vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE | VGA_SR_FONTS ); ++ vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_ALL ); + #endif + vgaHWLock(hwp0); + } diff --git a/x11/xorg-libs/patches/patch-ag b/x11/xorg-libs/patches/patch-ag index 22b2ebbffc6..64f9f9fd39d 100644 --- a/x11/xorg-libs/patches/patch-ag +++ b/x11/xorg-libs/patches/patch-ag @@ -1,14 +1,13 @@ -$NetBSD: patch-ag,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ +$NetBSD: patch-ag,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ ---- config/cf/sun.cf.orig 2004-02-02 14:55:26.000000000 +1100 -+++ config/cf/sun.cf -@@ -19,6 +19,9 @@ XCOMM platform: $XFree86: xc/config/cf/ +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2006-01-03 10:28:07.000000000 +0100 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2006-01-03 10:28:42.000000000 +0100 +@@ -128,7 +128,7 @@ #endif - XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) -+/* This is the XFree86 package - we want to build XFree86 on Solaris */ -+#define BuildXFree86OnSparcSunOS YES -+ - /* - * Compiler setup. This sun.cf file knows what options to use with - * certain compilers, including Sun C, CenterLine C, and gcc. It + LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \ +- $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \ ++ $(XXF86VMLIB) -lXaw $(XMULIB) $(XTOOLLIB) \ + $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(LOADERLIB) $(DLLIB) \ + $(XLIB) $(CURSESLIB) RegexLibrary -lm + diff --git a/x11/xorg-libs/patches/patch-aj b/x11/xorg-libs/patches/patch-aj index 49e42ec442a..72b04dec51e 100644 --- a/x11/xorg-libs/patches/patch-aj +++ b/x11/xorg-libs/patches/patch-aj @@ -1,13 +1,56 @@ -$NetBSD: patch-aj,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ +$NetBSD: patch-aj,v 1.3 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/x11perf/Imakefile.orig 2004-09-10 09:44:07.000000000 +0200 -+++ programs/x11perf/Imakefile 2004-09-10 09:44:19.000000000 +0200 -@@ -12,7 +12,7 @@ - #if HasShm - SHMDEFS = -DMITSHM - #endif --#if BuildRenderLibrary -+#if 0 - XRENDERDEFS = -DXRENDER - XRENDERDEPS = $(DEPXRENDERLIB) - XRENDERLIBS = $(XRENDERLIB) +--- programs/xdm/Imakefile.orig 2005-12-06 12:35:11.000000000 +0100 ++++ programs/xdm/Imakefile 2005-12-06 12:38:07.000000000 +0100 +@@ -107,7 +107,7 @@ PWD_DEFINES = -DUSESHADOW -DSHADOWSUITE + #endif + #endif + +-#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture) ++#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture) && !defined(DragonFlyArchitecture) + SYS_LIBRARIES3 = -lresolv + #endif + #if SystemV || defined(SequentArchitecture) +@@ -208,6 +208,13 @@ LIFREQ_FLAGS = -Xa + #endif + #endif + ++XDMLOGDIR = $(LOGDIRECTORY) ++#ifdef VarRunDirectory ++XDMPIDDIR = $(VARRUNDIR) ++#else ++XDMPIDDIR = $(XDMDIR) ++#endif ++ + SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2) $(SYS_LIBRARIES3) + + XDMCONFIGDIR = XdmConfigurationSubdirectory +@@ -265,7 +272,8 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) + #endif + PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW) + +- CHOOSERPATH = $(XDMDIR)/chooser ++ CHOOSERPATH = $(BINDIR)/chooser ++ GREETERLIBPATH = $(USRLIBDIR)/libXdmGreet.so + OSMAJORVERSION = OSMajorVersion + OSMINORVERSION = OSMinorVersion + CONN_DEFINES = $(CONNECTION_FLAGS) +@@ -282,7 +290,8 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) + EXTRAMANDEFS = $(RANDOM_DEFINES) -DCHOOSERPATH=$(CHOOSERPATH) \ + -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \ + -DXDMDIR=$(XDMDIR) -DBINDIR=$(BINDIR) \ +- ++ -DGREETERLIBPATH=$(GREETERLIBPATH) \ ++ -DXDMAUTHDIR=$(XDMVARDIR) + + XCOMM + XCOMM Special definitions for compiling default resources; these parameters +@@ -331,7 +340,7 @@ SpecialCObjectRule(daemon,$(ICONFIGFILES + #if BuildChooser + SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS)) + NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter) +-InstallProgram(chooser,$(XDMDIR)) ++InstallProgram(chooser,$(BINDIR)) + InstallAppDefaults(Chooser) + #endif + #if BuildBoth diff --git a/x11/xorg-libs/patches/patch-ak b/x11/xorg-libs/patches/patch-ak index da76ba7f95a..2d121ace5b2 100644 --- a/x11/xorg-libs/patches/patch-ak +++ b/x11/xorg-libs/patches/patch-ak @@ -1,19 +1,63 @@ -$NetBSD: patch-ak,v 1.3 2005/01/25 17:49:57 xtraeme Exp $ +$NetBSD: patch-ak,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2005-01-21 19:27:21.000000000 +0000 -+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-01-21 19:41:06.000000000 +0000 -@@ -127,10 +127,11 @@ - DLLIB = DlLibrary +--- programs/xdm/config/Imakefile.orig 2006-01-02 10:57:27.000000000 +0100 ++++ programs/xdm/config/Imakefile 2006-01-02 10:59:46.000000000 +0100 +@@ -23,9 +23,9 @@ + # define XdmbwPixmap XVendorStdFilePrefix-bw.xpm #endif --LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \ -- $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \ -+LOCAL_LIBRARIES = -lxf86config $(XXF86MISCLIB) \ -+ $(XXF86VMLIB) -lXaw $(XMULIB) $(XTOOLLIB) \ - $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(LOADERLIB) $(DLLIB) \ -- $(XLIB) $(CURSESLIB) RegexLibrary -lm -+ $(XLIB) $(CURSESLIB) RegexLibrary -lm \ -+ $(XKBUILIB) $(XKBFILELIB) +-CHOOSERPATH = $(XDMDIR)/chooser ++CHOOSERPATH = $(BINDIR)/chooser - NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),) - InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter) +-XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\ ++XPM_DEFINES=-DXPM -DBITMAPDIR=$(INCDIR)/X11/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\ + -DXDM_BWPIXMAP=XdmbwPixmap + + XDMLOGDIR = $(LOGDIRECTORY) +@@ -48,24 +48,23 @@ + #endif + + CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter) +-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter) ++CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter) + CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) + CppFileTarget(Xsession,Xsession.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter) + + LinkFile(Xservers,Xservers.$(SERVERSTYPE)) + + #if InstallXdmConfig +-InstallNonExecFile(xdm-config,$(XDMDIR)) +-InstallNonExecFile(Xresources,$(XDMDIR)) +-InstallNonExecFile(Xservers,$(XDMDIR)) +-InstallNonExecFile(Xaccess,$(XDMDIR)) +-InstallNamedProg(Xsession,Xsession,$(XDMDIR)) +-InstallNamedProg(GiveConsole,GiveConsole,$(XDMDIR)) +-InstallNamedProg(TakeConsole,TakeConsole,$(XDMDIR)) +-InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMDIR)) +-InstallNamedProg(Xstartup,Xstartup,$(XDMDIR)) +-InstallNamedProg(Xreset,Xreset,$(XDMDIR)) +-InstallNamedProg(Xwilling,Xwilling,$(XDMDIR)) ++XDMEGDIR = XdmEgDir ++InstallNonExecFile(xdm-config,$(XDMEGDIR)) ++InstallNonExecFile(Xresources,$(XDMEGDIR)) ++InstallNonExecFile(Xservers,$(XDMEGDIR)) ++InstallNonExecFile(Xaccess,$(XDMEGDIR)) ++InstallNamedProg(Xsession,Xsession,$(XDMEGDIR)) ++InstallNamedProg(GiveConsole,GiveConsole,$(XDMEGDIR)) ++InstallNamedProg(TakeConsole,TakeConsole,$(XDMEGDIR)) ++InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMEGDIR)) ++InstallNamedProg(Xwilling,Xwilling,$(XDMEGDIR)) + #else + InstallNonExecFileNoClobber(xdm-config,$(XDMDIR)) + InstallNonExecFileNoClobber(Xresources,$(XDMDIR)) +@@ -81,8 +80,8 @@ + #endif + + #if InstallXdmConfig +-InstallNonExecFile(XdmPixmap,$(XDMDIR)/pixmaps) +-InstallNonExecFile(XdmbwPixmap,$(XDMDIR)/pixmaps) ++InstallNonExecFile(XdmPixmap,$(INCDIR)/X11/pixmaps) ++InstallNonExecFile(XdmbwPixmap,$(INCDIR)/X11/pixmaps) + #else + InstallNonExecFileNoClobber(XdmPixmap,$(XDMDIR)/pixmaps) + InstallNonExecFileNoClobber(XdmbwPixmap,$(XDMDIR)/pixmaps) diff --git a/x11/xorg-libs/patches/patch-al b/x11/xorg-libs/patches/patch-al index 84f9a08769d..2e28f077169 100644 --- a/x11/xorg-libs/patches/patch-al +++ b/x11/xorg-libs/patches/patch-al @@ -1,25 +1,12 @@ -$NetBSD: patch-al,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ +$NetBSD: patch-al,v 1.3 2006/01/18 23:53:06 xtraeme Exp $ -Workaround to make this build on Linux, I think the error is related -to buildlink. - ---- programs/Xserver/hw/dmx/dmxinit.c.orig 2004-09-16 15:20:43.000000000 +0200 -+++ programs/Xserver/hw/dmx/dmxinit.c 2004-09-16 15:21:21.000000000 +0200 -@@ -573,7 +573,7 @@ - #endif - - if (dmxGeneration != serverGeneration) { -- int vendrel = VENDOR_RELEASE; -+ int vendrel = NULL; - int major, minor, year, month, day; - - dmxGeneration = serverGeneration; -@@ -595,7 +595,7 @@ - dmxLog(dmxInfo, "DMX version: %d.%d.%02d%02d%02d (%s)\n", - major, minor, year, month, day, VENDOR_STRING); - -- SetVendorRelease(VENDOR_RELEASE); -+ SetVendorRelease(NULL); - SetVendorString(VENDOR_STRING); - - if (dmxGeneration == 1) { +--- programs/xdm/config/xdm-conf.cpp.orig 2006-01-02 11:00:33.000000000 +0100 ++++ programs/xdm/config/xdm-conf.cpp 2006-01-02 11:00:51.000000000 +0100 +@@ -19,6 +19,7 @@ + DisplayManager.accessFile: XDMCONFIGDIR/Xaccess + DisplayManager*resources: XDMCONFIGDIR/Xresources + DisplayManager.willing: SU nobody -c XDMSCRIPTDIR/Xwilling ++DisplayManager.authDir: XDMAUTHDIR + ! All displays should use authorization, but we cannot be sure + ! X terminals may not be configured that way, so they will require + ! individual resource settings. diff --git a/x11/xorg-libs/patches/patch-am b/x11/xorg-libs/patches/patch-am index 7a6a06abb9b..524406bb584 100644 --- a/x11/xorg-libs/patches/patch-am +++ b/x11/xorg-libs/patches/patch-am @@ -1,59 +1,13 @@ -$NetBSD: patch-am,v 1.3 2004/10/20 14:33:30 reed Exp $ +$NetBSD: patch-am,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/xdm/Imakefile.orig 2004-07-26 15:56:33.000000000 -0700 -+++ programs/xdm/Imakefile -@@ -195,6 +195,13 @@ LIFREQ_FLAGS = -Xa - #endif - #endif +--- programs/Xserver/GL/apple/Imakefile.orig Mon Mar 14 23:25:00 2005 ++++ programs/Xserver/GL/apple/Imakefile +@@ -36,7 +36,7 @@ LinkSourceFile(compsize.c,$(LIBSRC)/GL/g + -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/hw/darwin/quartz/cr \ + -I$(SERVERSRC)/hw/darwin/quartz $(GL_INCLUDES) \ + -I$(MESASRCDIR)/include -I$(MESASRCDIR)/src/mesa/glapi \ +- -I$(XF86OSSRC) ++ -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared -+XDMLOGDIR = $(LOGDIRECTORY) -+#ifdef VarRunDirectory -+XDMPIDDIR = $(VARRUNDIR) -+#else -+XDMPIDDIR = $(XDMDIR) -+#endif -+ - SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2) $(SYS_LIBRARIES3) + DEFINES = $(GLX_DEFINES) - XDMCONFIGDIR = XdmConfigurationSubdirectory -@@ -252,7 +259,8 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) - #endif - PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW) - -- CHOOSERPATH = $(XDMDIR)/chooser -+ CHOOSERPATH = $(BINDIR)/chooser -+ GREETERLIBPATH = $(USRLIBDIR)/libXdmGreet.so - OSMAJORVERSION = OSMajorVersion - OSMINORVERSION = OSMinorVersion - CONN_DEFINES = $(CONNECTION_FLAGS) -@@ -267,6 +275,10 @@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) - $(XPM_DEFINES) $(XINERAMA_DEFINES) $(PROCTITLE_DEFINES) \ - $(IFADDRS_DEFINES) $(IPV6_DEFINES) $(MKSTEMP_DEFINES) - EXTRAMANDEFS = $(RANDOM_DEFINES) -DCHOOSERPATH=$(CHOOSERPATH) \ -+ -DGREETERLIBPATH=$(GREETERLIBPATH) \ -+ -DXDMDIR=$(XDMDIR) \ -+ -DXDMAUTHDIR=$(XDMVARDIR) \ -+ -DXDMPIDDIR=$(XDMPIDDIR) \ - -DXDMLOGDIR=$(XDMLOGDIR) - - XCOMM -@@ -290,8 +302,8 @@ RES_DEFINES = '-DDEF_SERVER_LINE=":0 loc - '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \ - '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \ - '-DDEF_CHOOSER="$(CHOOSERPATH)"' \ -- '-DDEF_AUTH_DIR="$(XDMDIR)"' \ -- '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"' -+ '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \ -+ '-DDEF_GREETER_LIB="$(GREETERLIBPATH)"' - - ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter) - #ifdef LinkConfDirectory -@@ -316,7 +328,7 @@ SpecialCObjectRule(daemon,$(ICONFIGFILES - #if BuildChooser - SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS)) - NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter) --InstallProgram(chooser,$(XDMDIR)) -+InstallProgram(chooser,$(BINDIR)) - InstallAppDefaults(Chooser) - #endif - #if BuildBoth diff --git a/x11/xorg-libs/patches/patch-an b/x11/xorg-libs/patches/patch-an index 559402118c0..0126f180095 100644 --- a/x11/xorg-libs/patches/patch-an +++ b/x11/xorg-libs/patches/patch-an @@ -1,107 +1,16 @@ -$NetBSD: patch-an,v 1.3 2004/10/20 14:33:30 reed Exp $ +$NetBSD: patch-an,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/xdm/xdm.man.orig 2004-07-26 15:56:33.000000000 -0700 -+++ programs/xdm/xdm.man -@@ -164,7 +164,7 @@ as resources. - Names the configuration file, which specifies resources to control - the behavior of - .I xdm. --.I __projectroot__/lib/X11/xdm/xdm-config -+.I XDMDIR/xdm-config - is the default. - See the section \fBConfiguration File\fP. - .IP "\fB\-nodaemon\fP" -@@ -306,7 +306,7 @@ uses the \fIlockf\fP library call, while - This names a directory under which - .I xdm - stores authorization files while initializing the session. The --default value is \fI __projectroot__/lib/X11/xdm.\fP -+default value is \fI\&XDMAUTHDIR\fP. - Can be overridden for specific displays by - DisplayManager.\fIDISPLAY\fP.authFile. - .IP \fBDisplayManager.autoRescan\fP -@@ -374,7 +374,7 @@ algorithm is used instead. - .IP \fBDisplayManager.greeterLib\fP - On systems that support a dynamically-loadable greeter library, the - name of the library. The default is --\fI __projectroot__/lib/X11/xdm/libXdmGreet.so\fP. -+\fI\&GREETERLIBPATH\fP. - .IP \fBDisplayManager.choiceTimeout\fP - Number of seconds to wait for display to respond after user has - selected a host from the chooser. If the display sends an XDMCP -@@ -406,7 +406,7 @@ section - which describes the various - resources that are appropriate to place in this file. - There is no default value for this resource, but --\fI __projectroot__/lib/X11/xdm/Xresources\fP -+\fI\&XDMDIR/Xresources\fP - is the conventional name. - .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.chooser\fP" - Specifies the program run to offer a host menu for Indirect queries -@@ -599,7 +599,7 @@ variable XAUTHORITY at the created file. - First, the - .I xdm - configuration file should be set up. --Make a directory (usually \fI __projectroot__/lib/X11/xdm\fP) to contain all -+Make a directory (usually \fI\&XDMDIR\fP) to contain all - of the relevant files. - .LP - Here is a reasonable configuration file, which could be -@@ -608,12 +608,12 @@ named \fIxdm-config\fP: +--- programs/Xserver/hw/xfree86/loader/Imakefile.orig 2004-08-13 12:39:57.000000000 +0900 ++++ programs/Xserver/hw/xfree86/loader/Imakefile 2005-02-21 10:38:49.000000000 +0900 +@@ -40,6 +40,11 @@ + ARCHDEFINES = -DDoMMAPedMerge -DMmapPageAlign + #endif - .ta .5i 4i ++#if defined(NetBSDArchitecture) && defined(AMD64Architecture) && \ ++ defined(PassHintToMMAP) ++ARCHDEFINES = -DUseMMAP -DPassHintToMMAP ++#endif ++ + DEFINES = $(DBMALLOCDEFINE) $(DLOPENDEFINES) $(OS_DEFINES) $(COMPAT_DEFINES) \ + $(SHM_DEFINES) $(FONTCACHE_DEFINES) $(ARCHDEFINES) -- DisplayManager.servers: __projectroot__/lib/X11/xdm/Xservers -+ DisplayManager.servers: XDMDIR/Xservers - DisplayManager.errorLogFile: XDMLOGDIR/xdm.log -- DisplayManager*resources: __projectroot__/lib/X11/xdm/Xresources -- DisplayManager*startup: __projectroot__/lib/X11/xdm/Xstartup -- DisplayManager*session: __projectroot__/lib/X11/xdm/Xsession -- DisplayManager.pidFile: __projectroot__/lib/X11/xdm/xdm-pid -+ DisplayManager*resources: XDMDIR/Xresources -+ DisplayManager*startup: XDMDIR/Xstartup -+ DisplayManager*session: XDMDIR/Xsession -+ DisplayManager.pidFile: XDMPIDDIR/xdm-pid - DisplayManager._0.authorize: true - DisplayManager*authorize: false - -@@ -1123,8 +1123,8 @@ Here is a sample \fIXstartup\fP script: - xmessage\0\-file /etc/nologin\0\-timeout 30\0\-center - exit 1 - fi -- sessreg\0\-a\0\-l $DISPLAY\0\-x __projectroot__/lib/xdm/Xservers $LOGNAME -- __projectroot__/lib/xdm/GiveConsole -+ sessreg\0\-a\0\-l $DISPLAY\0\-x XDMDIR/Xservers $LOGNAME -+ XDMDIR/GiveConsole - exit 0 - .fi - .SH "SESSION PROGRAM" -@@ -1237,8 +1237,8 @@ A sample \fIXreset\fP script: - \& # - \& # This program is run as root after the session ends - \& # -- sessreg\0\-d\0\-l $DISPLAY\0\-x __projectroot__/lib/xdm/Xservers $LOGNAME -- __projectroot__/lib/xdm/TakeConsole -+ sessreg\0\-d\0\-l $DISPLAY\0\-x XDMDIR/Xservers $LOGNAME -+ XDMDIR/TakeConsole - exit 0 - .fi - .SH "CONTROLLING THE SERVER" -@@ -1341,7 +1341,7 @@ interested in - .I xinit. - .SH FILES - .TP 20 --.I __projectroot__/lib/X11/xdm/xdm-config -+.I XDMDIR/xdm-config - the default configuration file - .TP 20 - .I $HOME/.Xauthority -@@ -1359,7 +1359,7 @@ the default server - .I __projectroot__/bin/xterm - the default session program and failsafe client - .TP 20 --.I __projectroot__/lib/X11/xdm/A<display>\-<suffix> -+.I XDMAUTHDIR/authdir/authfiles/A<display>\-<suffix> - the default place for authorization files - .TP 20 - .I /tmp/K5C<display> diff --git a/x11/xorg-libs/patches/patch-ao b/x11/xorg-libs/patches/patch-ao index c2fca7d2147..a0862064e3f 100644 --- a/x11/xorg-libs/patches/patch-ao +++ b/x11/xorg-libs/patches/patch-ao @@ -1,60 +1,13 @@ -$NetBSD: patch-ao,v 1.3 2004/10/20 14:33:30 reed Exp $ +$NetBSD: patch-ao,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/xdm/config/Imakefile.orig 2004-07-26 23:24:47.000000000 -0700 -+++ programs/xdm/config/Imakefile -@@ -23,9 +23,9 @@ DEFAULTVT=vt7 - # define XdmbwPixmap XVendorStdFilePrefix-bw.xpm - #endif - --CHOOSERPATH = $(XDMDIR)/chooser -+CHOOSERPATH = $(BINDIR)/chooser - --XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\ -+XPM_DEFINES=-DXPM -DBITMAPDIR=$(INCDIR)/X11/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@\ - -DXDM_BWPIXMAP=XdmbwPixmap - - XDMLOGDIR = $(LOGDIRECTORY) -@@ -42,21 +42,22 @@ SU = su - #endif - - CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter) --CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter) -+CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter) - CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) - - LinkFile(Xservers,Xservers.$(SERVERSTYPE)) - - #if InstallXdmConfig --InstallNonExecFile(xdm-config,$(XDMDIR)) --InstallNonExecFile(Xresources,$(XDMDIR)) --InstallNonExecFile(Xservers,$(XDMDIR)) --InstallNonExecFile(Xaccess,$(XDMDIR)) --InstallNamedProg(Xsession,Xsession,$(XDMDIR)) --InstallNamedProg(GiveConsole,GiveConsole,$(XDMDIR)) --InstallNamedProg(TakeConsole,TakeConsole,$(XDMDIR)) --InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMDIR)) --InstallNamedProg(Xwilling,Xwilling,$(XDMDIR)) -+XDMEGDIR = XdmEgDir -+InstallNonExecFile(xdm-config,$(XDMEGDIR)) -+InstallNonExecFile(Xresources,$(XDMEGDIR)) -+InstallNonExecFile(Xservers,$(XDMEGDIR)) -+InstallNonExecFile(Xaccess,$(XDMEGDIR)) -+InstallNamedProg(Xsession,Xsession,$(XDMEGDIR)) -+InstallNamedProg(GiveConsole,GiveConsole,$(XDMEGDIR)) -+InstallNamedProg(TakeConsole,TakeConsole,$(XDMEGDIR)) -+InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMEGDIR)) -+InstallNamedProg(Xwilling,Xwilling,$(XDMEGDIR)) - #else - InstallNonExecFileNoClobber(xdm-config,$(XDMDIR)) - InstallNonExecFileNoClobber(Xresources,$(XDMDIR)) -@@ -70,8 +71,8 @@ InstallNamedProgNoClobber(Xwilling,Xwill - #endif - - #if InstallXdmConfig --InstallNonExecFile(XdmPixmap,$(XDMDIR)/pixmaps) --InstallNonExecFile(XdmbwPixmap,$(XDMDIR)/pixmaps) -+InstallNonExecFile(XdmPixmap,$(INCDIR)/X11/pixmaps) -+InstallNonExecFile(XdmbwPixmap,$(INCDIR)/X11/pixmaps) - #else - InstallNonExecFileNoClobber(XdmPixmap,$(XDMDIR)/pixmaps) - InstallNonExecFileNoClobber(XdmbwPixmap,$(XDMDIR)/pixmaps) +--- config/cf/xorg.cf.orig 2005-12-06 12:40:11.000000000 +0100 ++++ config/cf/xorg.cf 2005-12-06 12:40:59.000000000 +0100 +@@ -1285,6 +1285,8 @@ + #ifndef BuildScanpci + # if SystemV || SystemV4 || \ + (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ ++ (defined(NetBSDArchitecture) && \ ++ (defined(AMD64Architecture) || defined(PpcArchitecture))) || \ + defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ + defined(OS2Architecture) || defined(GNUMachArchitecture) || \ + (defined(KFreeBSDArchitecture) && defined(i386Architecture)) diff --git a/x11/xorg-libs/patches/patch-ap b/x11/xorg-libs/patches/patch-ap index a78599115bc..77608e76e2b 100644 --- a/x11/xorg-libs/patches/patch-ap +++ b/x11/xorg-libs/patches/patch-ap @@ -1,12 +1,15 @@ -$NetBSD: patch-ap,v 1.3 2004/10/20 14:33:30 reed Exp $ +$NetBSD: patch-ap,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/xdm/config/xdm-conf.cpp.orig 2004-04-23 12:54:43.000000000 -0700 -+++ programs/xdm/config/xdm-conf.cpp -@@ -11,6 +11,7 @@ DisplayManager.keyFile: XDMDIR/xdm-keys - DisplayManager.servers: XDMDIR/Xservers - DisplayManager.accessFile: XDMDIR/Xaccess - DisplayManager.willing: SU nobody -c XDMDIR/Xwilling -+DisplayManager.authDir XDMAUTHDIR - ! All displays should use authorization, but we cannot be sure - ! X terminals may not be configured that way, so they will require - ! individual resource settings. +--- config/cf/Imake.cf.orig 2005-12-06 11:10:24.000000000 +0100 ++++ config/cf/Imake.cf 2005-12-06 11:10:43.000000000 +0100 +@@ -246,6 +246,10 @@ + # define PpcArchitecture + # undef __powerpc__ + # endif ++# ifdef __x86_64__ ++# define AMD64Architecture ++# undef __x86_64__ ++# endif + #endif /* NetBSD */ + + /* Systems based on kernel of NetBSD */ diff --git a/x11/xorg-libs/patches/patch-aq b/x11/xorg-libs/patches/patch-aq index 4bfc0c3f347..c018a996d1e 100644 --- a/x11/xorg-libs/patches/patch-aq +++ b/x11/xorg-libs/patches/patch-aq @@ -1,13 +1,16 @@ -$NetBSD: patch-aq,v 1.3 2005/03/22 09:49:14 adam Exp $ +$NetBSD: patch-aq,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/Xserver/GL/apple/Imakefile.orig Mon Mar 14 23:25:00 2005 -+++ programs/Xserver/GL/apple/Imakefile -@@ -36,7 +36,7 @@ LinkSourceFile(compsize.c,$(LIBSRC)/GL/g - -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/hw/darwin/quartz/cr \ - -I$(SERVERSRC)/hw/darwin/quartz $(GL_INCLUDES) \ - -I$(MESASRCDIR)/include -I$(MESASRCDIR)/src/mesa/glapi \ -- -I$(XF86OSSRC) -+ -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared - - DEFINES = $(GLX_DEFINES) +--- programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig 2004-11-03 17:35:09.000000000 +0900 ++++ programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c 2004-11-03 17:33:04.000000000 +0900 +@@ -44,6 +44,11 @@ + #include <machine/mtrr.h> + #include <machine/sysarch.h> + #include <sys/queue.h> ++#ifdef __x86_64__ ++#define i386_set_mtrr x86_64_set_mtrr ++#define i386_get_mtrr x86_64_get_mtrr ++#define i386_iopl x86_64_iopl ++#endif + #endif + #if defined(__OpenBSD__) && defined(__amd64__) diff --git a/x11/xorg-libs/patches/patch-ar b/x11/xorg-libs/patches/patch-ar index 346e5e711cc..3eb72045f5e 100644 --- a/x11/xorg-libs/patches/patch-ar +++ b/x11/xorg-libs/patches/patch-ar @@ -1,16 +1,40 @@ -$NetBSD: patch-ar,v 1.2 2005/02/21 16:45:40 hira Exp $ +$NetBSD: patch-ar,v 1.3 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/Xserver/hw/xfree86/loader/Imakefile.orig 2004-08-13 12:39:57.000000000 +0900 -+++ programs/Xserver/hw/xfree86/loader/Imakefile 2005-02-21 10:38:49.000000000 +0900 -@@ -40,6 +40,11 @@ - ARCHDEFINES = -DDoMMAPedMerge -DMmapPageAlign +--- config/cf/DragonFly.cf.in.orig 2006-01-06 13:35:13.000000000 +0000 ++++ config/cf/DragonFly.cf.in +@@ -96,12 +96,12 @@ XCOMM operating system: OSName (OSMajor + #define HasFlex YES + + #ifndef CcCmd +-# define CcCmd cc ++# define CcCmd @@PKGSRC_CC@@ + #endif + #ifndef CplusplusCmd +-# define CplusplusCmd c++ ++# define CplusplusCmd @@PKGSRC_CXX@@ + #endif +-#define CppCmd /usr/bin/cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -148,6 +148,10 @@ XCOMM operating system: OSName (OSMajor + # define HasSSESupport NO #endif -+#if defined(NetBSDArchitecture) && defined(AMD64Architecture) && \ -+ defined(PassHintToMMAP) -+ARCHDEFINES = -DUseMMAP -DPassHintToMMAP ++#ifndef BuildDmx ++#define BuildDmx YES +#endif + - DEFINES = $(DBMALLOCDEFINE) $(DLOPENDEFINES) $(OS_DEFINES) $(COMPAT_DEFINES) \ - $(SHM_DEFINES) $(FONTCACHE_DEFINES) $(ARCHDEFINES) + #ifndef UseRpath + # define UseRpath YES + #endif +@@ -293,7 +297,7 @@ XCOMM operating system: OSName (OSMajor + * Compress manual pages + */ + #ifndef CompressManPages +-# define CompressManPages YES ++# define CompressManPages NO + #endif + #define HasBsdMake YES diff --git a/x11/xorg-libs/patches/patch-as b/x11/xorg-libs/patches/patch-as index 150cdb2c9d6..eb2efab1d11 100644 --- a/x11/xorg-libs/patches/patch-as +++ b/x11/xorg-libs/patches/patch-as @@ -1,52 +1,12 @@ -$NetBSD: patch-as,v 1.2 2005/02/21 16:45:40 hira Exp $ +$NetBSD: patch-as,v 1.3 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/Xserver/hw/xfree86/loader/loader.c.orig 2004-08-30 06:06:00.000000000 +0900 -+++ programs/Xserver/hw/xfree86/loader/loader.c 2005-02-21 10:39:41.000000000 +0900 -@@ -472,6 +472,13 @@ - #ifdef UseMMAP - unsigned long ret; +--- lib/GL/dri/drm/Imakefile.orig 2006-01-06 13:44:51.000000000 +0000 ++++ lib/GL/dri/drm/Imakefile +@@ -34,6 +35,7 @@ OS_SUBDIR3 = shared-core -+# if defined(__NetBSD__) && defined(__amd64__) && defined(PassHintToMMAP) -+# define LOADER_MMAP_AREA_SIZE (256*1024*1024) -+# define LOADER_MMAP_AREA_START ((2U*1024*1024*1024) - LOADER_MMAP_AREA_SIZE) -+ static char *mm_addr = (char *)LOADER_MMAP_AREA_START; -+# else -+ char *mm_addr = NULL; -+# endif - # ifdef MmapPageAlign - unsigned long pagesize; - unsigned long new_size; -@@ -494,21 +501,31 @@ - if ((new_off_bias + size) > new_size) - new_size += pagesize; - ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE --# ifdef __amd64__ -+# if defined(__amd64__) && !defined(PassHintToMMAP) - | MAP_32BIT - # endif - , fd, new_off); - if (ret == -1) - FatalError("mmap() failed: %s\n", strerror(errno)); -+ -+# if defined(__amd64__) && defined(__NetBSD__) && defined(PassHintToMMAP) -+ mm_addr += new_size: -+# endif -+ - return (void *)(ret + new_off_bias); - # else - ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE --# ifdef __amd64__ -+# if defined(__amd64__) && !defined(PassHintToMMAP) - | MAP_32BIT - # endif - , fd, offset + offsetbias); - if (ret == -1) - FatalError("mmap() failed: %s\n", strerror(errno)); -+ -+# if defined(__amd64__) && defined(__NetBSD__) && defined(PassHintToMMAP) -+ mm_addr += (size + 4095) & ~4095; -+# endif -+ - return (void *)ret; - # endif - #else + LIBDRM_DIR = ../../../../extras/drm/libdrm + ++LinkSourceFile(xf86drm.h,$(LIBDRM_DIR)) + LinkSourceFile(xf86drm.c,$(LIBDRM_DIR)) + + LinkSourceFile(xf86drmHash.c,$(LIBDRM_DIR)) diff --git a/x11/xorg-libs/patches/patch-at b/x11/xorg-libs/patches/patch-at index 81255283dbe..8e7aaff790c 100644 --- a/x11/xorg-libs/patches/patch-at +++ b/x11/xorg-libs/patches/patch-at @@ -1,13 +1,14 @@ -$NetBSD: patch-at,v 1.1 2004/11/15 11:15:48 hira Exp $ +$NetBSD: patch-at,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig 2004-11-03 17:32:01.000000000 +0900 -+++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile 2004-11-03 17:32:07.000000000 +0900 -@@ -114,7 +114,7 @@ - KMODOBJ = kmod_noop.o - #endif +--- lib/GL/glx/Imakefile.orig 2006-01-06 13:56:28.000000000 +0000 ++++ lib/GL/glx/Imakefile +@@ -92,6 +92,9 @@ LinkSourceFile(xf86dri.h, $(MESASRCDIR)/ + LinkSourceFile(xf86dristr.h, $(MESASRCDIR)/src/glx/x11) + LinkSourceFile(xfont.c, $(MESASRCDIR)/src/glx/x11) --#if defined(i386Architecture) || defined(ia64Architecture) -+#if defined(i386Architecture) || defined(ia64Architecture) || defined(AMD64Architecture) - RES_SRC=stdResource.c - RES_OBJ=stdResource.o - #else ++LIBDRM_DIR = ../../..//extras/drm/libdrm ++LinkSourceFile(xf86drm.h, ${LIBDRM_DIR}) ++ + /* + * Maybe some of these could come from + * xc/extras/ogl-sample/main/glx/lib at some point. diff --git a/x11/xorg-libs/patches/patch-au b/x11/xorg-libs/patches/patch-au index a4b302bf63b..6718ed7cac9 100644 --- a/x11/xorg-libs/patches/patch-au +++ b/x11/xorg-libs/patches/patch-au @@ -1,16 +1,16 @@ -$NetBSD: patch-au,v 1.1 2004/11/15 11:15:48 hira Exp $ +$NetBSD: patch-au,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig 2004-11-03 17:35:09.000000000 +0900 -+++ programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c 2004-11-03 17:33:04.000000000 +0900 -@@ -44,6 +44,11 @@ - #include <machine/mtrr.h> - #include <machine/sysarch.h> - #include <sys/queue.h> -+#ifdef __x86_64__ -+#define i386_set_mtrr x86_64_set_mtrr -+#define i386_get_mtrr x86_64_get_mtrr -+#define i386_iopl x86_64_iopl +--- config/cf/Imake.tmpl.orig 2006-01-06 16:13:36.000000000 +0000 ++++ config/cf/Imake.tmpl +@@ -1965,7 +1965,11 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags + SHLIBLDFLAGS = SharedLibraryLoadFlags $(SHLIBGLOBALSFLAGS) + #if HasGcc + NOSTDLIB = -nostdlib ++#if defined(DragonFlyArchitecture) ++ POSTNOSTDLIB = `${CC} -print-file-name=libgcc.a` -Wl,-Bdynamic ++#else + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic +#endif - #endif - - #if defined(__OpenBSD__) && defined(__amd64__) + #elif HasIntelC + NOSTDLIB = -nostdlib + POSTNOSTDLIB = diff --git a/x11/xorg-libs/patches/patch-av b/x11/xorg-libs/patches/patch-av index 91cb220dc1d..c8a02dd0022 100644 --- a/x11/xorg-libs/patches/patch-av +++ b/x11/xorg-libs/patches/patch-av @@ -1,13 +1,13 @@ -$NetBSD: patch-av,v 1.2 2005/04/15 21:33:27 hira Exp $ +$NetBSD: patch-av,v 1.3 2006/01/18 23:53:06 xtraeme Exp $ ---- config/cf/xorg.cf.orig 2005-01-24 12:11:42.000000000 +0900 -+++ config/cf/xorg.cf 2005-04-15 23:01:03.000000000 +0900 -@@ -1294,6 +1294,8 @@ - #ifndef BuildScanpci - # if SystemV || SystemV4 || \ - (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ -+ (defined(NetBSDArchitecture) && \ -+ (defined(AMD64Architecture) || defined(PpcArchitecture))) || \ - defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ - defined(OS2Architecture) || defined(GNUMachArchitecture) - # define BuildScanpci YES +--- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.orig 2006-01-06 17:17:03.000000000 +0000 ++++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h +@@ -445,7 +445,7 @@ extern int errno; + /* Kernel of *BSD */ + /**************************************************************************/ + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ +- defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) ++ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) + + # include <sys/param.h> + # if defined(__FreeBSD_version) && !defined(__FreeBSD_kernel_version) diff --git a/x11/xorg-libs/patches/patch-aw b/x11/xorg-libs/patches/patch-aw index 73594c5b619..b50e63f4e4c 100644 --- a/x11/xorg-libs/patches/patch-aw +++ b/x11/xorg-libs/patches/patch-aw @@ -1,40 +1,13 @@ -$NetBSD: patch-aw,v 1.1 2004/11/15 11:15:49 hira Exp $ +$NetBSD: patch-aw,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ ---- config/cf/Imake.cf.orig 2004-08-12 06:14:01.000000000 +0900 -+++ config/cf/Imake.cf 2004-11-09 03:52:53.000000000 +0900 -@@ -246,6 +246,10 @@ - # define PpcArchitecture - # undef __powerpc__ +--- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig 2006-01-06 17:29:53.000000000 +0000 ++++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile +@@ -47,7 +47,7 @@ SHARED_CFLAGS = PositionIndependentCFlag + IOPERM_SRC = ioperm_noop.c + IOPERM_OBJ = ioperm_noop.o # endif -+# ifdef __x86_64__ -+# define AMD64Architecture -+# undef __x86_64__ -+# endif - #endif /* NetBSD */ - - /* Systems based on kernel of NetBSD */ -@@ -253,7 +257,23 @@ - #define KNetBSDArchitecture - #endif - --#ifdef __FreeBSD__ -+#ifdef __DragonFly__ -+# define MacroIncludeFile <DragonFly.cf> -+# define MacroFile DragonFly.cf -+# undef __DragonFly__ -+# define FreeBSDArchitecture -+# define KFreeBSDArchitecture -+# ifdef __i386__ -+# define i386BsdArchitecture -+# define i386Architecture -+# undef i386 -+# endif -+# ifdef __amd64__ -+# define AMD64Architecture -+# undef __amd64__ -+# undef __x86_64__ -+# endif -+#elif defined __FreeBSD__ - # define MacroIncludeFile <FreeBSD.cf> - # define MacroFile FreeBSD.cf - # undef __FreeBSD__ +-#elif defined(KFreeBSDArchitecture) ++#elif defined(KFreeBSDArchitecture) || defined(DragonFlyArchitecture) + # if defined(i386Architecture) || defined(AMD64Architecture) + IOPERMDEFINES = -DUSE_DEV_IO + # elif defined(AlphaBsdArchitecture) diff --git a/x11/xorg-libs/patches/patch-ay b/x11/xorg-libs/patches/patch-ay index 47c19cd9ec1..f8b32812516 100644 --- a/x11/xorg-libs/patches/patch-ay +++ b/x11/xorg-libs/patches/patch-ay @@ -1,41 +1,13 @@ -$NetBSD: patch-ay,v 1.2 2005/03/01 19:00:11 xtraeme Exp $ +$NetBSD: patch-ay,v 1.3 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/Xserver/hw/xfree86/loader/elfloader.c.orig 2005-03-01 16:52:41.000000000 +0000 -+++ programs/Xserver/hw/xfree86/loader/elfloader.c 2005-03-01 16:53:55.000000000 +0000 -@@ -922,7 +922,7 @@ - ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n"); - return FALSE; - } --# if defined(linux) || defined(__OpenBSD__) || defined(sun) -+# if defined(linux) || defined(__OpenBSD__) || defined(sun) || defined(__NetBSD__) - { - unsigned long page_size = getpagesize(); - unsigned long round; -@@ -1097,7 +1097,7 @@ - ErrorF("ELFCreatePLT() Unable to allocate memory!!!!\n"); - return; - } --# if defined(linux) || defined(__OpenBSD__) || defined(sun) -+# if defined(linux) || defined(__OpenBSD__) || defined(sun) || defined(__NetBSD__) - { - unsigned long page_size = getpagesize(); - unsigned long round; -@@ -2775,7 +2775,8 @@ - elffile->lsection[j].size = SecSize(i); - elffile->lsection[j].flags = flags; - switch (SecType(i)) { --#if defined(linux) || defined(__OpenBSD__) || defined(sun) -+ -+#if defined(linux) || defined(__OpenBSD__) || defined(sun) || defined(__NetBSD__) - case SHT_PROGBITS: - { - unsigned long page_size = getpagesize(); -@@ -2979,7 +2980,7 @@ - ErrorF("Unable to allocate ELF sections\n"); - return NULL; - } --# if defined(linux) || defined(__OpenBSD__) || defined(sun) -+# if defined(linux) || defined(__OpenBSD__) || defined(sun) || defined(__NetBSD__) - { - unsigned long page_size = getpagesize(); - unsigned long round; +--- programs/Xserver/hw/xfree86/os-support/Imakefile.orig 2006-01-06 17:31:16.000000000 +0000 ++++ programs/Xserver/hw/xfree86/os-support/Imakefile +@@ -67,7 +67,7 @@ OS_SUBDIR = lynxos + #endif + + #if defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || \ +- defined(OpenBSDArchitecture) ++ defined(OpenBSDArchitecture) || defined(DragonFlyArchitecture) + OS_SUBDIR = bsd + #endif + diff --git a/x11/xorg-libs/patches/patch-az b/x11/xorg-libs/patches/patch-az index fe1bc35c004..a21b341df0f 100644 --- a/x11/xorg-libs/patches/patch-az +++ b/x11/xorg-libs/patches/patch-az @@ -1,22 +1,13 @@ -$NetBSD: patch-az,v 1.1 2005/04/14 21:35:51 xtraeme Exp $ +$NetBSD: patch-az,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c -@@ -5748,7 +5748,7 @@ static void RADEONSave(ScrnInfoPtr pScrn - */ - vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */ - #else -- vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS); /* Save mode -+ vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL); /* Save mode - * & fonts & cmap - */ - #endif -@@ -5818,7 +5818,7 @@ static void RADEONRestore(ScrnInfoPtr pS - */ - vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE ); - #else -- vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS ); -+ vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL ); - #endif - vgaHWLock(hwp); - } else { +--- programs/xinit/startx.cpp.orig 2006-01-13 18:26:13.000000000 +0100 ++++ programs/xinit/startx.cpp +@@ -208,7 +208,7 @@ add $displayname . $mcookie + EOF + removelist="$displayname $removelist" + else +- dummy=$((dummy+1)); ++ dummy=$(($dummy + 1)); + XAUTH -q -f $xserverauthfile << EOF + add :$dummy . $authcookie + EOF diff --git a/x11/xorg-libs/patches/patch-ba b/x11/xorg-libs/patches/patch-ba deleted file mode 100644 index fb02a9a3a83..00000000000 --- a/x11/xorg-libs/patches/patch-ba +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2005/04/16 03:48:47 reed Exp $ - -Index: extras/Xpm/lib/scan.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/scan.c,v -retrieving revision 1.4 -diff -u -r1.4 scan.c ---- scan.c 17 Nov 2004 20:22:05 -0000 1.4 -+++ extras/Xpm/lib/scan.c 15 Feb 2005 21:34:05 -0000 -@@ -621,8 +621,8 @@ - char *dst; - unsigned int *iptr; - char *data; -- unsigned int x, y, i; -- int bits, depth, ibu, ibpp, offset; -+ unsigned int x, y; -+ int bits, depth, ibu, ibpp, offset, i; - unsigned long lbt; - Pixel pixel, px; - -@@ -632,6 +632,9 @@ - lbt = low_bits_table[depth]; - ibpp = image->bits_per_pixel; - offset = image->xoffset; -+ -+ if (image->bitmap_unit < 0) -+ return (XpmNoMemory); - - if ((image->bits_per_pixel | image->depth) == 1) { - ibu = image->bitmap_unit; -Index: extras/Xpm/lib/create.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/create.c,v -retrieving revision 1.7 -diff -u -r1.7 create.c ---- create.c 19 Dec 2004 17:45:01 -0000 1.7 -+++ extras/Xpm/lib/create.c 15 Feb 2005 21:39:53 -0000 -@@ -1215,10 +1215,10 @@ - register char *src; - register char *dst; - register unsigned int *iptr; -- register unsigned int x, y, i; -+ register unsigned int x, y; - register char *data; - Pixel pixel, px; -- int nbytes, depth, ibu, ibpp; -+ int nbytes, depth, ibu, ibpp, i; - - data = image->data; - iptr = pixelindex; diff --git a/x11/xorg-libs/patches/patch-bb b/x11/xorg-libs/patches/patch-bb deleted file mode 100644 index 53852a5b5c8..00000000000 --- a/x11/xorg-libs/patches/patch-bb +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- config/imake/imake.c.orig 2004-03-04 18:45:52.000000000 +0100 -+++ config/imake/imake.c 2004-08-10 17:20:20.000000000 +0200 -@@ -1020,7 +1020,7 @@ - } - #endif - --#if defined(__OpenBSD__) -+#if defined(__OpenBSD__) || defined(__DragonFly__) - static void - get_stackprotector(FILE *inFile) - { -@@ -1603,7 +1604,7 @@ - fprintf(inFile, "#define DefaultOSTeenyVersion 0\n"); - } - #endif /* EMX */ --#if defined(__OpenBSD__) -+#if defined(__OpenBSD__) || defined(__DragonFly__) - get_stackprotector(inFile); - #endif - return FALSE; diff --git a/x11/xorg-libs/patches/patch-bc b/x11/xorg-libs/patches/patch-bc deleted file mode 100644 index b33973f3f35..00000000000 --- a/x11/xorg-libs/patches/patch-bc +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-bc,v 1.3 2006/01/08 14:51:11 abs Exp $ - ---- include/Xos_r.h.orig 2004-04-23 19:43:05.000000000 +0100 -+++ include/Xos_r.h -@@ -205,6 +205,9 @@ extern void XtProcessUnlock( - # undef _POSIX_THREAD_SAFE_FUNCTIONS - #endif - -+#if defined(__DragonFly__) -+#define XNO_MTSAFE_PWDAPI 1 -+#endif - - /***** <pwd.h> wrappers *****/ - -@@ -257,7 +260,7 @@ typedef struct { - */ - - #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ -- defined(__APPLE__) -+ defined(__APPLE__) || defined(__DragonFly__) - static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) - { - memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); -@@ -335,7 +338,20 @@ typedef struct { - char pwbuf[X_LINE_MAX]; - } _Xgetpwparams; - # if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx) --# ifndef Lynx -+# if defined(__NetBSD__) -+static __inline__ struct passwd * _XGetpwuid(uid_t u, _Xgetpwparams p) -+{ -+ struct passwd *pwp; -+ return (getpwuid_r(u, &p.pws, p.pwbuf, sizeof((p).pwbuf), &pwp) == -1) -+ ? NULL : &p.pws; -+} -+static __inline__ struct passwd * _XGetpwnam(const char *n, _Xgetpwparams p) -+{ -+ struct passwd *pwp; -+ return (getpwnam_r(n, &p.pws, p.pwbuf, sizeof((p).pwbuf), &pwp) == -1) -+ ? NULL : &p.pws; -+} -+# elif !defined(Lynx) - # define _XGetpwuid(u,p) \ - ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) - # define _XGetpwnam(u,p) \ -@@ -427,7 +443,7 @@ typedef int _Xgetservbynameparams; /* du - /* UnixWare 2.0, or other systems with thread support but no _r API. */ - /* WARNING: The h_addr_list and s_aliases values are *not* copied! */ - --#if defined(__NetBSD__) || defined(__FreeBSD__) -+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) - #include <sys/param.h> - #endif - -@@ -652,6 +668,15 @@ extern int _Preaddir_r(DIR *, struct dir - # elif defined(SVR4) - /* Pre-POSIX API, returns non-NULL on success. */ - # define _XReaddir(d,p) (readdir_r((d), &(p).dir_entry)) -+#elif defined(__DragonFly__) -+# define _XReaddir(d,p) \ -+ ( (_Xos_processLock), \ -+ (((p).result = readdir((d))) ? \ -+ (memcpy(&((p).dir_entry), (p).result, _DIRENT_MINSIZ((p).result)), \ -+ ((p).result = &(p).dir_entry), 0) : \ -+ 0), \ -+ (_Xos_processUnlock), \ -+ (p).result ) - # else - /* We have no idea what is going on. Fake it all using process locks. */ - # define _XReaddir(d,p) \ diff --git a/x11/xorg-libs/patches/patch-bd b/x11/xorg-libs/patches/patch-bd deleted file mode 100644 index 93b1b31da36..00000000000 --- a/x11/xorg-libs/patches/patch-bd +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- extras/drm/shared/drm.h.orig 2005-04-30 23:19:49.000000000 +0200 -+++ extras/drm/shared/drm.h 2005-04-30 23:21:37.000000000 +0200 -@@ -46,8 +46,8 @@ - #define DRM_IOC_WRITE _IOC_WRITE - #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE - #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) --#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) --#if defined(__FreeBSD__) && defined(IN_MODULE) -+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#if (defined(__DragonFly__) || defined(__FreeBSD__)) && defined(IN_MODULE) - /* Prevent name collision when including sys/ioccom.h */ - #undef ioctl - #include <sys/ioccom.h> diff --git a/x11/xorg-libs/patches/patch-be b/x11/xorg-libs/patches/patch-be deleted file mode 100644 index 328d0a90415..00000000000 --- a/x11/xorg-libs/patches/patch-be +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-be,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c.orig 2005-04-30 23:25:04.000000000 +0200 -+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c 2005-04-30 23:25:32.000000000 +0200 -@@ -86,6 +86,10 @@ - - #include "xf86drm.h" - -+#ifdef __DragonFly__ -+#define DRM_MAJOR 145 -+#endif -+ - #ifdef __FreeBSD__ - #define DRM_MAJOR 145 - #endif diff --git a/x11/xorg-libs/patches/patch-bf b/x11/xorg-libs/patches/patch-bf deleted file mode 100644 index 9be03b54b62..00000000000 --- a/x11/xorg-libs/patches/patch-bf +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig 2005-04-30 22:49:33.000000000 +0200 -+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c 2005-04-30 22:53:03.000000000 +0200 -@@ -78,7 +78,7 @@ - #include "r128_drm.h" - #include <inttypes.h> /* for int64_t & friends */ - #include "radeon_drm.h" --#ifndef __FreeBSD__ -+#if !(defined(__FreeBSD__) || defined(__DragonFly__)) - #include "sis_drm.h" - #include "i810_drm.h" - #include "i830_drm.h" -@@ -89,7 +89,7 @@ - * extensions used before XFree86 4.3. - */ - --#ifndef __FreeBSD__ -+#if !(defined(__FreeBSD__) || defined(__DragonFly__)) - /* I810 */ - - Bool drmI810CleanupDma(int driSubFD) -@@ -1013,7 +1013,7 @@ - } - } - --#ifndef __FreeBSD__ -+#if !(defined(__FreeBSD__) || defined(__DragonFly__)) - /* SiS */ - - Bool drmSiSAgpInit(int driSubFD, int offset, int size) diff --git a/x11/xorg-libs/patches/patch-bg b/x11/xorg-libs/patches/patch-bg deleted file mode 100644 index ed281509e23..00000000000 --- a/x11/xorg-libs/patches/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c.orig 2005-04-30 22:55:18.000000000 +0200 -+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c 2005-04-30 22:55:55.000000000 +0200 -@@ -18,7 +18,7 @@ - #if defined(linux) - #include <asm/ioctl.h> - #include <linux/agpgart.h> --#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - #include <sys/ioctl.h> - #include <sys/agpio.h> - #endif diff --git a/x11/xorg-libs/patches/patch-bh b/x11/xorg-libs/patches/patch-bh deleted file mode 100644 index 665a2a06c53..00000000000 --- a/x11/xorg-libs/patches/patch-bh +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- lib/xtrans/Xtranssock.c Mon Apr 5 23:04:31 2004 -+++ lib/xtrans/Xtranssock.c Mon Apr 5 23:04:58 2004 -@@ -91,7 +91,7 @@ - #if defined(__osf__) || defined(linux) || defined(AIXV5) - #include <sys/param.h> - #endif /* osf */ --#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - #include <sys/param.h> - #include <machine/endian.h> - #endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */ diff --git a/x11/xorg-libs/patches/patch-bi b/x11/xorg-libs/patches/patch-bi deleted file mode 100644 index ad29b250a29..00000000000 --- a/x11/xorg-libs/patches/patch-bi +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-bi,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Mon Nov 17 22:20:40 2003 -+++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Sat Mar 20 05:37:28 2004 -@@ -406,7 +406,7 @@ - /* 386BSD and derivatives, BSD/386 */ - /**************************************************************************/ - --#if defined(__386BSD__) && (defined(__FreeBSD__) || defined(__NetBSD__)) -+#if defined(__386BSD__) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)) - # undef __386BSD__ - #endif - -@@ -441,7 +441,7 @@ - # if defined(__NetBSD__) || defined(__OpenBSD__) - # include <machine/console.h> - # else --# if defined(__FreeBSD__) -+# if defined(__FreeBSD__) || defined(__DragonFly__) - # include <osreldate.h> - # if __FreeBSD_version >= 410000 - # include <sys/consio.h> -@@ -460,7 +460,7 @@ - # if defined(__FreeBSD__) - # include <machine/pcvt_ioctl.h> - # else --# if defined(__NetBSD__) || defined(__OpenBSD__) -+# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - # if !defined(WSCONS_SUPPORT) - # include <machine/pcvt_ioctl.h> - # endif /* WSCONS_SUPPORT */ -@@ -480,7 +480,7 @@ - # include <dev/wscons/wsconsio.h> - # include <dev/wscons/wsdisplay_usl_io.h> - # endif /* WSCONS_SUPPORT */ --# if defined(__FreeBSD__) -+# if defined(__FreeBSD__) || defined(__DragonFly__) - # include <osreldate.h> - # if __FreeBSD_version >= 500013 - # include <sys/mouse.h> diff --git a/x11/xorg-libs/patches/patch-bj b/x11/xorg-libs/patches/patch-bj deleted file mode 100644 index 0a8d1da6940..00000000000 --- a/x11/xorg-libs/patches/patch-bj +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-bj,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- /dev/null 2004-08-06 12:14:07.000000000 -0500 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c 2004-08-06 12:17:27.000000000 -0500 -@@ -68,7 +68,7 @@ - static void usbSigioReadInput (int fd, void *closure); - #endif - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - /* These are for FreeBSD */ - #define DEFAULT_MOUSE_DEV "/dev/mouse" - #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" -@@ -97,7 +97,7 @@ - { - #if defined(__NetBSD__) - return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC; - #else - return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO; -@@ -120,7 +120,7 @@ - * main "mouse" driver. - */ - static const char *miscNames[] = { --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - "SysMouse", - #endif - NULL -@@ -149,7 +149,7 @@ - static const char * - DefaultProtocol(void) - { --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - return "Auto"; - #elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) - return "WSMouse"; -@@ -158,7 +158,7 @@ - #endif - } - --#if defined(__FreeBSD__) && defined(MOUSE_PROTO_SYSMOUSE) -+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) - static struct { - int dproto; - const char *name; -@@ -227,7 +227,7 @@ - mode.rate = rate > 0 ? rate : -1; - mode.resolution = res > 0 ? res : -1; - mode.accelfactor = -1; --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - if (pMse->autoProbe || - (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) { - /* -@@ -245,7 +245,7 @@ - } - #endif - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - - #define MOUSED_PID_FILE "/var/run/moused.pid" - -@@ -767,7 +767,7 @@ - p->BuiltinNames = BuiltinNames; - p->DefaultProtocol = DefaultProtocol; - p->CheckProtocol = CheckProtocol; --#if defined(__FreeBSD__) && defined(MOUSE_PROTO_SYSMOUSE) -+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) - p->SetupAuto = SetupAuto; - p->SetPS2Res = SetSysMouseRes; - p->SetBMRes = SetSysMouseRes; -@@ -777,7 +777,7 @@ - p->SetupAuto = SetupAuto; - p->SetMiscRes = SetMouseRes; - #endif --#if defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - p->FindDevice = FindDevice; - #endif - p->PreInit = bsdMousePreInit; diff --git a/x11/xorg-libs/patches/patch-bk b/x11/xorg-libs/patches/patch-bk deleted file mode 100644 index fb1fee3745d..00000000000 --- a/x11/xorg-libs/patches/patch-bk +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ - ---- programs/Xserver/Xext/shm.c.orig 2005-04-30 23:00:21.000000000 +0200 -+++ programs/Xserver/Xext/shm.c 2005-04-30 23:00:40.000000000 +0200 -@@ -157,7 +157,7 @@ - } - - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) - #include <sys/signal.h> - - static Bool badSysCall = FALSE; diff --git a/x11/xorg-libs/patches/patch-bl b/x11/xorg-libs/patches/patch-bl deleted file mode 100644 index 3282739aaa6..00000000000 --- a/x11/xorg-libs/patches/patch-bl +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bl,v 1.2 2005/10/23 20:00:06 rillig Exp $ - ---- programs/Xserver/hw/xfree86/common/xf86Xinput.c.orig 2005-05-16 23:20:56.000000000 +0900 -+++ programs/Xserver/hw/xfree86/common/xf86Xinput.c 2005-05-16 23:23:25.000000000 +0900 -@@ -932,15 +932,10 @@ - /* modeled from xf86Events.c */ - if (device->ptrfeed->ctrl.threshold) { - if ((abs(dx) + abs(dy)) >= device->ptrfeed->ctrl.threshold) { -- local->dxremaind = ((float)dx * (float)(device->ptrfeed->ctrl.num)) / -- (float)(device->ptrfeed->ctrl.den) + local->dxremaind; -- valuator[0] = (int)local->dxremaind; -- local->dxremaind = local->dxremaind - (float)valuator[0]; -- -- local->dyremaind = ((float)dy * (float)(device->ptrfeed->ctrl.num)) / -- (float)(device->ptrfeed->ctrl.den) + local->dyremaind; -- valuator[1] = (int)local->dyremaind; -- local->dyremaind = local->dyremaind - (float)valuator[1]; -+ valuator[0] = (dx * device->ptrfeed->ctrl.num) / -+ device->ptrfeed->ctrl.den; -+ valuator[1] = (dy * device->ptrfeed->ctrl.num) / -+ device->ptrfeed->ctrl.den; - } - } - else if (dx || dy) { diff --git a/x11/xorg-libs/patches/patch-bm b/x11/xorg-libs/patches/patch-bm deleted file mode 100644 index 00b12341e7e..00000000000 --- a/x11/xorg-libs/patches/patch-bm +++ /dev/null @@ -1,187 +0,0 @@ -$NetBSD: patch-bm,v 1.1 2005/09/18 19:33:42 xtraeme Exp $ - -Single patch to fix CAN-2005-2495. - ---- programs/Xserver/afb/afbpixmap.c.orig Fri Apr 23 20:59:39 2004 -+++ programs/Xserver/afb/afbpixmap.c Sun Sep 18 04:56:02 2005 -@@ -73,10 +73,14 @@ - int depth; - { - PixmapPtr pPixmap; -- int datasize; -- int paddedWidth; -+ size_t datasize; -+ size_t paddedWidth; - - paddedWidth = BitmapBytePad(width); -+ -+ if (paddedWidth > 32767 || height > 32767 || depth > 4) -+ return NullPixmap; -+ - datasize = height * paddedWidth * depth; - pPixmap = AllocatePixmap(pScreen, datasize); - if (!pPixmap) ---- programs/Xserver/cfb/cfbpixmap.c.orig Fri Apr 23 21:00:12 2004 -+++ programs/Xserver/cfb/cfbpixmap.c Sun Sep 18 04:56:02 2005 -@@ -70,10 +70,13 @@ - int depth; - { - PixmapPtr pPixmap; -- int datasize; -- int paddedWidth; -+ size_t datasize; -+ size_t paddedWidth; - - paddedWidth = PixmapBytePad(width, depth); -+ -+ if (paddedWidth / 4 > 32767 || height > 32767) -+ return NullPixmap; - datasize = height * paddedWidth; - pPixmap = AllocatePixmap(pScreen, datasize); - if (!pPixmap) ---- programs/Xserver/dix/dispatch.c.orig Mon Dec 13 02:23:05 2004 -+++ programs/Xserver/dix/dispatch.c Sun Sep 18 04:56:02 2005 -@@ -1506,6 +1506,23 @@ - client->errorValue = 0; - return BadValue; - } -+ if (stuff->width > 32767 || stuff->height > 32767) -+ { -+ /* It is allowed to try and allocate a pixmap which is larger than -+ * 32767 in either dimension. However, all of the framebuffer code -+ * is buggy and does not reliably draw to such big pixmaps, basically -+ * because the Region data structure operates with signed shorts -+ * for the rectangles in it. -+ * -+ * Furthermore, several places in the X server computes the -+ * size in bytes of the pixmap and tries to store it in an -+ * integer. This integer can overflow and cause the allocated size -+ * to be much smaller. -+ * -+ * So, such big pixmaps are rejected here with a BadAlloc -+ */ -+ return BadAlloc; -+ } - if (stuff->depth != 1) - { - pDepth = pDraw->pScreen->allowedDepths; ---- programs/Xserver/dix/pixmap.c.orig Fri Apr 23 21:04:44 2004 -+++ programs/Xserver/dix/pixmap.c Sun Sep 18 04:56:02 2005 -@@ -126,6 +126,9 @@ - unsigned size; - int i; - -+ if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize) -+ return NullPixmap; -+ - pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize); - if (!pPixmap) - return NullPixmap; ---- programs/Xserver/fb/fbpixmap.c.orig Mon Aug 9 05:40:50 2004 -+++ programs/Xserver/fb/fbpixmap.c Sun Sep 18 04:56:02 2005 -@@ -32,12 +32,14 @@ - fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp) - { - PixmapPtr pPixmap; -- int datasize; -- int paddedWidth; -+ size_t datasize; -+ size_t paddedWidth; - int adjust; - int base; - - paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits); -+ if (paddedWidth / 4 > 32767 || height > 32767) -+ return NullPixmap; - datasize = height * paddedWidth; - #ifdef PIXPRIV - base = pScreen->totalPixmapSize; ---- programs/Xserver/hw/xfree86/xaa/xaaInit.c.orig Fri Jul 30 22:30:56 2004 -+++ programs/Xserver/hw/xfree86/xaa/xaaInit.c Sun Sep 18 04:56:02 2005 -@@ -498,6 +498,9 @@ - XAAPixmapPtr pPriv; - PixmapPtr pPix = NULL; - int size = w * h; -+ -+ if (w > 32767 || h > 32767) -+ return NullPixmap; - - if (!infoRec->offscreenDepthsInitialized) - XAAInitializeOffscreenDepths (pScreen); ---- programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c.orig Fri Apr 23 21:54:17 2004 -+++ programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c Sun Sep 18 04:56:02 2005 -@@ -85,7 +85,7 @@ - int depth ; - { - register PixmapPtr pPixmap = (PixmapPtr)NULL; -- int size ; -+ size_t size ; - - TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ; - -@@ -93,6 +93,10 @@ - return (PixmapPtr) NULL ; - - size = PixmapBytePad(width, depth); -+ -+ if (size / 4 > 32767 || height > 32767) -+ return (PixmapPtr) NULL ; -+ - pPixmap = AllocatePixmap (pScreen, (height * size)); - - if ( !pPixmap ) ---- programs/Xserver/ilbm/ilbmpixmap.c.orig Fri Apr 23 21:54:22 2004 -+++ programs/Xserver/ilbm/ilbmpixmap.c Sun Sep 18 04:56:02 2005 -@@ -75,10 +75,12 @@ - int depth; - { - PixmapPtr pPixmap; -- int datasize; -- int paddedWidth; -+ size_t datasize; -+ size_t paddedWidth; - - paddedWidth = BitmapBytePad(width); -+ if (paddedWidth > 32767 || height > 32767 || depth > 4) -+ return NullPixmap; - datasize = height * paddedWidth * depth; - pPixmap = AllocatePixmap(pScreen, datasize); - if (!pPixmap) ---- programs/Xserver/iplan2p4/iplpixmap.c.orig Fri Apr 23 21:54:24 2004 -+++ programs/Xserver/iplan2p4/iplpixmap.c Sun Sep 18 04:56:02 2005 -@@ -74,12 +74,14 @@ - int depth; - { - PixmapPtr pPixmap; -- int datasize; -- int paddedWidth; -+ size_t datasize; -+ size_t paddedWidth; - int ipad=INTER_PLANES*2 - 1; - - paddedWidth = PixmapBytePad(width, depth); - paddedWidth = (paddedWidth + ipad) & ~ipad; -+ if (paddedWidth / 4 > 32767 || height > 32767) -+ return NullPixmap; - datasize = height * paddedWidth; - pPixmap = AllocatePixmap(pScreen, datasize); - if (!pPixmap) ---- programs/Xserver/mfb/mfbpixmap.c.orig Fri Nov 14 17:48:57 2003 -+++ programs/Xserver/mfb/mfbpixmap.c Sun Sep 18 04:56:02 2005 -@@ -72,12 +72,14 @@ - int depth; - { - PixmapPtr pPixmap; -- int datasize; -- int paddedWidth; -+ size_t datasize; -+ size_t paddedWidth; - - if (depth != 1) - return NullPixmap; - paddedWidth = BitmapBytePad(width); -+ if (paddedWidth / 4 > 32767 || height > 32767) -+ return NullPixmap; - datasize = height * paddedWidth; - pPixmap = AllocatePixmap(pScreen, datasize); - if (!pPixmap) diff --git a/x11/xorg-libs/patches/patch-bn b/x11/xorg-libs/patches/patch-bn deleted file mode 100644 index 86f6ce26400..00000000000 --- a/x11/xorg-libs/patches/patch-bn +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-bn,v 1.2 2005/10/23 20:00:06 rillig Exp $ - -diff -c -r work.x86_64/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h work.x86_64.la/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h -*** old/programs/Xserver/hw/xfree86/common/xf86PciInfo.h Sat Jul 31 00:20:21 2004 ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h Fri Jul 1 16:01:28 2005 -*************** -*** 313,318 **** ---- 313,319 ---- - #define PCI_CHIP_RV280_5964 0x5964 - #define PCI_CHIP_RV280_5C61 0x5C61 - #define PCI_CHIP_RV280_5C63 0x5C63 -+ #define PCI_CHIP_R480_5D52 0x5D52 - #define PCI_CHIP_R423_5D57 0x5D57 - #define PCI_CHIP_RS350_7834 0x7834 - #define PCI_CHIP_RS350_7835 0x7835 -diff -c -r work.x86_64/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h work.x86_64.la/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h -*** old/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h Thu Aug 12 04:23:46 2004 ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h Fri Jul 1 15:58:35 2005 -*************** -*** 91,96 **** ---- 91,97 ---- - { PCI_CHIP_R423_UR, "ATI FireGL V5100 (R423) UR (PCIE)" }, - { PCI_CHIP_R423_UT, "ATI FireGL V7100 (R423) UT (PCIE)" }, - { PCI_CHIP_R423_5D57, "ATI Radeon X800XT (R423) 5D57 (PCIE)" }, -+ { PCI_CHIP_R480_5D52, "ATI Radeon X850XT (R480) 5D52 (PCIE)" }, - - { -1, NULL } - }; -diff -c -r work.x86_64/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c work.x86_64.la/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c -*** old/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Fri Dec 17 01:13:18 2004 ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Fri Jul 1 15:59:59 2005 -*************** -*** 2309,2314 **** ---- 2309,2315 ---- - case PCI_CHIP_R423_UR: - case PCI_CHIP_R423_UT: - case PCI_CHIP_R423_5D57: -+ case PCI_CHIP_R480_5D52: - info->ChipFamily = CHIP_FAMILY_R420; - break; - -*** old/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c Thu Aug 12 03:03:06 2004 ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c Fri Jul 1 16:00:32 2005 -*************** -*** 144,149 **** ---- 144,150 ---- - { PCI_CHIP_R423_UR, PCI_CHIP_R423_UR, RES_SHARED_VGA }, - { PCI_CHIP_R423_UT, PCI_CHIP_R423_UT, RES_SHARED_VGA }, - { PCI_CHIP_R423_5D57, PCI_CHIP_R423_5D57, RES_SHARED_VGA }, -+ { PCI_CHIP_R480_5D52, PCI_CHIP_R480_5D52, RES_SHARED_VGA }, - - { -1, -1, RES_UNDEFINED } - }; |