diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-08-10 01:29:22 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-08-10 01:29:22 +0000 |
| commit | 42c2cdc260b0e772e68388af270c8dc52619f390 (patch) | |
| tree | c42eb73319325adc39ee7608c734da7d99ebdc3c /x11/XFree86-4-libraries | |
| parent | 27473f06b4aa63d0f61eecc36b5c4d1d358a4cb9 (diff) | |
| download | ports-42c2cdc260b0e772e68388af270c8dc52619f390.tar.gz ports-42c2cdc260b0e772e68388af270c8dc52619f390.zip | |
Update XFree86 clients to 4.4 release. Release notes are available at
http://www.xfree86.org/4.4.0/RELNOTES.html
PR: ports/67733 imake
ports/67508 libraries
ports/67510 clients
ports/67513 server
ports/67776 100dpi fonts
ports/67777 75dpi fonts
ports/67778 cyrillic fonts
ports/67779 default bitmap fonts
ports/67781 font encodings
ports/67783 scalable fonts
ports/67784 font server
ports/67785 XFree86 meta-port
ports/67775 documents
ports/67786 manpages
ports/67787 nest server
ports/67788 print server
ports/67789 virtual framebuffer server
ports/56487 (Upgrading Xfree86-clients from ports overwrites xdm config files)
ports/44252 (XFree86-4-Server port removes/overwrites config files)
Submitted by: Dejan Lesjak (dejan DOT lesjak AT ijs DOT si)
Additional changes by: anholt
Jung-uk Kim (jkim AT niksun DOT com)
arved
Tested by: pointyhat
linimon
Notes
Notes:
svn path=/head/; revision=115778
Diffstat (limited to 'x11/XFree86-4-libraries')
22 files changed, 483 insertions, 926 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 599518c4b926..fdafd0b2f9ec 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -6,21 +6,20 @@ # PORTNAME= libraries -PORTVERSION= 4.3.0 -PORTREVISION= 7 +PORTVERSION= 4.4.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz:x \ - X430src-2.tgz:x \ - X430src-3.tgz:x \ +DISTFILES= XFree86-4.4.0-src-1.tgz:x \ + XFree86-4.4.0-src-2.tgz:x \ + XFree86-4.4.0-src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz +EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ + XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 libraries and headers @@ -40,7 +39,54 @@ PREFIX?= ${X11BASE} MTREE_FILE= /etc/mtree/BSD.x11-4.dist INSTALLS_SHLIB= yes SCRIPTS_ENV= DebuggableLibraries=${DebuggableLibraries} -MAN3= Xaw.3 Xcursor.3 Xrandr.3 +MAN3= FontCacheChangeCacheSettings.3 \ + FontCacheGetCacheSettings.3 \ + FontCacheGetCacheStatistics.3 \ + FontCacheQueryExtension.3 \ + FontCacheQueryVersion.3 \ + XDGA.3 \ + XDGAChangePixmapMode.3 \ + XDGACloseFramebuffer.3 \ + XDGACopyArea.3 \ + XDGACopyTransparentArea.3 \ + XDGACreateColormap.3 \ + XDGAFillRectangle.3 \ + XDGAGetViewportStatus.3 \ + XDGAInstallColormap.3 \ + XDGAKeyEventToXKeyEvent.3 \ + XDGAOpenFramebuffer.3 \ + XDGAQueryExtension.3 \ + XDGAQueryModes.3 \ + XDGAQueryVersion.3 \ + XDGASelectInput.3 \ + XDGASetClientVersion.3 \ + XDGASetMode.3 \ + XDGASetViewport.3 \ + XDGASync.3 \ + XF86DGA.3 \ + XFree86-DGA.3 \ + XRes.3 \ + XResQueryClientPixmapBytes.3 \ + XResQueryClientResources.3 \ + XResQueryClients.3 \ + XResQueryExtension.3 \ + XResQueryVersion.3 \ + XScreenSaverAllocInfo.3 \ + XScreenSaverGetRegistered.3 \ + XScreenSaverQueryExtension.3 \ + XScreenSaverQueryInfo.3 \ + XScreenSaverQueryVersion.3 \ + XScreenSaverRegister.3 \ + XScreenSaverSelectInput.3 \ + XScreenSaverSetAttributes.3 \ + XScreenSaverUnregister.3 \ + XScreenSaverUnsetAttributes.3 \ + Xaw.3 \ + Xcursor.3 \ + Xfontcache.3 \ + Xrandr.3 \ + Xss.3 + XBUILD_DIRS= lib nls programs/Xserver/include \ programs/Xserver/hw/xfree86/parser XINCLUDE_DIRS= programs/proxymngr @@ -78,20 +124,12 @@ PLIST_SUB+= XTHRSTUB:="@comment " PLIST_SUB+= XTHRSTUB:="" .endif -# amd64 also supplies libxkbfile.so* -.if ${MACHINE_ARCH} == "amd64" -PLIST_SUB+= AMD64:="" -.else -PLIST_SUB+= AMD64:="@comment " -.endif - post-extract: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c post-patch: ${CP} ${FILESDIR}/nls::Compose::microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251 - ${MKDIR} ${WRKSRC}/exports/lib post-install: ${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PM.h \ diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index 4c3445d29834..edbe3d91944d 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1,8 +1,8 @@ -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af -SIZE (xc/X430src-1.tgz) = 10993622 -MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 -SIZE (xc/X430src-2.tgz) = 7962239 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 -SIZE (xc/X430src-3.tgz) = 12366363 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 SIZE (xc/Wraphelp2.gz) = 3376 diff --git a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf index 6938da5efc6d..468995e71539 100644 --- a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf +++ b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf @@ -1,6 +1,6 @@ ---- config/cf/FreeBSD.cf.orig Tue Jan 14 21:52:12 2003 -+++ config/cf/FreeBSD.cf Thu Feb 5 12:33:53 2004 -@@ -89,14 +89,14 @@ +--- config/cf/FreeBSD.cf.orig Thu Apr 8 05:39:06 2004 ++++ config/cf/FreeBSD.cf Thu Apr 8 06:04:59 2004 +@@ -108,14 +108,14 @@ # endif # define HasPosixThreads YES # define ThreadedX YES @@ -17,19 +17,20 @@ # else # if OSRelVersion >= 500043 # define BuildThreadStubLibrary NO -@@ -106,9 +106,9 @@ +@@ -125,10 +125,10 @@ # define NeedUIThrStubs YES # endif # if (OSRelVersion >= 500016) -# define ThreadsLibraries -lc_r +# define ThreadsLibraries %%PTHREAD_LIBS%% + # define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc # else -# define ThreadsLibraries -pthread +# define ThreadsLibraries %%PTHREAD_LIBS%% # endif # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) -@@ -162,11 +162,11 @@ + # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) +@@ -187,11 +187,11 @@ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) @@ -45,79 +46,23 @@ #endif #define CppCmd /usr/bin/cpp -@@ -177,7 +177,12 @@ - #if defined(UseInstalled) - #define DefaultCCOptions /**/ - #else --#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions -+#if defined(HasGcc3) && HasGcc3 -+#define NoSystemWarn -Wno-system-headers -+#else -+#define NoSystemWarn -+#endif -+#define DefaultCCOptions -ansi -Dasm=__asm NoSystemWarn GccWarningOptions - #endif - #endif - #ifndef ExtraLibraries -@@ -228,21 +233,25 @@ - #endif - - /* -- * 4.1/i386 and 5.0/i386 have the AGP driver. -+ * 4.1/i386 and 5.0/i386,alpha,ia64,amd64 have the AGP driver. - */ - #ifndef HasAgpGart - #if defined(i386Architecture) && \ - (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)) - #define HasAgpGart YES - #endif -+#if (defined(AlphaArchitecture) || defined(ia64Architecture) || \ -+ defined(x86_64Architecture)) && (OSMajorVersion >= 5) -+#define HasAgpGart YES -+#endif - #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) && \ -- (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2)) -+#if defined(x86_64Architecture) || (defined(i386Architecture) && \ -+ (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))) - # define HasX86Support YES - # define HasMMXSupport YES - # define Has3DNowSupport YES -@@ -299,7 +308,7 @@ - - #ifndef SharedLibraryLoadFlags - #if UseElfFormat --#define SharedLibraryLoadFlags -shared -rpath $(USRLIBDIRPATH) -+#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH) - #else - #define SharedLibraryLoadFlags -Bshareable -R $(USRLIBDIRPATH) - #endif -@@ -455,10 +464,8 @@ - #ifdef i386Architecture - #define ServerExtraDefines GccGasOption XFree86ServerDefines - #endif --#ifdef AlphaArchitecture --#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 --#endif --#ifdef Sparc64Architecture -+#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \ -+ defined(ia64Architecture) || defined(x86_64Architecture) - #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 - #endif - -@@ -482,18 +489,8 @@ +@@ -354,7 +354,7 @@ + #ifndef LibraryRpathLoadFlags + # if UseRpath + # if UseElfFormat +-# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH) ++# define LibraryRpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) + # else + # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) + # endif +@@ -439,18 +439,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif -/* 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 +-#define DefaultGcc2i386Opt -O2 GccAliasingArgs -#endif -#endif - diff --git a/x11/XFree86-4-libraries/files/patch-Imake.cf b/x11/XFree86-4-libraries/files/patch-Imake.cf deleted file mode 100644 index 11e6068925b0..000000000000 --- a/x11/XFree86-4-libraries/files/patch-Imake.cf +++ /dev/null @@ -1,18 +0,0 @@ ---- config/cf/Imake.cf.orig Tue Feb 18 08:51:45 2003 -+++ config/cf/Imake.cf Tue Jul 15 20:02:05 2003 -@@ -232,6 +232,15 @@ - # define Sparc64Architecture - # undef __sparc64__ - # endif -+# ifdef __ia64__ -+# define ia64Architecture -+# undef __ia64__ -+# endif -+# ifdef __amd64__ -+# define x86_64Architecture -+# undef __amd64__ -+# undef __x86_64__ -+# endif - #endif /* __FreeBSD__ */ - - #ifdef AMOEBA diff --git a/x11/XFree86-4-libraries/files/patch-X11.tmpl b/x11/XFree86-4-libraries/files/patch-X11.tmpl index dc4673d50344..1c152e2aafe2 100644 --- a/x11/XFree86-4-libraries/files/patch-X11.tmpl +++ b/x11/XFree86-4-libraries/files/patch-X11.tmpl @@ -1,6 +1,6 @@ ---- config/cf/X11.tmpl.orig Tue Feb 25 13:57:52 2003 -+++ config/cf/X11.tmpl Sun Mar 2 21:13:31 2003 -@@ -575,7 +575,7 @@ +--- config/cf/X11.tmpl.orig Thu Apr 8 22:31:58 2004 ++++ config/cf/X11.tmpl Thu Apr 8 22:42:52 2004 +@@ -544,7 +544,7 @@ #define BuildXft1Library BuildRenderLibrary #endif #ifndef UseFontconfig @@ -9,7 +9,7 @@ #endif #ifndef BuildFontconfigLibrary #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -1497,7 +1497,14 @@ +@@ -1499,7 +1499,14 @@ #endif #ifndef PsWrap @@ -23,16 +23,4 @@ + PSWRAP = PsWrap #endif - #ifndef ResourceConfigurationManagement -@@ -3028,7 +3035,10 @@ - - #endif /* else BuildFreetype2Library */ - --#if BuildFreetype2Library || HasFreetype2 -+#if HasFreetype2 -+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include -+FREETYPE2DEFINES = -DFREETYPE2 -+#elif BuildFreetype2Library - FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) - FREETYPE2DEFINES = -DFREETYPE2 - #endif + #ifndef ResourceConfigurationManagement diff --git a/x11/XFree86-4-libraries/files/patch-Xlc-fix b/x11/XFree86-4-libraries/files/patch-Xlc-fix deleted file mode 100644 index 93b9c4676e9d..000000000000 --- a/x11/XFree86-4-libraries/files/patch-Xlc-fix +++ /dev/null @@ -1,108 +0,0 @@ -Index: lib/X11/XlcDL.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/X11/XlcDL.c,v -retrieving revision 1.9 -retrieving revision 1.9.2.1 -diff -u -u -r1.9 -r1.9.2.1 ---- lib/X11/XlcDL.c 25 Nov 2002 14:04:53 -0000 1.9 -+++ lib/X11/XlcDL.c 11 Mar 2003 23:18:49 -0000 1.9.2.1 -@@ -406,7 +406,7 @@ - - if (lc_name == NULL) return (XLCd)NULL; - -- if (_XlcLocaleDirName(lc_dir, (char *)lc_name) == (char*)NULL) -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, (char *)lc_name) == (char*)NULL) - return (XLCd)NULL; - - resolve_object(lc_dir, lc_name); -@@ -452,7 +452,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XIM)0; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XIM)0; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -498,7 +498,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -543,7 +543,7 @@ - #endif - - lc_name = lcd->core->name; -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; - - count = lc_count; - for (; count-- > 0; objects_list++) { -@@ -610,7 +610,7 @@ - - lc_name = lcd->core->name; - -- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XOM)0; -+ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XOM)0; - - count = lc_count; - for (; count-- > 0; objects_list++) { -Index: lib/X11/XlcPubI.h -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/X11/XlcPubI.h,v -retrieving revision 3.9 -retrieving revision 3.9.6.1 -diff -u -u -r3.9 -r3.9.6.1 ---- lib/X11/XlcPubI.h 16 Nov 2001 00:52:27 -0000 3.9 -+++ lib/X11/XlcPubI.h 11 Mar 2003 23:18:49 -0000 3.9.6.1 -@@ -217,6 +217,7 @@ - extern char *_XlcLocaleDirName( - #if NeedFunctionPrototypes - char* /* dir_name */, -+ size_t, /* dir_len */ - char* /* lc_name */ - #endif - ); -Index: lib/X11/lcFile.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/X11/lcFile.c,v -retrieving revision 3.30 -retrieving revision 3.30.2.1 -diff -u -u -r3.30 -r3.30.2.1 ---- lib/X11/lcFile.c 25 Nov 2002 14:04:53 -0000 3.30 -+++ lib/X11/lcFile.c 11 Mar 2003 23:18:49 -0000 3.30.2.1 -@@ -429,8 +429,9 @@ - } - - char * --_XlcLocaleDirName(dir_name, lc_name) -+_XlcLocaleDirName(dir_name, dir_len, lc_name) - char *dir_name; -+ size_t dir_len; - char *lc_name; - { - char dir[PATH_MAX], buf[PATH_MAX], *name = NULL; -@@ -486,9 +487,16 @@ - target_dir = args[0]; - target_name = lc_name; - } -- strcpy(dir_name, target_dir); -- strcat(dir_name, "/"); -- strcat(dir_name, target_name); -+ /* snprintf(dir_name, dir_len, "%s/%", target_dir, target_name); */ -+ strncpy(dir_name, target_dir, dir_len - 1); -+ if (strlen(target_dir) >= dir_len - 1) { -+ dir_name[dir_len - 1] = '\0'; -+ } else { -+ strcat(dir_name, "/"); -+ strncat(dir_name, target_name, dir_len - strlen(dir_name) - 1); -+ if (strlen(target_name) >= dir_len - strlen(dir_name) - 1) -+ dir_name[dir_len - 1] = '\0'; -+ } - if (target_name != lc_name) - Xfree(target_name); - return dir_name; diff --git a/x11/XFree86-4-libraries/files/patch-Xv.c b/x11/XFree86-4-libraries/files/patch-Xv.c deleted file mode 100644 index b6882671a665..000000000000 --- a/x11/XFree86-4-libraries/files/patch-Xv.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: lib/Xv/Xv.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/Xv/Xv.c,v -retrieving revision 1.16 -retrieving revision 1.17 -diff -u -u -r1.16 -r1.17 ---- lib/Xv/Xv.c 16 Oct 2002 00:37:33 -0000 1.16 -+++ lib/Xv/Xv.c 28 Apr 2003 16:56:27 -0000 1.17 -@@ -267,6 +267,7 @@ - *p_nAdaptors = rep.num_adaptors; - *p_pAdaptors = pas; - -+ Xfree(buffer); - UnlockDisplay(dpy); - SyncHandle(); - diff --git a/x11/XFree86-4-libraries/files/patch-access.c b/x11/XFree86-4-libraries/files/patch-access.c deleted file mode 100644 index 3eb2b97aa37d..000000000000 --- a/x11/XFree86-4-libraries/files/patch-access.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: programs/Xserver/os/access.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/Xserver/os/access.c,v -retrieving revision 3.43 -retrieving revision 3.44 -diff -u -u -r3.43 -r3.44 ---- programs/Xserver/os/access.c 20 Apr 2003 18:35:12 -0000 3.43 -+++ programs/Xserver/os/access.c 25 May 2003 10:38:47 -0000 3.44 -@@ -745,6 +745,7 @@ - if (ifr->ifa_addr.sa_family == AF_DECnet) - continue; - #endif /* DNETCONN */ -+ len = sizeof(*(ifr->ifa_addr)); - family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr); - if (family == -1 || family == FamilyLocal) - continue; diff --git a/x11/XFree86-4-libraries/files/patch-amd64 b/x11/XFree86-4-libraries/files/patch-amd64 new file mode 100644 index 000000000000..bf1674147090 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-amd64 @@ -0,0 +1,300 @@ +--- config/imake/imakemdep.h.orig Mon Dec 29 20:53:52 2003 ++++ config/imake/imakemdep.h Tue Mar 2 11:05:16 2004 +@@ -374,6 +374,9 @@ + # ifdef __AMD64__ + "-D__AMD64__", + # endif ++# ifdef __amd64__ ++ "-D__amd64__", ++# endif + # ifdef __x86_64__ + "-D__AMD64__", + # endif +@@ -1271,6 +1274,9 @@ + # if defined (__AMD64__) || defined (__x86_64__) + {"__AMD64__", "1"}, + {"__x86_64__", "1"}, ++# endif ++# if defined (__amd64__) ++ {"__amd64__", "1"}, + # endif + # ifdef __i386 + {"__i386", "1"}, +--- extras/Mesa/src/mmath.h.orig Wed Oct 22 11:44:41 2003 ++++ extras/Mesa/src/mmath.h Thu Mar 4 14:25:57 2004 +@@ -205,7 +205,7 @@ + + + #if defined(__i386__) || defined(__sparc__) || defined(__s390x__) || \ +- defined(__powerpc__) || defined(__AMD64__) || \ ++ defined(__powerpc__) || defined(__AMD64__) || defined(__amd64__) || \ + ( defined(__alpha__) && ( defined(__IEEE_FLOAT) || !defined(VMS) ) ) + #define USE_IEEE + #endif +--- extras/x86emu/include/x86emu/types.h.orig Mon Jul 7 11:34:21 2003 ++++ extras/x86emu/include/x86emu/types.h Thu Mar 4 14:29:56 2004 +@@ -76,7 +76,7 @@ + defined(__sparc64__) || \ + defined(__s390x__) || \ + (defined(__hppa__) && defined(__LP64)) || \ +- defined(__AMD64__) || defined(AMD64) || \ ++ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \ + (defined(__sgi) && (_MIPS_SZLONG == 64)) + #define NUM32 int + #else +--- include/DPS/dpsconfig.h.orig Thu Mar 4 14:33:19 2004 ++++ include/DPS/dpsconfig.h Thu Mar 4 14:33:14 2004 +@@ -89,7 +89,7 @@ + #if defined(__alpha) || defined(__alpha__) || \ + defined(__ia64__) || defined(ia64) || \ + defined(__s390x__) || \ +- defined(__AMD64__) || defined(AMD64) ++ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) + #define IEEEFLOAT 1 + #endif + +--- include/Xmd.h.orig Thu Oct 23 11:19:01 2003 ++++ include/Xmd.h Wed Mar 3 19:29:07 2004 +@@ -64,7 +64,7 @@ + defined(__sparc64__) || \ + defined(__s390x__) || \ + (defined(__hppa__) && defined(__LP64__)) || \ +- defined(__AMD64__) || defined(AMD64) || \ ++ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \ + (defined(sgi) && (_MIPS_SZLONG == 64)) + #define LONG64 /* 32/64-bit architecture */ + #endif +--- lib/Xt/Xtos.h.orig Fri Oct 24 11:47:35 2003 ++++ lib/Xt/Xtos.h Thu Mar 4 14:37:00 2004 +@@ -67,7 +67,7 @@ + defined(__sparc64__) || \ + defined(__s390x__) || \ + (defined(__hppa__) && defined(__LP64__)) || \ +- defined(__AMD64__) || defined(AMD64) || \ ++ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \ + (defined(sgi) && (_MIPS_SZLONG == 64)) + #define LONG64 + #endif +--- lib/font/util/fontxlfd.c.orig Fri Oct 24 12:11:52 2003 ++++ lib/font/util/fontxlfd.c Thu Mar 4 14:39:56 2004 +@@ -197,7 +197,7 @@ + defined(ia64) || defined(__ia64__) || \ + defined(__alpha__) || defined(__alpha) || \ + defined(__hppa__) || \ +- defined(__AMD64__) || defined(__AMD64) || \ ++ defined(__AMD64__) || defined(__AMD64) || defined(__amd64__) || \ + defined(sgi) + #if !defined(__UNIXOS2__) + #include <float.h> +--- programs/Xserver/fb/fb.h.orig Mon Nov 3 00:11:00 2003 ++++ programs/Xserver/fb/fb.h Wed Mar 3 19:14:52 2004 +@@ -105,7 +105,7 @@ + defined(ia64) || defined(__ia64__) || \ + defined(__sparc64__) || \ + defined(__s390x__) || \ +- defined(AMD64) || defined (__AMD64__) || \ ++ defined(AMD64) || defined (__AMD64__) || defined (__amd64__) \ + (defined(sgi) && (_MIPS_SZLONG == 64)) + typedef unsigned long FbBits; + # else +--- programs/Xserver/hw/xfree86/loader/elfloader.c.orig Thu Nov 6 13:38:13 2003 ++++ programs/Xserver/hw/xfree86/loader/elfloader.c Thu Mar 4 14:46:17 2004 +@@ -137,7 +137,7 @@ + # if !defined(linux) + # error No MAP_ANON? + # endif +-# if !defined (__AMD64__) || !defined(__linux__) ++# if !(defined (__AMD64__) || defined (__amd64__)) || !defined(__linux__) + # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON) + # else + # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_32BIT) +@@ -156,6 +156,7 @@ + #if defined (__alpha__) || \ + defined (__ia64__) || \ + defined (__AMD64__) || \ ++ defined (__amd64__) || \ + (defined (__sparc__) && \ + (defined (__arch64__) || \ + defined (__sparcv9))) +@@ -247,7 +248,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + typedef Elf_Rela Elf_Rel_t; + #else + typedef Elf_Rel Elf_Rel_t; +@@ -441,7 +443,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + ELFDEBUG(", r_addend 0x%lx", rel->r_addend); + # endif + ELFDEBUG("\n"); +@@ -477,6 +480,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -501,6 +505,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -556,6 +561,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -1216,7 +1222,7 @@ + unsigned long *dest64; + unsigned short *dest16; + #endif +-#if defined(__AMD64__) ++#if defined(__AMD64__) || defined(__amd64__) + unsigned long *dest64; + int *dest32s; + #endif +@@ -1234,7 +1240,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + ELFDEBUG("%lx", rel->r_addend); + # endif + ELFDEBUG("\n"); +@@ -1293,7 +1300,7 @@ + + break; + #endif /* i386 */ +-#if defined(__AMD64__) ++#if defined(__AMD64__) || defined(__amd64__) + case R_X86_64_32: + dest32 = (unsigned int *)(secp + rel->r_offset); + # ifdef ELFDEBUG +--- programs/Xserver/hw/xfree86/loader/loader.c.orig Fri Feb 13 18:58:45 2004 ++++ programs/Xserver/hw/xfree86/loader/loader.c Thu Mar 4 14:50:15 2004 +@@ -507,7 +507,7 @@ + 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(__amd64__) + | MAP_32BIT + # endif + , fd, new_off); +@@ -516,7 +516,7 @@ + return (void *)(ret + new_off_bias); + # else + ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE +-# ifdef __AMD64__ ++# if defined(__AMD64__) || defined(__amd64__) + | MAP_32BIT + # endif + , fd, offset + offsetbias); +--- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Thu Oct 2 09:30:06 2003 ++++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Thu Mar 4 01:46:09 2004 +@@ -80,7 +80,8 @@ + PCIDRVRSRC = ix86Pci.c linuxPci.c + PCIDRVROBJ = ix86Pci.o linuxPci.o + +-#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) ++#elif defined(FreeBSDArchitecture) && \ ++ (defined(AlphaArchitecture) || defined(AMD64Architecture)) + + + XCOMM generic FreeBSD PCI driver (using /dev/pci) +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Fri Feb 13 18:58:47 2004 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Wed Mar 3 19:39:52 2004 +@@ -347,7 +347,7 @@ + # if !defined(__FreeBSD__) + # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge + # endif +-#elif defined(__AMD64__) ++#elif defined(__AMD64__) || defined(__amd64__) + # if defined(__FreeBSD__) + # define ARCH_PCI_INIT freebsdPciInit + # else +--- programs/Xserver/hw/xfree86/os-support/xf86drm.h.orig Wed Oct 29 05:57:47 2003 ++++ programs/Xserver/hw/xfree86/os-support/xf86drm.h Wed Mar 3 20:13:22 2004 +@@ -289,7 +289,7 @@ + #define DRM_LOCK_CONT 0x40000000 /**< Hardware lock is contended */ + + #if defined(__GNUC__) && (__GNUC__ >= 2) +-# if defined(__i386) || defined(__AMD64__) ++# if defined(__i386) || defined(__AMD64__) || defined(__amd64__) + /* Reflect changes here to drmP.h */ + #define DRM_CAS(lock,old,new,__ret) \ + do { \ +--- programs/Xserver/hw/xfree86/xf86cfg/loadmod.c.orig Thu Jun 12 10:12:38 2003 ++++ programs/Xserver/hw/xfree86/xf86cfg/loadmod.c Thu Mar 4 14:54:57 2004 +@@ -182,7 +182,7 @@ + SYMFUNC(xf86memchr) + SYMFUNC(xf86memcmp) + SYMFUNC(xf86memcpy) +-#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__) ++#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__) || defined (__amd64__) + /* + * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle + * structure copies. This causes a problem both here and in shared +--- programs/Xserver/include/servermd.h.orig Mon Nov 3 00:11:59 2003 ++++ programs/Xserver/include/servermd.h Tue Mar 2 10:55:03 2004 +@@ -389,7 +389,8 @@ + + #endif /* ia64 */ + +-#if defined(__AMD64__) || defined(AMD64) ++#if defined(__AMD64__) || defined(AMD64) || \ ++ defined(__amd64__) + # define IMAGE_BYTE_ORDER LSBFirst + + # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) +--- programs/Xserver/mi/micoord.h.orig Fri Feb 13 18:58:52 2004 ++++ programs/Xserver/mi/micoord.h Thu Mar 4 14:57:05 2004 +@@ -70,7 +70,7 @@ + defined(__i386__) || defined(i386) || \ + defined(__ia64__) || defined(ia64) || \ + defined(__s390x__) || defined(__s390__) || \ +- defined(__AMD64__) || defined(AMD64) ++ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) + #define GetHighWord(x) (((int) (x)) >> 16) + #else + #define GetHighWord(x) (((int) (x)) / 65536) +--- programs/Xserver/os/xalloc.c.orig Mon Nov 3 00:12:00 2003 ++++ programs/Xserver/os/xalloc.c Thu Mar 4 15:00:10 2004 +@@ -184,7 +184,7 @@ + defined(__ia64__) || defined(ia64) || \ + defined(__sparc64__) || \ + defined(__s390x__) || \ +- defined(__AMD64__) || defined(AMD64) || \ ++ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \ + (defined(sgi) && _MIPS_SZLONG == 64)) + #define MAGIC 0x1404196414071968 + #define MAGIC_FREE 0x1506196615061966 +--- programs/Xserver/render/picture.h.orig Mon Nov 3 00:12:01 2003 ++++ programs/Xserver/render/picture.h Thu Mar 4 15:08:31 2004 +@@ -170,7 +170,7 @@ + defined(ia64) || defined(__ia64__) || \ + defined(__sparc64__) || \ + defined(__s390x__) || \ +- defined(AMD64) || defined (__AMD64__) || \ ++ defined(AMD64) || defined (__AMD64__) || defined (__amd64__) || \ + (defined(sgi) && (_MIPS_SZLONG == 64)) + typedef long xFixed_32_32; + # else diff --git a/x11/XFree86-4-libraries/files/patch-dps b/x11/XFree86-4-libraries/files/patch-dps index 8c64dcec233c..ff6619041026 100644 --- a/x11/XFree86-4-libraries/files/patch-dps +++ b/x11/XFree86-4-libraries/files/patch-dps @@ -1,5 +1,5 @@ ---- lib/dps/Imakefile.orig Tue Dec 31 13:15:41 2002 -+++ lib/dps/Imakefile Fri Jan 10 21:24:35 2003 +--- lib/dps/Imakefile.orig Thu Apr 8 23:12:39 2004 ++++ lib/dps/Imakefile Thu Apr 8 23:14:39 2004 @@ -29,7 +29,6 @@ SED = sed AWK = awk @@ -31,7 +31,7 @@ - -HostProgramTargetName($(PSWRAP)): - @echo "checking $@ over in $(PSWRAPSRC) first..."; \ -- cd $(PSWRAPSRC) && $(MAKE); \ +- cd $(PSWRAPSRC) && $(MAKE) pswraponly; \ - echo "okay, continuing in $(CURRENT_DIR)" includes :: $(HEADERS) diff --git a/x11/XFree86-4-libraries/files/patch-dpsinfo b/x11/XFree86-4-libraries/files/patch-dpsinfo index b90e75402b66..4605e2c05493 100644 --- a/x11/XFree86-4-libraries/files/patch-dpsinfo +++ b/x11/XFree86-4-libraries/files/patch-dpsinfo @@ -1,14 +1,14 @@ ---- programs/dpsinfo/Imakefile.orig Mon Sep 2 12:57:28 2002 -+++ programs/dpsinfo/Imakefile Mon Sep 2 13:27:26 2002 -@@ -4,7 +4,6 @@ - DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXLIB) - LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XLIB) - SYS_LIBRARIES = MathLibrary +--- programs/dpsinfo/Imakefile.orig Thu Apr 8 23:17:22 2004 ++++ programs/dpsinfo/Imakefile Thu Apr 8 23:18:08 2004 +@@ -3,7 +3,6 @@ + + DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXONLYLIB) + LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XONLYLIB) - PSWRAP = PsWrap SRCS = iwraps.psw dpsinfo.c -@@ -14,10 +13,10 @@ +@@ -13,10 +12,10 @@ .SUFFIXES: .psw .h diff --git a/x11/XFree86-4-libraries/files/patch-lcPrTxt.c b/x11/XFree86-4-libraries/files/patch-lcPrTxt.c deleted file mode 100644 index d54dd94d639c..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lcPrTxt.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/X11/lcPrTxt.c.orig Mon Jun 3 15:36:00 2002 -+++ lib/X11/lcPrTxt.c Mon Apr 21 23:38:30 2003 -@@ -154,7 +154,6 @@ - buf_len = text_prop->nitems * 6 + 1; - else - buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1; -- buf = (XPointer) Xmalloc(buf_len); - } - buf = (XPointer) Xmalloc(buf_len); - if (buf == NULL) diff --git a/x11/XFree86-4-libraries/files/patch-lib-Imakefile b/x11/XFree86-4-libraries/files/patch-lib-Imakefile index b9de3d421d2d..f0ebcfc94004 100644 --- a/x11/XFree86-4-libraries/files/patch-lib-Imakefile +++ b/x11/XFree86-4-libraries/files/patch-lib-Imakefile @@ -1,11 +1,11 @@ ---- lib/Imakefile.orig Sun Mar 2 19:44:29 2003 -+++ lib/Imakefile Sun Mar 2 19:44:31 2003 -@@ -211,7 +211,7 @@ +--- lib/Imakefile.orig Thu Apr 8 23:24:13 2004 ++++ lib/Imakefile Thu Apr 8 23:25:07 2004 +@@ -207,7 +207,7 @@ $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \ $(LIBXML2BUILDDIR) $(EXPATBUILDDIR) $(FONTCONFIGBUILDDIR) \ - $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \ + $(XVMCLIBDIR) $(RANDRLIBDIR) \ - $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) + $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR) SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \ diff --git a/x11/XFree86-4-libraries/files/patch-lib-XRes-Imakefile b/x11/XFree86-4-libraries/files/patch-lib-XRes-Imakefile deleted file mode 100644 index a71509466660..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib-XRes-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/XRes/Imakefile.orig Fri Apr 9 12:51:17 2004 -+++ lib/XRes/Imakefile Fri Apr 9 12:53:13 2004 -@@ -7,6 +7,8 @@ - #define LibName XRes -+#define DoSharedLib YES -+SOXRESREV = 0.0 - #define SoRev SOXRESREV - #define LibHeaders NO - - #include <Threads.tmpl> - diff --git a/x11/XFree86-4-libraries/files/patch-libXfont b/x11/XFree86-4-libraries/files/patch-libXfont deleted file mode 100644 index efd0c06cd01a..000000000000 --- a/x11/XFree86-4-libraries/files/patch-libXfont +++ /dev/null @@ -1,369 +0,0 @@ -Index: lib/FS/FSFontInfo.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSFontInfo.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSFontInfo.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSFontInfo.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -65,7 +65,7 @@ - long nbytes; - int i, - j; -- int size = 0; -+ size_t size = 0; - FSXFontInfoHeader **fhdr = (FSXFontInfoHeader **) 0; - FSPropInfo **pi = (FSPropInfo **) 0; - FSPropOffset **po = (FSPropOffset **) 0; -@@ -123,8 +123,14 @@ - if (reply.nameLength == 0) /* got last reply in version 1 */ - break; - if ((i + reply.nReplies) >= size) { -+ -+ if (reply.nReplies > SIZE_T_MAX - i - 1) -+ goto badmem; - size = i + reply.nReplies + 1; - -+ if (size > SIZE_T_MAX / sizeof(char *)) -+ goto badmem; -+ - if (fhdr) { - FSXFontInfoHeader **tmp_fhdr = (FSXFontInfoHeader **) - FSrealloc((char *) fhdr, -@@ -237,6 +243,9 @@ - pi[i]->num_offsets = local_pi.num_offsets; - pi[i]->data_len = local_pi.data_len; - -+ if (pi[i]->num_offsets > SIZE_T_MAX / sizeof(FSPropOffset)) -+ goto badmem; -+ - po[i] = (FSPropOffset *) - FSmalloc(pi[i]->num_offsets * sizeof(FSPropOffset)); - if (!po[i]) { -@@ -281,6 +290,10 @@ - - nbytes = pi[i]->data_len + reply.nameLength; - _FSEatData(svr, (unsigned long) (((nbytes+3)&~3) - nbytes)); -+ } -+ /* avoid integer overflow */ -+ if (i > INT_MAX - 1) { -+ goto badmem; - } - } - *info = fhdr; -Index: lib/FS/FSFtNames.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSFtNames.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSFtNames.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSFtNames.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -78,7 +78,8 @@ - (SIZEOF(fsListFontsReply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) - return (char **) 0; - -- if (rep.nFonts) { -+ if (rep.nFonts && rep.nFonts <= SIZE_T_MAX / sizeof(char *) -+ && rep.length <= ((SIZE_T_MAX + SIZEOF(fsListFontsReply) - 1) >> 2)) { - flist = (char **) FSmalloc((unsigned) rep.nFonts * sizeof(char *)); - rlen = (rep.length << 2) - SIZEOF(fsListFontsReply); - c = (char *) FSmalloc((unsigned) (rlen + 1)); -Index: lib/FS/FSGetCats.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSGetCats.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSGetCats.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSGetCats.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -72,9 +72,10 @@ - SyncHandle(); - return (char **) NULL; - } -- if (rep.num_catalogues) { -+ if (rep.num_catalogues && rep.num_catalogues <= SIZE_T_MAX/sizeof(char *) -+ && rep.length <= ((SIZE_T_MAX + SIZEOF(fsGetCataloguesReply) - 1)>>2)) { - list = (char **) -- FSmalloc((unsigned) (rep.num_catalogues * sizeof(char *))); -+ FSmalloc((unsigned) (rep.num_catalogues * sizeof(char *))); - rlen = (rep.length << 2) - SIZEOF(fsGetCataloguesReply); - c = (char *) FSmalloc((unsigned) rlen + 1); - if ((!list) || (!c)) { -Index: lib/FS/FSListCats.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSListCats.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSListCats.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSListCats.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -78,7 +78,8 @@ - (SIZEOF(fsListCataloguesReply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) - return (char **) 0; - -- if (rep.num_catalogues) { -+ if (rep.num_catalogues && rep.num_catalogues <= SIZE_T_MAX/sizeof(char *) -+ && rep.length <= ((SIZE_T_MAX+SIZEOF(fsListCataloguesReply)+1)>>2)) { - clist = (char **) - FSmalloc((unsigned) rep.num_catalogues * sizeof(char *)); - rlen = (rep.length << 2) - SIZEOF(fsListCataloguesReply); -Index: lib/FS/FSListExt.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSListExt.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSListExt.c 14 Dec 2001 19:53:32 -0000 1.2 -+++ lib/FS/FSListExt.c 29 Aug 2003 18:01:10 -0000 1.3 -@@ -72,7 +72,8 @@ - SyncHandle(); - return (char **) NULL; - } -- if (rep.nExtensions) { -+ if (rep.nExtensions && rep.nExtensions <= SIZE_T_MAX / sizeof(char *) -+ && rep.length <= ((SIZE_T_MAX+SIZEOF(fsListExtensionsReply)+1)>>2)) { - list = (char **) FSmalloc((unsigned)(rep.nExtensions * sizeof(char *))); - rlen = (rep.length << 2) - SIZEOF(fsListExtensionsReply); - c = (char *) FSmalloc((unsigned) rlen + 1); -Index: lib/FS/FSOpenServ.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSOpenServ.c,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -u -r1.6 -r1.7 ---- lib/FS/FSOpenServ.c 14 Dec 2001 19:53:33 -0000 1.6 -+++ lib/FS/FSOpenServ.c 29 Aug 2003 18:01:11 -0000 1.7 -@@ -118,7 +118,7 @@ - AlternateServer *alts; - int altlen; - char *vendor_string; -- long setuplength; -+ unsigned long setuplength; - - if (server == NULL || *server == '\0') { - if ((server = getenv("FONTSERVER")) == NULL) { -@@ -153,7 +153,8 @@ - _FSRead(svr, (char *) &prefix, (long) SIZEOF(fsConnSetup)); - - setuplength = prefix.alternate_len << 2; -- if ((alt_data = (char *) -+ if (setuplength > (SIZE_T_MAX>>2) -+ || (alt_data = (char *) - (setup = FSmalloc((unsigned) setuplength))) == NULL) { - errno = ENOMEM; - FSfree((char *) svr); -@@ -162,6 +163,10 @@ - _FSRead(svr, (char *) alt_data, setuplength); - ad = alt_data; - -+ if (prefix.num_alternates > SIZE_T_MAX / sizeof(AlternateServer)) { -+ errno = ENOMEM; -+ return (FSServer *) 0; -+ } - alts = (AlternateServer *) - FSmalloc(sizeof(AlternateServer) * prefix.num_alternates); - if (!alts) { -@@ -193,7 +198,8 @@ - svr->num_alternates = prefix.num_alternates; - - setuplength = prefix.auth_len << 2; -- if ((auth_data = (char *) -+ if (prefix.auth_len > (SIZE_T_MAX>>2) -+ || (auth_data = (char *) - (setup = FSmalloc((unsigned) setuplength))) == NULL) { - errno = ENOMEM; - FSfree((char *) svr); -Index: lib/FS/FSQGlyphs.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSQGlyphs.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSQGlyphs.c 14 Dec 2001 19:53:33 -0000 1.2 -+++ lib/FS/FSQGlyphs.c 29 Aug 2003 18:01:11 -0000 1.3 -@@ -85,12 +85,20 @@ - (SIZEOF(fsQueryXBitmaps8Reply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) - return FSBadAlloc; - -+ if (reply.num_chars > SIZE_T_MAX / sizeof(FSOffset)) -+ return FSBadAlloc; -+ - offs = (FSOffset *) FSmalloc(sizeof(FSOffset) * reply.num_chars); - *offsets = offs; - if (!offs) - return FSBadAlloc; - left = (reply.length << 2) - SIZEOF(fsQueryXBitmaps8Reply) - - (SIZEOF(fsOffset32) * reply.num_chars); -+ /* XXX This thest is incomplete */ -+ if (reply.length > (SIZE_T_MAX >> 2)) { -+ FSfree((char *) offs); -+ return FSBadAlloc; -+ } - gd = (unsigned char *) FSmalloc(left); - *glyphdata = gd; - if (!gd) { -@@ -141,6 +149,8 @@ - int i; - fsChar2b_version1 *swapped_str; - -+ if (str_len > SIZE_T_MAX/SIZEOF(fsChar2b_version1)) -+ return FSBadAlloc; - swapped_str = (fsChar2b_version1 *) - FSmalloc(SIZEOF(fsChar2b_version1) * str_len); - if (!swapped_str) -@@ -160,12 +170,19 @@ - fsFalse)) - return FSBadAlloc; - -+ if(reply.num_chars > SIZE_T_MAX/sizeof(FSOffset)) -+ return FSBadAlloc; - offs = (FSOffset *) FSmalloc(sizeof(FSOffset) * reply.num_chars); - *offsets = offs; - if (!offs) - return FSBadAlloc; - left = (reply.length << 2) - SIZEOF(fsQueryXBitmaps16Reply) - - (SIZEOF(fsOffset32) * reply.num_chars); -+ /* XXX - this test is incomplete */ -+ if (reply.length > (SIZE_T_MAX>>2)) { -+ FSfree((char *) offs); -+ return FSBadAlloc; -+ } - gd = (unsigned char *) FSmalloc(left); - *glyphdata = gd; - if (!gd) { -Index: lib/FS/FSQXExt.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSQXExt.c,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -u -r1.5 -r1.6 ---- lib/FS/FSQXExt.c 14 Dec 2001 19:53:33 -0000 1.5 -+++ lib/FS/FSQXExt.c 29 Aug 2003 18:01:12 -0000 1.6 -@@ -92,6 +92,9 @@ - (SIZEOF(fsQueryXExtents8Reply) - SIZEOF(fsGenericReply)) >> 2, - fsFalse)) - return FSBadAlloc; -+ -+ if (reply.num_extents > SIZE_T_MAX / sizeof(FSXCharInfo)) -+ return FSBadAlloc; - - ext = (FSXCharInfo *) FSmalloc(sizeof(FSXCharInfo) * reply.num_extents); - *extents = ext; -@@ -147,6 +150,9 @@ - if (!_FSReply(svr, (fsReply *) & reply, - (SIZEOF(fsQueryXExtents16Reply) - SIZEOF(fsGenericReply)) >> 2, - fsFalse)) -+ return FSBadAlloc; -+ -+ if (reply.num_extents > SIZE_T_MAX/sizeof(FSXCharInfo)) - return FSBadAlloc; - - ext = (FSXCharInfo *) FSmalloc(sizeof(FSXCharInfo) * reply.num_extents); -Index: lib/FS/FSQXInfo.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSQXInfo.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -u -r1.2 -r1.3 ---- lib/FS/FSQXInfo.c 14 Dec 2001 19:53:33 -0000 1.2 -+++ lib/FS/FSQXInfo.c 29 Aug 2003 18:01:12 -0000 1.3 -@@ -91,6 +91,9 @@ - props->num_offsets = local_pi.num_offsets; - props->data_len = local_pi.data_len; - -+ if (props->num_offsets > SIZE_T_MAX / sizeof(FSPropOffset)) -+ return FSBadAlloc; -+ - /* prepare for prop data */ - offset_data = (FSPropOffset *) - FSmalloc(props->num_offsets * sizeof(FSPropOffset)); -Index: lib/FS/FSlibint.h -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/FS/FSlibint.h,v -retrieving revision 3.7 -retrieving revision 3.8 -diff -u -u -r3.7 -r3.8 ---- lib/FS/FSlibint.h 14 Dec 2001 19:53:33 -0000 3.7 -+++ lib/FS/FSlibint.h 29 Aug 2003 18:01:12 -0000 3.8 -@@ -76,6 +76,11 @@ - #include "FSlibos.h" - #include <errno.h> - #include <stddef.h> -+ -+#include <limits.h> -+#ifndef SIZE_T_MAX -+#define SIZE_T_MAX UINT_MAX -+#endif - - typedef int (* FSIOErrorHandler)(FSServer *); - typedef int (* FSErrorHandler)(FSServer *, FSErrorEvent *); -Index: lib/font/fc/fsconvert.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/font/fc/fsconvert.c,v -retrieving revision 1.12 -retrieving revision 1.13 -diff -u -u -r1.12 -r1.13 ---- lib/font/fc/fsconvert.c 27 May 2003 22:26:48 -0000 1.12 -+++ lib/font/fc/fsconvert.c 29 Aug 2003 18:01:13 -0000 1.13 -@@ -102,6 +102,10 @@ - - nprops = pfi->nprops = pi->num_offsets; - -+ if (nprops < 0 -+ || nprops > SIZE_T_MAX/(sizeof(FontPropRec) + sizeof(char))) -+ return -1; -+ - dprop = (FontPropPtr) xalloc(sizeof(FontPropRec) * nprops + - sizeof (char) * nprops); - if (!dprop) -Index: lib/font/fc/fserve.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/font/fc/fserve.c,v -retrieving revision 3.23 -retrieving revision 3.24 -diff -u -u -r3.23 -r3.24 ---- lib/font/fc/fserve.c 27 May 2003 22:26:48 -0000 3.23 -+++ lib/font/fc/fserve.c 29 Aug 2003 18:01:13 -0000 3.24 -@@ -1505,8 +1505,8 @@ - - if (conn->blockState & FS_GIVE_UP) - return BadFontName; -- -- if (namelen > sizeof (buf) - 1) -+ -+ if (namelen <= 0 || namelen > sizeof (buf) - 1) - return BadFontName; - - /* -Index: lib/font/fc/fslibos.h -=================================================================== -RCS file: /home/ncvs/xfree/xc/lib/font/fc/fslibos.h,v -retrieving revision 3.7 -retrieving revision 3.8 -diff -u -u -r3.7 -r3.8 ---- lib/font/fc/fslibos.h 31 May 2002 18:45:49 -0000 3.7 -+++ lib/font/fc/fslibos.h 29 Aug 2003 18:01:14 -0000 3.8 -@@ -48,13 +48,16 @@ - #ifndef FONT_OPEN_MAX - - #ifndef X_NOT_POSIX --#ifdef _POSIX_SOURCE --#include <limits.h> --#else --#define _POSIX_SOURCE --#include <limits.h> --#undef _POSIX_SOURCE -+# ifdef _POSIX_SOURCE -+# include <limits.h> -+# else -+# define _POSIX_SOURCE -+# include <limits.h> -+# undef _POSIX_SOURCE -+# endif - #endif -+#ifndef SIZE_T_MAX -+# define SIZE_T_MAX UINT_MAX - #endif - #ifndef OPEN_MAX - #if defined(SVR4) || defined(__UNIXOS2__) diff --git a/x11/XFree86-4-libraries/files/patch-luit b/x11/XFree86-4-libraries/files/patch-luit index a86b255f889c..4e7dbece425a 100644 --- a/x11/XFree86-4-libraries/files/patch-luit +++ b/x11/XFree86-4-libraries/files/patch-luit @@ -1,200 +1,14 @@ -Index: programs/luit/Imakefile -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/luit/Imakefile,v -retrieving revision 1.2 -retrieving revision 1.4 -diff -u -u -r1.2 -r1.4 ---- programs/luit/Imakefile 17 Oct 2002 01:06:09 -0000 1.2 -+++ programs/luit/Imakefile 28 May 2003 16:02:35 -0000 1.4 -@@ -1,19 +1,19 @@ --XCOMM $XFree86: xc/programs/luit/Imakefile,v 1.2 2002/10/17 01:06:09 dawes Exp $ -+XCOMM $XFree86: xc/programs/luit/Imakefile,v 1.3tsi Exp $ - - #ifndef LocaleAliasFile --#define LocaleAliasFile \ -- $(XLOCALEDIR)/locale.alias -+#define LocaleAliasFile $(XLOCALEDIR)/locale.alias - #endif - -+LOCALEALIASFILE = LocaleAliasFile - LOCAL_LIBRARIES = $(XFONTENCLIB) - DEPLIBS = $(DEPXFONTENCLIB) - --SYS_LIBRARIES = MathLibrary GzipLibrary -+SYS_LIBRARIES = GzipLibrary - - SRCS = luit.c iso2022.c charset.c parser.c sys.c other.c - - OBJS = luit.o iso2022.o charset.o parser.o sys.o other.o - --DEFINES = -DLOCALE_ALIAS_FILE=\"LocaleAliasFile\" -+DEFINES = -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\" - - ComplexProgramTarget(luit) -Index: programs/luit/luit.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/luit/luit.c,v -retrieving revision 1.10 -retrieving revision 1.11 -diff -u -u -r1.10 -r1.11 ---- programs/luit/luit.c 24 Feb 2003 01:10:25 -0000 1.10 -+++ programs/luit/luit.c 8 Sep 2003 14:25:30 -0000 1.11 -@@ -545,6 +545,10 @@ +--- programs/luit/luit.c.orig Thu Apr 8 05:14:16 2004 ++++ programs/luit/luit.c Thu Apr 8 05:20:18 2004 +@@ -545,9 +545,11 @@ #endif installHandler(SIGCHLD, sigchldHandler); -+ /*rc = copyTermios(0, pty); -+ if(rc < 0) -+ FatalError("Couldn't copy terminal settings\n"); -+ */ /* Disabled, appears to break luit. */ - rc = setRawTermios(); ++/* Disabled, appears to break luit. + rc = copyTermios(0, pty); if(rc < 0) - FatalError("Couldn't set terminal to raw\n"); -Index: programs/luit/luit.man -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/luit/luit.man,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -u -r1.7 -r1.8 ---- programs/luit/luit.man 24 Feb 2003 01:10:25 -0000 1.7 -+++ programs/luit/luit.man 3 Apr 2003 16:44:36 -0000 1.8 -@@ -202,8 +202,8 @@ - takes no responsibility for any resulting security issues. + FatalError("Couldn't copy terminal settings\n"); ++*/ - .B Luit --will refuse to run if it is installed setuid and the underlying system --does not have POSIX saved ids. -+will refuse to run if it is installed setuid and cannot safely drop -+privileges. - .SH BUGS - None of this complexity should be necessary. Stateless UTF-8 - throughout the system is the way to go. -Index: programs/luit/sys.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/luit/sys.c,v -retrieving revision 1.7 -retrieving revision 1.10 -diff -u -u -r1.7 -r1.10 ---- programs/luit/sys.c 7 Jan 2002 20:38:30 -0000 1.7 -+++ programs/luit/sys.c 8 Sep 2003 14:25:30 -0000 1.10 -@@ -68,6 +68,10 @@ - #include <stropts.h> - #endif - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include "sys.h" - - static int saved_tio_valid = 0; -@@ -211,6 +215,23 @@ - } - - int -+copyTermios(int sfd, int dfd) -+{ -+ struct termios tio; -+ int rc; -+ -+ rc = tcgetattr(sfd, &tio); -+ if(rc < 0) -+ return -1; -+ -+ rc = tcsetattr(dfd, TCSAFLUSH, &tio); -+ if(rc < 0) -+ return -1; -+ -+ return 0; -+} -+ -+int - saveTermios(void) - { - int rc; -@@ -311,7 +332,8 @@ - { - char name[12], *line = NULL; - int pty = -1; -- char *name1 = "pqrstuvwxyzPQRST", *name2 = "0123456789abcdef"; -+ char *name1 = "pqrstuvwxyzPQRST", -+ *name2 = "0123456789abcdefghijklmnopqrstuv"; - char *p1, *p2; - - #ifdef HAVE_GRANTPT -@@ -363,17 +385,16 @@ - pty = open(name, O_RDWR); - if(pty >= 0) - goto found; -- if(errno == ENOENT) -- goto bail; -- else -- continue; -+ /* Systems derived from 4.4BSD differ in their pty names, -+ so ENOENT doesn't necessarily imply we're done. */ -+ continue; - } - } - - goto bail; - - found: -- line = malloc(strlen(name)); -+ line = malloc(strlen(name) + 1); - strcpy(line, name); - line[5] = 't'; - fix_pty_perms(line); -@@ -429,7 +450,10 @@ - return -1; - } - --#ifdef _POSIX_SAVED_IDS -+/* Post-4.4 BSD systems have POSIX semantics (_POSIX_SAVED_IDS -+ or not, depending on the version). 4.3BSD and Minix do not have -+ saved IDs at all, so there's no issue. */ -+#if (defined(BSD) && !defined(_POSIX_SAVED_IDS)) || defined(_MINIX) - int - droppriv() - { -@@ -438,6 +462,25 @@ + rc = setRawTermios(); if(rc < 0) - return rc; - return setgid(getgid()); -+} -+#elif defined(_POSIX_SAVED_IDS) -+int -+droppriv() -+{ -+ int uid = getuid(); -+ int euid = geteuid(); -+ int gid = getgid(); -+ int egid = getegid(); -+ int rc; -+ -+ if((uid != euid || gid != egid) && euid != 0) { -+ errno = ENOSYS; -+ return -1; -+ } -+ rc = setuid(uid); -+ if(rc < 0) -+ return rc; -+ return setgid(gid); - } - #else - int -Index: programs/luit/sys.h -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/luit/sys.h,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -u -r1.1 -r1.2 ---- programs/luit/sys.h 2 Nov 2001 03:06:43 -0000 1.1 -+++ programs/luit/sys.h 8 Sep 2003 14:25:30 -0000 1.2 -@@ -24,6 +24,7 @@ - int waitForInput(int fd1, int fd2); - int setWindowSize(int sfd, int dfd); - int installHandler(int signum, void (*handler)(int)); -+int copyTermios(int sfd, int dfd); - int saveTermios(void); - int restoreTermios(void); - int setRawTermios(void); diff --git a/x11/XFree86-4-libraries/files/patch-startx b/x11/XFree86-4-libraries/files/patch-startx index bda120efac80..95f8664ed75f 100644 --- a/x11/XFree86-4-libraries/files/patch-startx +++ b/x11/XFree86-4-libraries/files/patch-startx @@ -10,7 +10,7 @@ + -listen_tcp) + listen_tcp="" + ;; - # '' required to prevent cpp from treating "/*" as a C comment. + XCOMM '' required to prevent cpp from treating "/*" as a C comment. /''*|\./''*) if [ "$whoseargs" = "client" ]; then @@ -164,7 +168,7 @@ diff --git a/x11/XFree86-4-libraries/files/patch-xdm b/x11/XFree86-4-libraries/files/patch-xdm index 2eb9d293b899..06af733c4de3 100644 --- a/x11/XFree86-4-libraries/files/patch-xdm +++ b/x11/XFree86-4-libraries/files/patch-xdm @@ -1,11 +1,45 @@ ---- programs/xdm/config/Imakefile.orig Tue Feb 1 04:33:43 2000 -+++ programs/xdm/config/Imakefile Sun Mar 25 06:57:37 2001 -@@ -1,7 +1,7 @@ - XCOMM $XConsortium: Imakefile /main/17 1996/01/15 12:19:32 gildea $ - XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.7 2000/01/31 19:33:43 dawes Exp $ +--- programs/xdm/config/Imakefile.orig Tue Apr 20 20:42:01 2004 ++++ programs/xdm/config/Imakefile Sun May 9 22:37:08 2004 +@@ -5,7 +5,7 @@ + + XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.15 2004/01/09 00:25:25 dawes Exp $ -SERVERSTYPE = XdmServersType +SERVERSTYPE = ws all:: Xservers.ws xdm-config Xservers Xresources +@@ -34,6 +34,8 @@ + XDMPIDDIR = $(XDMDIR) + #endif + ++XDMDEFCONFDIR = $(XDMDIR)/default ++ + #if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture) + SU = "su -m" + #else +@@ -47,15 +49,15 @@ + 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)) ++InstallNonExecFile(xdm-config,$(XDMDEFCONFDIR)) ++InstallNonExecFile(Xresources,$(XDMDEFCONFDIR)) ++InstallNonExecFile(Xservers,$(XDMDEFCONFDIR)) ++InstallNonExecFile(Xaccess,$(XDMDEFCONFDIR)) ++InstallNamedProg(Xsession,Xsession,$(XDMDEFCONFDIR)) ++InstallNamedProg(GiveConsole,GiveConsole,$(XDMDEFCONFDIR)) ++InstallNamedProg(TakeConsole,TakeConsole,$(XDMDEFCONFDIR)) ++InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMDEFCONFDIR)) ++InstallNamedProg(Xwilling,Xwilling,$(XDMDEFCONFDIR)) + #else + InstallNonExecFileNoClobber(xdm-config,$(XDMDIR)) + InstallNonExecFileNoClobber(Xresources,$(XDMDIR)) diff --git a/x11/XFree86-4-libraries/files/patch-xfree86.cf b/x11/XFree86-4-libraries/files/patch-xfree86.cf deleted file mode 100644 index 0c1ea9ea816f..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xfree86.cf +++ /dev/null @@ -1,20 +0,0 @@ ---- config/cf/xfree86.cf.orig Wed Feb 26 15:07:59 2003 -+++ config/cf/xfree86.cf Mon Nov 24 14:44:33 2003 -@@ -481,7 +481,7 @@ - - /* SPARC and UltraSPARC drivers */ - --#if defined(SparcArchitecture) && \ -+#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) && \ - !defined(LynxOSArchitecture) && \ - !defined(NetBSDArchitecture) && \ - !defined(OpenBSDArchitecture) -@@ -1803,6 +1803,8 @@ - #ifndef XFree86ConsoleDefines - # if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) - # define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT -+# elif defined(FreeBSDArchitecture) -+# define XFree86ConsoleDefines -DSYSCONS_SUPPORT - # else - # define XFree86ConsoleDefines /**/ - # endif diff --git a/x11/XFree86-4-libraries/files/patch-xkbfile-Imakefile b/x11/XFree86-4-libraries/files/patch-xkbfile-Imakefile deleted file mode 100644 index e9b6819326b0..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xkbfile-Imakefile +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/xkbfile/Imakefile.dist Thu Dec 4 17:28:22 2003 -+++ lib/xkbfile/Imakefile Thu Dec 4 17:30:51 2003 -@@ -6,7 +6,12 @@ - XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.4 2001/08/27 17:40:59 dawes Exp $ - - #define DoNormalLib YES -+#if defined(x86_64Architecture) -+#define DoSharedLib YES -+SOXKBFILEREV= 6.0 -+#else - #define DoSharedLib NO -+#endif - #define DoExtraLib NO - #define DoDebugLib NO - #define DoProfileLib NO diff --git a/x11/XFree86-4-libraries/files/patch-z04 b/x11/XFree86-4-libraries/files/patch-z04 index a507a0e85b2a..24ac35c46c1b 100644 --- a/x11/XFree86-4-libraries/files/patch-z04 +++ b/x11/XFree86-4-libraries/files/patch-z04 @@ -1,15 +1,15 @@ ---- lib/X11/Imakefile.orig Thu Dec 20 11:03:47 2001 -+++ lib/X11/Imakefile Sun Aug 25 01:18:53 2002 -@@ -943,7 +943,7 @@ +--- lib/X11/Imakefile.orig Thu Apr 8 23:51:16 2004 ++++ lib/X11/Imakefile Thu Apr 8 23:53:08 2004 +@@ -10,7 +10,7 @@ + HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \ + Xcms.h Xlocale.h XKBlib.h - OBJS = $(OBJS1) $(OBJS2) $(OBJS3) +-#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients ++#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !FreeBSDBuildXxserv + all:: --#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients -+#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients || FreeBSDBuildXxserv - #include <Library.tmpl> - - SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES)) -@@ -983,8 +983,10 @@ + BuildIncludes($(HEADERS),IncSubdir,..) +@@ -1041,8 +1041,10 @@ #if InstallXcmsTxt InstallNonExecFile(Xcms.txt,$(LIBDIR)) #endif diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist index ba588e6d1d47..136fb8e1d0e8 100644 --- a/x11/XFree86-4-libraries/pkg-plist +++ b/x11/XFree86-4-libraries/pkg-plist @@ -268,9 +268,6 @@ include/X11/extensions/Printstr.h include/X11/extensions/XEVI.h include/X11/extensions/XEVIstr.h include/X11/extensions/XI.h -include/X11/extensions/XIE.h -include/X11/extensions/XIEproto.h -include/X11/extensions/XIEprotost.h include/X11/extensions/XInput.h include/X11/extensions/XIproto.h include/X11/extensions/XKB.h @@ -507,6 +504,8 @@ 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_CN.UTF-8/XI18N_OBJS +lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE lib/X11/locale/zh_CN.gbk/Compose lib/X11/locale/zh_CN.gbk/XI18N_OBJS lib/X11/locale/zh_CN.gbk/XLC_LOCALE @@ -525,6 +524,8 @@ lib/X11/locale/zh_TW/Compose lib/X11/locale/zh_TW/XI18N_OBJS lib/X11/locale/zh_TW/XLC_LOCALE lib/libFS.a +lib/libFS.so +lib/libFS.so.6 lib/libGL.a lib/libGL.so lib/libGL.so.1 @@ -532,6 +533,8 @@ lib/libGLU.a lib/libGLU.so lib/libGLU.so.1 lib/libGLw.a +lib/libGLw.so +lib/libGLw.so.1 lib/libICE.a lib/libICE.so lib/libICE.so.6 @@ -546,7 +549,7 @@ lib/libX11.so lib/libX11.so.6 lib/libXRes.a lib/libXRes.so -lib/libXRes.so.0 +lib/libXRes.so.1 %%XTHRSTUB:%%lib/libXThrStub.so %%XTHRSTUB:%%lib/libXThrStub.so.6 lib/libXTrap.a @@ -570,10 +573,14 @@ lib/libXfont.a lib/libXfont.so lib/libXfont.so.1 lib/libXfontcache.a +lib/libXfontcache.so +lib/libXfontcache.so.1 lib/libXi.a lib/libXi.so lib/libXi.so.6 lib/libXinerama.a +lib/libXinerama.so +lib/libXinerama.so.1 lib/libXmu.a lib/libXmu.so lib/libXmu.so.6 @@ -593,6 +600,8 @@ lib/libXrender.a lib/libXrender.so lib/libXrender.so.1 lib/libXss.a +lib/libXss.so +lib/libXss.so.1 lib/libXt.a lib/libXt.so lib/libXt.so.6 @@ -603,9 +612,17 @@ lib/libXv.a lib/libXv.so lib/libXv.so.1 lib/libXvMC.a +lib/libXvMC.so +lib/libXvMC.so.1 lib/libXxf86dga.a +lib/libXxf86dga.so +lib/libXxf86dga.so.1 lib/libXxf86misc.a +lib/libXxf86misc.so +lib/libXxf86misc.so.1 lib/libXxf86vm.a +lib/libXxf86vm.so +lib/libXxf86vm.so.1 lib/libdps.a lib/libdps.so lib/libdps.so.1 @@ -614,6 +631,8 @@ lib/libdpstk.so lib/libdpstk.so.1 lib/libfntstubs.a lib/libfontenc.a +lib/libfontenc.so +lib/libfontenc.so.1 lib/liboldX.a lib/liboldX.so lib/liboldX.so.6 @@ -622,7 +641,9 @@ lib/libpsres.so lib/libpsres.so.1 lib/libxf86config.a lib/libxkbfile.a -%%AMD64:%%lib/libxkbfile.so -%%AMD64:%%lib/libxkbfile.so.6 +lib/libxkbfile.so +lib/libxkbfile.so.1 lib/libxkbui.a +lib/libxkbui.so +lib/libxkbui.so.1 libdata/pkgconfig/xcursor.pc |