diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2008-03-07 21:47:50 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2008-03-07 21:47:50 +0000 |
| commit | 836aebde5babd8b8701f585f03b775ebfc41a564 (patch) | |
| tree | f990d2d5c21cdbac2e187df45b68fcc8e5d5353a /x11/XFree86-4-libraries | |
| parent | c5420942c6d91a6dad718b6431ee6849f320142f (diff) | |
Notes
Diffstat (limited to 'x11/XFree86-4-libraries')
40 files changed, 0 insertions, 2062 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile deleted file mode 100644 index 14231722544c..000000000000 --- a/x11/XFree86-4-libraries/Makefile +++ /dev/null @@ -1,145 +0,0 @@ -# New ports collection makefile for: XFree86-libraries -# Date created: 10 Oct 1999 -# Whom: taguchi@tohoku.iij.ad.jp -# -# $FreeBSD$ -# - -PORTNAME= libraries -PORTVERSION= 4.5.0 -PORTREVISION= 1 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XFREE} -MASTER_SITE_SUBDIR= ${PORTVERSION} -PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ - XFree86-${PORTVERSION}-src-2.tgz \ - XFree86-${PORTVERSION}-src-3.tgz - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-4 libraries and headers - -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig - -CONFLICTS= Mesa-[0-9]* libX11-[0-9]* libGL-[0-9]* libGLU-[0-9]* \ - libICE-[0-9]* libSM-[0-9]* libXau-[0-9]* libXaw-[0-9]* \ - libXcursor-[0-9]* libXdmcp-[0-9]* libXext-[0-9]* \ - libXfont-[0-9]* libXi-[0-9]* libXinerama-[0-9]* libXmu-[0-9]* \ - libXp-[0-9]* libXpm-[0-9]* libXrandr-[0-9]* libXrender-[0-9]* \ - libXres-[0-9]* libXt-[0-9]* libXv-[0-9]* libXxf86-[0-9]* \ - libxkbfile-[0-9]* panoramixext-[0-9]* printext-[0-9]* \ - randrext-[0-9]* renderext-[0-9]* resourceext-[0-9]* \ - xextensions-[0-9]* xf86ext-[0-9]* xlibs-[0-9]* \ - xorg-libraries-[0-9]* xpm-[0-9]* xproto-[0-9]* - -DEPRECATED= isn't maintained anymore -EXPIRATION_DATE= 2007-12-25 - -USE_X_PREFIX= no -PREFIX?= ${X11BASE} -MTREE_FILE= ${PORTSDIR}/Templates/BSD.local.dist -INSTALLS_SHLIB= yes -SCRIPTS_ENV= DebuggableLibraries=${DebuggableLibraries} -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 -XINSTALL_DIRS= include lib nls programs/Xserver/include \ - programs/Xserver/hw/xfree86/parser -XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} - -# XFree86 User Config: -# DebuggableLibraries NO build with debug libs -# (requires FreeBSD 4.X or later) -# ---------------------------------------------------------------------------- -DebuggableLibraries?= NO -# End of XFree86 User Config - -.ifdef USE_XLIB -.error You have `USE_XLIB' variable defined either in environment or in make(1) arguments. Please undefine and try again. -.endif - -.include "Makefile.inc" -.include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86 and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif - -PLIST_SUB+= OSMESA:="" - -# sparc64 doesn't have a working libc_r yet, and -current doesn't need -# libXThrStub. -#.if ${ARCH} == "sparc64" || ${OSVERSION} >= 500043 -#PLIST_SUB+= XTHRSTUB:="@comment " -#.else -#PLIST_SUB+= XTHRSTUB:="" -#.endif - -post-patch: - ${CP} ${FILESDIR}/nls::Compose::microsoft-cp1251 \ - ${WRKSRC}/nls/Compose/microsoft-cp1251 - -post-install: - ${MKDIR} ${PREFIX}/include/X11/PM - ${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PM.h \ - ${PREFIX}/include/X11/PM - ${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PMproto.h \ - ${PREFIX}/include/X11/PM - ${MKDIR} ${PREFIX}/libdata/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/lib/Xcursor/xcursor.pc \ - ${PREFIX}/libdata/pkgconfig - ${MKDIR} ${PREFIX}/lib/X11/xserver - ${INSTALL_DATA} ${WRKSRC}/programs/Xserver/Xext/SecurityPolicy \ - ${PREFIX}/lib/X11/xserver/SecurityPolicy.default - -.include <bsd.port.post.mk> diff --git a/x11/XFree86-4-libraries/Makefile.inc b/x11/XFree86-4-libraries/Makefile.inc deleted file mode 100644 index f4cb6411df5e..000000000000 --- a/x11/XFree86-4-libraries/Makefile.inc +++ /dev/null @@ -1,72 +0,0 @@ -# Include before bsd.port.pre.mk for XFree86-4 ports which share -# XFree86-4-libraries's patches. -# The purpose of this file is to reduce the duplicated code among the XFree86-4 -# ports which each do only part of a standard XFree86 build. -# -# XBUILD_DIRS is the group of directories under ${WRKSRC} that will -# be built in. -# XINCLUDE_DIRS is the group of directories under ${WRKSRC} that need -# to be Makefilesed or included in besides XBUILD_DIRS -# XINSTALL_DIRS is the group of directories which will have -# their install targets run. -# XINSTALL_MAN_DIRS is the group of directories which will have -# their install.man targets run. - -DIST_SUBDIR= xc -WRKSRC?= ${WRKDIR}/xc -USE_IMAKE= YES -XFREE86_HTML_MAN= yes -PATCHDIR?= ${.CURDIR}/../../x11/XFree86-4-libraries/files -SCRIPTS_ENV+= CC="${CC}" \ - CXX="${CXX}" \ - CFLAGS="${CFLAGS}" -MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" - -XINSTALL_DIRS?= ${XBUILD_DIRS} -_XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS} - -.if !target(pre-configure) -pre-configure: - @${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \ - s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/config/cf/FreeBSD.cf -.endif - -.if !target(do-configure) -do-configure: - @cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf - @cp ${X11BASE}/lib/X11/config/date.def ${WRKSRC}/config/cf - @cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${WRKSRC}/config/imake/imake \ - -DTOPDIR=${WRKSRC} -DCURDIR=$${dir} -I${WRKSRC}/config/cf; \ - done - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefiles; \ - done - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} includes; \ - done - @for dir in include ${XBUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} depend; \ - done -.endif - -.if !target(do-build) -do-build: - @for dir in ${XBUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} all; \ - done -.endif - -.if !target(do-install) -do-install: - @for dir in ${XINSTALL_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install; \ - done - @for dir in ${XINSTALL_MAN_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ - done -.endif - diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo deleted file mode 100644 index a439d4854378..000000000000 --- a/x11/XFree86-4-libraries/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11/XFree86-4-libraries/files/nls::Compose::microsoft-cp1251 b/x11/XFree86-4-libraries/files/nls::Compose::microsoft-cp1251 deleted file mode 100644 index b7218bdbc7d9..000000000000 --- a/x11/XFree86-4-libraries/files/nls::Compose::microsoft-cp1251 +++ /dev/null @@ -1,15 +0,0 @@ -XCOMM -XCOMM microsoft-cp1251 Compose Sequence -XCOMM -XCOMM Sequence Definition -XCOMM -XCOMM $XFree86$ -XCOMM -XCOMM This file currently has no entries. It appears that a compose file (even -XCOMM just an empty one) is required for the appropriate keysyms to work for -XCOMM this encoding. -XCOMM -XCOMM <Multi_key> Means <Compose> -XCOMM Special Character - -XCOMM End of Sequence Definition diff --git a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf deleted file mode 100644 index 468995e71539..000000000000 --- a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf +++ /dev/null @@ -1,78 +0,0 @@ ---- 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 --# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -+# define SystemMTDefines %%PTHREAD_CFLAGS%% - /* - * FreeBSD has tread-safe api but no getpwnam_r yet. - */ - # define HasThreadSafeAPI YES - # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI - # if HasLibPthread --# define ThreadsLibraries -lpthread -+# define ThreadsLibraries %%PTHREAD_LIBS%% - # else - # if OSRelVersion >= 500043 - # define BuildThreadStubLibrary NO -@@ -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) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) -@@ -187,11 +187,11 @@ - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ -+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX - #else --# define CcCmd cc --# define CplusplusCmd c++ -+# define CcCmd FreeBSDCC -+# define CplusplusCmd FreeBSDCXX - #endif - - #define CppCmd /usr/bin/cpp -@@ -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 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags FreeBSDCFLAGS - - #ifndef PreIncDir - # define PreIncDir /usr/include diff --git a/x11/XFree86-4-libraries/files/patch-Imake.rules b/x11/XFree86-4-libraries/files/patch-Imake.rules deleted file mode 100644 index deea1cb886a6..000000000000 --- a/x11/XFree86-4-libraries/files/patch-Imake.rules +++ /dev/null @@ -1,67 +0,0 @@ ---- config/cf/Imake.rules.orig Mon Dec 9 15:00:42 2002 -+++ config/cf/Imake.rules Mon Oct 13 17:04:19 2003 -@@ -1406,7 +1406,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef RmanDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanDependency() /**/ - #else - #define RmanDependency() @@\ -@@ -1421,7 +1421,7 @@ - #endif /* RmanDependency */ - - #ifndef RmanCmdDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define RmanCmdDependency /**/ - #else - #define RmanCmdDependency ProgramTargetName($(RMAN)) -@@ -1874,7 +1874,7 @@ - * this Imakefile is within the source tree. - */ - #ifndef DependDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define DependDependency() /**/ - #else - #define DependDependency() @@\ -@@ -1969,7 +1969,7 @@ - * within the source tree. - */ - #ifndef ImakeDependency --#ifdef UseInstalled -+#if defined(UseInstalled) || defined(UseInstalledPrograms) - #define ImakeDependency(target) /**/ - #else - #define ImakeDependency(target) @@\ -@@ -2066,11 +2066,18 @@ - * ProjectUnsharedLibReferences - variables for unshared libraries - */ - #ifndef ProjectUnsharedLibReferences -+#if defined(UseInstalledLibraries) -+#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ -+Concat3(DEP,varname,LIB) = @@\ -+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ -+LintLibReferences(varname,libname,libsource) -+#else - #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ - Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\ - Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ - LintLibReferences(varname,libname,libsource) - #endif -+#endif - - /* - * ProjectUnsharedFontLibReferences - unshared font libraries -@@ -3126,6 +3133,9 @@ - - #ifdef UseInstalled - #define ImakeSubCmdHelper $(IMAKE_CMD) -+#elif defined(UseInstalledPrograms) -+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11/XFree86-4-libraries/files/patch-Imake.tmpl b/x11/XFree86-4-libraries/files/patch-Imake.tmpl deleted file mode 100644 index 526e2e5de8a8..000000000000 --- a/x11/XFree86-4-libraries/files/patch-Imake.tmpl +++ /dev/null @@ -1,75 +0,0 @@ ---- config/cf/Imake.tmpl.orig Mon Dec 9 19:20:41 2002 -+++ config/cf/Imake.tmpl Thu Jan 2 14:34:20 2003 -@@ -237,7 +237,8 @@ - - #ifndef RmanCmd - #if BuildRman --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RmanCmd rman - #else - #define RmanCmd $(TOP)/config/util/rman -@@ -1348,7 +1349,8 @@ - #define LoaderLibPrefix /**/ - #endif - #ifndef ImakeCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define ImakeCmd imake - #else - #define ImakeCmd $(IMAKESRC)/imake -@@ -1359,19 +1361,22 @@ - #endif - #ifndef DependCmd - #if UseGccMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd gccmakedep - #else - #define DependCmd $(DEPENDSRC)/gccmakedep - #endif - #elif UseCCMakeDepend --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd ccmakedep - #else - #define DependCmd $(DEPENDSRC)/ccmakedep - #endif - #else --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define DependCmd makedepend - #else - #define DependCmd $(DEPENDSRC)/makedepend -@@ -1398,21 +1403,23 @@ - #ifndef ExportListCmd - # ifndef ExportListGenSource - # define ExportListCmd /**/ --# elif !defined(UseInstalled) -+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms) - # define ExportListCmd $(CONFIGSRC)/util/exportlistgen - # else - # define ExportListCmd exportlistgen - # endif - #endif - #ifndef MkdirHierCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define MkdirHierCmd mkdirhier - #else - #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh - #endif - #endif - #ifndef RevPathCmd --#ifdef UseInstalled /* assume BINDIR in path */ -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+/* assume BINDIR in path */ - #define RevPathCmd revpath - #else - #define RevPathCmd $(CONFIGSRC)/util/revpath diff --git a/x11/XFree86-4-libraries/files/patch-X11.tmpl b/x11/XFree86-4-libraries/files/patch-X11.tmpl deleted file mode 100644 index 1c152e2aafe2..000000000000 --- a/x11/XFree86-4-libraries/files/patch-X11.tmpl +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 --#define UseFontconfig BuildXftLibrary -+#define UseFontconfig (BuildXftLibrary || BuildXft1Library) - #endif - #ifndef BuildFontconfigLibrary - #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -1499,7 +1499,14 @@ - #endif - - #ifndef PsWrap -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define PsWrap pswrap -+#define PsWrapDependency /**/ -+#else - #define PsWrap $(PSWRAPSRC)/pswrap -+#define PsWrapDependency HostProgramTargetName($(PSWRAP)) -+#endif -+ PSWRAP = PsWrap - #endif - - #ifndef ResourceConfigurationManagement diff --git a/x11/XFree86-4-libraries/files/patch-XRes.c b/x11/XFree86-4-libraries/files/patch-XRes.c deleted file mode 100644 index bbb923724125..000000000000 --- a/x11/XFree86-4-libraries/files/patch-XRes.c +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/XRes/XRes.c.orig Wed Oct 16 02:37:26 2002 -+++ lib/XRes/XRes.c Wed May 7 23:44:38 2003 -@@ -218,7 +218,13 @@ - } - - #ifdef LONG64 -+#ifdef __sparc64__ -+ /* The first assignment is to work around a bug in gcc/gas on sparc64. */ -+ *bytes = rep.bytes_overflow; -+ *bytes = (*bytes * 4294967295) + rep.bytes; -+#else - *bytes = (rep.bytes_overflow * 4294967295) + rep.bytes; -+#endif - #else - *bytes = rep.bytes_overflow ? 0xffffffff : rep.bytes; - #endif diff --git a/x11/XFree86-4-libraries/files/patch-Xcursor-Imakefile b/x11/XFree86-4-libraries/files/patch-Xcursor-Imakefile deleted file mode 100644 index c9c5ace3f899..000000000000 --- a/x11/XFree86-4-libraries/files/patch-Xcursor-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Xcursor/Imakefile.orig Tue May 13 14:34:23 2003 -+++ lib/Xcursor/Imakefile Tue May 13 14:34:34 2003 -@@ -69,8 +69,6 @@ - RemoveFile($@) - sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@ - --InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig) -- - clean:: - RemoveFile(xcursor.pc) - diff --git a/x11/XFree86-4-libraries/files/patch-c2 b/x11/XFree86-4-libraries/files/patch-c2 deleted file mode 100644 index bbebc76c13e0..000000000000 --- a/x11/XFree86-4-libraries/files/patch-c2 +++ /dev/null @@ -1,21 +0,0 @@ ---- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 -+++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 -@@ -300,6 +300,10 @@ - */ - - #ifndef MakeStringsDependency -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define MakeStringsDependency @@\ -+MAKESTRS = makestrs -+#else - # define MakeStringsDependency @@\ - MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ - NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -308,6 +312,7 @@ - cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ - @@\ - includes:: HostProgramTargetName($(MAKESTRS)) -+#endif - #endif - - #ifndef ToolkitMakeStrings diff --git a/x11/XFree86-4-libraries/files/patch-dps b/x11/XFree86-4-libraries/files/patch-dps deleted file mode 100644 index ff6619041026..000000000000 --- a/x11/XFree86-4-libraries/files/patch-dps +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 - SORT = sort -- PSWRAP = PsWrap - - COMMONOBJECTFILES = \ - dpsclient.o\ -@@ -201,7 +200,7 @@ - - includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS) - --$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP)) -+$(DPSOPSCFILES) $(PSOPSCFILES): PsWrapDependency - - SRCS = \ - ${COMMONSOURCEFILES} \ -@@ -224,16 +223,11 @@ - - .SUFFIXES: .psw .h - --.psw.c : HostProgramTargetName($(PSWRAP)) -+.psw.c : PsWrapDependency - RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) - --.psw.h : HostProgramTargetName($(PSWRAP)) -+.psw.h : PsWrapDependency - RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) -- --HostProgramTargetName($(PSWRAP)): -- @echo "checking $@ over in $(PSWRAPSRC) first..."; \ -- cd $(PSWRAPSRC) && $(MAKE) pswraponly; \ -- echo "okay, continuing in $(CURRENT_DIR)" - - includes :: $(HEADERS) - depend :: $(DPSOPSCFILES) $(PSOPSCFILES) diff --git a/x11/XFree86-4-libraries/files/patch-dpsinfo b/x11/XFree86-4-libraries/files/patch-dpsinfo deleted file mode 100644 index 4605e2c05493..000000000000 --- a/x11/XFree86-4-libraries/files/patch-dpsinfo +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 - -@@ -13,10 +12,10 @@ - - .SUFFIXES: .psw .h - --.psw.c : ProgramTargetName($(PSWRAP)) -+.psw.c : PsWrapDependency - RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) - --.psw.h : ProgramTargetName($(PSWRAP)) -+.psw.h : PsWrapDependency - RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) - - depend:: $(DERIVED_FILES) diff --git a/x11/XFree86-4-libraries/files/patch-f b/x11/XFree86-4-libraries/files/patch-f deleted file mode 100644 index d1b90e4a9fc0..000000000000 --- a/x11/XFree86-4-libraries/files/patch-f +++ /dev/null @@ -1,10 +0,0 @@ ---- nls/Compose/Imakefile.orig Mon Jun 3 22:19:43 2002 -+++ nls/Compose/Imakefile Sat Jan 11 01:00:46 2003 -@@ -54,6 +54,7 @@ - ComposeTarget(koi8-r) - ComposeTarget(koi8-u) - ComposeTarget(koi8-c) -+ComposeTarget(microsoft-cp1251) - ComposeTarget(mulelao-1) - ComposeTarget(vi_VN.tcvn) - ComposeTarget(vi_VN.viscii) diff --git a/x11/XFree86-4-libraries/files/patch-imake.c b/x11/XFree86-4-libraries/files/patch-imake.c deleted file mode 100644 index 43699ed7daad..000000000000 --- a/x11/XFree86-4-libraries/files/patch-imake.c +++ /dev/null @@ -1,22 +0,0 @@ ---- config/imake/imake.c.orig Tue Dec 17 04:21:38 2002 -+++ config/imake/imake.c Sat Jan 4 15:57:23 2003 -@@ -1384,6 +1384,19 @@ - name = &uts_name; - } - #endif -+# ifdef __FreeBSD__ -+ /* Hack for FreeBSD ports "Cross Version" compiling system. */ -+ { -+ char *e; -+ if ((e = getenv("OSREL")) != NULL && -+ strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) { -+ strcpy(name->release, e); -+ strcpy(name->version, name->sysname); -+ strcat(name->version, " "); -+ strcat(name->version, e); -+ } -+ } -+# endif - - # if defined DEFAULT_OS_NAME - # if defined CROSSCOMPILE diff --git a/x11/XFree86-4-libraries/files/patch-lib-Xau-Imakefile b/x11/XFree86-4-libraries/files/patch-lib-Xau-Imakefile deleted file mode 100644 index 70119d9dadd9..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib-Xau-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Xau/Imakefile.orig Wed Apr 14 19:40:56 2004 -+++ lib/Xau/Imakefile Wed Apr 14 19:42:08 2004 -@@ -11,6 +11,8 @@ - #define DoDebugLib DebugLibXau - #define DoProfileLib ProfileLibXau - #define LibName Xau -+#define DoSharedLib YES -+SOXAUTHREV = 0.0 - #define SoRev SOXAUTHREV - #define IncSubdir X11 - diff --git a/x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile b/x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile deleted file mode 100644 index eb52f912cad7..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile +++ /dev/null @@ -1,39 +0,0 @@ ---- lib/GL/GL/Imakefile.orig Sun Jan 9 03:58:13 2005 -+++ lib/GL/GL/Imakefile Sun Jan 9 04:01:26 2005 -@@ -294,11 +294,15 @@ - - #if NormalLibGlx - NormalLibraryTarget($(LIBNAME),$(UOBJS)) -+#if !defined(LibInstall) || LibInstall - InstallLibrary($(LIBNAME),$(USRLIBDIR)) - #endif -+#endif - #if SharedLibGlx - SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(OBJS),$(OBJS) $(THREADOBJS),.,.) -+#if !defined(LibInstall) || LibInstall - InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) -+#endif - #if LinkGLToUsrLib && AlternateUsrLibDir - install:: - MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR)) -@@ -310,8 +314,10 @@ - #endif - #if DebugLibGlx - DebuggedLibraryTarget($(LIBNAME),$(DOBJS)) -+#if !defined(LibInstall) || LibInstall - InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) - #endif -+#endif - #if ExtraLibGlx && defined(ExtraLibRules) - all:: - ExtraLibMkdir() -@@ -322,7 +328,9 @@ - #endif - #if ProfileLibGlx - ProfiledLibraryTarget($(LIBNAME),$(POBJS)) -+#if !defined(LibInstall) || LibInstall - InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -+#endif - #endif - - diff --git a/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_dri_Imakefile b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_dri_Imakefile deleted file mode 100644 index 156ed4c1189d..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_dri_Imakefile +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/GL/mesa/drivers/dri/Imakefile.orig Sun Jan 9 22:27:16 2005 -+++ lib/GL/mesa/drivers/dri/Imakefile Sun Jan 9 22:27:59 2005 -@@ -7,6 +7,10 @@ - - SUBDIRS = common DriDrivers - -+#if (defined(FreeBSDBuildXlib) && FreeBSDBuildXlib) || (defined(ModInstall) && !ModInstall) -+SUBDIRS = common -+#endif -+ - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) - diff --git a/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_osmesa_Imakefile b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_osmesa_Imakefile deleted file mode 100644 index 71b6bb04bc08..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_osmesa_Imakefile +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/GL/mesa/drivers/osmesa/Imakefile.orig Sun Jan 9 03:32:47 2005 -+++ lib/GL/mesa/drivers/osmesa/Imakefile Sun Jan 9 03:34:41 2005 -@@ -131,6 +131,7 @@ - #endif - - -+#if !defined(LibInstall) || LibInstall || (!defined(ModInstall) || ModInstall) - #if DoNormalLib - NormalLibraryTarget($(LIBNAME), $(UOBJS)) - InstallLibrary($(LIBNAME),$(USRLIBDIR)) -@@ -158,6 +159,7 @@ - #if DoProfileLib - ProfiledLibraryTarget($(LIBNAME), $(POBJS)) - InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -+#endif - #endif - - DependTarget() diff --git a/x11/XFree86-4-libraries/files/patch-lib_Imakefile b/x11/XFree86-4-libraries/files/patch-lib_Imakefile deleted file mode 100644 index 9e23e6c01608..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib_Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Imakefile.orig Sun Jan 9 22:24:32 2005 -+++ lib/Imakefile Sun Jan 9 22:25:09 2005 -@@ -249,7 +249,7 @@ - $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \ - $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \ - $(LIBXML2BUILDDIR) $(FONTCONFIGBUILDDIR) \ -- $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \ -+ $(XVMCLIBDIR) $(RANDRLIBDIR) \ - $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR) \ - $(DMXLIBDIR) - diff --git a/x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile b/x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile deleted file mode 100644 index 1cc81756d39a..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/X11/Imakefile.orig Sun Jan 9 02:58:04 2005 -+++ lib/X11/Imakefile Sun Jan 9 02:59:57 2005 -@@ -10,7 +10,7 @@ - HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \ - Xcms.h Xlocale.h XKBlib.h - --#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer -+#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer && !FreeBSDBuildXxserv - all:: - - depend:: -@@ -1043,8 +1043,10 @@ - #if InstallXcmsTxt - InstallNonExecFile(Xcms.txt,$(LIBDIR)) - #endif -+#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib - InstallNonExecFile(XErrorDB,$(LIBDIR)) - InstallNonExecFile(XKeysymDB,$(LIBDIR)) -+#endif - InstallLintLibrary(X11,$(LINTLIBDIR)) - - diff --git a/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftfuncs.c b/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftfuncs.c deleted file mode 100644 index 65e0a748702e..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftfuncs.c +++ /dev/null @@ -1,238 +0,0 @@ ---- lib/font/FreeType/ftfuncs.c.orig Wed Apr 14 11:32:43 2004 -+++ lib/font/FreeType/ftfuncs.c Sun Aug 27 14:35:48 2006 -@@ -50,10 +50,7 @@ THE SOFTWARE. - #include FT_TYPE1_TABLES_H - #include FT_XFREE86_H - #include FT_BBOX_H --#include FT_INTERNAL_TRUETYPE_TYPES_H - #include FT_TRUETYPE_TAGS_H --#include FT_INTERNAL_SFNT_H --#include FT_INTERNAL_STREAM_H - /* - * If you want to use FT_Outline_Get_CBox instead of - * FT_Outline_Get_BBox, define here. -@@ -119,6 +116,46 @@ static char *xlfd_props[] = { - }; - - -+/* read 2-byte value from a SFNT table */ -+static FT_UShort -+sfnt_get_ushort( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[2]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) ); -+ result = (FT_UShort)( (buff[0] << 8) | buff[1] ); -+ -+ return result; -+} -+ -+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o))) -+ -+ -+#if 0 -+static FT_ULong -+sfnt_get_ulong( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[4]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ); -+ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) | -+ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3]; -+ -+ return result; -+} -+#endif -+ -+ -+ -+ - static int ftypeInitP = 0; /* is the engine initialised? */ - static FT_Library ftypeLibrary; - -@@ -207,6 +244,10 @@ FreeTypeOpenFace(FTFacePtr *facep, char - if(maxp && maxp->maxContours == 0) - face->bitmap = 1; - } -+ -+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face, -+ TTAG_hhea, 34 ); -+ - /* Insert face in hashtable and return it */ - face->next = faceTable[bucket]; - faceTable[bucket] = face; -@@ -458,6 +499,29 @@ FreeTypeOpenInstance(FTInstancePtr *inst - } - - if( FT_IS_SFNT( face->face ) ) { -+#if 1 -+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y; -+ FT_UInt nn; -+ -+ instance->strike_index=0xFFFFU; -+ -+ tt_char_width = (int)(trans->scale*(1<<6) + 0.5); -+ tt_char_height = (int)(trans->scale*(1<<6) + 0.5); -+ -+ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64; -+ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64; -+ -+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ ) -+ { -+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn]; -+ -+ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem ) -+ { -+ instance->strike_index = nn; -+ break; -+ } -+ } -+#else - /* See Set_Char_Sizes() in ttdriver.c */ - FT_Error err; - TT_Face tt_face; -@@ -482,6 +546,7 @@ FreeTypeOpenInstance(FTInstancePtr *inst - sfnt = (SFNT_Service)tt_face->sfnt; - err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index); - if ( err ) instance->strike_index=0xFFFFU; -+#endif - } - - /* maintain a linked list of instances */ -@@ -799,31 +864,36 @@ ft_make_up_italic_bitmap( char *raster, - * parse the htmx field in TrueType font. - */ - --/* from src/truetype/ttgload.c */ - static void --tt_get_metrics( TT_HoriHeader* header, -+tt_get_metrics( FT_Face face, - FT_UInt idx, -+ FT_UInt num_hmetrics, - FT_Short* bearing, - FT_UShort* advance ) --/* Copyright 1996-2001, 2002 by */ --/* David Turner, Robert Wilhelm, and Werner Lemberg. */ - { -- TT_LongMetrics longs_m; -- FT_UShort k = header->number_Of_HMetrics; -+ /* read the metrics directly from the horizontal header, we -+ * parse the SFNT table directly through the standard FreeType API. -+ * this works with any version of the library and doesn't need to -+ * peek at its internals. Maybe a bit less -+ */ -+ FT_UInt count = num_hmetrics; - -- if ( k == 0 ) { -- *bearing = *advance = 0; -- return; -+ if ( count == 0 ) -+ { -+ *advance = 0; -+ *bearing = 0; - } -+ else if ( idx < count ) -+ { -+ FT_ULong offset = idx*4; - -- if ( idx < (FT_UInt)k ) { -- longs_m = (TT_LongMetrics )header->long_metrics + idx; -- *bearing = longs_m->bearing; -- *advance = longs_m->advance; -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 ); - } -- else { -- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k]; -- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance; -+ else -+ { -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 ); - } - } - -@@ -831,6 +901,7 @@ static int - ft_get_very_lazy_bbox( FT_UInt index, - FT_Face face, - FT_Size size, -+ FT_UInt num_hmetrics, - double slant, - FT_Matrix *matrix, - FT_BBox *bbox, -@@ -838,14 +909,13 @@ ft_get_very_lazy_bbox( FT_UInt index, - FT_Long *vertAdvance) - { - if ( FT_IS_SFNT( face ) ) { -- TT_Face ttface = (TT_Face)face; - FT_Size_Metrics *smetrics = &size->metrics; - FT_Short leftBearing = 0; - FT_UShort advance = 0; - FT_Vector p0, p1, p2, p3; - - /* horizontal */ -- tt_get_metrics(&ttface->horizontal, index, -+ tt_get_metrics( face, num_hmetrics, index, - &leftBearing, &advance); - - #if 0 -@@ -905,6 +975,27 @@ static FT_Error - FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index, - FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return ) - { -+#if 1 -+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0) -+ { -+ FT_Error error; -+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index]; -+ -+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 ); -+ if ( !error ) -+ { -+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY ); -+ if ( !error ) -+ { -+ if ( metrics_return != NULL ) -+ *metrics_return = ft_face->glyph->metrics; -+ -+ return 0; -+ } -+ } -+ } -+ return -1; -+#elif (FREETYPE_VERSION >= 2001008) - SFNT_Service sfnt; - TT_Face face; - FT_Error error; -@@ -968,6 +1059,7 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_ - - Exit: - return error; -+#endif - } - - int -@@ -1023,6 +1115,7 @@ FreeTypeRasteriseGlyph(unsigned idx, int - if( bitmap_metrics == NULL ) { - if ( instance->ttcap.flags & TTCAP_IS_VERY_LAZY ) { - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, -@@ -1197,6 +1290,7 @@ FreeTypeRasteriseGlyph(unsigned idx, int - if( is_outline == 1 ){ - if( correct ){ - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, diff --git a/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftfuncs.h b/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftfuncs.h deleted file mode 100644 index 925263c0009e..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftfuncs.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $ - ---- lib/font/FreeType/ftfuncs.h.orig 2005-07-07 15:59:47.000000000 +0100 -+++ lib/font/FreeType/ftfuncs.h 2006-06-01 23:21:39.000000000 +0100 -@@ -47,6 +47,7 @@ - char *filename; - FT_Face face; - int bitmap; -+ FT_UInt num_hmetrics; - struct _FTInstance *instances; - struct _FTInstance *active_instance; - struct _FTFace *next; /* link to next face in bucket */ diff --git a/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftsystem.c b/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftsystem.c deleted file mode 100644 index 51569bfa7104..000000000000 --- a/x11/XFree86-4-libraries/files/patch-lib_font_FreeType_ftsystem.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $ - ---- lib/font/FreeType/ftsystem.c.orig 2005-07-09 07:36:10.000000000 +0100 -+++ lib/font/FreeType/ftsystem.c 2006-06-01 23:21:53.000000000 +0100 -@@ -32,7 +32,9 @@ - #endif - #include <ft2build.h> - #include FT_CONFIG_CONFIG_H --#include FT_INTERNAL_DEBUG_H -+#define FT_TRACE( level, varformat ) do ; while ( 0 ) /* nothing */ -+#define FT_TRACE1( varformat ) FT_TRACE( 1, varformat ) -+#define FT_ERROR( varformat ) do ; while ( 0 ) /* nothing */ - #include FT_SYSTEM_H - #include FT_ERRORS_H - #include FT_TYPES_H diff --git a/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile b/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile deleted file mode 100644 index fa3f34e36ccc..000000000000 --- a/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/GL/dri/Imakefile.orig Sun Jan 23 01:48:51 2005 -+++ programs/Xserver/GL/dri/Imakefile Sun Jan 23 01:49:41 2005 -@@ -59,7 +59,7 @@ - - INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) -I$(MESASRCDIR)/include \ -- -I$(XF86OSSRC) -I$(XF86COMSRC) \ -+ -I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \ - -I../include -I../glx -I$(LIBSRC)/GL/include \ - -I$(SERVERSRC)/mi -I$(FONTINCSRC) \ - -I$(DRMSRCDIR)/shared diff --git a/x11/XFree86-4-libraries/files/patch-startx b/x11/XFree86-4-libraries/files/patch-startx deleted file mode 100644 index 95f8664ed75f..000000000000 --- a/x11/XFree86-4-libraries/files/patch-startx +++ /dev/null @@ -1,54 +0,0 @@ ---- programs/xinit/startx.cpp.orig Fri Nov 30 21:57:48 2001 -+++ programs/xinit/startx.cpp Fri Jan 18 23:59:42 2002 -@@ -80,8 +80,12 @@ - fi - - whoseargs="client" -+listen_tcp="-nolisten tcp" - while [ x"$1" != x ]; do - case "$1" in -+ -listen_tcp) -+ listen_tcp="" -+ ;; - XCOMM '' required to prevent cpp from treating "/*" as a C comment. - /''*|\./''*) - if [ "$whoseargs" = "client" ]; then -@@ -164,7 +168,7 @@ - done - #endif - --xinit $client $clientargs -- $server $display $serverargs -+xinit $client $clientargs -- $server $display $serverargs $listen_tcp - - if [ x"$removelist" != x ]; then - xauth remove $removelist ---- programs/xinit/startx.man.orig Fri Dec 14 21:01:56 2001 -+++ programs/xinit/startx.man Fri Jan 18 23:56:03 2002 -@@ -46,10 +46,17 @@ - somewhat nicer user interface for running a single session of the X - Window System. It is often run with no arguments. - .PP --Arguments immediately following the -+Except for the -+.RB '-listen_tcp' -+option, arguments immediately following the - .I startx - command are used to start a client in the same manner as - .IR xinit (1). -+The -+.RB '-listen_tcp' -+option of startx enables the TCP/IP transport type which is needed for remote X -+displays. This is disabled by default for security reasons. -+.PP - The special argument - .RB '--' - marks the end of client arguments and the beginning of server options. -@@ -70,6 +77,8 @@ - startx -- -dpi 100 - .PP - startx -- -layout Multihead -+.PP -+startx -listen_tcp -- -depth 16 - .RE - .PP - To determine the client to run, diff --git a/x11/XFree86-4-libraries/files/patch-texteroids b/x11/XFree86-4-libraries/files/patch-texteroids deleted file mode 100644 index 335883a8dde4..000000000000 --- a/x11/XFree86-4-libraries/files/patch-texteroids +++ /dev/null @@ -1,23 +0,0 @@ ---- programs/texteroids/Imakefile.orig Mon Sep 2 13:23:43 2002 -+++ programs/texteroids/Imakefile Mon Sep 2 13:27:13 2002 -@@ -3,7 +3,6 @@ - DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXLIB) - LOCAL_LIBRARIES = $(XTOOLLIB) $(DPSLIB) $(XLIB) - SYS_LIBRARIES = MathLibrary -- PSWRAP = PsWrap - - SRCS = twraps.psw texteroids.c - -@@ -13,10 +12,10 @@ - - .SUFFIXES: .psw .h - --.psw.c : ProgramTargetName($(PSWRAP)) -+.psw.c : PsWrapDependency - RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) - --.psw.h : ProgramTargetName($(PSWRAP)) -+.psw.h : PsWrapDependency - RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) - - depend:: $(DERIVED_FILES) diff --git a/x11/XFree86-4-libraries/files/patch-xditview-Imakefile b/x11/XFree86-4-libraries/files/patch-xditview-Imakefile deleted file mode 100644 index 74fc94cabb96..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xditview-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/xditview/Imakefile.orig Tue Feb 18 23:44:48 2003 -+++ programs/xditview/Imakefile Tue Feb 18 23:45:10 2003 -@@ -12,6 +12,8 @@ - FONTLIBS = XftClientLibs - FONTDEFS = -DUSE_XFT - #endif -+ FONTLIBS = `pkg-config xft --libs` -+ FONTDEFS = -DUSE_XFT `pkg-config xft --cflags` - #if HasMkstemp - TEMPDEFS = -DHAS_MKSTEMP - #endif diff --git a/x11/XFree86-4-libraries/files/patch-xdm b/x11/XFree86-4-libraries/files/patch-xdm deleted file mode 100644 index 06af733c4de3..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xdm +++ /dev/null @@ -1,45 +0,0 @@ ---- 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-xdm_session.c b/x11/XFree86-4-libraries/files/patch-xdm_session.c deleted file mode 100644 index c7c2d43dce28..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xdm_session.c +++ /dev/null @@ -1,27 +0,0 @@ ---- programs/xdm/session.c.orig Wed May 30 00:56:22 2001 -+++ programs/xdm/session.c Fri Sep 28 23:25:16 2001 -@@ -541,6 +541,7 @@ - int pid; - #ifdef HAS_SETUSERCONTEXT - struct passwd* pwd; -+ extern char **environ; - #endif - #ifdef USE_PAM - pam_handle_t *pamh = thepamh(); -@@ -623,6 +624,8 @@ - * Set the user's credentials: uid, gid, groups, - * environment variables, resource limits, and umask. - */ -+ /* destroy user environment before calling setusercontext */ -+ environ = verify->userEnviron; - pwd = getpwnam(name); - if (pwd) - { -@@ -632,6 +635,7 @@ - errno); - return (0); - } -+ verify->userEnviron = environ; - endpwent(); - } - else diff --git a/x11/XFree86-4-libraries/files/patch-xf86.tmpl b/x11/XFree86-4-libraries/files/patch-xf86.tmpl deleted file mode 100644 index 3bf0b443d5f8..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xf86.tmpl +++ /dev/null @@ -1,12 +0,0 @@ ---- config/cf/xf86.tmpl.orig Tue Dec 17 04:21:38 2002 -+++ config/cf/xf86.tmpl Thu Jan 2 14:10:44 2003 -@@ -19,6 +19,9 @@ - #ifdef UseInstalled - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -+#elif UseInstalledPrograms -+ IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ -+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS) - #else - IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11/XFree86-4-libraries/files/patch-xterm-Imakefile b/x11/XFree86-4-libraries/files/patch-xterm-Imakefile deleted file mode 100644 index d8a85f8e929d..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xterm-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/xterm/Imakefile.orig Tue Feb 18 23:49:54 2003 -+++ programs/xterm/Imakefile Tue Feb 18 23:50:10 2003 -@@ -103,6 +103,8 @@ - XRFLIBS = XftClientLibs $(XRENDERLIB) - XRFDEPLIBS = XftClientDepLibs $(DEPXRENDERLIB) - #endif -+ XRFDEF = -DXRENDERFONT `pkg-config xft --cflags` -+ XRFLIBS = `pkg-config xft --libs` - - MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) $(NOPOSIXTERMIOS) \ - -DOSMAJORVERSION=$(OSMAJORVERSION) \ diff --git a/x11/XFree86-4-libraries/files/patch-z14 b/x11/XFree86-4-libraries/files/patch-z14 deleted file mode 100644 index abd685278cbb..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z14 +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/etc/Imakefile.orig Wed May 30 07:52:23 2001 -+++ programs/Xserver/hw/xfree86/etc/Imakefile Thu Jun 7 06:55:20 2001 -@@ -43,7 +43,7 @@ - # endif - #endif - --#if !BuildServersOnly && BuildClients -+#if (!BuildServersOnly && BuildClients) || FreeBSDBuildXxserv - #ifndef SunArchitecture - TERMFILES = sun.termcap sun.terminfo - #endif diff --git a/x11/XFree86-4-libraries/files/patch-z15 b/x11/XFree86-4-libraries/files/patch-z15 deleted file mode 100644 index 07dffdc80f41..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z15 +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/proxymngr/Imakefile~ Thu Feb 10 03:02:19 2000 -+++ programs/proxymngr/Imakefile Sun May 7 23:02:04 2000 -@@ -27,7 +27,9 @@ - CppFileTarget(pmconfig,pmconfig.cpp,$(SITE_CONFIG),NullParameter) - - BuildIncludes($(HEADERS),X11/PM,../..) -+#if !defined(LibHeaders) || LibHeaders - InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/PM,$(INSTINCFLAGS)) -+#endif - - ComplexProgramTarget_1(proxymngr,$(LOCAL_LIBRARIES),NullParameter) - SpecialCObjectRule(main,$(_NOOP_),'-DCONFIG_FILE="'$(PROXYMANAGERDIR)'/pmconfig"') diff --git a/x11/XFree86-4-libraries/files/patch-z34 b/x11/XFree86-4-libraries/files/patch-z34 deleted file mode 100644 index 747d662b3c7c..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z34 +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 && FreeBSDBuildXlib - #define LibInstall YES - #else - #define LibInstall NO diff --git a/x11/XFree86-4-libraries/files/patch-z35 b/x11/XFree86-4-libraries/files/patch-z35 deleted file mode 100644 index 66c6d1d8dfba..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z35 +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/font/stubs/Imakefile.orig Wed Dec 20 13:32:01 2000 -+++ lib/font/stubs/Imakefile Wed Dec 20 13:32:29 2000 -@@ -18,7 +18,9 @@ - NormalLibraryObjectRule() - NormalLibraryTarget(fntstubs,$(OBJS)) - LintLibraryTarget(fntstubs,$(SRCS)) -+# if !defined(LibInstall) || LibInstall - InstallLibrary(fntstubs,$(USRLIBDIR)) -+# endif /* LibInstall */ - NormalLintTarget($(SRCS)) - DependTarget() - diff --git a/x11/XFree86-4-libraries/files/patch-z45 b/x11/XFree86-4-libraries/files/patch-z45 deleted file mode 100644 index 430c24d8ed74..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z45 +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/GLU/Imakefile.orig Fri May 31 11:45:39 2002 -+++ lib/GLU/Imakefile Thu Jan 2 12:04:03 2003 -@@ -103,6 +103,7 @@ - #undef _LinkBuildLibrary - #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib) - -+#if !defined(LibInstall) || LibInstall - #if NormalLibGlu - NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS)) - InstallLibrary($(LIBNAME),$(USRLIBDIR)) -@@ -126,7 +127,7 @@ - ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(PROFILE_OBJS)) - InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) - #endif /* ProfileLibGlu */ -- -+#endif - - ForceSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) diff --git a/x11/XFree86-4-libraries/pkg-descr b/x11/XFree86-4-libraries/pkg-descr deleted file mode 100644 index 1ca8ab2b48b7..000000000000 --- a/x11/XFree86-4-libraries/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package containts XFree86 include header files and (shared) -library files. - -WWW: http://www.xfree86.org/ diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist deleted file mode 100644 index 5793ed0886e1..000000000000 --- a/x11/XFree86-4-libraries/pkg-plist +++ /dev/null @@ -1,725 +0,0 @@ -@unexec if cmp -s %D/lib/X11/xserver/SecurityPolicy %D/lib/X11/xserver/SecurityPolicy.default; then rm %D/lib/X11/xserver/SecurityPolicy; fi -bin/xcursor-config -include/DPS/ColorSB.h -include/DPS/ColorSBP.h -include/DPS/DPSScrollW.h -include/DPS/DPSScrollWP.h -include/DPS/FontCreatP.h -include/DPS/FontCreato.h -include/DPS/FontSB.h -include/DPS/FontSBP.h -include/DPS/FontSamplP.h -include/DPS/FontSample.h -include/DPS/PSres.h -include/DPS/XDPS.h -include/DPS/XDPSlib.h -include/DPS/XDPSproto.h -include/DPS/dpsNXargs.h -include/DPS/dpsXclient.h -include/DPS/dpsXcommon.h -include/DPS/dpsXpreview.h -include/DPS/dpsXshare.h -include/DPS/dpsXuserpath.h -include/DPS/dpsclient.h -include/DPS/dpsconfig.h -include/DPS/dpsexcept.h -include/DPS/dpsfriends.h -include/DPS/dpsops.h -include/DPS/psops.h -include/GL/GLwDrawA.h -include/GL/GLwDrawAP.h -include/GL/GLwMDrawA.h -include/GL/GLwMDrawAP.h -include/GL/gl.h -include/GL/glext.h -include/GL/glu.h -include/GL/glx.h -include/GL/glxext.h -include/GL/glxint.h -include/GL/glxmd.h -include/GL/glxproto.h -include/GL/glxtokens.h -include/GL/osmesa.h -include/X11/Composite.h -include/X11/CompositeP.h -include/X11/ConstrainP.h -include/X11/Constraint.h -include/X11/Core.h -include/X11/CoreP.h -include/X11/DECkeysym.h -include/X11/HPkeysym.h -include/X11/ICE/ICE.h -include/X11/ICE/ICEconn.h -include/X11/ICE/ICElib.h -include/X11/ICE/ICEmsg.h -include/X11/ICE/ICEproto.h -include/X11/ICE/ICEutil.h -include/X11/Intrinsic.h -include/X11/IntrinsicP.h -include/X11/Object.h -include/X11/ObjectP.h -include/X11/PM/PM.h -include/X11/PM/PMproto.h -include/X11/RectObj.h -include/X11/RectObjP.h -include/X11/SM/SM.h -include/X11/SM/SMlib.h -include/X11/SM/SMproto.h -include/X11/Shell.h -include/X11/ShellP.h -include/X11/StringDefs.h -include/X11/Sunkeysym.h -include/X11/Vendor.h -include/X11/VendorP.h -include/X11/X.h -include/X11/X10.h -include/X11/XF86keysym.h -include/X11/XKBlib.h -include/X11/XWDFile.h -include/X11/Xalloca.h -include/X11/Xarch.h -include/X11/Xatom.h -include/X11/Xauth.h -include/X11/Xaw/AllWidgets.h -include/X11/Xaw/AsciiSink.h -include/X11/Xaw/AsciiSinkP.h -include/X11/Xaw/AsciiSrc.h -include/X11/Xaw/AsciiSrcP.h -include/X11/Xaw/AsciiText.h -include/X11/Xaw/AsciiTextP.h -include/X11/Xaw/Box.h -include/X11/Xaw/BoxP.h -include/X11/Xaw/Cardinals.h -include/X11/Xaw/Command.h -include/X11/Xaw/CommandP.h -include/X11/Xaw/Dialog.h -include/X11/Xaw/DialogP.h -include/X11/Xaw/Form.h -include/X11/Xaw/FormP.h -include/X11/Xaw/Grip.h -include/X11/Xaw/GripP.h -include/X11/Xaw/Label.h -include/X11/Xaw/LabelP.h -include/X11/Xaw/List.h -include/X11/Xaw/ListP.h -include/X11/Xaw/MenuButtoP.h -include/X11/Xaw/MenuButton.h -include/X11/Xaw/MultiSink.h -include/X11/Xaw/MultiSinkP.h -include/X11/Xaw/MultiSrc.h -include/X11/Xaw/MultiSrcP.h -include/X11/Xaw/Paned.h -include/X11/Xaw/PanedP.h -include/X11/Xaw/Panner.h -include/X11/Xaw/PannerP.h -include/X11/Xaw/Porthole.h -include/X11/Xaw/PortholeP.h -include/X11/Xaw/Repeater.h -include/X11/Xaw/RepeaterP.h -include/X11/Xaw/Reports.h -include/X11/Xaw/Scrollbar.h -include/X11/Xaw/ScrollbarP.h -include/X11/Xaw/Simple.h -include/X11/Xaw/SimpleMenP.h -include/X11/Xaw/SimpleMenu.h -include/X11/Xaw/SimpleP.h -include/X11/Xaw/Sme.h -include/X11/Xaw/SmeBSB.h -include/X11/Xaw/SmeBSBP.h -include/X11/Xaw/SmeLine.h -include/X11/Xaw/SmeLineP.h -include/X11/Xaw/SmeP.h -include/X11/Xaw/StripCharP.h -include/X11/Xaw/StripChart.h -include/X11/Xaw/Template.c -include/X11/Xaw/Template.h -include/X11/Xaw/TemplateP.h -include/X11/Xaw/Text.h -include/X11/Xaw/TextP.h -include/X11/Xaw/TextSink.h -include/X11/Xaw/TextSinkP.h -include/X11/Xaw/TextSrc.h -include/X11/Xaw/TextSrcP.h -include/X11/Xaw/Tip.h -include/X11/Xaw/TipP.h -include/X11/Xaw/Toggle.h -include/X11/Xaw/ToggleP.h -include/X11/Xaw/Tree.h -include/X11/Xaw/TreeP.h -include/X11/Xaw/VendorEP.h -include/X11/Xaw/Viewport.h -include/X11/Xaw/ViewportP.h -include/X11/Xaw/XawImP.h -include/X11/Xaw/XawInit.h -include/X11/Xcms.h -include/X11/Xcursor/Xcursor.h -include/X11/Xdefs.h -include/X11/Xdmcp.h -include/X11/Xfuncproto.h -include/X11/Xfuncs.h -include/X11/Xlib.h -include/X11/Xlibint.h -include/X11/Xlocale.h -include/X11/Xmd.h -include/X11/Xmu/Atoms.h -include/X11/Xmu/CharSet.h -include/X11/Xmu/CloseHook.h -include/X11/Xmu/Converters.h -include/X11/Xmu/CurUtil.h -include/X11/Xmu/CvtCache.h -include/X11/Xmu/DisplayQue.h -include/X11/Xmu/Drawing.h -include/X11/Xmu/Editres.h -include/X11/Xmu/EditresP.h -include/X11/Xmu/Error.h -include/X11/Xmu/ExtAgent.h -include/X11/Xmu/Initer.h -include/X11/Xmu/Lookup.h -include/X11/Xmu/Misc.h -include/X11/Xmu/StdCmap.h -include/X11/Xmu/StdSel.h -include/X11/Xmu/SysUtil.h -include/X11/Xmu/WidgetNode.h -include/X11/Xmu/WinUtil.h -include/X11/Xmu/Xct.h -include/X11/Xmu/Xmu.h -include/X11/Xos.h -include/X11/Xos_r.h -include/X11/Xosdefs.h -include/X11/Xpoll.h -include/X11/Xproto.h -include/X11/Xprotostr.h -include/X11/Xresource.h -include/X11/Xthreads.h -include/X11/Xutil.h -include/X11/ap_keysym.h -include/X11/bitmaps/1x1 -include/X11/bitmaps/2x2 -include/X11/bitmaps/black -include/X11/bitmaps/boxes -include/X11/bitmaps/calculator -include/X11/bitmaps/cntr_ptr -include/X11/bitmaps/cntr_ptrmsk -include/X11/bitmaps/cross_weave -include/X11/bitmaps/dimple1 -include/X11/bitmaps/dimple3 -include/X11/bitmaps/dot -include/X11/bitmaps/dropbar7 -include/X11/bitmaps/dropbar8 -include/X11/bitmaps/escherknot -include/X11/bitmaps/flagdown -include/X11/bitmaps/flagup -include/X11/bitmaps/flipped_gray -include/X11/bitmaps/gray -include/X11/bitmaps/gray1 -include/X11/bitmaps/gray3 -include/X11/bitmaps/grid16 -include/X11/bitmaps/grid2 -include/X11/bitmaps/grid4 -include/X11/bitmaps/grid8 -include/X11/bitmaps/hlines2 -include/X11/bitmaps/hlines3 -include/X11/bitmaps/icon -include/X11/bitmaps/keyboard16 -include/X11/bitmaps/left_ptr -include/X11/bitmaps/left_ptrmsk -include/X11/bitmaps/letters -include/X11/bitmaps/light_gray -include/X11/bitmaps/mailempty -include/X11/bitmaps/mailemptymsk -include/X11/bitmaps/mailfull -include/X11/bitmaps/mailfullmsk -include/X11/bitmaps/mensetmanus -include/X11/bitmaps/menu10 -include/X11/bitmaps/menu12 -include/X11/bitmaps/menu16 -include/X11/bitmaps/menu6 -include/X11/bitmaps/menu8 -include/X11/bitmaps/noletters -include/X11/bitmaps/opendot -include/X11/bitmaps/opendotMask -include/X11/bitmaps/plaid -include/X11/bitmaps/right_ptr -include/X11/bitmaps/right_ptrmsk -include/X11/bitmaps/root_weave -include/X11/bitmaps/scales -include/X11/bitmaps/sipb -include/X11/bitmaps/star -include/X11/bitmaps/starMask -include/X11/bitmaps/stipple -include/X11/bitmaps/target -include/X11/bitmaps/terminal -include/X11/bitmaps/tie_fighter -include/X11/bitmaps/vlines2 -include/X11/bitmaps/vlines3 -include/X11/bitmaps/weird_size -include/X11/bitmaps/wide_weave -include/X11/bitmaps/wingdogs -include/X11/bitmaps/woman -include/X11/bitmaps/xfd_icon -include/X11/bitmaps/xlogo11 -include/X11/bitmaps/xlogo16 -include/X11/bitmaps/xlogo32 -include/X11/bitmaps/xlogo64 -include/X11/bitmaps/xsnow -include/X11/cursorfont.h -include/X11/extensions/MITMisc.h -include/X11/extensions/Print.h -include/X11/extensions/Printstr.h -include/X11/extensions/XEVI.h -include/X11/extensions/XEVIstr.h -include/X11/extensions/XI.h -include/X11/extensions/XInput.h -include/X11/extensions/XIproto.h -include/X11/extensions/XKB.h -include/X11/extensions/XKBbells.h -include/X11/extensions/XKBconfig.h -include/X11/extensions/XKBfile.h -include/X11/extensions/XKBgeom.h -include/X11/extensions/XKBproto.h -include/X11/extensions/XKBrules.h -include/X11/extensions/XKBsrv.h -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/XRes.h -include/X11/extensions/XResproto.h -include/X11/extensions/XShm.h -include/X11/extensions/XTest.h -include/X11/extensions/Xag.h -include/X11/extensions/Xagsrv.h -include/X11/extensions/Xagstr.h -include/X11/extensions/Xcup.h -include/X11/extensions/Xcupstr.h -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 -include/X11/extensions/XvMClib.h -include/X11/extensions/XvMCproto.h -include/X11/extensions/Xvlib.h -include/X11/extensions/Xvproto.h -include/X11/extensions/bigreqstr.h -include/X11/extensions/dmxext.h -include/X11/extensions/dmxproto.h -include/X11/extensions/dpms.h -include/X11/extensions/dpmsstr.h -include/X11/extensions/extutil.h -include/X11/extensions/fontcache.h -include/X11/extensions/fontcacheP.h -include/X11/extensions/fontcachstr.h -include/X11/extensions/lbxbuf.h -include/X11/extensions/lbxbufstr.h -include/X11/extensions/lbxdeltastr.h -include/X11/extensions/lbximage.h -include/X11/extensions/lbxopts.h -include/X11/extensions/lbxstr.h -include/X11/extensions/lbxzlib.h -include/X11/extensions/mitmiscstr.h -include/X11/extensions/multibuf.h -include/X11/extensions/multibufst.h -include/X11/extensions/panoramiXext.h -include/X11/extensions/panoramiXproto.h -include/X11/extensions/panoramiXwrap.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 -include/X11/extensions/renderproto.h -include/X11/extensions/saver.h -include/X11/extensions/saverproto.h -include/X11/extensions/scrnsaver.h -include/X11/extensions/security.h -include/X11/extensions/securstr.h -include/X11/extensions/shape.h -include/X11/extensions/shapestr.h -include/X11/extensions/shmstr.h -include/X11/extensions/sync.h -include/X11/extensions/syncstr.h -include/X11/extensions/xcmiscstr.h -include/X11/extensions/xf86bigfont.h -include/X11/extensions/xf86bigfstr.h -include/X11/extensions/xf86dga.h -include/X11/extensions/xf86dga1.h -include/X11/extensions/xf86dga1str.h -include/X11/extensions/xf86dgastr.h -include/X11/extensions/xf86misc.h -include/X11/extensions/xf86mscstr.h -include/X11/extensions/xf86vmode.h -include/X11/extensions/xf86vmstr.h -include/X11/extensions/xtestext1.h -include/X11/extensions/xteststr.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 -include/X11/fonts/fontenc.h -include/X11/fonts/fsmasks.h -include/X11/keysym.h -include/X11/keysymdef.h -include/X11/xpm.h -include/xf86Optrec.h -include/xf86Parser.h -lib/X11/XErrorDB -lib/X11/XKeysymDB -lib/X11/Xcms.txt -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/compose.dir -lib/X11/locale/el_GR.UTF-8/Compose -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-11/XI18N_OBJS -lib/X11/locale/iso8859-11/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/ja_JP.UTF-8/XI18N_OBJS -lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE -lib/X11/locale/ko/Compose -lib/X11/locale/ko/XI18N_OBJS -lib/X11/locale/ko/XLC_LOCALE -lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS -lib/X11/locale/ko_KR.UTF-8/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/lib/common/ximcp.so -lib/X11/locale/lib/common/ximcp.so.2 -lib/X11/locale/lib/common/xlcDef.so -lib/X11/locale/lib/common/xlcDef.so.2 -lib/X11/locale/lib/common/xlcUTF8Load.so -lib/X11/locale/lib/common/xlcUTF8Load.so.2 -lib/X11/locale/lib/common/xlibi18n.so -lib/X11/locale/lib/common/xlibi18n.so.2 -lib/X11/locale/lib/common/xlocale.so -lib/X11/locale/lib/common/xlocale.so.2 -lib/X11/locale/lib/common/xomGeneric.so -lib/X11/locale/lib/common/xomGeneric.so.2 -lib/X11/locale/locale.alias -lib/X11/locale/locale.dir -lib/X11/locale/microsoft-cp1251/Compose -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/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.UTF-8/XI18N_OBJS -lib/X11/locale/th_TH.UTF-8/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_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 -lib/X11/locale/zh_CN/Compose -lib/X11/locale/zh_CN/XI18N_OBJS -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.UTF-8/XI18N_OBJS -lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE -lib/X11/locale/zh_TW.big5/Compose -lib/X11/locale/zh_TW.big5/XI18N_OBJS -lib/X11/locale/zh_TW.big5/XLC_LOCALE -lib/X11/locale/zh_TW/Compose -lib/X11/locale/zh_TW/XI18N_OBJS -lib/X11/locale/zh_TW/XLC_LOCALE -lib/X11/xserver/SecurityPolicy.default -lib/libFS.a -lib/libFS.so -lib/libFS.so.6 -lib/libGL.a -lib/libGL.so -lib/libGL.so.1 -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 -%%OSMESA:%%lib/libOSMesa.a -%%OSMESA:%%lib/libOSMesa.so -%%OSMESA:%%lib/libOSMesa.so.4 -lib/libSM.a -lib/libSM.so -lib/libSM.so.6 -lib/libX11.a -lib/libX11.so -lib/libX11.so.6 -lib/libXRes.a -lib/libXRes.so -lib/libXRes.so.1 -lib/libXThrStub.so -lib/libXThrStub.so.6 -lib/libXTrap.a -lib/libXTrap.so -lib/libXTrap.so.6 -lib/libXau.a -lib/libXau.so -lib/libXau.so.0 -lib/libXaw.a -lib/libXaw.so -lib/libXaw.so.6 -lib/libXaw.so.7 -lib/libXcursor.a -lib/libXcursor.so -lib/libXcursor.so.1 -lib/libXdmcp.a -lib/libXext.a -lib/libXext.so -lib/libXext.so.6 -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 -lib/libXmuu.a -lib/libXmuu.so -lib/libXmuu.so.1 -lib/libXp.a -lib/libXp.so -lib/libXp.so.6 -lib/libXpm.a -lib/libXpm.so -lib/libXpm.so.4 -lib/libXrandr.a -lib/libXrandr.so -lib/libXrandr.so.2 -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 -lib/libXtst.a -lib/libXtst.so -lib/libXtst.so.6 -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/libdmx.a -lib/libdmx.so -lib/libdmx.so.1 -lib/libdps.a -lib/libdps.so -lib/libdps.so.1 -lib/libdpstk.a -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 -lib/libpsres.a -lib/libpsres.so -lib/libpsres.so.1 -lib/libxf86config.a -lib/libxkbfile.a -lib/libxkbfile.so -lib/libxkbfile.so.1 -lib/libxkbui.a -lib/libxkbui.so -lib/libxkbui.so.1 -libdata/pkgconfig/xcursor.pc -@dirrm include/DPS -@dirrm include/GL -@dirrm include/X11/ICE -@dirrm include/X11/PM -@dirrm include/X11/SM -@dirrm include/X11/Xaw -@dirrm include/X11/Xcursor -@dirrm include/X11/Xmu -@dirrm include/X11/extensions -@dirrm include/X11/fonts -@dirrm lib/X11/locale/C -@dirrm lib/X11/locale/armscii-8 -@dirrm lib/X11/locale/el_GR.UTF-8 -@dirrm lib/X11/locale/en_US.UTF-8 -@dirrm lib/X11/locale/georgian-academy -@dirrm lib/X11/locale/georgian-ps -@dirrm lib/X11/locale/ibm-cp1133 -@dirrm lib/X11/locale/iscii-dev -@dirrm lib/X11/locale/isiri-3342 -@dirrm lib/X11/locale/iso8859-1 -@dirrm lib/X11/locale/iso8859-10 -@dirrm lib/X11/locale/iso8859-11 -@dirrm lib/X11/locale/iso8859-13 -@dirrm lib/X11/locale/iso8859-14 -@dirrm lib/X11/locale/iso8859-15 -@dirrm lib/X11/locale/iso8859-2 -@dirrm lib/X11/locale/iso8859-3 -@dirrm lib/X11/locale/iso8859-4 -@dirrm lib/X11/locale/iso8859-5 -@dirrm lib/X11/locale/iso8859-6 -@dirrm lib/X11/locale/iso8859-7 -@dirrm lib/X11/locale/iso8859-8 -@dirrm lib/X11/locale/iso8859-9 -@dirrm lib/X11/locale/iso8859-9e -@dirrm lib/X11/locale/ja -@dirrm lib/X11/locale/ja.JIS -@dirrm lib/X11/locale/ja.SJIS -@dirrm lib/X11/locale/ja_JP.UTF-8 -@dirrm lib/X11/locale/ko -@dirrm lib/X11/locale/ko_KR.UTF-8 -@dirrm lib/X11/locale/koi8-c -@dirrm lib/X11/locale/koi8-r -@dirrm lib/X11/locale/koi8-u -@dirrm lib/X11/locale/lib/common -@dirrm lib/X11/locale/lib -@dirrm lib/X11/locale/microsoft-cp1251 -@dirrm lib/X11/locale/microsoft-cp1255 -@dirrm lib/X11/locale/microsoft-cp1256 -@dirrm lib/X11/locale/mulelao-1 -@dirrm lib/X11/locale/nokhchi-1 -@dirrm lib/X11/locale/tatar-cyr -@dirrm lib/X11/locale/th_TH -@dirrm lib/X11/locale/th_TH.UTF-8 -@dirrm lib/X11/locale/tscii-0 -@dirrm lib/X11/locale/vi_VN.tcvn -@dirrm lib/X11/locale/vi_VN.viscii -@dirrm lib/X11/locale/zh_CN -@dirrm lib/X11/locale/zh_CN.UTF-8 -@dirrm lib/X11/locale/zh_CN.gbk -@dirrm lib/X11/locale/zh_HK.big5 -@dirrm lib/X11/locale/zh_HK.big5hkscs -@dirrm lib/X11/locale/zh_TW -@dirrm lib/X11/locale/zh_TW.UTF-8 -@dirrm lib/X11/locale/zh_TW.big5 -@dirrm lib/X11/locale -@exec if [ ! -f %D/lib/X11/xserver/SecurityPolicy ]; then cp %D/lib/X11/xserver/SecurityPolicy.default %D/lib/X11/xserver/SecurityPolicy; fi -@dirrmtry include/X11/bitmaps -@dirrmtry lib/X11/xserver diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure deleted file mode 100644 index ed6fff32962e..000000000000 --- a/x11/XFree86-4-libraries/scripts/configure +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -# This script does the following: -# (1) cp xf86site.def, installed by imake-4 port, -# to ${WRKDIR}/xc/config/cf. -# this provides settings for the ports system. -# (2) Create a host.def for this specific port, using -# host.def as a base. - -ORIGDEF=$PREFIX/lib/X11/config/xf86site.def -DESTDEF=$WRKDIR/xc/config/cf/xf86site.def -ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -HOSTDEF=$WRKDIR/xc/config/cf/host.def - -# Use original host.def as initial config file -rm -f $LOCALDEF -grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF -echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - -# This is also defined in xf86site.def, but doesn't get -# picked up for some reason. -echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - -# User Config. -if [ X$DebuggableLibraries != XDEFAULT -a X$DebuggableLibraries != X ]; then -echo "#define DebuggableLibraries $DebuggableLibraries" >> $LOCALDEF -fi - -# disable some options -for i in \ - InstallXdmConfig \ - InstallXinitConfig \ - InstallFSConfig \ - InstallAppDefFiles \ - BuildServer \ - BuildFontServer \ - BuildFonts \ - Build75DpiFonts \ - Build100DpiFonts \ - BuildSpeedoFonts \ - BuildType1Fonts \ - BuildCIDFonts \ - BuildCyrillicFonts \ - BuildLatin2Fonts \ - BuildHtmlManPages \ - BuildPlugin -do \ - echo "#define $i NO" >> $LOCALDEF -done - -echo "#define FreeBSDCC ${CC}" >> $LOCALDEF -echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF -echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF - -echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF -echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF - -# Copy ORIGDEF to DESTDEF -rm -f $DESTDEF -cp -f $ORIGDEF $DESTDEF - -# copy generated config to host.def -cp -f $LOCALDEF $HOSTDEF - -exit 0 |