diff options
| author | Will Andrews <will@FreeBSD.org> | 2002-03-16 23:40:19 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2002-03-16 23:40:19 +0000 |
| commit | 92becb4baf7713b343d948a652f39579b35fcb52 (patch) | |
| tree | e95fd7d2f39f40888e10b2d3afdb76e7196d0055 /x11/XFree86-4-libraries | |
| parent | XFree86 4.2.0 Stage 1: bsd.port.mk (diff) | |
XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades
[1] Upgrade to 4.2.0.
[2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES
by default.
Submitted by: [1] sf, taguchi@tohoku.iij.ad.jp
Approved by: [2] core
Notes
Notes:
svn path=/head/; revision=56229
Diffstat (limited to 'x11/XFree86-4-libraries')
25 files changed, 235 insertions, 878 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 53395c56ff7e..ff5cc756f851 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -6,13 +6,17 @@ # PORTNAME= libraries -PORTVERSION= 4.1.0 -PORTREVISION= 2 +PORTVERSION= 4.2.0 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XFREE} -MASTER_SITE_SUBDIR= 4.1.0 +MASTER_SITES= ${MASTER_SITE_XFREE} \ + ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \ + ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap \ + ftp://ftp3.za.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X410src-1.tgz +EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz +DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap +IGNOREFILES= Wraphelp.c MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -59,7 +63,7 @@ MAN3= Xaw.3 Xft.3 # ---------------------------------------------------------------------------- # DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4 # -HasXdmAuth?= DEFAULT +HasXdmAuth?= YES HasSecureRPC?= DEFAULT BuildPexExt?= DEFAULT BuildXinerama?= DEFAULT @@ -78,21 +82,16 @@ PLIST_SUB+= OSMESA:="@comment " PLIST_SUB+= OSMESA:="" .endif -.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES -pre-everything:: - @${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c." -.else -MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ - ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \ - ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/ -EXTRACT_ONLY= X410src-1.tgz -DISTFILES+= Wraphelp.c -IGNOREFILES= Wraphelp.c -.endif # USA_RESIDENT -.endif # HasXdmAuth != NO +post-patch: + cd ${WRKSRC}/nls; \ + for i in Compose XI18N_OBJS XLC_LOCALE; do \ + ${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \ + done do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure +post-install: + @${MKHTMLINDEX} ${X11BASE}/lib/X11/doc/html + .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index 942f997451ad..4766fc3aff79 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32 +MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f MD5 (xc/Wraphelp.c) = IGNORE diff --git a/x11/XFree86-4-libraries/files/patch-DRI b/x11/XFree86-4-libraries/files/patch-DRI index 6b51e4dd1f2d..5d18c6e1ac24 100644 --- a/x11/XFree86-4-libraries/files/patch-DRI +++ b/x11/XFree86-4-libraries/files/patch-DRI @@ -1,40 +1,50 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile.orig Wed Apr 11 11:15:17 2001 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile Wed Apr 11 11:18:01 2001 -@@ -6,6 +6,7 @@ - agpsupport.c ctxbitmap.c - SRCS += device_if.h bus_if.h pci_if.h - CFLAGS += ${DEBUG_FLAGS} -I.. -+KMODDIR = ${X11BASE}/lib/X11/kernel +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile.orig Thu Dec 13 09:24:52 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile Sat Jan 19 21:35:22 2002 +@@ -5,6 +5,7 @@ + SRCS= tdfx_drv.c + SRCS+= device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS+= ${DEBUG_FLAGS} -I. -I.. ++KMODDIR = ${X11BASE}/lib/X11/kernel @: ln -sf /sys @ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile.orig Wed Apr 11 11:20:15 2001 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile Wed Apr 11 11:20:31 2001 +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile.orig Thu Dec 13 09:24:49 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile Sat Jan 19 21:37:05 2002 @@ -5,6 +5,7 @@ - SRCS += device_if.h bus_if.h pci_if.h - CFLAGS += ${DEBUG_FLAGS} -I.. - KMODDEPS = drm -+KMODDIR = ${X11BASE}/lib/X11/kernel + SRCS = gamma_drv.c gamma_dma.c + SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS += ${DEBUG_FLAGS} -I. -I.. ++KMODDIR= ${X11BASE}/lib/X11/kernel @: ln -sf /sys @ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile.orig Wed Apr 11 11:17:21 2001 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile Wed Apr 11 11:20:01 2001 +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile.orig Thu Dec 13 09:24:49 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile Sat Jan 19 21:36:20 2002 @@ -5,6 +5,7 @@ - SRCS += device_if.h bus_if.h pci_if.h - CFLAGS += ${DEBUG_FLAGS} -I.. - KMODDEPS = drm -+KMODDIR = ${X11BASE}/lib/X11/kernel + SRCS= mga_drv.c mga_state.c mga_warp.c mga_dma.c + SRCS+= device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS+= ${DEBUG_FLAGS} -I. -I.. ++KMODDIR= ${X11BASE}/lib/X11/kernel @: ln -sf /sys @ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile.orig Wed Apr 11 11:20:10 2001 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile Wed Apr 11 11:20:22 2001 -@@ -6,6 +6,7 @@ - CFLAGS += ${DEBUG_FLAGS} -I.. - KERN = /usr/src/sys - KMODDEPS = drm -+KMODDIR = ${X11BASE}/lib/X11/kernel +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile.orig Thu Dec 13 09:24:50 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile Mon Jan 21 10:17:46 2002 +@@ -5,6 +5,7 @@ + SRCS = r128_cce.c r128_drv.c r128_state.c + SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS += ${DEBUG_FLAGS} -I. -I.. ++KMODDIR= ${X11BASE}/lib/X11/kernel + + @: + ln -sf /sys @ +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile.orig Thu Dec 13 09:24:51 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile Mon Jan 21 10:17:21 2002 +@@ -5,6 +5,7 @@ + SRCS = radeon_cp.c radeon_drv.c radeon_state.c + SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS += ${DEBUG_FLAGS} -I. -I.. ++KMODDIR= ${X11BASE}/lib/X11/kernel @: ln -sf /sys @ diff --git a/x11/XFree86-4-libraries/files/patch-c2 b/x11/XFree86-4-libraries/files/patch-c2 index e585d0765e41..e0ed10d1a722 100644 --- a/x11/XFree86-4-libraries/files/patch-c2 +++ b/x11/XFree86-4-libraries/files/patch-c2 @@ -18,24 +18,3 @@ # if defined(LargePICTable) && LargePICTable # ifdef LargePositionIndependentCplusplusFlags CXXPICFLAGS = LargePositionIndependentCplusplusFlags -@@ -434,15 +434,19 @@ - # ifdef IncSubdir - # ifdef IncSubSubdir - BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..) -+# if !defined(LibHeaders) || LibHeaders - InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS)) -+# endif /* LibHeaders */ - # else - BuildIncludes($(HEADERS),IncSubdir,..) -+# if !defined(LibHeaders) || LibHeaders - InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS)) -+# endif /* LibHeaders */ - # endif - # else - # ifndef CplusplusSource --# if !defined(LibHeaders) || LibHeaders - BuildIncludesTop($(HEADERS)) -+# if !defined(LibHeaders) || LibHeaders - InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS)) - # endif - # endif diff --git a/x11/XFree86-4-libraries/files/patch-f b/x11/XFree86-4-libraries/files/patch-f index 93e7d910dadf..bac6e4ebf87a 100644 --- a/x11/XFree86-4-libraries/files/patch-f +++ b/x11/XFree86-4-libraries/files/patch-f @@ -1,106 +1,74 @@ ---- nls/compose.dir~ Tue Dec 12 03:52:39 2000 -+++ nls/compose.dir Tue Dec 12 03:53:04 2000 -@@ -209,7 +209,7 @@ - zh/Compose zh_CN.eucCN - zh/Compose zh_CN.GB2312 - zh_TW.big5/Compose zh_TW.big5 --zh_TW.big5/Compose zh_TW.Big5 -+zh_TW.Big5/Compose zh_TW.Big5 - zh_TW/Compose zh_TW.eucTW - #endif /* R63_COMPAT */ - -@@ -415,5 +415,5 @@ - zh/Compose: zh_CN.GB2312 - microsoft-cp1255/Compose: yi_US.CP1256 - zh_TW.big5/Compose: zh_TW.big5 --zh_TW.big5/Compose: zh_TW.Big5 -+zh_TW.Big5/Compose: zh_TW.Big5 - zh_TW/Compose: zh_TW.eucTW ---- nls/locale.alias~ Wed May 23 20:32:14 2001 -+++ nls/locale.alias Sat May 26 02:37:21 2001 -@@ -493,12 +493,12 @@ - zh zh_CN.eucCN - zh_CN zh_CN.eucCN - zh_CN.big5 zh_TW.big5 --zh_CN.Big5 zh_TW.big5 -+zh_CN.Big5 zh_TW.Big5 - zh_CN.EUC zh_CN.eucCN - zh_CN.euc zh_CN.eucCN - zh_CN.gb2312 zh_CN.eucCN - zh_CN.gbk zh_CN.GBK --zh_TW zh_TW.big5 -+zh_TW zh_TW.Big5 - zh_TW.EUC zh_TW.eucTW - zh_TW.euc zh_TW.eucTW - -@@ -1182,13 +1182,13 @@ +--- nls/compose.dir.orig Thu Nov 22 07:29:11 2001 ++++ nls/compose.dir Sat Jan 19 22:12:13 2002 +@@ -211,7 +211,7 @@ + zh_CN/Compose: zh_CN.GB2312 + zh_CN.gbk/Compose: zh_CN.GBK + zh_TW.big5/Compose: zh_TW.big5 +-zh_TW.big5/Compose: zh_TW.Big5 ++zh_TW.Big5/Compose: zh_TW.Big5 + zh_TW/Compose: zh_TW.eucTW + XCOMM + XCOMM +--- nls/locale.alias.orig Thu Dec 20 06:29:40 2001 ++++ nls/locale.alias Sat Jan 19 22:22:20 2002 +@@ -637,18 +637,18 @@ yi_US.MICROSOFT-CP1255: yi_US.CP1255 zh: zh_CN.eucCN zh_CN: zh_CN.eucCN --zh_CN.big5: zh_TW.big5 -zh_CN.Big5: zh_TW.big5 -+zh_CN.big5: zh_TW.Big5 +zh_CN.Big5: zh_TW.Big5 zh_CN.EUC: zh_CN.eucCN + zh_CN.GB2312: zh_CN.eucCN + zh_CN.GBK: zh_CN.gbk +-zh_CN.big5: zh_TW.big5 ++zh_CN.big5: zh_TW.Big5 zh_CN.euc: zh_CN.eucCN zh_CN.gb2312: zh_CN.eucCN - zh_CN.gbk: zh_CN.GBK + zh_HK: zh_HK.big5 + zh_HK.Big5: zh_HK.big5 + zh_HK.Big5HKSCS: zh_HK.big5hkscs -zh_TW: zh_TW.big5 +-zh_TW.Big5: zh_TW.big5 +zh_TW: zh_TW.Big5 ++zh_TW.Big5: zh_TW.Big5 zh_TW.EUC: zh_TW.eucTW - zh_TW.euc: zh_TW.eucTW - zh_TW.big5: zh_TW.big5 ---- nls/locale.dir~ Tue Dec 12 03:18:29 2000 -+++ nls/locale.dir Tue Dec 12 04:01:54 2000 -@@ -199,7 +199,7 @@ - zh/XLC_LOCALE zh_CN.eucCN - zh/XLC_LOCALE zh_CN.GB2312 - zh_TW.big5/XLC_LOCALE zh_TW.big5 --zh_TW.big5/XLC_LOCALE zh_TW.Big5 -+zh_TW.Big5/XLC_LOCALE zh_TW.Big5 - zh_TW/XLC_LOCALE zh_TW.eucTW - XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress. - en_US.UTF-8/XLC_LOCALE af_ZA.UTF-8 -@@ -533,7 +533,7 @@ - zh/XLC_LOCALE: zh_CN.eucCN - zh/XLC_LOCALE: zh_CN.GB2312 - zh_TW.big5/XLC_LOCALE: zh_TW.big5 --zh_TW.big5/XLC_LOCALE: zh_TW.Big5 -+zh_TW.Big5/XLC_LOCALE: zh_TW.Big5 - zh_TW/XLC_LOCALE: zh_TW.eucTW + + XCOMM The following locale names are used in SCO 3.0 +--- nls/locale.dir.orig Thu Jan 10 01:14:16 2002 ++++ nls/locale.dir Sat Jan 19 22:16:56 2002 +@@ -216,7 +216,7 @@ + zh_CN.gbk/XLC_LOCALE: zh_CN.gbk + zh_HK.big5/XLC_LOCALE: zh_HK.big5 + zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs +-zh_TW.big5/XLC_LOCALE: zh_TW.big5 ++zh_TW.Big5/XLC_LOCALE: zh_TW.Big5 + zh_TW/XLC_LOCALE: zh_TW.eucTW XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress. - en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8 ---- nls/Compose/Imakefile.orig Fri Dec 8 02:52:48 2000 -+++ nls/Compose/Imakefile Tue Dec 12 03:18:29 2000 -@@ -58,5 +58,5 @@ - ComposeTarget(vi_VN.viscii) - ComposeTarget(zh) + en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8 +--- nls/Compose/Imakefile.orig Sat Nov 3 08:29:28 2001 ++++ nls/Compose/Imakefile Sat Jan 19 22:17:40 2002 +@@ -70,5 +70,5 @@ + ComposeTarget(zh_CN) + ComposeTarget(zh_CN.gbk) ComposeTarget(zh_TW) -ComposeTarget(zh_TW.big5) +ComposeTarget(zh_TW.Big5) ---- nls/Compose/zh_TW.Big5.orig Sun Jul 16 04:33:35 2000 -+++ nls/Compose/zh_TW.Big5 Sun Jul 16 04:33:35 2000 -@@ -0,0 +1,15 @@ -+# -+# zh_TW.big5 Compose Sequence -+# -+# Sequence Definition -+# -+# $XFree86: xc/nls/Compose/zh_TW.big5,v 1.1 1999/08/28 09:00:40 dawes Exp $ -+# -+# This file currently has no entries. It appears that a compose file (even -+# just an empty one) is required for the appropriate keysyms to work for -+# this encoding. -+# -+# <Multi_key> Means <Compose> -+# Special Character -+ -+# End of Sequence Definition ---- nls/XLC_LOCALE/Imakefile~ Tue Mar 6 19:54:45 2001 -+++ nls/XLC_LOCALE/Imakefile Sat May 26 02:38:44 2001 -@@ -88,7 +88,7 @@ - LTarget(zh_CN.gbk) +--- nls/XI18N_OBJS/Imakefile.orig Fri Nov 16 09:52:31 2001 ++++ nls/XI18N_OBJS/Imakefile Sun Jan 20 01:08:44 2002 +@@ -57,7 +57,7 @@ + XI18NTarget(zh_CN.gbk) + XI18NTarget(zh_HK.big5hkscs) + XI18NTarget(zh_TW) +-XI18NTarget(zh_TW.big5) ++XI18NTarget(zh_TW.Big5) + XI18NTarget(th_TH) + XI18NTarget(en_US.UTF-8) + #ifdef UXPArchitecture +--- nls/XLC_LOCALE/Imakefile.orig Fri Nov 2 08:35:28 2001 ++++ nls/XLC_LOCALE/Imakefile Sat Jan 19 22:19:27 2002 +@@ -89,7 +89,7 @@ + LTarget(zh_HK.big5) LTarget(zh_HK.big5hkscs) LTarget(zh_TW) -LTarget(zh_TW.big5) @@ -108,76 +76,3 @@ LTarget(th_TH) LTarget(en_US.UTF-8) #ifdef UXPArchitecture ---- nls/XLC_LOCALE/zh_TW.Big5.orig Sun Jul 16 04:33:35 2000 -+++ nls/XLC_LOCALE/zh_TW.Big5 Sun Jul 16 04:36:58 2000 -@@ -0,0 +1,70 @@ -+XCOMM -+XCOMM (c) 1996, X11R6 L10N for Taiwan and Big5 Encoding Project -+XCOMM -+XCOMM modified for X11R6.3 by Hung-Chi Chu <hcchu@r350.ee.ntu.edu.tw> 1998/01/10 -+XCOMM -+XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_TW.big5,v 1.1 1999/08/28 09:00:41 dawes Exp $ -+XCOMM -+XCOMM XLC_FONTSET category -+XCOMM -+XLC_FONTSET -+XCOMM fs0 class (7 bit ASCII) -+fs0 { -+ charset { -+ name ISO8859-1:GL -+ } -+ font { -+ primary ISO8859-1:GL -+ vertical_rotate all -+ } -+} -+XCOMM fs1 class -+fs1 { -+ charset { -+ name BIG5-0:GLGR -+ } -+ font { -+ primary BIG5-0:GLGR -+ substitute BIG5-0:GLGR -+ } -+} -+END XLC_FONTSET -+ -+XCOMM -+XCOMM XLC_XLOCALE category -+XCOMM -+XLC_XLOCALE -+ -+encoding_name zh_TW.Big5 -+mb_cur_max 2 -+state_depend_encoding False -+ -+wc_encoding_mask \x00008000 -+wc_shift_bits 8 -+ -+use_stdc_env True -+force_convert_to_mb True -+ -+XCOMM cs0 class -+cs0 { -+ side GL:Default -+ length 1 -+ wc_encoding \x00000000 -+ ct_encoding ISO8859-1:GL -+} -+ -+XCOMM cs1 class -+cs1 { -+ side none -+ length 2 -+ byte1 \xa1,\xf9 -+ byte2 \x40,\x7e;\xa1,\xfe -+ -+ wc_encoding \x00008000 -+ ct_encoding BIG5-0:GLGR:\x1b\x25\x2f\x32\x80\x89\x42\x49\x47\x35\x2d\x30\x02 -+ -+ mb_conversion [\xa140,\xf9fe]->\x2140 -+ ct_conversion [\x2140,\x79fe]->\xa140 -+} -+ -+END XLC_XLOCALE diff --git a/x11/XFree86-4-libraries/files/patch-g550 b/x11/XFree86-4-libraries/files/patch-g550 deleted file mode 100644 index ac6622733ce7..000000000000 --- a/x11/XFree86-4-libraries/files/patch-g550 +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.orig Fri May 11 16:56:10 2001 -+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h Sat Oct 20 11:28:09 2001 -@@ -358,6 +358,7 @@ - #define PCI_CHIP_MGAG200_PCI 0x0520 - #define PCI_CHIP_MGAG200 0x0521 - #define PCI_CHIP_MGAG400 0x0525 -+#define PCI_CHIP_MGAG550 0x2527 - #define PCI_CHIP_IMPRESSION 0x0D10 - #define PCI_CHIP_MGAG100_PCI 0x1000 - #define PCI_CHIP_MGAG100 0x1001 -@@ -964,6 +965,7 @@ - {PCI_CHIP_MGAG200_PCI, "MGA G200 PCI",0}, - {PCI_CHIP_MGAG200, "MGA G200 AGP",0}, - {PCI_CHIP_MGAG400, "MGA G400 AGP",0}, -+ {PCI_CHIP_MGAG550, "MGA G550 AGP",0}, - {PCI_CHIP_MGAG100_PCI, "MGA G100 PCI",0}, - {PCI_CHIP_MGAG100, "MGA G100 AGP",0}, - {0x0000, NULL,0}}}, diff --git a/x11/XFree86-4-libraries/files/patch-h b/x11/XFree86-4-libraries/files/patch-h index a9649b315c06..d0e8bbfd19f5 100644 --- a/x11/XFree86-4-libraries/files/patch-h +++ b/x11/XFree86-4-libraries/files/patch-h @@ -1,6 +1,6 @@ ---- config/cf/Imake.rules.orig Fri Apr 27 06:27:48 2001 -+++ config/cf/Imake.rules Mon Jun 4 19:56:42 2001 -@@ -1388,7 +1388,7 @@ +--- config/cf/Imake.rules.orig Tue Dec 18 05:00:37 2001 ++++ config/cf/Imake.rules Sat Jan 19 22:47:40 2002 +@@ -1399,7 +1399,7 @@ dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\ RemoveFiles(dest.suffix.html dest.suffix-html) @@\ RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\ @@ -9,16 +9,16 @@ @@\ install.man:: dest.suffix.html @@\ MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ -@@ -1624,7 +1624,7 @@ +@@ -1644,7 +1644,7 @@ MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ @MakeFlagsToShellFlags(i,set +e); \ @@\ if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ - RELPATH=`echo opath/cdir | \ @@\ + RELPATH=`cd opath/cdir; pwd | \ @@\ - sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ + sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\ cd Concat($(DESTDIR),opath/cdir); \ @@\ if [ -d rdir -a ! -h rdir ]; then \ @@\ -@@ -1671,7 +1671,7 @@ +@@ -1691,7 +1691,7 @@ MakeDir(Concat($(DESTDIR),npath)) @@\ @MakeFlagsToShellFlags(i,set +e); \ @@\ if [ -d Concat($(DESTDIR),opath) ]; then \ @@\ diff --git a/x11/XFree86-4-libraries/files/patch-i810 b/x11/XFree86-4-libraries/files/patch-i810 deleted file mode 100644 index b6d75b108146..000000000000 --- a/x11/XFree86-4-libraries/files/patch-i810 +++ /dev/null @@ -1,42 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Wed May 30 06:51:29 2001 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Thu Jan 3 11:11:42 2002 -@@ -1019,10 +1019,15 @@ - { - vgaHWPtr hwp; - I810Ptr pI810; -+ unsigned temp; - - hwp = VGAHWPTR(pScrn); - pI810 = I810PTR(pScrn); - DoSave(pScrn, &hwp->SavedReg, &pI810->SavedReg, TRUE); -+ -+ temp = INREG(MEMMODE); -+ temp |= 4; -+ OUTREG(MEMMODE, temp); - } - - -@@ -2006,9 +2011,10 @@ - if (I810_DEBUG & DEBUG_VERBOSE_DRI) - ErrorF("\n\nENTER VT\n"); - -+/*********BUGGY********************* - if (! I810BindGARTMemory(pScrn)) - return FALSE; -- -+***********************************/ - #ifdef XF86DRI - if (pI810->directRenderingEnabled) { - if (I810_DEBUG & DEBUG_VERBOSE_DRI) -@@ -2047,9 +2053,10 @@ - } - I810Restore(pScrn); - -+/*********BUGGY*********************** - if (! I810UnbindGARTMemory(pScrn)) - return; -- -+*************************************/ - vgaHWLock(hwp); - } - diff --git a/x11/XFree86-4-libraries/files/patch-j b/x11/XFree86-4-libraries/files/patch-j deleted file mode 100644 index cc9ac2f98fdb..000000000000 --- a/x11/XFree86-4-libraries/files/patch-j +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/xdm/config/xdm-conf.cpp.orig Wed Sep 6 17:05:53 2000 -+++ programs/xdm/config/xdm-conf.cpp Wed Sep 6 17:06:03 2000 -@@ -5,7 +5,7 @@ - DisplayManager.keyFile: XDMDIR/xdm-keys - DisplayManager.servers: XDMDIR/Xservers - DisplayManager.accessFile: XDMDIR/Xaccess --DisplayManager.willing: su nobody -c XDMDIR/Xwilling -+DisplayManager.willing: su -fm nobody -c XDMDIR/Xwilling - ! All displays should use authorization, but we cannot be sure - ! X terminals will be configured that way, so by default - ! use authorization only for local displays :0, :1, etc. diff --git a/x11/XFree86-4-libraries/files/patch-mouse b/x11/XFree86-4-libraries/files/patch-mouse deleted file mode 100644 index 314a57f43428..000000000000 --- a/x11/XFree86-4-libraries/files/patch-mouse +++ /dev/null @@ -1,22 +0,0 @@ ---- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Aug 18 22:47:30 2001 -+++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Thu Aug 23 17:13:44 2001 -@@ -1837,8 +1837,6 @@ - if ((id = stateTab[pMse->emulateState][4][0]) != 0) { - xf86PostButtonEvent(pInfo->dev, 0, abs(id), (id >= 0), 0, 0); - pMse->emulateState = stateTab[pMse->emulateState][4][2]; -- } else { -- ErrorF("Got unexpected buttonTimer in state %d\n", pMse->emulateState); - } - - xf86UnblockSIGIO (sigstate); -@@ -1892,11 +1890,6 @@ - if (stateTab[pMse->emulateState][4][0] != 0) { - timer = TimerSet(timer, 0, pMse->emulate3Timeout, buttonTimer, - pInfo); -- } else { -- if (timer) { -- TimerFree(timer); -- timer = NULL; -- } - } - } diff --git a/x11/XFree86-4-libraries/files/patch-r128 b/x11/XFree86-4-libraries/files/patch-r128 deleted file mode 100644 index 09eb16583c4e..000000000000 --- a/x11/XFree86-4-libraries/files/patch-r128 +++ /dev/null @@ -1,56 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.orig Fri May 11 09:56:10 2001 -+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h Wed Dec 26 19:23:28 2001 -@@ -234,6 +234,7 @@ - #define PCI_CHIP_RAGE128ML 0x4D4C - #define PCI_CHIP_RAGE128PD 0x5044 - #define PCI_CHIP_RAGE128PF 0x5046 -+#define PCI_CHIP_RAGE128PE 0x5050 - #define PCI_CHIP_RAGE128PR 0x5052 - #define PCI_CHIP_RADEON_QD 0x5144 - #define PCI_CHIP_RADEON_QE 0x5145 -@@ -826,6 +827,7 @@ - {PCI_CHIP_RAGE128MF, "Rage 128 Mobility MF",0}, - {PCI_CHIP_RAGE128ML, "Rage 128 Mobility ML",0}, - {PCI_CHIP_RAGE128PD, "Rage 128 Pro PD",0}, -+ {PCI_CHIP_RAGE128PE, "Rage 128 Xpert 128",0}, - {PCI_CHIP_RAGE128PF, "Rage 128 Pro PF",0}, - {PCI_CHIP_RAGE128PR, "Rage 128 Pro PR",0}, - {PCI_CHIP_RADEON_QD, "Radeon QD",0}, ---- programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c.orig Fri May 4 21:05:33 2001 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c Wed Dec 26 19:24:14 2001 -@@ -81,6 +81,7 @@ - { PCI_CHIP_RAGE128RK, "ATI Rage 128 RK (PCI)" }, - { PCI_CHIP_RAGE128RL, "ATI Rage 128 RL (AGP)" }, - { PCI_CHIP_RAGE128PD, "ATI Rage 128 Pro PD (PCI)" }, -+ { PCI_CHIP_RAGE128PE, "ATI Rage 128 Xpert 128 (PCI)" }, - { PCI_CHIP_RAGE128PF, "ATI Rage 128 Pro PF (AGP)" }, - { PCI_CHIP_RAGE128LE, "ATI Rage 128 Mobility LE (PCI)" }, - { PCI_CHIP_RAGE128LF, "ATI Rage 128 Mobility LF (AGP)" }, -@@ -96,6 +97,7 @@ - { PCI_CHIP_RAGE128RK, PCI_CHIP_RAGE128RK, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128RL, PCI_CHIP_RAGE128RL, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128PD, PCI_CHIP_RAGE128PD, RES_SHARED_VGA }, -+ { PCI_CHIP_RAGE128PE, PCI_CHIP_RAGE128PE, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128PF, PCI_CHIP_RAGE128PF, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128LE, PCI_CHIP_RAGE128LE, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128LF, PCI_CHIP_RAGE128LF, RES_SHARED_VGA }, ---- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Wed May 30 00:51:08 2001 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Wed Dec 26 19:24:14 2001 -@@ -895,6 +895,7 @@ - case PCI_CHIP_RAGE128RK: - case PCI_CHIP_RAGE128RL: - case PCI_CHIP_RAGE128PD: -+ case PCI_CHIP_RAGE128PE: - case PCI_CHIP_RAGE128PF: - default: info->HasPanelRegs = FALSE; break; - } -@@ -1025,7 +1026,8 @@ - case PCI_CHIP_RAGE128LE: - case PCI_CHIP_RAGE128RE: - case PCI_CHIP_RAGE128RK: -- case PCI_CHIP_RAGE128PD: info->IsPCI = TRUE; break; -+ case PCI_CHIP_RAGE128PD: -+ case PCI_CHIP_RAGE128PE: info->IsPCI = TRUE; break; - case PCI_CHIP_RAGE128LF: - case PCI_CHIP_RAGE128MF: - case PCI_CHIP_RAGE128ML: diff --git a/x11/XFree86-4-libraries/files/patch-r128dri b/x11/XFree86-4-libraries/files/patch-r128dri deleted file mode 100644 index fd04fd0c9c11..000000000000 --- a/x11/XFree86-4-libraries/files/patch-r128dri +++ /dev/null @@ -1,26 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c.orig Sat Oct 6 05:29:25 2001 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c Fri Oct 5 17:28:40 2001 -@@ -705,6 +705,7 @@ - case PCI_CHIP_RAGE128LE: - case PCI_CHIP_RAGE128RE: - case PCI_CHIP_RAGE128RK: -+ case PCI_CHIP_RAGE128PE: - /* This is a PCI card, do nothing */ - break; - -@@ -985,12 +985,12 @@ - /* Check the r128 DRM version */ - version = drmGetVersion(info->drmFD); - if (version) { -- if (version->version_major != 2 || -- version->version_minor < 1) { -+ if (version->version_major != 3 || -+ version->version_minor < 0) { - /* incompatible drm version */ - xf86DrvMsg(pScreen->myNum, X_ERROR, - "[dri] R128DRIScreenInit failed because of a version mismatch.\n" -- "[dri] r128.o kernel module version is %d.%d.%d but version 2.1.x is needed.\n" -+ "[dri] r128.o kernel module version is %d.%d.%d but version 3.0 or greater is needed.\n" - "[dri] Disabling the DRI.\n", - version->version_major, - version->version_minor, diff --git a/x11/XFree86-4-libraries/files/patch-r128xmesa b/x11/XFree86-4-libraries/files/patch-r128xmesa deleted file mode 100644 index fc33b516da12..000000000000 --- a/x11/XFree86-4-libraries/files/patch-r128xmesa +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/GL/mesa/src/drv/r128/r128_xmesa.c.orig Fri Oct 5 17:21:31 2001 -+++ lib/GL/mesa/src/drv/r128/r128_xmesa.c Fri Oct 5 17:22:59 2001 -@@ -80,8 +80,8 @@ - } - - /* Check that the DRM driver version is compatible */ -- if ( sPriv->drmMajor != 2 || -- sPriv->drmMinor < 1 ) { -+ if ( sPriv->drmMajor != 3 /*|| -+ sPriv->drmMinor < 1*/ ) { - char msg[1000]; - sprintf( msg, "R128 DRI driver expected DRM driver version 2.1.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch ); - __driMesaMessage( msg ); diff --git a/x11/XFree86-4-libraries/files/patch-riva_hw.c b/x11/XFree86-4-libraries/files/patch-riva_hw.c deleted file mode 100644 index 0e5b50f8c2d0..000000000000 --- a/x11/XFree86-4-libraries/files/patch-riva_hw.c +++ /dev/null @@ -1,27 +0,0 @@ -reverse frequency parameter only for Riva128/SGRAM - -Index: programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c -=================================================================== -RCS file: /home/cvs/X/xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c,v -retrieving revision 1.12 -diff -u -u -2 -r1.12 riva_hw.c ---- programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c 2001/02/21 00:42:57 1.12 -+++ programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c 2001/03/25 16:20:00 -@@ -1780,4 +1780,5 @@ - * Fill in chip configuration. - */ -+ chip->CrystalFreqKHz = (chip->PEXTDEV[0x00000000/4] & 0x00000020) ? 13500 : 14318; /* this was reversed, not sure that it is right this way either (HCS) */ - if (chip->PFB[0x00000000/4] & 0x00000020) - { -@@ -1813,4 +1814,5 @@ - * SGRAM 128. - */ -+ chip->CrystalFreqKHz = (chip->PEXTDEV[0x00000000/4] & 0x00000020) ? 14318 : 13500; - chip->RamBandwidthKBytesPerSec = 1000000; - switch (chip->PFB[0x00000000/4] & 0x00000003) -@@ -1827,5 +1829,4 @@ - } - } -- chip->CrystalFreqKHz = (chip->PEXTDEV[0x00000000/4] & 0x00000020) ? 13500 : 14318; /* this was reversed, not sure that it is right this way either (HCS) */ - chip->CURSOR = &(chip->PRAMIN[0x00008000/4 - 0x0800/4]); - chip->CURSORPOS = &(chip->PRAMDAC[0x0300/4]); diff --git a/x11/XFree86-4-libraries/files/patch-t01 b/x11/XFree86-4-libraries/files/patch-t01 index f65c915cbbff..dc971232b5fb 100644 --- a/x11/XFree86-4-libraries/files/patch-t01 +++ b/x11/XFree86-4-libraries/files/patch-t01 @@ -1,14 +1,5 @@ --- config/imake/imake.c.ORIG Mon Dec 18 14:54:34 2000 +++ config/imake/imake.c Mon Dec 18 14:55:25 2000 -@@ -399,7 +399,7 @@ - int - main(int argc, char *argv[]) - { -- FILE *tmpfd; -+ FILE *tmpfd = (FILE *)NULL; - char makeMacro[ BUFSIZ ]; - char makefileMacro[ BUFSIZ ]; - @@ -1208,6 +1208,19 @@ if (uname(&name) < 0) LogFatal("Cannot invoke uname", ""); diff --git a/x11/XFree86-4-libraries/files/patch-t03 b/x11/XFree86-4-libraries/files/patch-t03 deleted file mode 100644 index 8e0b78cab1c2..000000000000 --- a/x11/XFree86-4-libraries/files/patch-t03 +++ /dev/null @@ -1,31 +0,0 @@ ---- config/pswrap/main.c.orig Wed Dec 20 15:30:23 2000 -+++ config/pswrap/main.c Wed Dec 20 15:32:06 2000 -@@ -129,7 +129,7 @@ - strcpy(headid, slash ? slash+1 : hfile); - for (c = headid; *c != '\0'; c++) { - if (*c == '.') *c = '_'; -- else isascii(*c) && islower(*c) && (*c = toupper(*c)); -+ else if (isascii(*c) && islower(*c)) *c = toupper(*c); - } - break; - case 'o': ---- config/pswrap/lexer.l.orig Wed Dec 20 15:33:37 2000 -+++ config/pswrap/lexer.l Wed Dec 20 15:33:57 2000 -@@ -346,7 +346,7 @@ - DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext)); - /* I have no idea why the cast is needed in the next line, - but it seems to make the compiler happy on alpha */ -- sscanf((char *) yytext,"%o",&yylval.intobj); -+ sscanf((char *) yytext,"%lo",&yylval.intobj); - return CINTEGER; - } - } -@@ -355,7 +355,7 @@ - if (nonComment) { - DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext)); - /* See previous comment... */ -- sscanf((char *) yytext,"0x%x",&yylval.intobj); -+ sscanf((char *) yytext,"0x%lx",&yylval.intobj); - return CINTEGER; - } - } diff --git a/x11/XFree86-4-libraries/files/patch-tga b/x11/XFree86-4-libraries/files/patch-tga deleted file mode 100644 index eb0cb8098333..000000000000 --- a/x11/XFree86-4-libraries/files/patch-tga +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c.orig Wed Aug 29 11:38:09 2001 -+++ programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c Wed Aug 29 11:39:09 2001 -@@ -758,7 +758,7 @@ - - pTga->FbMapSize = pScrn->videoRam * 1024; - -- if (mod && xf86LoadSubModule(pScrn, "fb") == NULL) { -+ if (xf86LoadSubModule(pScrn, "fb") == NULL) { - TGAFreeRec(pScrn); - return FALSE; - } diff --git a/x11/XFree86-4-libraries/files/patch-xfs b/x11/XFree86-4-libraries/files/patch-xfs deleted file mode 100644 index 8ac159dd7603..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xfs +++ /dev/null @@ -1,292 +0,0 @@ ---- programs/xfs/difs/dispatch.c 2001/04/01 14:00:20 3.9 -+++ programs/xfs/difs/dispatch.c 2001/06/21 01:15:44 -@@ -141,8 +141,10 @@ - op = MAJOROP; - if (op >= NUM_PROC_VECTORS) - result = ProcBadRequest (client); -- else -+ else if (*client->requestVector[op] != NULL) - result = (*client->requestVector[op]) (client); -+ else -+ result = FSBadRequest; - } - if (result != FSSuccess) { - if (client->noClientException != FSSuccess) -@@ -202,8 +204,12 @@ - return (client->noClientException = -2); - if (((*(char *) &whichbyte) && (prefix->byteOrder == 'B')) || - (!(*(char *) &whichbyte) && (prefix->byteOrder == 'l'))) { -+ int status; -+ - client->swapped = TRUE; -- SwapConnClientPrefix(prefix); -+ status = SwapConnClientPrefix(client, prefix); -+ if (status != FSSuccess) -+ return (status); - } - client->major_version = prefix->major_version; - client->minor_version = prefix->minor_version; -@@ -257,7 +263,16 @@ - client_auth[i].name = (char *) ad; - ad += client_auth[i].namelen; - client_auth[i].data = (char *) ad; -+ - ad += client_auth[i].datalen; -+ -+ if (ad - (char *)auth_data > stuff->length - -+ (i < (int)prefix->num_auths) ? 8 : 0) { -+ int lengthword = stuff->length; -+ -+ SendErrToClient(client, FSBadLength, (pointer)&lengthword); -+ return (FSBadLength); -+ } - } - num_alts = ListAlternateServers(&altservers); - for (i = 0, altlen = 0; i < num_alts; i++) { -@@ -585,6 +600,13 @@ - ad += acp[i].namelen; - acp[i].data = (char *) ad; - ad += acp[i].datalen; -+ if (ad - (char *)stuff + SIZEOF(fsCreateACReq) > stuff->length - -+ (i < (int)stuff->num_auths ? 8 : 0)) { -+ int lengthword = stuff->length; -+ -+ SendErrToClient(client, FSBadLength, (pointer)&lengthword); -+ return (FSBadLength); -+ } - } - - /* XXX needs work for AuthContinue */ -@@ -702,6 +724,13 @@ - REQUEST(fsSetResolutionReq); - REQUEST_AT_LEAST_SIZE(fsSetResolutionReq); - -+ if (stuff->length - SIZEOF(fsResolution) != stuff->num_resolutions * -+ sizeof(fsResolution)) { -+ int lengthword = stuff->length; -+ -+ SendErrToClient(client, FSBadAlloc, &lengthword); -+ return FSBadLength; -+ } - new_res = (fsResolution *) - fsalloc(SIZEOF(fsResolution) * stuff->num_resolutions); - if (!new_res) { -@@ -725,6 +754,13 @@ - REQUEST(fsReq); - REQUEST_AT_LEAST_SIZE(fsReq); - -+ if (stuff->length - SIZEOF(fsResolution) != client->num_resolutions * -+ sizeof(fsResolution)) { -+ int lengthword = stuff->length; -+ -+ SendErrToClient(client, FSBadAlloc, &lengthword); -+ return FSBadLength; -+ } - reply.type = FS_Reply; - reply.num_resolutions = client->num_resolutions; - reply.sequenceNumber = client->sequence; ---- programs/xfs/difs/fonts.c 2001/04/01 14:00:20 3.9 -+++ programs/xfs/difs/fonts.c 2001/06/21 01:15:45 -@@ -709,8 +709,12 @@ - } - } - if (validpaths < npaths) { -- fplist = (FontPathElementPtr *) -+ FontPathElementPtr *ftmp = (FontPathElementPtr *) - fsrealloc(fplist, sizeof(FontPathElementPtr) * validpaths); -+ -+ if (!ftmp) -+ goto bail; -+ fplist = ftmp; - npaths = validpaths; - } - if (validpaths == 0) { ---- programs/xfs/difs/main.c 2001/04/01 14:00:20 3.7 -+++ programs/xfs/difs/main.c 2001/06/21 01:15:45 -@@ -171,11 +171,14 @@ - exit(0); - } - --void -+int - NotImplemented(void) - { - NoopDDA(); /* dummy to get difsutils.o to link */ -- FatalError("Not implemented\n"); -+ /* Getting here can become the next xfs exploit... so don't exit */ -+ ErrorF("Not implemented\n"); -+ -+ return (FSBadImplementation); - } - - static Bool ---- programs/xfs/difs/swapreq.c 2001/01/17 23:45:29 1.5 -+++ programs/xfs/difs/swapreq.c 2001/06/21 01:15:46 -@@ -135,8 +135,8 @@ - return ((*ProcVector[stuff->reqType]) (client)); - } - --static void --swap_auth(pointer data, int num) -+static int -+swap_auth(ClientPtr client, pointer data, int num, int length) - { - unsigned char *p; - unsigned char t; -@@ -158,16 +158,29 @@ - p += 2; - p += (namelen + 3) & ~3; - p += (datalen + 3) & ~3; -+ if (p - (unsigned char *)data > length - (i < num ? 8 : 0)) { -+ int lengthword = length; -+ -+ SendErrToClient(client, FSBadLength, (pointer)&lengthword); -+ return (FSBadLength); -+ } - } -+ -+ return (FSSuccess); - } - - int - SProcCreateAC(ClientPtr client) - { -+ int status; -+ - REQUEST(fsCreateACReq); - stuff->length = lswaps(stuff->length); - stuff->acid = lswapl(stuff->acid); -- swap_auth((pointer) &stuff[1], stuff->num_auths); -+ status = swap_auth(client, (pointer) &stuff[1], -+ stuff->num_auths, stuff->length); -+ if (status != FSSuccess) -+ return (status); - return ((*ProcVector[stuff->reqType]) (client)); - } - -@@ -177,6 +190,8 @@ - REQUEST(fsSetResolutionReq); - stuff->length = lswaps(stuff->length); - stuff->num_resolutions = lswaps(stuff->num_resolutions); -+ if ((int)stuff->length - (&stuff[1] - &stuff[0]) < stuff->num_resolutions) -+ return (FSBadLength); - SwapShorts((short *) &stuff[1], stuff->num_resolutions); - - return ((*ProcVector[stuff->reqType]) (client)); -@@ -255,11 +270,14 @@ - return ((*ProcVector[stuff->reqType]) (client)); - } - --void --SwapConnClientPrefix(fsConnClientPrefix *pCCP) -+int -+SwapConnClientPrefix(ClientPtr client, fsConnClientPrefix *pCCP) - { -+ REQUEST(fsFakeReq); -+ - pCCP->major_version = lswaps(pCCP->major_version); - pCCP->minor_version = lswaps(pCCP->minor_version); - pCCP->auth_len = lswaps(pCCP->auth_len); -- swap_auth((pointer) &pCCP[1], pCCP->num_auths); -+ return (swap_auth(client, (pointer) &pCCP[1], -+ pCCP->num_auths, stuff->length)); - } ---- programs/xfs/include/difs.h 1999/08/21 13:48:50 1.2 -+++ programs/xfs/include/difs.h 2001/06/21 01:15:46 -@@ -83,6 +83,6 @@ - #endif - - /* difs/main.c */ --extern void NotImplemented(void); -+extern int NotImplemented(void); - - #endif ---- programs/xfs/include/osstruct.h 2001/01/16 22:52:04 1.1.1.4 -+++ programs/xfs/include/osstruct.h 2001/06/21 01:15:46 -@@ -49,16 +49,16 @@ - #include "os.h" - - typedef struct _alt_server { -- char subset; -- short namelen; -- char *name; -+ char subset; -+ unsigned short namelen; -+ char *name; - } AlternateServerRec; - - typedef struct _auth { -- short namelen; -- short datalen; -- char *name; -- char *data; -+ unsigned short namelen; -+ unsigned short datalen; -+ char *name; -+ char *data; - } AuthRec; - - #endif /* _OSSTRUCT_H_ */ ---- programs/xfs/include/swapreq.h 1998/10/25 07:12:32 1.1 -+++ programs/xfs/include/swapreq.h 2001/06/21 01:15:47 -@@ -48,7 +48,7 @@ - extern int SProcResourceRequest(ClientPtr client); - extern int SProcSetResolution(ClientPtr client); - extern int SProcSimpleRequest(ClientPtr client); --extern void SwapConnClientPrefix(fsConnClientPrefix *pCCP); -+extern int SwapConnClientPrefix(ClientPtr client, fsConnClientPrefix *pCCP); - extern void SwapLongs(long *list, unsigned long count); - extern void SwapShorts(short *list, unsigned long count); - -cvs server: Diffing xc/programs/xfs/os ---- programs/xfs/os/io.c 2001/01/17 23:45:32 3.12 -+++ programs/xfs/os/io.c 2001/06/21 01:15:47 -@@ -127,14 +127,24 @@ - int - ReadRequest(ClientPtr client) - { -- OsCommPtr oc = (OsCommPtr) client->osPrivate; -- ConnectionInputPtr oci = oc->input; -+ OsCommPtr oc; -+ ConnectionInputPtr oci; - fsReq *request; -- int fd = oc->fd; -- int result, -+ int fd, -+ result, - gotnow, - needed = 0; - -+ if (client == NULL) -+ return -1; -+ oc = (OsCommPtr) client->osPrivate; -+ if (oc == NULL) -+ return -1; -+ oci = oc->input; -+ fd = oc->fd; -+ if (oci == NULL || fd < 0) -+ return -1; -+ - if (AvailableInput) { - if (AvailableInput != oc) { - ConnectionInputPtr aci = AvailableInput->input; -@@ -207,6 +217,8 @@ - oci->bufcnt = gotnow; - } - /* fill 'er up */ -+ if (oc->trans_conn == NULL) -+ return -1; - result = _FontTransRead(oc->trans_conn, oci->buffer + oci->bufcnt, - oci->size - oci->bufcnt); - if (result <= 0) { -@@ -230,7 +242,7 @@ - (oci->bufcnt < BUFSIZE) && (needed < BUFSIZE)) { - char *ibuf; - -- ibuf = (char *) fsrealloc(oci, BUFSIZE); -+ ibuf = (char *) fsrealloc(oci->buffer, BUFSIZE); - if (ibuf) { - oci->size = BUFSIZE; - oci->buffer = ibuf; - - diff --git a/x11/XFree86-4-libraries/files/patch-z02 b/x11/XFree86-4-libraries/files/patch-z02 index cbf157626f02..e9c45890eb8d 100644 --- a/x11/XFree86-4-libraries/files/patch-z02 +++ b/x11/XFree86-4-libraries/files/patch-z02 @@ -1,6 +1,6 @@ ---- Imakefile.orig Thu Aug 3 22:25:52 2000 -+++ Imakefile Mon Mar 26 03:32:39 2001 -@@ -18,8 +18,32 @@ +--- Imakefile.orig Thu Mar 22 02:36:43 2001 ++++ Imakefile Mon Jan 21 22:15:51 2002 +@@ -25,8 +25,27 @@ #endif #endif @@ -12,11 +12,6 @@ +#else +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin + SUBDIRS = include config lib $(NLSSUBDIR) \ -+ programs/Xserver/include programs/Xserver/hw/xfree86/parser \ -+ programs/Xserver/hw/xfree86/dummylib \ -+ programs/Xserver/hw/xfree86/loader \ -+ programs/Xserver/hw/xfree86/xf86cfg \ -+ programs/Xserver/hw/xfree86/os-support \ + programs/rgb \ + programs \ + fonts/util @@ -33,7 +28,7 @@ LNINSTALLDIRS = lib #if HasParallelMake -@@ -210,3 +234,98 @@ +@@ -227,3 +246,98 @@ #undef BootstrapCleanSubdirs #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" BOOTSTRAPSUBDIRS = imake makedepend @@ -47,7 +42,7 @@ + programs/Xserver/hw/xfree86/parser +#else +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin -+FreeBSDPortsInstallDir = lib programs programs programs/Xserver/hw/xfree86/xf86cfg fonts/util programs/rgb ++FreeBSDPortsInstallDir = lib programs/rgb programs fonts/util +#else +#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv +FreeBSDPortsInstallDir = programs lib/font $(FreeBSDPortsDRIDir) diff --git a/x11/XFree86-4-libraries/files/patch-z06 b/x11/XFree86-4-libraries/files/patch-z06 index 127e554324c6..c4718575ceda 100644 --- a/x11/XFree86-4-libraries/files/patch-z06 +++ b/x11/XFree86-4-libraries/files/patch-z06 @@ -1,11 +1,11 @@ ---- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Sat Jul 1 08:39:11 2000 -+++ programs/Xserver/hw/xfree86/os-support/Imakefile Sun Jul 16 21:38:29 2000 -@@ -109,6 +109,8 @@ - SRCS = $(OS_SUBDIR)/?*.c $(BUS_SUBDIR)/?*.c misc/?*.c vbe/?*.c $(DRM_SRC) - OBJS = $(OS_SUBDIR)/?*.o $(BUS_SUBDIR)/?*.o misc/?*.o vbe/?*.o $(DRM_OBJ) +--- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Fri Dec 28 05:07:05 2001 ++++ programs/Xserver/hw/xfree86/os-support/Imakefile Sat Jan 19 23:46:45 2002 +@@ -95,6 +95,8 @@ + SRCS = $(OS_SUBDIR)/?*.c $(BUS_SUBDIR)/?*.c misc/?*.c $(VBE_SRC) $(DRM_SRC) + OBJS = $(OS_SUBDIR)/?*.o $(BUS_SUBDIR)/?*.o misc/?*.o $(VBE_OBJ) $(DRM_OBJ) +HEADERS = xf86_ansic.h + - DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE vbe/DONE $(DRM_DONES) + DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE $(VBE_DONES) $(DRM_DONES) #if HasParallelMake diff --git a/x11/XFree86-4-libraries/files/patch-z34 b/x11/XFree86-4-libraries/files/patch-z34 index 7a79e764d544..71bc523266e1 100644 --- a/x11/XFree86-4-libraries/files/patch-z34 +++ b/x11/XFree86-4-libraries/files/patch-z34 @@ -1,33 +1,11 @@ ---- lib/font/Imakefile.orig Thu Jan 18 04:43:16 2001 -+++ lib/font/Imakefile Thu Jun 7 04:03:36 2001 -@@ -125,22 +125,30 @@ - - #if NormalLibFont - NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS)) -+# if !defined(LibInstall) || LibInstall - InstallLibrary($(LIBNAME),$(USRLIBDIR)) -+# endif /* LibInstall */ - #endif /* NormalLibFont */ - - #if SharedLibFont - SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.) -+# if !defined(LibInstall) || LibInstall - InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) -+# endif /* LibInstall */ - #endif /* SharedLibFont */ - - #if DebugLibFont - DebuggedDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(DEBUG_OBJS)) -+# if !defined(LibInstall) || LibInstall - InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) -+# endif /* LibInstall */ - #endif /* DebugLibFont */ - - #if ProfileLibFont - ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(PROFILE_OBJS)) -+# if !defined(LibInstall) || LibInstall - InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -+# endif /* LibInstall */ - #endif /* ProfileLibFont */ - - #if BuildServer && DoLoadableServer +--- lib/font/Imakefile.orig Tue Aug 28 02:40:58 2001 ++++ lib/font/Imakefile Mon Jan 21 02:47:57 2002 +@@ -21,7 +21,7 @@ + #define LibCreate YES + #endif + +-#if BuildLibraries ++#if BuildLibraries && !FreeBSDBuildXbin + #define LibInstall YES + #else + #define LibInstall NO diff --git a/x11/XFree86-4-libraries/files/patch-z37 b/x11/XFree86-4-libraries/files/patch-z37 index 1ac6e657ff69..2a0e488ba13b 100644 --- a/x11/XFree86-4-libraries/files/patch-z37 +++ b/x11/XFree86-4-libraries/files/patch-z37 @@ -1,34 +1,11 @@ ---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Fri Dec 15 04:47:46 2000 -+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Fri Jan 5 16:39:23 2001 -@@ -12,6 +12,11 @@ - TEXTOBJ = text-mode.o - #endif - -+#if defined(FreeBSDBuildXbin) -+INCLUDES = -I../parser -+#endif -+ -+ - SRCS =\ - accessx.c\ - card-cfg.c\ -@@ -82,7 +87,7 @@ - #if DoLoadableServer - LOADERLIB = -L../loader -lxloader -L../dummylib -ldummy +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Tue Jul 10 08:45:24 2001 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Jan 21 07:27:55 2002 +@@ -84,7 +84,7 @@ MODULEDEFINES = -DUSE_MODULES --INCLUDES = -I../common -I../loader -I$(XF86OSSRC) \ -+INCLUDES = -I../common -I../loader -I$(XF86OSSRC) -I$(XF86OSSRC)/bus \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) + INCLUDES = -I../common -I../loader -I$(XF86OSSRC) \ + -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ +- -I$(FONTLIBSRC)/include ++ -I$(FONTLIBSRC)/include -I$(XF86OSSRC)/bus -I../parser #if !HasSnprintf SNPRINTF_DEFS = -DNEED_SNPRINTF -@@ -109,8 +114,10 @@ - - NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),) - InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter) -+#if !defined(LibHeaders) || LibHeaders - InstallMultipleFlags($(XBMPICS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS)) - InstallMultipleFlags($(XPMPICS),$(INCDIR)/X11/pixmaps,$(INSTINCFLAGS)) -+#endif - InstallAppDefaults(XF86Cfg) - - CppManTarget(xf86cfg,) + #endif diff --git a/x11/XFree86-4-libraries/files/patch-z46 b/x11/XFree86-4-libraries/files/patch-z46 new file mode 100644 index 000000000000..6ea5a0df5a65 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z46 @@ -0,0 +1,11 @@ +--- programs/Xserver/hw/xfree86/loader/Imakefile.orig Sat Nov 17 01:47:55 2001 ++++ programs/Xserver/hw/xfree86/loader/Imakefile Mon Jan 21 00:22:06 2002 +@@ -35,7 +35,7 @@ + + MODULEDEFINES = -DDEFAULT_MODULE_PATH=\"$(MODULEDIR)\" + +- INCLUDES = -I. -I.. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/vbe \ ++ INCLUDES = -I. -I.. -I../parser -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/vbe \ + -I$(SERVERSRC)/dbe -I$(SERVERSRC)/Xext -I$(XF86SRC)/int10 \ + -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/os -I$(XINCLUDESRC) -I$(FONTINCSRC) \ diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist index 2d48aa56276d..3cc78cee63e7 100644 --- a/x11/XFree86-4-libraries/pkg-plist +++ b/x11/XFree86-4-libraries/pkg-plist @@ -1,3 +1,5 @@ +@unexec %D/bin/mkhtmlindex %D/lib/X11/doc/html +@exec %D/bin/mkhtmlindex %D/lib/X11/doc/html include/DPS/ColorSB.h include/DPS/ColorSBP.h include/DPS/DPSScrollW.h @@ -302,6 +304,7 @@ include/X11/extensions/XKBstr.h include/X11/extensions/XKBui.h include/X11/extensions/XKM.h include/X11/extensions/XKMformat.h +include/X11/extensions/XLbx.h include/X11/extensions/XShm.h include/X11/extensions/XTest.h include/X11/extensions/Xag.h @@ -313,6 +316,7 @@ include/X11/extensions/Xdbe.h include/X11/extensions/Xdbeproto.h include/X11/extensions/Xext.h include/X11/extensions/Xinerama.h +include/X11/extensions/Xrandr.h include/X11/extensions/Xrender.h include/X11/extensions/Xv.h include/X11/extensions/XvMC.h @@ -335,6 +339,8 @@ include/X11/extensions/lbxzlib.h include/X11/extensions/multibuf.h include/X11/extensions/panoramiXext.h include/X11/extensions/panoramiXproto.h +include/X11/extensions/randr.h +include/X11/extensions/randrproto.h include/X11/extensions/record.h include/X11/extensions/recordstr.h include/X11/extensions/render.h @@ -357,6 +363,13 @@ include/X11/extensions/xf86mscstr.h include/X11/extensions/xf86vmode.h include/X11/extensions/xf86vmstr.h include/X11/extensions/xtestext1.h +include/X11/extensions/xtrapbits.h +include/X11/extensions/xtrapddmi.h +include/X11/extensions/xtrapdi.h +include/X11/extensions/xtrapemacros.h +include/X11/extensions/xtraplib.h +include/X11/extensions/xtraplibp.h +include/X11/extensions/xtrapproto.h include/X11/fonts/FS.h include/X11/fonts/FSlib.h include/X11/fonts/FSproto.h @@ -366,6 +379,7 @@ include/X11/fonts/codeconv/xttcconv.h include/X11/fonts/codeconv/xttcconvP.h include/X11/fonts/codeconv/xttcommon.h include/X11/fonts/codeconv/xttversion.h +include/X11/fonts/fontenc.h include/X11/fonts/fsmasks.h include/X11/keysym.h include/X11/keysymdef.h @@ -380,85 +394,136 @@ include/site.h include/xf86Optrec.h include/xf86Parser.h lib/X11/XftConfig +lib/X11/locale/C/XI18N_OBJS lib/X11/locale/C/XLC_LOCALE lib/X11/locale/armscii-8/Compose +lib/X11/locale/armscii-8/XI18N_OBJS lib/X11/locale/armscii-8/XLC_LOCALE +lib/X11/locale/common/ximcp.so.2 +lib/X11/locale/common/xlcDef.so.2 +lib/X11/locale/common/xlcUTF8Load.so.2 +lib/X11/locale/common/xlibi18n.so.2 +lib/X11/locale/common/xlocale.so.2 +lib/X11/locale/common/xomGeneric.so.2 lib/X11/locale/compose.dir +lib/X11/locale/en_US.UTF-8/Compose +lib/X11/locale/en_US.UTF-8/XI18N_OBJS lib/X11/locale/en_US.UTF-8/XLC_LOCALE lib/X11/locale/georgian-academy/Compose +lib/X11/locale/georgian-academy/XI18N_OBJS lib/X11/locale/georgian-academy/XLC_LOCALE lib/X11/locale/georgian-ps/Compose +lib/X11/locale/georgian-ps/XI18N_OBJS lib/X11/locale/georgian-ps/XLC_LOCALE lib/X11/locale/ibm-cp1133/Compose +lib/X11/locale/ibm-cp1133/XI18N_OBJS lib/X11/locale/ibm-cp1133/XLC_LOCALE +lib/X11/locale/iscii-dev/XI18N_OBJS lib/X11/locale/iscii-dev/XLC_LOCALE +lib/X11/locale/isiri-3342/XI18N_OBJS lib/X11/locale/isiri-3342/XLC_LOCALE lib/X11/locale/iso8859-1/Compose +lib/X11/locale/iso8859-1/XI18N_OBJS lib/X11/locale/iso8859-1/XLC_LOCALE lib/X11/locale/iso8859-10/Compose +lib/X11/locale/iso8859-10/XI18N_OBJS lib/X11/locale/iso8859-10/XLC_LOCALE lib/X11/locale/iso8859-13/Compose +lib/X11/locale/iso8859-13/XI18N_OBJS lib/X11/locale/iso8859-13/XLC_LOCALE lib/X11/locale/iso8859-14/Compose +lib/X11/locale/iso8859-14/XI18N_OBJS lib/X11/locale/iso8859-14/XLC_LOCALE lib/X11/locale/iso8859-15/Compose +lib/X11/locale/iso8859-15/XI18N_OBJS lib/X11/locale/iso8859-15/XLC_LOCALE lib/X11/locale/iso8859-2/Compose +lib/X11/locale/iso8859-2/XI18N_OBJS lib/X11/locale/iso8859-2/XLC_LOCALE lib/X11/locale/iso8859-3/Compose +lib/X11/locale/iso8859-3/XI18N_OBJS lib/X11/locale/iso8859-3/XLC_LOCALE lib/X11/locale/iso8859-4/Compose +lib/X11/locale/iso8859-4/XI18N_OBJS lib/X11/locale/iso8859-4/XLC_LOCALE lib/X11/locale/iso8859-5/Compose +lib/X11/locale/iso8859-5/XI18N_OBJS lib/X11/locale/iso8859-5/XLC_LOCALE lib/X11/locale/iso8859-6/Compose +lib/X11/locale/iso8859-6/XI18N_OBJS lib/X11/locale/iso8859-6/XLC_LOCALE lib/X11/locale/iso8859-7/Compose +lib/X11/locale/iso8859-7/XI18N_OBJS lib/X11/locale/iso8859-7/XLC_LOCALE lib/X11/locale/iso8859-8/Compose +lib/X11/locale/iso8859-8/XI18N_OBJS lib/X11/locale/iso8859-8/XLC_LOCALE lib/X11/locale/iso8859-9/Compose +lib/X11/locale/iso8859-9/XI18N_OBJS lib/X11/locale/iso8859-9/XLC_LOCALE lib/X11/locale/iso8859-9e/Compose +lib/X11/locale/iso8859-9e/XI18N_OBJS lib/X11/locale/iso8859-9e/XLC_LOCALE lib/X11/locale/ja.JIS/Compose +lib/X11/locale/ja.JIS/XI18N_OBJS lib/X11/locale/ja.JIS/XLC_LOCALE lib/X11/locale/ja.SJIS/Compose +lib/X11/locale/ja.SJIS/XI18N_OBJS lib/X11/locale/ja.SJIS/XLC_LOCALE lib/X11/locale/ja/Compose +lib/X11/locale/ja/XI18N_OBJS lib/X11/locale/ja/XLC_LOCALE lib/X11/locale/ko/Compose +lib/X11/locale/ko/XI18N_OBJS lib/X11/locale/ko/XLC_LOCALE lib/X11/locale/koi8-c/Compose +lib/X11/locale/koi8-c/XI18N_OBJS lib/X11/locale/koi8-c/XLC_LOCALE lib/X11/locale/koi8-r/Compose +lib/X11/locale/koi8-r/XI18N_OBJS lib/X11/locale/koi8-r/XLC_LOCALE lib/X11/locale/koi8-u/Compose +lib/X11/locale/koi8-u/XI18N_OBJS lib/X11/locale/koi8-u/XLC_LOCALE lib/X11/locale/locale.alias lib/X11/locale/locale.dir +lib/X11/locale/microsoft-cp1251/XI18N_OBJS lib/X11/locale/microsoft-cp1251/XLC_LOCALE +lib/X11/locale/microsoft-cp1255/XI18N_OBJS lib/X11/locale/microsoft-cp1255/XLC_LOCALE +lib/X11/locale/microsoft-cp1256/XI18N_OBJS lib/X11/locale/microsoft-cp1256/XLC_LOCALE -lib/X11/locale/mk_MK.UTF-8/Compose lib/X11/locale/mulelao-1/Compose +lib/X11/locale/mulelao-1/XI18N_OBJS lib/X11/locale/mulelao-1/XLC_LOCALE +lib/X11/locale/nokhchi-1/XI18N_OBJS lib/X11/locale/nokhchi-1/XLC_LOCALE +lib/X11/locale/tatar-cyr/XI18N_OBJS lib/X11/locale/tatar-cyr/XLC_LOCALE +lib/X11/locale/th_TH/XI18N_OBJS lib/X11/locale/th_TH/XLC_LOCALE +lib/X11/locale/tscii-0/XI18N_OBJS lib/X11/locale/tscii-0/XLC_LOCALE lib/X11/locale/vi_VN.tcvn/Compose +lib/X11/locale/vi_VN.tcvn/XI18N_OBJS lib/X11/locale/vi_VN.tcvn/XLC_LOCALE lib/X11/locale/vi_VN.viscii/Compose +lib/X11/locale/vi_VN.viscii/XI18N_OBJS lib/X11/locale/vi_VN.viscii/XLC_LOCALE -lib/X11/locale/zh/Compose -lib/X11/locale/zh/XLC_LOCALE +lib/X11/locale/zh/XI18N_OBJS lib/X11/locale/zh_CN.gbk/Compose +lib/X11/locale/zh_CN.gbk/XI18N_OBJS lib/X11/locale/zh_CN.gbk/XLC_LOCALE +lib/X11/locale/zh_CN/Compose +lib/X11/locale/zh_CN/XLC_LOCALE +lib/X11/locale/zh_HK.big5/XLC_LOCALE +lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE lib/X11/locale/zh_TW.Big5/Compose lib/X11/locale/zh_TW.Big5/XLC_LOCALE +lib/X11/locale/zh_TW.Big5/XI18N_OBJS lib/X11/locale/zh_TW/Compose +lib/X11/locale/zh_TW/XI18N_OBJS lib/X11/locale/zh_TW/XLC_LOCALE lib/libFS.a lib/libGL.a @@ -488,6 +553,9 @@ lib/libXIE.so lib/libXIE.so.6 lib/libXThrStub.so lib/libXThrStub.so.6 +lib/libXTrap.a +lib/libXTrap.so +lib/libXTrap.so.6 lib/libXau.a lib/libXaw.a lib/libXaw.so @@ -520,6 +588,9 @@ lib/libXp.so.6 lib/libXpm.a lib/libXpm.so lib/libXpm.so.4 +lib/libXrandr.a +lib/libXrandr.so +lib/libXrandr.so.1 lib/libXrender.a lib/libXrender.so lib/libXrender.so.1 @@ -531,6 +602,7 @@ lib/libXtst.a lib/libXtst.so lib/libXtst.so.6 lib/libXv.a +lib/libXvMC.a lib/libXxf86dga.a lib/libXxf86misc.a lib/libXxf86vm.a @@ -541,6 +613,7 @@ lib/libdpstk.a lib/libdpstk.so lib/libdpstk.so.1 lib/libfntstubs.a +lib/libfontenc.a lib/liboldX.a lib/liboldX.so lib/liboldX.so.6 diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index 3d5393dbc7f6..eb98efd99287 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -73,10 +73,8 @@ configure () { echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF - # Check Wraphelp.c - if [ $HasXdmAuth = DEFAULT ]; then - HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1) - fi + HasXdmAuth=YES + cpwh=NO if [ $HasXdmAuth = YES ]; then WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c |