Added support for Darwin/MacOSX

9 files changed, 308 insertions, 70 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 3da8230fd1e..946e57d56e1 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/03/01 19:00:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2005/03/22 09:48:48 adam Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
@@ -55,15 +55,17 @@ pre-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f}
 .endfor
 
-
-.if !empty(OPSYS:MNetBSD)
+.if ${OPSYS} == "NetBSD"
 .  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
-PLIST_SRC+=	${.CURDIR}/PLIST.common
-PLIST_SRC+=	${.CURDIR}/PLIST.common_end
 PLIST_SRC+=	${.CURDIR}/PLIST.${OPSYS}
 PLIST_SRC+=	${.CURDIR}/PLIST.${OPSYS}.i386
 .  endif
 .endif
+PLIST_SRC+=	${.CURDIR}/PLIST.common
+.if ${OPSYS} != "Darwin"
+PLIST_SRC+=	${.CURDIR}/PLIST.common_i18n
+.endif
+PLIST_SRC+=	${.CURDIR}/PLIST.common_end
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/x11/xorg-libs/PLIST.Darwin b/x11/xorg-libs/PLIST.Darwin
new file mode 100644
index 00000000000..46fbf2a8a1d
--- /dev/null
+++ b/x11/xorg-libs/PLIST.Darwin
@@ -0,0 +1,163 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2005/03/22 09:48:48 adam Exp $
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/include/X11/extensions/applewm.h
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/include/X11/extensions/applewmstr.h
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.1.0.dylib
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.1.dylib
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.a
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.dylib
+${X11ROOT_PREFIX}/lib/libFS.6.0.dylib
+${X11ROOT_PREFIX}/lib/libFS.6.dylib
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.dylib
+${X11ROOT_PREFIX}/lib/libGL.1.2.dylib
+${X11ROOT_PREFIX}/lib/libGL.1.dylib
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.dylib
+${X11ROOT_PREFIX}/lib/libGLU.1.3.dylib
+${X11ROOT_PREFIX}/lib/libGLU.1.dylib
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.dylib
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libICE.6.3.dylib
+${X11ROOT_PREFIX}/lib/libICE.6.dylib
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.dylib
+${X11ROOT_PREFIX}/lib/libOSMesa.4.0.dylib
+${X11ROOT_PREFIX}/lib/libOSMesa.4.dylib
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.dylib
+${X11ROOT_PREFIX}/lib/libSM.6.0.dylib
+${X11ROOT_PREFIX}/lib/libSM.6.dylib
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.dylib
+${X11ROOT_PREFIX}/lib/libX11.6.2.dylib
+${X11ROOT_PREFIX}/lib/libX11.6.dylib
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.dylib
+${X11ROOT_PREFIX}/lib/libXRes.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXRes.1.dylib
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.dylib
+${X11ROOT_PREFIX}/lib/libXTrap.6.4.dylib
+${X11ROOT_PREFIX}/lib/libXTrap.6.dylib
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.dylib
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.6.1.dylib
+${X11ROOT_PREFIX}/lib/libXaw.6.dylib
+${X11ROOT_PREFIX}/lib/libXaw.7.0.dylib
+${X11ROOT_PREFIX}/lib/libXaw.7.dylib
+${X11ROOT_PREFIX}/lib/libXaw.8.0.dylib
+${X11ROOT_PREFIX}/lib/libXaw.8.dylib
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.dylib
+${X11ROOT_PREFIX}/lib/libXcomposite.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXcomposite.1.dylib
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+${X11ROOT_PREFIX}/lib/libXcomposite.dylib
+${X11ROOT_PREFIX}/lib/libXdamage.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXdamage.1.dylib
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXdamage.dylib
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXevie.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXevie.1.dylib
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXevie.dylib
+${X11ROOT_PREFIX}/lib/libXext.6.4.dylib
+${X11ROOT_PREFIX}/lib/libXext.6.dylib
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.dylib
+${X11ROOT_PREFIX}/lib/libXfixes.3.0.dylib
+${X11ROOT_PREFIX}/lib/libXfixes.3.dylib
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXfixes.dylib
+${X11ROOT_PREFIX}/lib/libXfont.1.5.dylib
+${X11ROOT_PREFIX}/lib/libXfont.1.dylib
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.dylib
+${X11ROOT_PREFIX}/lib/libXi.6.0.dylib
+${X11ROOT_PREFIX}/lib/libXi.6.dylib
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.dylib
+${X11ROOT_PREFIX}/lib/libXinerama.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXinerama.1.dylib
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.dylib
+${X11ROOT_PREFIX}/lib/libXmu.6.2.dylib
+${X11ROOT_PREFIX}/lib/libXmu.6.dylib
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.dylib
+${X11ROOT_PREFIX}/lib/libXmuu.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXmuu.1.dylib
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.dylib
+${X11ROOT_PREFIX}/lib/libXp.6.2.dylib
+${X11ROOT_PREFIX}/lib/libXp.6.dylib
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.dylib
+${X11ROOT_PREFIX}/lib/libXpm.4.11.dylib
+${X11ROOT_PREFIX}/lib/libXpm.4.dylib
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.dylib
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
+${X11ROOT_PREFIX}/lib/libXss.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXss.1.dylib
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.dylib
+${X11ROOT_PREFIX}/lib/libXt.6.0.dylib
+${X11ROOT_PREFIX}/lib/libXt.6.dylib
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.dylib
+${X11ROOT_PREFIX}/lib/libXtst.6.1.dylib
+${X11ROOT_PREFIX}/lib/libXtst.6.dylib
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.dylib
+${X11ROOT_PREFIX}/lib/libXv.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXv.1.dylib
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.dylib
+${X11ROOT_PREFIX}/lib/libXvMC.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXvMC.1.dylib
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.dylib
+${X11ROOT_PREFIX}/lib/libXxf86misc.1.1.dylib
+${X11ROOT_PREFIX}/lib/libXxf86misc.1.dylib
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.dylib
+${X11ROOT_PREFIX}/lib/libXxf86vm.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXxf86vm.1.dylib
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.dylib
+${X11ROOT_PREFIX}/lib/libdps.1.0.dylib
+${X11ROOT_PREFIX}/lib/libdps.1.dylib
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.dylib
+${X11ROOT_PREFIX}/lib/libdpstk.1.0.dylib
+${X11ROOT_PREFIX}/lib/libdpstk.1.dylib
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.dylib
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.1.0.dylib
+${X11ROOT_PREFIX}/lib/libfontenc.1.dylib
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.dylib
+${X11ROOT_PREFIX}/lib/liboldX.6.0.dylib
+${X11ROOT_PREFIX}/lib/liboldX.6.dylib
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.dylib
+${X11ROOT_PREFIX}/lib/libpsres.1.0.dylib
+${X11ROOT_PREFIX}/lib/libpsres.1.dylib
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.dylib
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.1.0.dylib
+${X11ROOT_PREFIX}/lib/libxkbfile.1.dylib
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.dylib
+${X11ROOT_PREFIX}/lib/libxkbui.1.0.dylib
+${X11ROOT_PREFIX}/lib/libxkbui.1.dylib
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.dylib
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/man/man3/AppleWM.3
diff --git a/x11/xorg-libs/PLIST.Linux b/x11/xorg-libs/PLIST.Linux
index f58fc3a204c..2f71133c642 100644
--- a/x11/xorg-libs/PLIST.Linux
+++ b/x11/xorg-libs/PLIST.Linux
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2004/10/06 23:14:46 reed Exp $
+@comment $NetBSD: PLIST.Linux,v 1.4 2005/03/22 09:48:48 adam Exp $
+${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h
+${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h
 ${X11ROOT_PREFIX}/lib/libFS.so
 ${X11ROOT_PREFIX}/lib/libFS.so.6
 ${X11ROOT_PREFIX}/lib/libFS.so.6.0
@@ -131,5 +133,3 @@ ${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
 ${X11ROOT_PREFIX}/lib/libxkbui.so
 ${X11ROOT_PREFIX}/lib/libxkbui.so.1
 ${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
-${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h
-${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h
diff --git a/x11/xorg-libs/PLIST.common b/x11/xorg-libs/PLIST.common
index 87c75ab06ca..7e87ee0992a 100644
--- a/x11/xorg-libs/PLIST.common
+++ b/x11/xorg-libs/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2005/03/01 19:00:11 xtraeme Exp $
+@comment $NetBSD: PLIST.common,v 1.8 2005/03/22 09:48:48 adam Exp $
 ${X11ROOT_PREFIX}/include/DPS/ColorSB.h
 ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
 ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -384,152 +384,95 @@ ${X11ROOT_PREFIX}/lib/pkgconfig/compositeext.pc
 ${X11ROOT_PREFIX}/lib/X11/XErrorDB
 ${X11ROOT_PREFIX}/lib/X11/XKeysymDB
 ${X11ROOT_PREFIX}/lib/X11/Xcms.txt
-${X11ROOT_PREFIX}/lib/X11/locale/C/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/C/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/compose.dir
 ${X11ROOT_PREFIX}/lib/X11/locale/el_GR.UTF-8/Compose
 ${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/ja/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ja/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/ja/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/ko/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ko/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/ko/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/ximcp.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcDef.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcUTF8Load.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlibi18n.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlocale.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xomGeneric.so.2
 ${X11ROOT_PREFIX}/lib/X11/locale/locale.alias
 ${X11ROOT_PREFIX}/lib/X11/locale/locale.dir
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XLC_LOCALE
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xevie.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xfixes.${LIBMAN_SUFFIX}
diff --git a/x11/xorg-libs/PLIST.common_end b/x11/xorg-libs/PLIST.common_end
index adce365e968..b379268a919 100644
--- a/x11/xorg-libs/PLIST.common_end
+++ b/x11/xorg-libs/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.3 2005/03/01 19:00:11 xtraeme Exp $
+@comment $NetBSD: PLIST.common_end,v 1.4 2005/03/22 09:48:48 adam Exp $
 @dirrm ${X11ROOT_PREFIX}/lib/pkgconfig
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8
@@ -20,8 +20,6 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib/common
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-u
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-r
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-c
@@ -57,6 +55,8 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/C
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale
 @dirrm ${X11ROOT_PREFIX}/include/X11/fonts
+@dirrm ${X11ROOT_PREFIX}/include/X11/extensions
+@dirrm ${X11ROOT_PREFIX}/include/X11/bitmaps
 @dirrm ${X11ROOT_PREFIX}/include/X11/XprintAppUtil
 @dirrm ${X11ROOT_PREFIX}/include/X11/XprintUtil
 @dirrm ${X11ROOT_PREFIX}/include/X11/Xmu
diff --git a/x11/xorg-libs/PLIST.common_i18n b/x11/xorg-libs/PLIST.common_i18n
new file mode 100644
index 00000000000..80950d671a1
--- /dev/null
+++ b/x11/xorg-libs/PLIST.common_i18n
@@ -0,0 +1,60 @@
+@comment $NetBSD: PLIST.common_i18n,v 1.1 2005/03/22 09:48:48 adam Exp $
+${X11ROOT_PREFIX}/lib/X11/locale/C/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ko/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/ximcp.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcDef.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcUTF8Load.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlibi18n.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlocale.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xomGeneric.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XI18N_OBJS
+${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.gbk/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
+${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
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 330fd8118ad..f6001ea555d 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/03/19 19:34:49 hira Exp $
+$NetBSD: distinfo,v 1.15 2005/03/22 09:48:48 adam Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -13,6 +13,7 @@ SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
 SHA1 (patch-ac) = 444f724a62ec435cc804c4f91e310893583e205a
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
+SHA1 (patch-af) = 58594b376a62a584c0bc7f056e512fe8700d558e
 SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
 SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e
@@ -23,6 +24,7 @@ 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
diff --git a/x11/xorg-libs/patches/patch-af b/x11/xorg-libs/patches/patch-af
new file mode 100644
index 00000000000..5318367bd17
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-af
@@ -0,0 +1,55 @@
+$NetBSD: patch-af,v 1.3 2005/03/22 09:49:14 adam 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
+ # define StandardCppOptions     -traditional -D__GNUC__
+ #else
+-# define CppCmd                 /usr/bin/cpp
++# define CppCmd                /usr/bin/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@@
+ # else
+ #  define OptimizedCDebugFlags  -O2
+ # 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@@
+ # else
+ #  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
+ # endif
diff --git a/x11/xorg-libs/patches/patch-aq b/x11/xorg-libs/patches/patch-aq
new file mode 100644
index 00000000000..4bfc0c3f347
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.3 2005/03/22 09:49:14 adam 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)
+