diff options
| author | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2001-03-25 23:04:52 +0000 |
|---|---|---|
| committer | FUJISHIMA Satsuki <sf@FreeBSD.org> | 2001-03-25 23:04:52 +0000 |
| commit | 984a75e189f8032fdc9c22cb74ee524c9c5f229b (patch) | |
| tree | 9d805fa2f35da750e77d677f6098022710d037b6 | |
| parent | 142f65210852bc655ce7e4c7c22b2623ec78ba6a (diff) | |
| download | ports-984a75e189f8032fdc9c22cb74ee524c9c5f229b.tar.gz ports-984a75e189f8032fdc9c22cb74ee524c9c5f229b.zip | |
Notes
124 files changed, 3491 insertions, 4541 deletions
diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile index 3b1f5a591bd4..da29f8857634 100644 --- a/devel/imake-4/Makefile +++ b/devel/imake-4/Makefile @@ -6,23 +6,21 @@ # PORTNAME= imake -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= devel -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ -DISTFILES= X401src-1.tgz +MASTER_SITES= ${MASTER_SITE_XFREE} +DISTFILES= X402src-1.tgz -MAINTAINER= taguchi@tohoku.iij.ad.jp +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz -#MANUAL_PACKAGE_BUILD= installs/removes files also in the XFree86 port +MAINTAINER= taguchi@tohoku.iij.ad.jp PREFIX?= ${X11BASE} DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc/config MTREE_FILE= /etc/mtree/BSD.x11-4.dist +PATCH_DIST_ARGS= --force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/Imakefile \ xc/Makefile \ xc/config \ @@ -39,28 +37,82 @@ MAN1= imake.1 \ rman.1 \ xmkmf.1 MANCOMPRESSED= yes -INSTALL_TARGET= install install.man -# Followings are configration variables for XFree86 Systems. -HasSecureRPC?= YES -HasXdmAuth?= YES -HasPam?= YES -BuildPexExt?= YES -BuildXinerama?= YES -BuildXIE?= YES -BuildAoutLibraries?= NO -# End of XFree86 configrations SCRIPTS_ENV+= OSVERSION=${OSVERSION} \ - PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} \ - FILESDIR=${FILESDIR} \ HasSecureRPC=${HasSecureRPC} \ HasXdmAuth=${HasXdmAuth} \ HasPam=${HasPam} \ BuildPexExt=${BuildPexExt} \ BuildXinerama=${BuildXinerama} \ BuildXIE=${BuildXIE} \ - BuildAoutLibraries=${BuildAoutLibraries} + BuildAoutLibraries=${BuildAoutLibraries} \ + ForceNormalLib=${ForceNormalLib} \ + DebuggableLibraries=${DebuggableLibraries} \ + JoystickSupport=${JoystickSupport} \ + InstallXdmConfig=${InstallXdmConfig} \ + InstallXinitConfig=${InstallXinitConfig} \ + InstallAppDefFiles=${InstallAppDefFiles} \ + ExtendedInputDevices=${ExtendedInputDevices} \ + Build75DpiFonts=${Build75DpiFonts} \ + Build100DpiFonts=${Build100DpiFonts} \ + BuildSpeedoFonts=${BuildSpeedoFonts} \ + BuildType1Fonts=${BuildType1Fonts} \ + BuildCIDFonts=${BuildCIDFonts} \ + BuildTTFonts=${BuildTTFonts} +INSTALL_TARGET= install install.man +# --- +# User Config: +# All variables are same as Imake config macros. +# For more details, see ${WRKDIR}/xc/config/cf/README. +# Followings will write to ${PFEFIX}/lib/X11/config/xf86site.def, +# and all of XFree86-4-* ports will use them as default value. +# Offcause, you can override them (at your own risk ;-). +# Read scripts/configure for more details. +# --- +HasSecureRPC?= YES +HasXdmAuth?= YES +HasPam?= YES +BuildPexExt?= YES +BuildXinerama?= YES +BuildXIE?= YES +BuildAoutLibraries?= NO +ForceNormalLib?= YES +DebuggableLibraries?= NO +JoystickSupport?= YES +InstallXdmConfig?= YES +InstallXinitConfig?= YES +InstallAppDefFiles?= YES +Build75DpiFonts?= YES +Build100DpiFonts?= YES +BuildSpeedoFonts?= YES +BuildType1Fonts?= YES +BuildCIDFonts?= YES +BuildTTFonts?= YES +# --- +# Undocumented variables: +# ExtendedInputDevices: if you want to support some extended input device, +# such as wacom tablets, set YES. +# if NO, only mouse device will be supported. +ExtendedInputDevices?= YES +# --- +# Unconfigurable variables: +# BuildXF86Setup=NO : XF86Setup is now broken ;-( +# +# BuildFontServer : if you want to use xfs, then do not install its ports. +# BuildFonts : if you don't need fonts, then do not install its ports. +# BuildCyrillicFonts : install ${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic +# BuildLatin2Fonts : install ${PORTSDIR}/x11-fonts/XFree86-4-fontLatin2 +# [Note1] all of loadable modules (such as speedo, type1) +# will be compiled/installed as default. +# [Note2] default/traditional X11 fonts are corrected under +# ${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps. +# +# XF86CardDrivers : XFree86-4-* ports try to support many devices. +# XInputDrivers : So if you want to config them, edit manualy. +# +# NothingOutsideProjectRoot=YES : any ports will not install to /etc/ dir. +# This means config files will be installed to ${PREFIX}/lib/X11. +# It's a traditional place ;-) +# InstallXserverSetUID=NO : use Xwrapper. +# End of XFree86 configrations .include <bsd.port.mk> diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo index e9125a5f32c4..073d54832d2d 100644 --- a/devel/imake-4/distinfo +++ b/devel/imake-4/distinfo @@ -1 +1,2 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 diff --git a/devel/imake-4/files/patch-c b/devel/imake-4/files/patch-c index 22623f1c32cf..f5b0ae491d7c 100644 --- a/devel/imake-4/files/patch-c +++ b/devel/imake-4/files/patch-c @@ -1,6 +1,6 @@ ---- cf/Imake.tmpl.orig Tue Jun 27 09:55:44 2000 -+++ cf/Imake.tmpl Wed Sep 6 13:31:04 2000 -@@ -1385,7 +1385,7 @@ +--- cf/Imake.tmpl.orig Tue Dec 5 10:16:28 2000 ++++ cf/Imake.tmpl Tue Dec 5 10:39:48 2000 +@@ -1425,7 +1425,7 @@ CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) @@ -9,12 +9,11 @@ #endif COMPRESS = CompressCmd GZIPCMD = GzipCmd -@@ -1574,7 +1574,8 @@ +@@ -1616,7 +1616,7 @@ */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) + CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib diff --git a/devel/imake-4/files/patch-c2 b/devel/imake-4/files/patch-c2 new file mode 100644 index 000000000000..89ebb285a674 --- /dev/null +++ b/devel/imake-4/files/patch-c2 @@ -0,0 +1,8 @@ +--- cf/Library.tmpl Wed Oct 13 00:20:41 1999 ++++ cf/Library.tmpl Thu Dec 21 09:22:14 2000 +@@ -69,3 +69,3 @@ + CLIBDEBUGFLAGS = LibraryDebugOpt +- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) ++ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) + # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) + diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d index 39662846e4ec..27ec6db7e147 100644 --- a/devel/imake-4/files/patch-d +++ b/devel/imake-4/files/patch-d @@ -1,14 +1,6 @@ ---- cf/FreeBSD.cf.orig Sun Jun 25 03:15:53 2000 -+++ cf/FreeBSD.cf Sun Jul 16 18:22:14 2000 -@@ -351,19 +356,22 @@ - #else - #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC -+#endif -+#ifndef HasPam -+#define HasPam YES - #endif - +--- cf/FreeBSD.cf~ Tue Dec 5 10:16:28 2000 ++++ cf/FreeBSD.cf Tue Dec 5 10:45:42 2000 +@@ -371,14 +371,14 @@ /* 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) diff --git a/devel/imake-4/files/patch-h b/devel/imake-4/files/patch-h index c33c3c04b737..89b9f99e3e86 100644 --- a/devel/imake-4/files/patch-h +++ b/devel/imake-4/files/patch-h @@ -1,26 +1,24 @@ ---- cf/Imake.rules.orig Sun Jun 18 03:39:14 2000 -+++ cf/Imake.rules Fri Sep 1 13:33:50 2000 -@@ -1297,8 +1297,8 @@ - @@\ +--- cf/Imake.rules~ Tue Dec 5 10:16:28 2000 ++++ cf/Imake.rules Tue Dec 5 11:01:00 2000 +@@ -1303,7 +1303,7 @@ dest.suffix.html: file.man RmanCmdDependency @@\ RemoveFiles(dest.suffix.html dest.suffix-html) @@\ -- RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) &&\ @@\ + RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\ - $(MV) dest.suffix-html $@ @@\ -+ RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\ + $(MV) dest.suffix-html dest.suffix.html @@\ @@\ install.man:: dest.suffix.html @@\ MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ -@@ -1533,7 +1533,7 @@ +@@ -1539,7 +1539,7 @@ MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ @MakeFlagsToShellFlags(i,set +e); \ @@\ if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ - RELPATH=`echo opath/cdir | \ @@\ -+ RELPATH=`cd opath/cdir; pwd | \ @@\ ++ RELPATH=`cd opath/cdir; pwd | \ @@\ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ cd Concat($(DESTDIR),opath/cdir); \ @@\ if [ -d rdir -a ! -h rdir ]; then \ @@\ -@@ -1580,7 +1580,7 @@ +@@ -1586,7 +1586,7 @@ MakeDir(Concat($(DESTDIR),npath)) @@\ @MakeFlagsToShellFlags(i,set +e); \ @@\ if [ -d Concat($(DESTDIR),opath) ]; then \ @@\ diff --git a/devel/imake-4/files/patch-i b/devel/imake-4/files/patch-i deleted file mode 100644 index 9234130815ef..000000000000 --- a/devel/imake-4/files/patch-i +++ /dev/null @@ -1,11 +0,0 @@ ---- cf/Library.tmpl~ Wed Oct 13 13:20:41 1999 -+++ cf/Library.tmpl Wed Sep 6 13:32:03 2000 -@@ -67,7 +67,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CDEBUGFLAGS = LibraryCDebugFlags - CLIBDEBUGFLAGS = LibraryDebugOpt -- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(SYSCFLAGS) $(CLIBDEBUGFLAGS) - # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags - # endif diff --git a/devel/imake-4/files/patch-t01 b/devel/imake-4/files/patch-t01 index 6d605f8e3696..ce994b4f2ce5 100644 --- a/devel/imake-4/files/patch-t01 +++ b/devel/imake-4/files/patch-t01 @@ -1,6 +1,15 @@ ---- imake/imake.c~ Thu Jun 15 04:36:17 2000 -+++ imake/imake.c Thu Sep 28 13:58:02 2000 -@@ -1184,6 +1184,19 @@ +--- imake/imake.c.ORIG Mon Dec 18 14:54:34 2000 ++++ imake/imake.c Mon Dec 18 14:55:25 2000 +@@ -399,7 +399,7 @@ + int + main(int argc, char *argv[]) + { +- FILE *tmpfd; ++ FILE *tmpfd = (FILE *)NULL; + char makeMacro[ BUFSIZ ]; + char makefileMacro[ BUFSIZ ]; + +@@ -1208,6 +1208,19 @@ if (uname(&name) < 0) LogFatal("Cannot invoke uname", ""); diff --git a/devel/imake-4/files/patch-xthreads b/devel/imake-4/files/patch-xthreads new file mode 100644 index 000000000000..0be90302ebd7 --- /dev/null +++ b/devel/imake-4/files/patch-xthreads @@ -0,0 +1,101 @@ +--- ../include/Xos_r.h.orig Sat Mar 24 16:49:23 2001 ++++ ../include/Xos_r.h Sat Mar 24 16:49:25 2001 +@@ -245,7 +245,7 @@ + + /* NetBSD, at least, is missing several of the unixware passwd fields. */ + +-#if defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) + __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) + { + memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); +@@ -412,7 +412,7 @@ + /* UnixWare 2.0, or other systems with thread support but no _r API. */ + /* WARNING: The h_addr_list and s_aliases values are *not* copied! */ + +-#if defined(__NetBSD__) ++#if defined(__NetBSD__) || defined(__FreeBSD__) + #include <sys/param.h> + #endif + +--- cf/FreeBSD.cf.orig Sat Mar 24 16:49:25 2001 ++++ cf/FreeBSD.cf Sat Mar 24 16:49:49 2001 +@@ -66,6 +66,41 @@ + #define InstallXloadSetGID YES + #endif + ++/* ++ * Multi-thread safe libs ++ */ ++/* 2.2.7 and later has libc_r (POSIX threads) */ ++#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \ ++ OSMajorVersion >= 3 ++# ifndef HasLibPthread ++# define HasLibPthread NO ++# endif ++# define HasPosixThreads YES ++# define ThreadedX YES ++/* ++ * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. ++ */ ++# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE ++/* ++ * 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 ++# else ++# define BuildThreadStubLibrary YES ++# define NeedUIThrStubs YES ++# if (OSRelVersion >= 500016) ++# define ThreadsLibraries -lc_r ++# else ++# define ThreadsLibraries -pthread ++# endif ++# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) ++# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) ++# endif ++#endif ++ + #define AvoidNullMakeCommand YES + #define StripInstalledPrograms YES + #define CompressAllFonts YES +@@ -97,7 +132,23 @@ + #endif + #endif + +-#define CcCmd cc ++/* ++ * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP), ++ * when building X to avoid that for each client ld give the message ++ * ++ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found ++ */ ++#if BuildThreadStubLibrary && !UseInstalled ++# define CcCmd $(CLIENTENVSETUP) cc ++# define CplusplusCmd $(CLIENTENVSETUP) c++ ++#else ++# define CcCmd cc ++# define CplusplusCmd c++ ++#endif ++ ++#define CppCmd /usr/bin/cpp ++#define PreProcessCmd CppCmd ++#define StandardCppOptions -traditional + #define CppCmd /usr/bin/cpp + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional +--- cf/bsdLib.tmpl.orig Tue Aug 29 03:43:49 2000 ++++ cf/bsdLib.tmpl Sat Mar 24 16:49:25 2001 +@@ -47,7 +47,9 @@ + #define SharedX11Reqs + #endif + #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) ++#ifndef SharedXtReqs + #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) ++#endif + #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) + #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) + #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) diff --git a/devel/imake-4/pkg-plist b/devel/imake-4/pkg-plist index 7dfb6d74bd8d..7cb86b0a10de 100644 --- a/devel/imake-4/pkg-plist +++ b/devel/imake-4/pkg-plist @@ -43,6 +43,10 @@ lib/X11/config/cde.rules lib/X11/config/cde.tmpl lib/X11/config/convex.cf lib/X11/config/cray.cf +lib/X11/config/cygwin.cf +lib/X11/config/cygwin.rules +lib/X11/config/cygwin.tmpl +lib/X11/config/darwin.cf lib/X11/config/fujitsu.cf lib/X11/config/generic.cf lib/X11/config/gnu.cf diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure index 42dd8dc1b055..634ecb077ed5 100644 --- a/devel/imake-4/scripts/configure +++ b/devel/imake-4/scripts/configure @@ -1,55 +1,149 @@ #!/bin/sh # configuration scripts for imake/XFree86 -F=${WRKDIR}/.config +F=$WRKDIR/.config + +isyes() { + if [ X$1 = XYES -o X$1 = XYes -o X$1 = Xyes -o X$1 = XY -o X$1 = Xy ]; then + ret=YES + else + ret=$1 + fi +} configure () { rm -f $F -if [ ${OSVERSION} -ge 300000 -a X${HasSecureRPC} != "X" ]; then - echo "#define HasSecureRPC ${HasSecureRPC}" >> $F +echo "/*" >> $F +echo "/* Followins are generated by FreeBSD imake-4/XFree86-4-* ports system." >> $F +echo " */" >> $F +if [ $OSVERSION -ge 300000 -a X$HasSecureRPC != "X" ]; then + echo "#ifndef HasSecureRPC" >> $F + echo "#define HasSecureRPC $HasSecureRPC" >> $F + echo "#endif" >> $F +fi +if [ X$HasXdmAuth != "X" ]; then + if [ -f $WRKDIR/xc/lib/Xdmcp/Wraphelp.c -o -f $DISTDIR/xc/Wraphelp.c ]; then + echo "#ifndef HasXdmAuth" >> $F + echo "#define HasXdmAuth $HasXdmAuth" >> $F + echo "#endif" >> $F + fi +fi +if [ $OSVERSION -ge 310000 -a X$HasPam != "X" ]; then + echo "#ifndef HasPam" >> $F + echo "#define HasPam $HasPam" >> $F + echo "#endif" >> $F +fi +if [ X$BuildPexExt != "X" ]; then + echo "#ifndef BuildPexExt" >> $F + echo "#define BuildPexExt $BuildPexExt" >> $F + echo "#endif" >> $F +fi +if [ X$BuildXinerama != "X" ]; then + echo "#ifndef BuildXinerama" >> $F + echo "#define BuildXinerama $BuildXinerama" >> $F + echo "#endif" >> $F +fi +if [ X$BuildXIE != "X" ]; then + echo "#ifndef BuildXIE" >> $F + echo "#define BuildXIE $BuildXIE" >> $F + echo "#endif" >> $F +fi +if [ X$BuildAoutLibraries != "X" ]; then + echo "#ifndef BuildAoutLibraries" >> $F + echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $F + echo "#endif" >> $F +fi +if [ X$ForceNormalLib != "X" ]; then + echo "#ifndef ForceNormalLib" >> $F + echo "#define ForceNormalLib $ForceNormalLib" >> $F + echo "#endif" >> $F +fi +isyes $DebuggableLibraries +if [ $ret = YES -a $OSVERSION -ge 400000 ]; then + echo "#ifndef DebuggableLibraries" >> $F + echo "#define DebuggableLibraries $ret" >> $F + echo "#endif" >> $F fi -if [ X${HasXdmAuth} != "X" ]; then - echo "#define HasXdmAuth ${HasXdmAuth}" >> $F +if [ X$JoystickSupport != "X" ]; then + echo "#ifndef JoystickSupport" >> $F + echo "#define JoystickSupport $JoystickSupport" >> $F + echo "#endif" >> $F fi -if [ X${HasPam} != "X" ]; then - echo "#define HasPam ${HasPam}" >> $F +if [ X$InstallXdmConfig != "X" ]; then + echo "#ifndef InstallXdmConfig" >> $F + echo "#define InstallXdmConfig $InstallXdmConfig" >> $F + echo "#endif" >> $F fi -if [ X${BuildPexExt} != "X" ]; then - echo "#define BuildPexExt ${BuildPexExt}" >> $F +if [ X$InstallXinitConfig != "X" ]; then + echo "#ifndef InstallXinitConfig" >> $F + echo "#define InstallXinitConfig $InstallXinitConfig" >> $F + echo "#endif" >> $F fi -if [ X${BuildXinerama} != "X" ]; then - echo "#define BuildXinerama ${BuildXinerama}" >> $F +if [ X$InstallAppDefFiles != "X" ]; then + echo "#ifndef InstallAppDefFiles" >> $F + echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $F + echo "#endif" >> $F fi -if [ X${BuildXIE} != "X" ]; then - echo "#define BuildXIE ${BuildXIE}" >> $F +if [ X$ExtendedInputDevices = XYES ]; then + echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \ + elographics magellan \ + microtouch mutouch spaceorb summa \ + wacom void citron" >> $F +else + echo "#define XInputDrivers mouse" >> $F fi -if [ X${BuildAoutLibraries} != "X" ]; then - echo "#define BuildAoutLibraries ${BuildAoutLibraries}" >> $F +if [ X$Build75DpiFonts != "X" ]; then + echo "#ifndef Build75DpiFonts" >> $F + echo "#define Build75DpiFonts $Build75DpiFonts" >> $F + echo "#endif" >> $F +fi +if [ X$Build100DpiFonts != "X" ]; then + echo "#ifndef Build100DpiFonts" >> $F + echo "#define Build100DpiFonts $Build100DpiFonts" >> $F + echo "#endif" >> $F +fi +if [ X$BuildSpeedoFonts != "X" ]; then + echo "#ifndef BuildSpeedoFonts" >> $F + echo "#define BuildSpeedoFonts $BuildSpeedoFonts" >> $F + echo "#endif" >> $F +fi +if [ X$BuildType1Fonts != "X" ]; then + echo "#ifndef BuildType1Fonts" >> $F + echo "#define BuildType1Fonts $BuildType1Fonts" >> $F + echo "#endif" >> $F +fi +if [ X$BuildCIDFonts != "X" ]; then + echo "#ifndef BuildCIDFonts" >> $F + echo "#define BuildCIDFonts $BuildCIDFonts" >> $F + echo "#endif" >> $F +fi +if [ X$BuildTTFonts != "X" ]; then + echo "#ifndef BuildTTFonts" >> $F + echo "#define BuildTTFonts $BuildTTFonts" >> $F + echo "#endif" >> $F fi +echo "#define BuildXF86Setup NO" >> $F cat >> $F <<EOF #ifndef XF86CardDrivers #ifdef i386Architecture #define XF86CardDrivers mga glint nv tga s3virge sis rendition \ - neomagic i740 tdfx \ + neomagic i740 tdfx savage \ cirrus tseng trident chips apm \ - GlideDriver fbdev \ - ati r128 AgpGartDrivers cyrix \ - vga XF86OSCardDrivers XF86ExtraCardDrivers + GlideDriver fbdev i128 \ + ati AgpGartDrivers DevelDrivers ark cyrix \ + siliconmotion \ + vesa vga XF86OSCardDrivers XF86ExtraCardDrivers #else -#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ - neomagic i740 tdfx \ - cirrus tseng trident chips apm \ - GlideDriver fbdev \ - ati r128 cyrix \ - vga XF86OSCardDrivers XF86ExtraCardDrivers +#ifdef AlphaArchitecture +#define XF86CardDrivers mga tdfx glint s3virge rendition tga \ + savage nv DevelDrivers siliconmotion vga \ + XF86OSCardDrivers XF86xtraCardDrivers +#endif #endif #endif EOF -echo "#define XInputDrivers mouse dynapro elo2300 elographics magellan \ - microtouch mutouch spaceorb wacom" >> $F - # Never install something to outside ${X11BASE}!! echo "#define NothingOutsideProjectRoot YES" >> $F } diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile index 6c45735c2072..da5a9206fd22 100644 --- a/x11-fonts/XFree86-4-font100dpi/Makefile +++ b/x11-fonts/XFree86-4-font100dpi/Makefile @@ -6,15 +6,11 @@ # PORTNAME= font100dpi -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ +MASTER_SITES= ${MASTER_SITE_XFREE} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-2.tgz +DISTFILES= X402src-2.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp diff --git a/x11-fonts/XFree86-4-font100dpi/distinfo b/x11-fonts/XFree86-4-font100dpi/distinfo index 1102a3a2abd1..caf1b3b79c0f 100644 --- a/x11-fonts/XFree86-4-font100dpi/distinfo +++ b/x11-fonts/XFree86-4-font100dpi/distinfo @@ -1 +1 @@ -MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile index 6b9cbf9d54ec..27e1c8893349 100644 --- a/x11-fonts/XFree86-4-font75dpi/Makefile +++ b/x11-fonts/XFree86-4-font75dpi/Makefile @@ -6,15 +6,11 @@ # PORTNAME= font75dpi -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ +MASTER_SITES= ${MASTER_SITE_XFREE} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-2.tgz +DISTFILES= X402src-2.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp diff --git a/x11-fonts/XFree86-4-font75dpi/distinfo b/x11-fonts/XFree86-4-font75dpi/distinfo index 1102a3a2abd1..caf1b3b79c0f 100644 --- a/x11-fonts/XFree86-4-font75dpi/distinfo +++ b/x11-fonts/XFree86-4-font75dpi/distinfo @@ -1 +1 @@ -MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile index 30b8f1090c70..587ec89817db 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/Makefile +++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile @@ -6,15 +6,11 @@ # PORTNAME= fontCyrillic -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ +MASTER_SITES= ${MASTER_SITE_XFREE} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-2.tgz +DISTFILES= X402src-2.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp diff --git a/x11-fonts/XFree86-4-fontCyrillic/distinfo b/x11-fonts/XFree86-4-fontCyrillic/distinfo index 1102a3a2abd1..caf1b3b79c0f 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/distinfo +++ b/x11-fonts/XFree86-4-fontCyrillic/distinfo @@ -1 +1 @@ -MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile index 8200805d175b..dbc78c4b3275 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile @@ -6,16 +6,12 @@ # PORTNAME= fontDefaultBitmaps -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ +MASTER_SITES= ${MASTER_SITE_XFREE} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz X401src-2.tgz -EXTRACT_ONLY= X401src-2.tgz +DISTFILES= X402src-1.tgz X402src-2.tgz +EXTRACT_ONLY= X402src-2.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -32,7 +28,7 @@ WRKSRC= ${WRKDIR}/xc/fonts/bdf/misc post-extract: (cd ${WRKDIR} && \ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/X401src-1.tgz \ + ${DISTDIR}/${DIST_SUBDIR}/X402src-1.tgz \ | ${TAR} -xf - xc/extras/fonts) do-configure: diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo index d88dbd78fa11..217d7d2ad1db 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 -MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist index 3d6ba789ca1c..d141b3f4148e 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist @@ -1,121 +1,292 @@ -lib/X11/fonts/misc/6x13-ISO8859-3.pcf.gz -lib/X11/fonts/misc/6x13-ISO8859-4.pcf.gz -lib/X11/fonts/misc/6x13-ISO8859-5.pcf.gz -lib/X11/fonts/misc/6x13-ISO8859-9.pcf.gz -lib/X11/fonts/misc/6x13-ISO8859-10.pcf.gz -lib/X11/fonts/misc/6x13-ISO8859-13.pcf.gz -lib/X11/fonts/misc/6x13-ISO8859-15.pcf.gz -lib/X11/fonts/misc/6x13B-ISO8859-5.pcf.gz -lib/X11/fonts/misc/6x13B-ISO8859-9.pcf.gz -lib/X11/fonts/misc/6x13B-ISO8859-13.pcf.gz -lib/X11/fonts/misc/6x13B-ISO8859-15.pcf.gz -lib/X11/fonts/misc/6x13O.pcf.gz -lib/X11/fonts/misc/6x13O-ISO8859-1.pcf.gz -lib/X11/fonts/misc/6x13O-ISO8859-2.pcf.gz -lib/X11/fonts/misc/6x13O-ISO8859-5.pcf.gz -lib/X11/fonts/misc/6x13O-ISO8859-7.pcf.gz -lib/X11/fonts/misc/6x13O-ISO8859-9.pcf.gz -lib/X11/fonts/misc/6x13O-ISO8859-13.pcf.gz -lib/X11/fonts/misc/6x13O-ISO8859-15.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-2.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-3.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-4.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-5.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-7.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-8.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-9.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-10.pcf.gz -lib/X11/fonts/misc/7x13-ISO8859-13.pcf.gz -lib/X11/fonts/misc/7x13-KOI8-R.pcf.gz -lib/X11/fonts/misc/7x13B-ISO8859-2.pcf.gz -lib/X11/fonts/misc/7x13B-ISO8859-5.pcf.gz -lib/X11/fonts/misc/7x13B-ISO8859-7.pcf.gz -lib/X11/fonts/misc/7x13B-ISO8859-9.pcf.gz -lib/X11/fonts/misc/7x13B-ISO8859-13.pcf.gz -lib/X11/fonts/misc/7x13O.pcf.gz -lib/X11/fonts/misc/7x13O-ISO8859-1.pcf.gz -lib/X11/fonts/misc/7x13O-ISO8859-2.pcf.gz -lib/X11/fonts/misc/7x13O-ISO8859-5.pcf.gz -lib/X11/fonts/misc/7x13O-ISO8859-7.pcf.gz -lib/X11/fonts/misc/7x13O-ISO8859-9.pcf.gz -lib/X11/fonts/misc/7x13O-ISO8859-13.pcf.gz -lib/X11/fonts/misc/7x13O-ISO8859-15.pcf.gz -lib/X11/fonts/misc/8x13-ISO8859-3.pcf.gz -lib/X11/fonts/misc/8x13-ISO8859-4.pcf.gz -lib/X11/fonts/misc/8x13-ISO8859-5.pcf.gz -lib/X11/fonts/misc/8x13-ISO8859-9.pcf.gz -lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz -lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz -lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz -lib/X11/fonts/misc/8x13B-ISO8859-5.pcf.gz -lib/X11/fonts/misc/8x13B-ISO8859-9.pcf.gz -lib/X11/fonts/misc/8x13B-ISO8859-13.pcf.gz -lib/X11/fonts/misc/8x13B-ISO8859-15.pcf.gz -lib/X11/fonts/misc/8x13O.pcf.gz -lib/X11/fonts/misc/8x13O-ISO8859-1.pcf.gz -lib/X11/fonts/misc/8x13O-ISO8859-2.pcf.gz -lib/X11/fonts/misc/8x13O-ISO8859-5.pcf.gz -lib/X11/fonts/misc/8x13O-ISO8859-7.pcf.gz -lib/X11/fonts/misc/8x13O-ISO8859-9.pcf.gz -lib/X11/fonts/misc/8x13O-ISO8859-13.pcf.gz -lib/X11/fonts/misc/8x13O-ISO8859-15.pcf.gz -lib/X11/fonts/misc/18x18ko.pcf.gz lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-10.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-13.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-14.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-15.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-2.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-3.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-4.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-5.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-7.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-8.pcf.gz +lib/X11/fonts/misc/10x20-ISO8859-9.pcf.gz +lib/X11/fonts/misc/10x20-KOI8-R.pcf.gz lib/X11/fonts/misc/10x20.pcf.gz lib/X11/fonts/misc/12x13ja.pcf.gz lib/X11/fonts/misc/12x24.pcf.gz lib/X11/fonts/misc/12x24rk.pcf.gz lib/X11/fonts/misc/18x18ja.pcf.gz +lib/X11/fonts/misc/18x18ko.pcf.gz lib/X11/fonts/misc/5x7-ISO8859-1.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-10.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-13.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-14.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-15.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-2.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-3.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-4.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-5.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-7.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-8.pcf.gz +lib/X11/fonts/misc/5x7-ISO8859-9.pcf.gz +lib/X11/fonts/misc/5x7-KOI8-R.pcf.gz lib/X11/fonts/misc/5x7.pcf.gz lib/X11/fonts/misc/5x8-ISO8859-1.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-10.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-13.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-14.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-15.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-2.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-3.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-4.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-5.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-7.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-8.pcf.gz +lib/X11/fonts/misc/5x8-ISO8859-9.pcf.gz +lib/X11/fonts/misc/5x8-KOI8-R.pcf.gz lib/X11/fonts/misc/5x8.pcf.gz lib/X11/fonts/misc/6x10-ISO8859-1.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-10.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-13.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-14.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-15.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-2.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-3.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-4.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-5.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-7.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-8.pcf.gz +lib/X11/fonts/misc/6x10-ISO8859-9.pcf.gz +lib/X11/fonts/misc/6x10-KOI8-R.pcf.gz lib/X11/fonts/misc/6x10.pcf.gz lib/X11/fonts/misc/6x12-ISO8859-1.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-10.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-13.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-14.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-15.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-2.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-3.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-4.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-5.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-7.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-8.pcf.gz +lib/X11/fonts/misc/6x12-ISO8859-9.pcf.gz +lib/X11/fonts/misc/6x12-KOI8-R.pcf.gz lib/X11/fonts/misc/6x12.pcf.gz lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz +lib/X11/fonts/misc/6x13-ISO8859-10.pcf.gz +lib/X11/fonts/misc/6x13-ISO8859-13.pcf.gz +lib/X11/fonts/misc/6x13-ISO8859-14.pcf.gz +lib/X11/fonts/misc/6x13-ISO8859-15.pcf.gz lib/X11/fonts/misc/6x13-ISO8859-2.pcf.gz +lib/X11/fonts/misc/6x13-ISO8859-3.pcf.gz +lib/X11/fonts/misc/6x13-ISO8859-4.pcf.gz +lib/X11/fonts/misc/6x13-ISO8859-5.pcf.gz lib/X11/fonts/misc/6x13-ISO8859-7.pcf.gz lib/X11/fonts/misc/6x13-ISO8859-8.pcf.gz +lib/X11/fonts/misc/6x13-ISO8859-9.pcf.gz lib/X11/fonts/misc/6x13-KOI8-R.pcf.gz lib/X11/fonts/misc/6x13.pcf.gz lib/X11/fonts/misc/6x13B-ISO8859-1.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-10.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-13.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-14.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-15.pcf.gz lib/X11/fonts/misc/6x13B-ISO8859-2.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-3.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-4.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-5.pcf.gz lib/X11/fonts/misc/6x13B-ISO8859-7.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-8.pcf.gz +lib/X11/fonts/misc/6x13B-ISO8859-9.pcf.gz lib/X11/fonts/misc/6x13B.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-1.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-10.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-13.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-14.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-15.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-2.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-3.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-4.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-5.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-7.pcf.gz +lib/X11/fonts/misc/6x13O-ISO8859-9.pcf.gz +lib/X11/fonts/misc/6x13O.pcf.gz lib/X11/fonts/misc/6x9-ISO8859-1.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-10.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-13.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-14.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-15.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-2.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-3.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-4.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-5.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-7.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-8.pcf.gz +lib/X11/fonts/misc/6x9-ISO8859-9.pcf.gz +lib/X11/fonts/misc/6x9-KOI8-R.pcf.gz lib/X11/fonts/misc/6x9.pcf.gz lib/X11/fonts/misc/7x13-ISO8859-1.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-10.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-13.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-14.pcf.gz lib/X11/fonts/misc/7x13-ISO8859-15.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-2.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-3.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-4.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-5.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-7.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-8.pcf.gz +lib/X11/fonts/misc/7x13-ISO8859-9.pcf.gz +lib/X11/fonts/misc/7x13-KOI8-R.pcf.gz lib/X11/fonts/misc/7x13.pcf.gz lib/X11/fonts/misc/7x13B-ISO8859-1.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-10.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-13.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-14.pcf.gz lib/X11/fonts/misc/7x13B-ISO8859-15.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-2.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-3.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-4.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-5.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-7.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-8.pcf.gz +lib/X11/fonts/misc/7x13B-ISO8859-9.pcf.gz lib/X11/fonts/misc/7x13B.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-1.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-10.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-13.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-14.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-15.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-2.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-3.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-4.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-5.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-7.pcf.gz +lib/X11/fonts/misc/7x13O-ISO8859-9.pcf.gz +lib/X11/fonts/misc/7x13O.pcf.gz lib/X11/fonts/misc/7x14-ISO8859-1.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-10.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-13.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-14.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-15.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-2.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-3.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-4.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-5.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-7.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-8.pcf.gz +lib/X11/fonts/misc/7x14-ISO8859-9.pcf.gz lib/X11/fonts/misc/7x14-JISX0201.1976-0.pcf.gz +lib/X11/fonts/misc/7x14-KOI8-R.pcf.gz lib/X11/fonts/misc/7x14.pcf.gz lib/X11/fonts/misc/7x14B-ISO8859-1.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-10.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-13.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-14.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-15.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-2.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-3.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-4.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-5.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-7.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-8.pcf.gz +lib/X11/fonts/misc/7x14B-ISO8859-9.pcf.gz lib/X11/fonts/misc/7x14B.pcf.gz lib/X11/fonts/misc/8x13-ISO8859-1.pcf.gz +lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz +lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz +lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz +lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz lib/X11/fonts/misc/8x13-ISO8859-2.pcf.gz +lib/X11/fonts/misc/8x13-ISO8859-3.pcf.gz +lib/X11/fonts/misc/8x13-ISO8859-4.pcf.gz +lib/X11/fonts/misc/8x13-ISO8859-5.pcf.gz lib/X11/fonts/misc/8x13-ISO8859-7.pcf.gz lib/X11/fonts/misc/8x13-ISO8859-8.pcf.gz +lib/X11/fonts/misc/8x13-ISO8859-9.pcf.gz lib/X11/fonts/misc/8x13-KOI8-R.pcf.gz lib/X11/fonts/misc/8x13.pcf.gz lib/X11/fonts/misc/8x13B-ISO8859-1.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-10.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-13.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-14.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-15.pcf.gz lib/X11/fonts/misc/8x13B-ISO8859-2.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-3.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-4.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-5.pcf.gz lib/X11/fonts/misc/8x13B-ISO8859-7.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-8.pcf.gz +lib/X11/fonts/misc/8x13B-ISO8859-9.pcf.gz lib/X11/fonts/misc/8x13B.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-1.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-10.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-13.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-14.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-15.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-2.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-3.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-4.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-5.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-7.pcf.gz +lib/X11/fonts/misc/8x13O-ISO8859-9.pcf.gz +lib/X11/fonts/misc/8x13O.pcf.gz lib/X11/fonts/misc/8x16.pcf.gz lib/X11/fonts/misc/8x16rk.pcf.gz lib/X11/fonts/misc/9x15-ISO8859-1.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-10.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-13.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-14.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-15.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-2.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-3.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-4.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-5.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-7.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-8.pcf.gz +lib/X11/fonts/misc/9x15-ISO8859-9.pcf.gz +lib/X11/fonts/misc/9x15-KOI8-R.pcf.gz lib/X11/fonts/misc/9x15.pcf.gz lib/X11/fonts/misc/9x15B-ISO8859-1.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-10.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-13.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-14.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-15.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-2.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-3.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-4.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-5.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-7.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-8.pcf.gz +lib/X11/fonts/misc/9x15B-ISO8859-9.pcf.gz lib/X11/fonts/misc/9x15B.pcf.gz lib/X11/fonts/misc/9x18-ISO8859-1.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-10.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-13.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-14.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-15.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-2.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-3.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-4.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-5.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-7.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-8.pcf.gz +lib/X11/fonts/misc/9x18-ISO8859-9.pcf.gz +lib/X11/fonts/misc/9x18-KOI8-R.pcf.gz lib/X11/fonts/misc/9x18.pcf.gz lib/X11/fonts/misc/9x18B-ISO8859-1.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-10.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-13.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-14.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-15.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-2.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-3.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-4.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-5.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-7.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-8.pcf.gz +lib/X11/fonts/misc/9x18B-ISO8859-9.pcf.gz lib/X11/fonts/misc/9x18B.pcf.gz lib/X11/fonts/misc/arabic24.pcf.gz lib/X11/fonts/misc/clB6x10.pcf.gz @@ -169,6 +340,7 @@ lib/X11/fonts/misc/hanglm24.pcf.gz lib/X11/fonts/misc/jiskan16.pcf.gz lib/X11/fonts/misc/jiskan24.pcf.gz lib/X11/fonts/misc/k14.pcf.gz +lib/X11/fonts/misc/micro.pcf.gz lib/X11/fonts/misc/nil2.pcf.gz lib/X11/fonts/misc/olcursor.pcf.gz lib/X11/fonts/misc/olgl10.pcf.gz diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile index 86332c1a53fb..acc884cfc203 100644 --- a/x11-fonts/XFree86-4-fontEncodings/Makefile +++ b/x11-fonts/XFree86-4-fontEncodings/Makefile @@ -6,15 +6,11 @@ # PORTNAME= fontEncodings -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ +MASTER_SITES= ${MASTER_SITE_XFREE} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-2.tgz +DISTFILES= X402src-2.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp diff --git a/x11-fonts/XFree86-4-fontEncodings/distinfo b/x11-fonts/XFree86-4-fontEncodings/distinfo index 1102a3a2abd1..caf1b3b79c0f 100644 --- a/x11-fonts/XFree86-4-fontEncodings/distinfo +++ b/x11-fonts/XFree86-4-fontEncodings/distinfo @@ -1 +1 @@ -MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae diff --git a/x11-fonts/XFree86-4-fontEncodings/pkg-plist b/x11-fonts/XFree86-4-fontEncodings/pkg-plist index a22a38718b2a..b0266c9c717d 100644 --- a/x11-fonts/XFree86-4-fontEncodings/pkg-plist +++ b/x11-fonts/XFree86-4-fontEncodings/pkg-plist @@ -8,6 +8,7 @@ lib/X11/fonts/encodings/ibm-cp850.enc lib/X11/fonts/encodings/ibm-cp852.enc lib/X11/fonts/encodings/ibm-cp866.enc lib/X11/fonts/encodings/iso8859-11.enc +lib/X11/fonts/encodings/iso8859-13.enc lib/X11/fonts/encodings/large/big5.eten-0.enc.gz lib/X11/fonts/encodings/large/encodings.dir lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz diff --git a/x11-fonts/XFree86-4-fontLatin2/Makefile b/x11-fonts/XFree86-4-fontLatin2/Makefile index 763c675c1721..da311b0fbc80 100644 --- a/x11-fonts/XFree86-4-fontLatin2/Makefile +++ b/x11-fonts/XFree86-4-fontLatin2/Makefile @@ -6,15 +6,11 @@ # PORTNAME= fontLatin2 -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ +MASTER_SITES= ${MASTER_SITE_XFREE} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-2.tgz +DISTFILES= X402src-2.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -27,9 +23,30 @@ PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts WRKSRC= ${WRKDIR}/xc/fonts/bdf/latin2 -# User Config: -# If you want to disable 100dpi font, set following variable to "NO" -Build100DpiFonts?= YES + +# XFree86 User Config: +# --- +# Name Default Meaning +# ---------------------------------------------------------------------------- +# Build75DpiFonts YES build/install 75dpi fonts +# Build100DpiFonts YES build/install 100dpi fonts +Build75DpiFonts?= DEFAULT +Build100DpiFonts?= DEFAULT + +.if ${Build75DpiFonts} == DEFAULT || ${Build75DpiFonts} == YES +PLIST_SUB+= 75DPI:="" +75DPI:= -DBuild75DpiFonts=YES +.elif ${Build75DpiFonts} == NO +PLIST_SUB+= 75DPI:="@comment " +75DPI:= -DBuild75DpiFonts=NO +.endif +.if ${Build100DpiFonts} == DEFAULT || ${Build100DpiFonts} == YES +PLIST_SUB+= 100DPI:="" +100DPI:= -DBuild100DpiFonts=YES +.elif ${Build100DpiFonts} == NO +PLIST_SUB+= 100DPI:="@comment " +100DPI:= -DBuild100DpiFonts=NO +.endif do-configure: (cd ${WRKDIR}/xc/fonts/encodings && \ @@ -39,8 +56,7 @@ do-configure: ${MAKE} includes ; \ ${MAKE} depend) (cd ${WRKSRC} && \ - imake -DUseInstalled -DBuild75DpiFonts=YES \ - -DBuild100DpiFonts=${Build100DpiFonts} \ + imake -DUseInstalled ${75DPI} ${100DPI} \ ${PROJECTROOT} \ -I${PREFIX}/lib/X11/config \ -DTOPDIR=../../.. -DCURDIR=.; \ diff --git a/x11-fonts/XFree86-4-fontLatin2/distinfo b/x11-fonts/XFree86-4-fontLatin2/distinfo index 1102a3a2abd1..caf1b3b79c0f 100644 --- a/x11-fonts/XFree86-4-fontLatin2/distinfo +++ b/x11-fonts/XFree86-4-fontLatin2/distinfo @@ -1 +1 @@ -MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae diff --git a/x11-fonts/XFree86-4-fontLatin2/pkg-plist b/x11-fonts/XFree86-4-fontLatin2/pkg-plist index 633ec1df61e3..7ba6ea2ac416 100644 --- a/x11-fonts/XFree86-4-fontLatin2/pkg-plist +++ b/x11-fonts/XFree86-4-fontLatin2/pkg-plist @@ -1,334 +1,334 @@ -lib/X11/fonts/latin2/100dpi/UTI___10.pcf.gz -lib/X11/fonts/latin2/100dpi/UTI___12.pcf.gz -lib/X11/fonts/latin2/100dpi/UTI___14.pcf.gz -lib/X11/fonts/latin2/100dpi/UTI___18.pcf.gz -lib/X11/fonts/latin2/100dpi/UTI___24.pcf.gz -lib/X11/fonts/latin2/100dpi/UTRG__10.pcf.gz -lib/X11/fonts/latin2/100dpi/UTRG__12.pcf.gz -lib/X11/fonts/latin2/100dpi/UTRG__14.pcf.gz -lib/X11/fonts/latin2/100dpi/UTRG__18.pcf.gz -lib/X11/fonts/latin2/100dpi/UTRG__24.pcf.gz -lib/X11/fonts/latin2/100dpi/courB08.pcf.gz -lib/X11/fonts/latin2/100dpi/courB10.pcf.gz -lib/X11/fonts/latin2/100dpi/courB12.pcf.gz -lib/X11/fonts/latin2/100dpi/courB14.pcf.gz -lib/X11/fonts/latin2/100dpi/courB18.pcf.gz -lib/X11/fonts/latin2/100dpi/courB24.pcf.gz -lib/X11/fonts/latin2/100dpi/courBO08.pcf.gz -lib/X11/fonts/latin2/100dpi/courBO10.pcf.gz -lib/X11/fonts/latin2/100dpi/courBO12.pcf.gz -lib/X11/fonts/latin2/100dpi/courBO14.pcf.gz -lib/X11/fonts/latin2/100dpi/courBO18.pcf.gz -lib/X11/fonts/latin2/100dpi/courBO24.pcf.gz -lib/X11/fonts/latin2/100dpi/courO08.pcf.gz -lib/X11/fonts/latin2/100dpi/courO10.pcf.gz -lib/X11/fonts/latin2/100dpi/courO12.pcf.gz -lib/X11/fonts/latin2/100dpi/courO14.pcf.gz -lib/X11/fonts/latin2/100dpi/courO18.pcf.gz -lib/X11/fonts/latin2/100dpi/courO24.pcf.gz -lib/X11/fonts/latin2/100dpi/courR08.pcf.gz -lib/X11/fonts/latin2/100dpi/courR10.pcf.gz -lib/X11/fonts/latin2/100dpi/courR12.pcf.gz -lib/X11/fonts/latin2/100dpi/courR14.pcf.gz -lib/X11/fonts/latin2/100dpi/courR18.pcf.gz -lib/X11/fonts/latin2/100dpi/courR24.pcf.gz -lib/X11/fonts/latin2/100dpi/encodings.dir -lib/X11/fonts/latin2/100dpi/fonts.dir -lib/X11/fonts/latin2/100dpi/helvB08.pcf.gz -lib/X11/fonts/latin2/100dpi/helvB10.pcf.gz -lib/X11/fonts/latin2/100dpi/helvB12.pcf.gz -lib/X11/fonts/latin2/100dpi/helvB14.pcf.gz -lib/X11/fonts/latin2/100dpi/helvB18.pcf.gz -lib/X11/fonts/latin2/100dpi/helvB24.pcf.gz -lib/X11/fonts/latin2/100dpi/helvBO08.pcf.gz -lib/X11/fonts/latin2/100dpi/helvBO10.pcf.gz -lib/X11/fonts/latin2/100dpi/helvBO12.pcf.gz -lib/X11/fonts/latin2/100dpi/helvBO14.pcf.gz -lib/X11/fonts/latin2/100dpi/helvBO18.pcf.gz -lib/X11/fonts/latin2/100dpi/helvBO24.pcf.gz -lib/X11/fonts/latin2/100dpi/helvO08.pcf.gz -lib/X11/fonts/latin2/100dpi/helvO10.pcf.gz -lib/X11/fonts/latin2/100dpi/helvO12.pcf.gz -lib/X11/fonts/latin2/100dpi/helvO14.pcf.gz -lib/X11/fonts/latin2/100dpi/helvO18.pcf.gz -lib/X11/fonts/latin2/100dpi/helvO24.pcf.gz -lib/X11/fonts/latin2/100dpi/helvR08.pcf.gz -lib/X11/fonts/latin2/100dpi/helvR10.pcf.gz -lib/X11/fonts/latin2/100dpi/helvR12.pcf.gz -lib/X11/fonts/latin2/100dpi/helvR14.pcf.gz -lib/X11/fonts/latin2/100dpi/helvR18.pcf.gz -lib/X11/fonts/latin2/100dpi/helvR24.pcf.gz -lib/X11/fonts/latin2/100dpi/luBIS08.pcf.gz -lib/X11/fonts/latin2/100dpi/luBIS10.pcf.gz -lib/X11/fonts/latin2/100dpi/luBIS12.pcf.gz -lib/X11/fonts/latin2/100dpi/luBIS14.pcf.gz -lib/X11/fonts/latin2/100dpi/luBIS18.pcf.gz -lib/X11/fonts/latin2/100dpi/luBIS19.pcf.gz -lib/X11/fonts/latin2/100dpi/luBIS24.pcf.gz -lib/X11/fonts/latin2/100dpi/luBS08.pcf.gz -lib/X11/fonts/latin2/100dpi/luBS10.pcf.gz -lib/X11/fonts/latin2/100dpi/luBS12.pcf.gz -lib/X11/fonts/latin2/100dpi/luBS14.pcf.gz -lib/X11/fonts/latin2/100dpi/luBS18.pcf.gz -lib/X11/fonts/latin2/100dpi/luBS19.pcf.gz -lib/X11/fonts/latin2/100dpi/luBS24.pcf.gz -lib/X11/fonts/latin2/100dpi/luIS08.pcf.gz -lib/X11/fonts/latin2/100dpi/luIS10.pcf.gz -lib/X11/fonts/latin2/100dpi/luIS12.pcf.gz -lib/X11/fonts/latin2/100dpi/luIS14.pcf.gz -lib/X11/fonts/latin2/100dpi/luIS18.pcf.gz -lib/X11/fonts/latin2/100dpi/luIS19.pcf.gz -lib/X11/fonts/latin2/100dpi/luIS24.pcf.gz -lib/X11/fonts/latin2/100dpi/luRS08.pcf.gz -lib/X11/fonts/latin2/100dpi/luRS10.pcf.gz -lib/X11/fonts/latin2/100dpi/luRS12.pcf.gz -lib/X11/fonts/latin2/100dpi/luRS14.pcf.gz -lib/X11/fonts/latin2/100dpi/luRS18.pcf.gz -lib/X11/fonts/latin2/100dpi/luRS19.pcf.gz -lib/X11/fonts/latin2/100dpi/luRS24.pcf.gz -lib/X11/fonts/latin2/100dpi/lubB08.pcf.gz -lib/X11/fonts/latin2/100dpi/lubB10.pcf.gz -lib/X11/fonts/latin2/100dpi/lubB12.pcf.gz -lib/X11/fonts/latin2/100dpi/lubB14.pcf.gz -lib/X11/fonts/latin2/100dpi/lubB18.pcf.gz -lib/X11/fonts/latin2/100dpi/lubB19.pcf.gz -lib/X11/fonts/latin2/100dpi/lubB24.pcf.gz -lib/X11/fonts/latin2/100dpi/lubBI08.pcf.gz -lib/X11/fonts/latin2/100dpi/lubBI10.pcf.gz -lib/X11/fonts/latin2/100dpi/lubBI12.pcf.gz -lib/X11/fonts/latin2/100dpi/lubBI14.pcf.gz -lib/X11/fonts/latin2/100dpi/lubBI18.pcf.gz -lib/X11/fonts/latin2/100dpi/lubBI19.pcf.gz -lib/X11/fonts/latin2/100dpi/lubBI24.pcf.gz -lib/X11/fonts/latin2/100dpi/lubI08.pcf.gz -lib/X11/fonts/latin2/100dpi/lubI10.pcf.gz -lib/X11/fonts/latin2/100dpi/lubI12.pcf.gz -lib/X11/fonts/latin2/100dpi/lubI14.pcf.gz -lib/X11/fonts/latin2/100dpi/lubI18.pcf.gz -lib/X11/fonts/latin2/100dpi/lubI19.pcf.gz -lib/X11/fonts/latin2/100dpi/lubI24.pcf.gz -lib/X11/fonts/latin2/100dpi/lubR08.pcf.gz -lib/X11/fonts/latin2/100dpi/lubR10.pcf.gz -lib/X11/fonts/latin2/100dpi/lubR12.pcf.gz -lib/X11/fonts/latin2/100dpi/lubR14.pcf.gz -lib/X11/fonts/latin2/100dpi/lubR18.pcf.gz -lib/X11/fonts/latin2/100dpi/lubR19.pcf.gz -lib/X11/fonts/latin2/100dpi/lubR24.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenB08.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenB10.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenB12.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenB14.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenB18.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenB24.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenBI08.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenBI10.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenBI12.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenBI14.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenBI18.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenBI24.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenI08.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenI10.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenI12.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenI14.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenI18.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenI24.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenR08.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenR10.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenR12.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenR14.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenR18.pcf.gz -lib/X11/fonts/latin2/100dpi/ncenR24.pcf.gz -lib/X11/fonts/latin2/100dpi/timB08.pcf.gz -lib/X11/fonts/latin2/100dpi/timB10.pcf.gz -lib/X11/fonts/latin2/100dpi/timB12.pcf.gz -lib/X11/fonts/latin2/100dpi/timB14.pcf.gz -lib/X11/fonts/latin2/100dpi/timB18.pcf.gz -lib/X11/fonts/latin2/100dpi/timB24.pcf.gz -lib/X11/fonts/latin2/100dpi/timBI08.pcf.gz -lib/X11/fonts/latin2/100dpi/timBI10.pcf.gz -lib/X11/fonts/latin2/100dpi/timBI12.pcf.gz -lib/X11/fonts/latin2/100dpi/timBI14.pcf.gz -lib/X11/fonts/latin2/100dpi/timBI18.pcf.gz -lib/X11/fonts/latin2/100dpi/timBI24.pcf.gz -lib/X11/fonts/latin2/100dpi/timI08.pcf.gz -lib/X11/fonts/latin2/100dpi/timI10.pcf.gz -lib/X11/fonts/latin2/100dpi/timI12.pcf.gz -lib/X11/fonts/latin2/100dpi/timI14.pcf.gz -lib/X11/fonts/latin2/100dpi/timI18.pcf.gz -lib/X11/fonts/latin2/100dpi/timI24.pcf.gz -lib/X11/fonts/latin2/100dpi/timR08.pcf.gz -lib/X11/fonts/latin2/100dpi/timR10.pcf.gz -lib/X11/fonts/latin2/100dpi/timR12.pcf.gz -lib/X11/fonts/latin2/100dpi/timR14.pcf.gz -lib/X11/fonts/latin2/100dpi/timR18.pcf.gz -lib/X11/fonts/latin2/100dpi/timR24.pcf.gz -lib/X11/fonts/latin2/75dpi/UTI___10.pcf.gz -lib/X11/fonts/latin2/75dpi/UTI___12.pcf.gz -lib/X11/fonts/latin2/75dpi/UTI___14.pcf.gz -lib/X11/fonts/latin2/75dpi/UTI___18.pcf.gz -lib/X11/fonts/latin2/75dpi/UTI___24.pcf.gz -lib/X11/fonts/latin2/75dpi/UTRG__10.pcf.gz -lib/X11/fonts/latin2/75dpi/UTRG__12.pcf.gz -lib/X11/fonts/latin2/75dpi/UTRG__14.pcf.gz -lib/X11/fonts/latin2/75dpi/UTRG__18.pcf.gz -lib/X11/fonts/latin2/75dpi/UTRG__24.pcf.gz -lib/X11/fonts/latin2/75dpi/courB08.pcf.gz -lib/X11/fonts/latin2/75dpi/courB10.pcf.gz -lib/X11/fonts/latin2/75dpi/courB12.pcf.gz -lib/X11/fonts/latin2/75dpi/courB14.pcf.gz -lib/X11/fonts/latin2/75dpi/courB18.pcf.gz -lib/X11/fonts/latin2/75dpi/courB24.pcf.gz -lib/X11/fonts/latin2/75dpi/courBO08.pcf.gz -lib/X11/fonts/latin2/75dpi/courBO10.pcf.gz -lib/X11/fonts/latin2/75dpi/courBO12.pcf.gz -lib/X11/fonts/latin2/75dpi/courBO14.pcf.gz -lib/X11/fonts/latin2/75dpi/courBO18.pcf.gz -lib/X11/fonts/latin2/75dpi/courBO24.pcf.gz -lib/X11/fonts/latin2/75dpi/courO08.pcf.gz -lib/X11/fonts/latin2/75dpi/courO10.pcf.gz -lib/X11/fonts/latin2/75dpi/courO12.pcf.gz -lib/X11/fonts/latin2/75dpi/courO14.pcf.gz -lib/X11/fonts/latin2/75dpi/courO18.pcf.gz -lib/X11/fonts/latin2/75dpi/courO24.pcf.gz -lib/X11/fonts/latin2/75dpi/courR08.pcf.gz -lib/X11/fonts/latin2/75dpi/courR10.pcf.gz -lib/X11/fonts/latin2/75dpi/courR12.pcf.gz -lib/X11/fonts/latin2/75dpi/courR14.pcf.gz -lib/X11/fonts/latin2/75dpi/courR18.pcf.gz -lib/X11/fonts/latin2/75dpi/courR24.pcf.gz -lib/X11/fonts/latin2/75dpi/encodings.dir -lib/X11/fonts/latin2/75dpi/fonts.dir -lib/X11/fonts/latin2/75dpi/helvB08.pcf.gz -lib/X11/fonts/latin2/75dpi/helvB10.pcf.gz -lib/X11/fonts/latin2/75dpi/helvB12.pcf.gz -lib/X11/fonts/latin2/75dpi/helvB14.pcf.gz -lib/X11/fonts/latin2/75dpi/helvB18.pcf.gz -lib/X11/fonts/latin2/75dpi/helvB24.pcf.gz -lib/X11/fonts/latin2/75dpi/helvBO08.pcf.gz -lib/X11/fonts/latin2/75dpi/helvBO10.pcf.gz -lib/X11/fonts/latin2/75dpi/helvBO12.pcf.gz -lib/X11/fonts/latin2/75dpi/helvBO14.pcf.gz -lib/X11/fonts/latin2/75dpi/helvBO18.pcf.gz -lib/X11/fonts/latin2/75dpi/helvBO24.pcf.gz -lib/X11/fonts/latin2/75dpi/helvO08.pcf.gz -lib/X11/fonts/latin2/75dpi/helvO10.pcf.gz -lib/X11/fonts/latin2/75dpi/helvO12.pcf.gz -lib/X11/fonts/latin2/75dpi/helvO14.pcf.gz -lib/X11/fonts/latin2/75dpi/helvO18.pcf.gz -lib/X11/fonts/latin2/75dpi/helvO24.pcf.gz -lib/X11/fonts/latin2/75dpi/helvR08.pcf.gz -lib/X11/fonts/latin2/75dpi/helvR10.pcf.gz -lib/X11/fonts/latin2/75dpi/helvR12.pcf.gz -lib/X11/fonts/latin2/75dpi/helvR14.pcf.gz -lib/X11/fonts/latin2/75dpi/helvR18.pcf.gz -lib/X11/fonts/latin2/75dpi/helvR24.pcf.gz -lib/X11/fonts/latin2/75dpi/luBIS08.pcf.gz -lib/X11/fonts/latin2/75dpi/luBIS10.pcf.gz -lib/X11/fonts/latin2/75dpi/luBIS12.pcf.gz -lib/X11/fonts/latin2/75dpi/luBIS14.pcf.gz -lib/X11/fonts/latin2/75dpi/luBIS18.pcf.gz -lib/X11/fonts/latin2/75dpi/luBIS19.pcf.gz -lib/X11/fonts/latin2/75dpi/luBIS24.pcf.gz -lib/X11/fonts/latin2/75dpi/luBS08.pcf.gz -lib/X11/fonts/latin2/75dpi/luBS10.pcf.gz -lib/X11/fonts/latin2/75dpi/luBS12.pcf.gz -lib/X11/fonts/latin2/75dpi/luBS14.pcf.gz -lib/X11/fonts/latin2/75dpi/luBS18.pcf.gz -lib/X11/fonts/latin2/75dpi/luBS19.pcf.gz -lib/X11/fonts/latin2/75dpi/luBS24.pcf.gz -lib/X11/fonts/latin2/75dpi/luIS08.pcf.gz -lib/X11/fonts/latin2/75dpi/luIS10.pcf.gz -lib/X11/fonts/latin2/75dpi/luIS12.pcf.gz -lib/X11/fonts/latin2/75dpi/luIS14.pcf.gz -lib/X11/fonts/latin2/75dpi/luIS18.pcf.gz -lib/X11/fonts/latin2/75dpi/luIS19.pcf.gz -lib/X11/fonts/latin2/75dpi/luIS24.pcf.gz -lib/X11/fonts/latin2/75dpi/luRS08.pcf.gz -lib/X11/fonts/latin2/75dpi/luRS10.pcf.gz -lib/X11/fonts/latin2/75dpi/luRS12.pcf.gz -lib/X11/fonts/latin2/75dpi/luRS14.pcf.gz -lib/X11/fonts/latin2/75dpi/luRS18.pcf.gz -lib/X11/fonts/latin2/75dpi/luRS19.pcf.gz -lib/X11/fonts/latin2/75dpi/luRS24.pcf.gz -lib/X11/fonts/latin2/75dpi/lubB08.pcf.gz -lib/X11/fonts/latin2/75dpi/lubB10.pcf.gz -lib/X11/fonts/latin2/75dpi/lubB12.pcf.gz -lib/X11/fonts/latin2/75dpi/lubB14.pcf.gz -lib/X11/fonts/latin2/75dpi/lubB18.pcf.gz -lib/X11/fonts/latin2/75dpi/lubB19.pcf.gz -lib/X11/fonts/latin2/75dpi/lubB24.pcf.gz -lib/X11/fonts/latin2/75dpi/lubBI08.pcf.gz -lib/X11/fonts/latin2/75dpi/lubBI10.pcf.gz -lib/X11/fonts/latin2/75dpi/lubBI12.pcf.gz -lib/X11/fonts/latin2/75dpi/lubBI14.pcf.gz -lib/X11/fonts/latin2/75dpi/lubBI18.pcf.gz -lib/X11/fonts/latin2/75dpi/lubBI19.pcf.gz -lib/X11/fonts/latin2/75dpi/lubBI24.pcf.gz -lib/X11/fonts/latin2/75dpi/lubI08.pcf.gz -lib/X11/fonts/latin2/75dpi/lubI10.pcf.gz -lib/X11/fonts/latin2/75dpi/lubI12.pcf.gz -lib/X11/fonts/latin2/75dpi/lubI14.pcf.gz -lib/X11/fonts/latin2/75dpi/lubI18.pcf.gz -lib/X11/fonts/latin2/75dpi/lubI19.pcf.gz -lib/X11/fonts/latin2/75dpi/lubI24.pcf.gz -lib/X11/fonts/latin2/75dpi/lubR08.pcf.gz -lib/X11/fonts/latin2/75dpi/lubR10.pcf.gz -lib/X11/fonts/latin2/75dpi/lubR12.pcf.gz -lib/X11/fonts/latin2/75dpi/lubR14.pcf.gz -lib/X11/fonts/latin2/75dpi/lubR18.pcf.gz -lib/X11/fonts/latin2/75dpi/lubR19.pcf.gz -lib/X11/fonts/latin2/75dpi/lubR24.pcf.gz -lib/X11/fonts/latin2/75dpi/lutBS10.pcf.gz -lib/X11/fonts/latin2/75dpi/lutBS12.pcf.gz -lib/X11/fonts/latin2/75dpi/lutBS14.pcf.gz -lib/X11/fonts/latin2/75dpi/lutBS18.pcf.gz -lib/X11/fonts/latin2/75dpi/lutRS10.pcf.gz -lib/X11/fonts/latin2/75dpi/lutRS12.pcf.gz -lib/X11/fonts/latin2/75dpi/lutRS14.pcf.gz -lib/X11/fonts/latin2/75dpi/lutRS18.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenB08.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenB10.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenB12.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenB14.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenB18.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenB24.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenBI08.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenBI10.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenBI12.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenBI14.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenBI18.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenBI24.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenI08.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenI10.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenI12.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenI14.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenI18.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenI24.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenR08.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenR10.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenR12.pcf.gz -lib/X11/fonts/latin2/75dpi/ncenR14.pcf.gz -lib/X11/fonts/latin2/75dpi/timB08.pcf.gz -lib/X11/fonts/latin2/75dpi/timB10.pcf.gz -lib/X11/fonts/latin2/75dpi/timB12.pcf.gz -lib/X11/fonts/latin2/75dpi/timB14.pcf.gz -lib/X11/fonts/latin2/75dpi/timB18.pcf.gz -lib/X11/fonts/latin2/75dpi/timB24.pcf.gz -lib/X11/fonts/latin2/75dpi/timBI08.pcf.gz -lib/X11/fonts/latin2/75dpi/timBI10.pcf.gz -lib/X11/fonts/latin2/75dpi/timBI12.pcf.gz -lib/X11/fonts/latin2/75dpi/timBI14.pcf.gz -lib/X11/fonts/latin2/75dpi/timBI18.pcf.gz -lib/X11/fonts/latin2/75dpi/timBI24.pcf.gz -lib/X11/fonts/latin2/75dpi/timI08.pcf.gz -lib/X11/fonts/latin2/75dpi/timI10.pcf.gz -lib/X11/fonts/latin2/75dpi/timI12.pcf.gz -lib/X11/fonts/latin2/75dpi/timI14.pcf.gz -lib/X11/fonts/latin2/75dpi/timI18.pcf.gz -lib/X11/fonts/latin2/75dpi/timI24.pcf.gz -lib/X11/fonts/latin2/75dpi/timR08.pcf.gz -lib/X11/fonts/latin2/75dpi/timR10.pcf.gz -lib/X11/fonts/latin2/75dpi/timR12.pcf.gz -lib/X11/fonts/latin2/75dpi/timR14.pcf.gz -lib/X11/fonts/latin2/75dpi/timR18.pcf.gz -lib/X11/fonts/latin2/75dpi/timR24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTI___10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTI___12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTI___14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTI___18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTI___24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTRG__10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTRG__12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTRG__14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTRG__18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/UTRG__24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courB08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courB10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courB12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courB14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courB18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courB24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courBO08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courBO10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courBO12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courBO14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courBO18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courBO24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courO08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courO10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courO12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courO14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courO18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courO24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courR08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courR10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courR12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courR14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courR18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/courR24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/encodings.dir +%%100DPI:%%lib/X11/fonts/latin2/100dpi/fonts.dir +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvB08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvB10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvB12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvB14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvB18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvB24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvBO08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvBO10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvBO12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvBO14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvBO18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvBO24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvO08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvO10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvO12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvO14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvO18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvO24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvR08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvR10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvR12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvR14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvR18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/helvR24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBIS08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBIS10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBIS12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBIS14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBIS18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBIS19.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBIS24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBS08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBS10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBS12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBS14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBS18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBS19.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luBS24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luIS08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luIS10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luIS12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luIS14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luIS18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luIS19.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luIS24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luRS08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luRS10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luRS12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luRS14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luRS18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luRS19.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/luRS24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubB08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubB10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubB12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubB14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubB18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubB19.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubB24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubBI08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubBI10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubBI12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubBI14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubBI18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubBI19.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubBI24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubI08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubI10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubI12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubI14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubI18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubI19.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubI24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubR08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubR10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubR12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubR14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubR18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubR19.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/lubR24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenB08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenB10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenB12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenB14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenB18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenB24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenBI08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenBI10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenBI12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenBI14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenBI18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenBI24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenI08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenI10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenI12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenI14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenI18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenI24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenR08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenR10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenR12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenR14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenR18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/ncenR24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timB08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timB10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timB12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timB14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timB18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timB24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timBI08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timBI10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timBI12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timBI14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timBI18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timBI24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timI08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timI10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timI12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timI14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timI18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timI24.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timR08.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timR10.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timR12.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timR14.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timR18.pcf.gz +%%100DPI:%%lib/X11/fonts/latin2/100dpi/timR24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTI___10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTI___12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTI___14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTI___18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTI___24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTRG__10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTRG__12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTRG__14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTRG__18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/UTRG__24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courB08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courB10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courB12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courB14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courB18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courB24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courBO08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courBO10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courBO12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courBO14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courBO18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courBO24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courO08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courO10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courO12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courO14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courO18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courO24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courR08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courR10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courR12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courR14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courR18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/courR24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/encodings.dir +%%75DPI:%%lib/X11/fonts/latin2/75dpi/fonts.dir +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvB08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvB10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvB12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvB14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvB18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvB24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvBO08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvBO10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvBO12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvBO14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvBO18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvBO24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvO08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvO10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvO12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvO14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvO18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvO24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvR08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvR10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvR12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvR14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvR18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/helvR24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBIS08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBIS10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBIS12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBIS14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBIS18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBIS19.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBIS24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBS08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBS10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBS12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBS14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBS18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBS19.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luBS24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luIS08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luIS10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luIS12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luIS14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luIS18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luIS19.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luIS24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luRS08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luRS10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luRS12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luRS14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luRS18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luRS19.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/luRS24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubB08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubB10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubB12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubB14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubB18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubB19.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubB24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubBI08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubBI10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubBI12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubBI14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubBI18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubBI19.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubBI24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubI08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubI10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubI12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubI14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubI18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubI19.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubI24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubR08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubR10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubR12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubR14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubR18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubR19.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lubR24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lutBS10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lutBS12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lutBS14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lutBS18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lutRS10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lutRS12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lutRS14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/lutRS18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenB08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenB10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenB12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenB14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenB18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenB24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenBI08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenBI10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenBI12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenBI14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenBI18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenBI24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenI08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenI10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenI12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenI14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenI18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenI24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenR08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenR10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenR12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/ncenR14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timB08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timB10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timB12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timB14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timB18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timB24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timBI08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timBI10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timBI12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timBI14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timBI18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timBI24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timI08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timI10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timI12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timI14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timI18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timI24.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timR08.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timR10.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timR12.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timR14.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timR18.pcf.gz +%%75DPI:%%lib/X11/fonts/latin2/75dpi/timR24.pcf.gz diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile index 17cef02dc6fd..51fc9a8892e7 100644 --- a/x11-fonts/XFree86-4-fontScalable/Makefile +++ b/x11-fonts/XFree86-4-fontScalable/Makefile @@ -6,15 +6,11 @@ # PORTNAME= fontScalable -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ +MASTER_SITES= ${MASTER_SITE_XFREE} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-2.tgz +DISTFILES= X402src-2.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -27,12 +23,39 @@ PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts WRKSRC= ${WRKDIR}/xc/fonts -# User Config: -# To disable following fonts, set variable to "NO" -BuildSpeedoFonts?= YES -BuildType1Fonts?= YES -BuildCIDFonts?= YES -BuildTTFonts?= YES + +# XFree86 User Config: +# --- +# Name Default Meaning +# ---------------------------------------------------------------------------- +# BuildSpeedoFonts YES build/install Speedo fonts +# BuildType1Fonts YES build/install Type1 fonts +# BuildCIDFonts YES build/install CID fonts +BuildSpeedoFonts?= DEFAULT +BuildType1Fonts?= DEFAULT +BuildCIDFonts?= DEFAULT + +.if ${BuildSpeedoFonts} == DEFAULT || ${BuildSpeedoFonts} == YES +PLIST_SUB+= SPEEDO:="" +SPEEDO:= -DBuildSpeedoFonts=YES +.elif ${BuildSpeedoFonts} == NO +PLIST_SUB+= SPEEDO:="@comment " +SPEEDO:= -DBuildSpeedoFonts=NO +.endif +.if ${BuildType1Fonts} == DEFAULT || ${BuildType1Fonts} == YES +PLIST_SUB+= TYPE1:="" +TYPE1:= -DBuildType1Fonts=YES +.elif ${BuildType1Fonts} == NO +PLIST_SUB+= TYPE1:="@comment " +TYPE1:= -DBuildType1Fonts=NO +.endif +.if ${BuildCIDFonts} == DEFAULT || ${BuildCIDFonts} == YES +PLIST_SUB+= CID:="" +CID:= -DBuildCIDFonts=YES +.elif ${BuildCIDFonts} == NO +PLIST_SUB+= CID:="@comment " +CID:= -DBuildCIDFonts=NO +.endif do-configure: (cd ${WRKDIR}/xc/fonts/encodings && \ @@ -43,10 +66,7 @@ do-configure: ${MAKE} depend) (cd ${WRKSRC} && \ imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \ - -DBuildSpeedoFonts=${BuildSpeedoFonts} \ - -DBuildType1Fonts=${BuildType1Fonts} \ - -DBuildCIDFonts=${BuildCIDFonts} \ - -DBuildTTFonts=${BuildTTFonts} \ + ${SPEEDO} ${TYPE1} ${CID} \ -DMakeLocalFontDir=YES \ -DFreeBSDBuildXscl=YES \ -DTOPDIR=.. -DCURDIR=.; \ diff --git a/x11-fonts/XFree86-4-fontScalable/distinfo b/x11-fonts/XFree86-4-fontScalable/distinfo index 1102a3a2abd1..caf1b3b79c0f 100644 --- a/x11-fonts/XFree86-4-fontScalable/distinfo +++ b/x11-fonts/XFree86-4-fontScalable/distinfo @@ -1 +1 @@ -MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae diff --git a/x11-fonts/XFree86-4-fontScalable/files/patch-01 b/x11-fonts/XFree86-4-fontScalable/files/patch-01 index e4b42d59be5d..fd75cf0a14a4 100644 --- a/x11-fonts/XFree86-4-fontScalable/files/patch-01 +++ b/x11-fonts/XFree86-4-fontScalable/files/patch-01 @@ -1,5 +1,5 @@ ---- Imakefile.orig Sun May 16 23:38:09 1999 -+++ Imakefile Wed May 10 14:45:01 2000 +--- Imakefile.orig Thu Nov 30 01:37:41 2000 ++++ Imakefile Wed Jan 3 11:13:47 2001 @@ -14,7 +14,11 @@ PEXDIR = PEX #endif @@ -7,7 +7,7 @@ +#if defined(FreeBSDBuildXscl) || FreeBSDBuildXscl +SUBDIRS = $(SCALEDDIR) $(PEXDIR) +#else - SUBDIRS = $(ENCODINGDIR) bdf $(SCALEDDIR) $(PEXDIR) + SUBDIRS = $(ENCODINGDIR) bdf $(SCALEDDIR) $(PEXDIR) util +#endif #if MakeLocalFontDir diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist index 66e739af014b..0a840b370a41 100644 --- a/x11-fonts/XFree86-4-fontScalable/pkg-plist +++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist @@ -1,64 +1,64 @@ -lib/X11/fonts/CID/fonts.dir -lib/X11/fonts/CID/fonts.scale +%%CID:%%lib/X11/fonts/CID/fonts.dir +%%CID:%%lib/X11/fonts/CID/fonts.scale lib/X11/fonts/PEX/Roman.phont lib/X11/fonts/PEX/Roman_M.phont -lib/X11/fonts/Speedo/encodings.dir -lib/X11/fonts/Speedo/font0419.spd -lib/X11/fonts/Speedo/font0582.spd -lib/X11/fonts/Speedo/font0583.spd -lib/X11/fonts/Speedo/font0611.spd -lib/X11/fonts/Speedo/font0648.spd -lib/X11/fonts/Speedo/font0649.spd -lib/X11/fonts/Speedo/font0709.spd -lib/X11/fonts/Speedo/font0710.spd -lib/X11/fonts/Speedo/fonts.dir -lib/X11/fonts/Speedo/fonts.scale -lib/X11/fonts/Type1/UTBI____.afm -lib/X11/fonts/Type1/UTBI____.pfa -lib/X11/fonts/Type1/UTB_____.afm -lib/X11/fonts/Type1/UTB_____.pfa -lib/X11/fonts/Type1/UTI_____.afm -lib/X11/fonts/Type1/UTI_____.pfa -lib/X11/fonts/Type1/UTRG____.afm -lib/X11/fonts/Type1/UTRG____.pfa -lib/X11/fonts/Type1/c0419bt_.afm -lib/X11/fonts/Type1/c0419bt_.pfb -lib/X11/fonts/Type1/c0582bt_.afm -lib/X11/fonts/Type1/c0582bt_.pfb -lib/X11/fonts/Type1/c0583bt_.afm -lib/X11/fonts/Type1/c0583bt_.pfb -lib/X11/fonts/Type1/c0611bt_.afm -lib/X11/fonts/Type1/c0611bt_.pfb -lib/X11/fonts/Type1/c0632bt_.afm -lib/X11/fonts/Type1/c0632bt_.pfb -lib/X11/fonts/Type1/c0633bt_.afm -lib/X11/fonts/Type1/c0633bt_.pfb -lib/X11/fonts/Type1/c0648bt_.afm -lib/X11/fonts/Type1/c0648bt_.pfb -lib/X11/fonts/Type1/c0649bt_.afm -lib/X11/fonts/Type1/c0649bt_.pfb -lib/X11/fonts/Type1/cour.afm -lib/X11/fonts/Type1/cour.pfa -lib/X11/fonts/Type1/courb.afm -lib/X11/fonts/Type1/courb.pfa -lib/X11/fonts/Type1/courbi.afm -lib/X11/fonts/Type1/courbi.pfa -lib/X11/fonts/Type1/couri.afm -lib/X11/fonts/Type1/couri.pfa -lib/X11/fonts/Type1/cursor.pfa -lib/X11/fonts/Type1/encodings.dir -lib/X11/fonts/Type1/fonts.dir -lib/X11/fonts/Type1/fonts.scale -lib/X11/fonts/Type1/lcdxmo.afm -lib/X11/fonts/Type1/lcdxmo.pfa -lib/X11/fonts/Type1/lcdxmr.afm -lib/X11/fonts/Type1/lcdxmr.pfa -lib/X11/fonts/Type1/lcdxro.afm -lib/X11/fonts/Type1/lcdxro.pfa -lib/X11/fonts/Type1/lcdxrr.afm -lib/X11/fonts/Type1/lcdxrr.pfa -lib/X11/fonts/Type1/lcdxso.afm -lib/X11/fonts/Type1/lcdxso.pfa -lib/X11/fonts/Type1/lcdxsr.afm -lib/X11/fonts/Type1/lcdxsr.pfa +%%SPEEDO:%%lib/X11/fonts/Speedo/encodings.dir +%%SPEEDO:%%lib/X11/fonts/Speedo/font0419.spd +%%SPEEDO:%%lib/X11/fonts/Speedo/font0582.spd +%%SPEEDO:%%lib/X11/fonts/Speedo/font0583.spd +%%SPEEDO:%%lib/X11/fonts/Speedo/font0611.spd +%%SPEEDO:%%lib/X11/fonts/Speedo/font0648.spd +%%SPEEDO:%%lib/X11/fonts/Speedo/font0649.spd +%%SPEEDO:%%lib/X11/fonts/Speedo/font0709.spd +%%SPEEDO:%%lib/X11/fonts/Speedo/font0710.spd +%%SPEEDO:%%lib/X11/fonts/Speedo/fonts.dir +%%SPEEDO:%%lib/X11/fonts/Speedo/fonts.scale +%%TYPE1:%%lib/X11/fonts/Type1/UTBI____.afm +%%TYPE1:%%lib/X11/fonts/Type1/UTBI____.pfa +%%TYPE1:%%lib/X11/fonts/Type1/UTB_____.afm +%%TYPE1:%%lib/X11/fonts/Type1/UTB_____.pfa +%%TYPE1:%%lib/X11/fonts/Type1/UTI_____.afm +%%TYPE1:%%lib/X11/fonts/Type1/UTI_____.pfa +%%TYPE1:%%lib/X11/fonts/Type1/UTRG____.afm +%%TYPE1:%%lib/X11/fonts/Type1/UTRG____.pfa +%%TYPE1:%%lib/X11/fonts/Type1/c0419bt_.afm +%%TYPE1:%%lib/X11/fonts/Type1/c0419bt_.pfb +%%TYPE1:%%lib/X11/fonts/Type1/c0582bt_.afm +%%TYPE1:%%lib/X11/fonts/Type1/c0582bt_.pfb +%%TYPE1:%%lib/X11/fonts/Type1/c0583bt_.afm +%%TYPE1:%%lib/X11/fonts/Type1/c0583bt_.pfb +%%TYPE1:%%lib/X11/fonts/Type1/c0611bt_.afm +%%TYPE1:%%lib/X11/fonts/Type1/c0611bt_.pfb +%%TYPE1:%%lib/X11/fonts/Type1/c0632bt_.afm +%%TYPE1:%%lib/X11/fonts/Type1/c0632bt_.pfb +%%TYPE1:%%lib/X11/fonts/Type1/c0633bt_.afm +%%TYPE1:%%lib/X11/fonts/Type1/c0633bt_.pfb +%%TYPE1:%%lib/X11/fonts/Type1/c0648bt_.afm +%%TYPE1:%%lib/X11/fonts/Type1/c0648bt_.pfb +%%TYPE1:%%lib/X11/fonts/Type1/c0649bt_.afm +%%TYPE1:%%lib/X11/fonts/Type1/c0649bt_.pfb +%%TYPE1:%%lib/X11/fonts/Type1/cour.afm +%%TYPE1:%%lib/X11/fonts/Type1/cour.pfa +%%TYPE1:%%lib/X11/fonts/Type1/courb.afm +%%TYPE1:%%lib/X11/fonts/Type1/courb.pfa +%%TYPE1:%%lib/X11/fonts/Type1/courbi.afm +%%TYPE1:%%lib/X11/fonts/Type1/courbi.pfa +%%TYPE1:%%lib/X11/fonts/Type1/couri.afm +%%TYPE1:%%lib/X11/fonts/Type1/couri.pfa +%%TYPE1:%%lib/X11/fonts/Type1/cursor.pfa +%%TYPE1:%%lib/X11/fonts/Type1/encodings.dir +%%TYPE1:%%lib/X11/fonts/Type1/fonts.dir +%%TYPE1:%%lib/X11/fonts/Type1/fonts.scale +%%TYPE1:%%lib/X11/fonts/Type1/lcdxmo.afm +%%TYPE1:%%lib/X11/fonts/Type1/lcdxmo.pfa +%%TYPE1:%%lib/X11/fonts/Type1/lcdxmr.afm +%%TYPE1:%%lib/X11/fonts/Type1/lcdxmr.pfa +%%TYPE1:%%lib/X11/fonts/Type1/lcdxro.afm +%%TYPE1:%%lib/X11/fonts/Type1/lcdxro.pfa +%%TYPE1:%%lib/X11/fonts/Type1/lcdxrr.afm +%%TYPE1:%%lib/X11/fonts/Type1/lcdxrr.pfa +%%TYPE1:%%lib/X11/fonts/Type1/lcdxso.afm +%%TYPE1:%%lib/X11/fonts/Type1/lcdxso.pfa +%%TYPE1:%%lib/X11/fonts/Type1/lcdxsr.afm +%%TYPE1:%%lib/X11/fonts/Type1/lcdxsr.pfa @unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index bdd991ca87c6..e8f947dcb132 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -6,12 +6,16 @@ # PORTNAME= FontServer -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz + +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -19,14 +23,10 @@ XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files -SCRIPTS_ENV+= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} +PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files +MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man -MANCOMPRESSED= yes +INSTALL_TARGET= FreeBSDPortsInstall installXserver.man MAN1= Xserver.1 xfs.1 do-configure: diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo index e9125a5f32c4..073d54832d2d 100644 --- a/x11-servers/XFree86-4-FontServer/distinfo +++ b/x11-servers/XFree86-4-FontServer/distinfo @@ -1 +1,2 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 diff --git a/x11-servers/XFree86-4-FontServer/pkg-plist b/x11-servers/XFree86-4-FontServer/pkg-plist index fcdecd61a492..ced5ee87b536 100644 --- a/x11-servers/XFree86-4-FontServer/pkg-plist +++ b/x11-servers/XFree86-4-FontServer/pkg-plist @@ -1,4 +1,2 @@ bin/xfs -lib/X11/doc/html/manindex1.html -lib/X11/doc/html/manindex3.html lib/X11/fs/config diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index 82cf3788e8aa..9d013751cee1 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -6,12 +6,16 @@ # PORTNAME= NestServer -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz + +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -19,13 +23,10 @@ XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files -SCRIPTS_ENV+= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} +PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files +MAKE_ENV= MAN_INSTALL_TARGET=installXnest.man ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= installXnest installXnest.man +INSTALL_TARGET= installXnest installXserver.man MANCOMPRESSED= yes MAN1= Xnest.1 Xserver.1 diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo index e9125a5f32c4..073d54832d2d 100644 --- a/x11-servers/XFree86-4-NestServer/distinfo +++ b/x11-servers/XFree86-4-NestServer/distinfo @@ -1 +1,2 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 diff --git a/x11-servers/XFree86-4-NestServer/pkg-plist b/x11-servers/XFree86-4-NestServer/pkg-plist index f29c7ea2030a..eff754d76af6 100644 --- a/x11-servers/XFree86-4-NestServer/pkg-plist +++ b/x11-servers/XFree86-4-NestServer/pkg-plist @@ -1,3 +1 @@ bin/Xnest -lib/X11/doc/html/manindex1.html -lib/X11/doc/html/manindex3.html diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index ac706d919f10..d7a448684043 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -6,12 +6,16 @@ # PORTNAME= PrintServer -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz + +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -19,14 +23,10 @@ XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files -SCRIPTS_ENV+= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} +PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files +MAKE_ENV= MAN_INSTALL_TARGET=NOOP ALL_TARGET= FreeBSDPortsBuild INSTALL_TARGET= installXprt -MAN1= Xserver.1 do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo index e9125a5f32c4..073d54832d2d 100644 --- a/x11-servers/XFree86-4-PrintServer/distinfo +++ b/x11-servers/XFree86-4-PrintServer/distinfo @@ -1 +1,2 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 diff --git a/x11-servers/XFree86-4-PrintServer/pkg-plist b/x11-servers/XFree86-4-PrintServer/pkg-plist index d44beac9a918..0646e79271d4 100644 --- a/x11-servers/XFree86-4-PrintServer/pkg-plist +++ b/x11-servers/XFree86-4-PrintServer/pkg-plist @@ -1,3 +1 @@ bin/Xprt -lib/X11/doc/html/manindex1.html -lib/X11/doc/html/manindex3.html diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 2096859cccab..6e425c0e7244 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -6,47 +6,38 @@ # PORTNAME= Server -PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTVERSION= 4.0.3 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz -MAINTAINER= taguchi@tohoku.iij.ad.jp +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz +PATCH_DIST_STRIP= -p1 -RUN_DEPENDS= Xwrapper:${PORTSDIR}/x11/wrapper +MAINTAINER= taguchi@tohoku.iij.ad.jp XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files -SCRIPTS_ENV+= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} \ +PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files +SCRIPTS_ENV= HasXdmAuth=${HasXdmAuth} \ + HasSecureRPC=${HasSecureRPC} \ + HasPam=${HasPam} \ ExtendedInputDevices=${ExtendedInputDevices} +MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man ALL_TARGET= FreeBSDPortsBuild INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man -MANCOMPRESSED= yes MAN1= SuperProbe.1 \ XFree86.1 \ Xserver.1 \ - imake.1 \ kbd_mode.1 \ - lndir.1 \ - makedepend.1 \ - makeg.1 \ - makestrs.1 \ - mkdirhier.1 \ - pswrap.1 \ - revpath.1 \ - rman.1 \ - showrgb.1 \ - xf86config.1 \ - xmkmf.1 + pcitweak.1 \ + scanpci.1 \ + xf86config.1 MAN3= XF86VidMode.3 \ XF86VidModeDeleteModeLine.3 \ XF86VidModeGetAllModeLines.3 \ @@ -60,50 +51,82 @@ MAN3= XF86VidMode.3 \ XF86VidModeSetViewPort.3 \ XF86VidModeSwitchMode.3 \ XF86VidModeSwitchToMode.3 -MAN4= apm.4 \ - ati.4 \ - chips.4 \ - cirrus.4 \ - cyrix.4 \ - dynapro.4 \ - elographics.4 \ - fbdev.4 \ +MAN4= mga.4 \ + tdfx.4 \ glint.4 \ - i740.4 \ - i810.4 \ - keyboard.4 \ - mga.4 \ - microtouch.4 \ - mouse.4 \ - mutouch.4 \ - neomagic.4 \ - nv.4 \ - r128.4 \ - rendition.4 \ s3virge.4 \ - sis.4 \ - tdfx.4 \ - trident.4 \ - tseng.4 \ + rendition.4 \ + savage.4 \ + nv.4 \ + siliconmotion.4 \ vga.4 \ - wacom.4 + keyboard.4 \ + mouse.4 MAN5= XF86Config.5 -# User Config: -# If you want to disabe Extended input devices (such as wacom tablets), -# Set following as NO. or type make ExtendefInputDevices=NO -ExtendedInputDevices?= YES +# XFree86 User Config: +# --- +# Name Default Meaning +# ---------------------------------------------------------------------------- +# HasXdmAuth YES support XDM-AUTHORIZATION-1. +# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later) +# HasPam YES support PAM (require FreeBSD-3.1 or later) +# ExtendedInputDevices YES support extended input devices +HasXdmAuth?= DEFAULT +HasSecureRPC?= DEFAULT +HasPam?= DEFAULT +ExtendedInputDevices?= DEFAULT +.if !exists(/sys) && !exists(/usr/src/sys) +BuildXF86DRI= NO +PLIST_SUB+= DRI="@comment " +.else +PLIST_SUB+= DRI="" +.endif + +.if ${ExtendedInputDevices} == DEFAULT || ${ExtendedInputDevices} == YES +PLIST_SUB+= XIE:="" +MAN4+= citron.4 \ + dynapro.4 \ + elographics.4 \ + microtouch.4 \ + mutouch.4 \ + wacom.4 \ + void.4 +.else +PLIST_SUB+= XIE:="@comment " +.endif -#.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -#pre-everything: -# ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -#.endif +.if defined(BuildXF86DRI) && ${BuildXF86DRI} == NO +pre-fetch: + @${ECHO_MSG} "DRI would not build: kernel source required in /sys." +.endif do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure +.include <bsd.port.pre.mk> +.if ${ARCH} == i386 +PLIST_SUB+= I386:="" +MAN4+= apm.4 \ + chips.4 \ + cirrus.4 \ + cyrix.4 \ + fbdev.4 \ + fbdevhw.4 \ + i128.4 \ + i740.4 \ + i810.4 \ + neomagic.4 \ + r128.4 \ + sis.4 \ + trident.4 \ + tseng.4 \ + vesa.4 +.else +PLIST_SUB+= I386:="@comment " +.endif + post-install: - [ -x ${PREFIX}/bin/Xwrapper ] && ( cd ${PREFIX}/bin ; ${LN} -sf Xwrapper X ) - ${CHMOD} a-s ${PREFIX}/bin/XFree86 + strip ${PREFIX}/bin/XFree86 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo index e9125a5f32c4..073d54832d2d 100644 --- a/x11-servers/XFree86-4-Server-snap/distinfo +++ b/x11-servers/XFree86-4-Server-snap/distinfo @@ -1 +1,2 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist index 7f9f241ba469..e2d10250b3e6 100644 --- a/x11-servers/XFree86-4-Server-snap/pkg-plist +++ b/x11-servers/XFree86-4-Server-snap/pkg-plist @@ -1,10 +1,10 @@ bin/SuperProbe bin/X bin/XFree86 +%%XIE:%%bin/joycal bin/kbd_mode bin/pcitweak bin/scanpci -bin/showrgb bin/xf86config lib/X11/Cards lib/X11/XF86Config.98 @@ -18,33 +18,31 @@ lib/X11/doc/README.DECtga lib/X11/doc/README.DGA lib/X11/doc/README.DRI lib/X11/doc/README.DRIcomp -lib/X11/doc/README.SiS -lib/X11/doc/README.apm -lib/X11/doc/README.ati -lib/X11/doc/README.chips -lib/X11/doc/README.cyrix +%%I386:%%lib/X11/doc/README.I128 +%%I386:%%lib/X11/doc/README.SiS +%%I386:%%lib/X11/doc/README.apm +%%I386:%%lib/X11/doc/README.ati +%%I386:%%lib/X11/doc/README.chips +%%I386:%%lib/X11/doc/README.cyrix lib/X11/doc/README.fonts -lib/X11/doc/README.i740 -lib/X11/doc/README.i810 +%%I386:%%lib/X11/doc/README.i740 +%%I386:%%lib/X11/doc/README.i810 lib/X11/doc/README.mouse -lib/X11/doc/README.r128 +%%I386:%%lib/X11/doc/README.newport +%%I386:%%lib/X11/doc/README.r128 lib/X11/doc/README.rendition lib/X11/doc/README.s3virge lib/X11/doc/RELNOTES lib/X11/doc/ServersOnly lib/X11/doc/Status +lib/X11/doc/Versions lib/X11/doc/VideoBoard98 -lib/X11/doc/html/manindex1.html -lib/X11/doc/html/manindex3.html -lib/X11/doc/html/manindex4.html -lib/X11/doc/html/manindex5.html lib/X11/etc/Xinstall.sh lib/X11/etc/sun.termcap lib/X11/etc/sun.terminfo lib/X11/etc/xmodmap.std lib/X11/etc/xterm.termcap lib/X11/etc/xterm.terminfo -lib/X11/rgb.txt lib/X11/xserver/SecurityPolicy lib/modules/codeconv/libARABIC.a lib/modules/codeconv/libARMSCII8.a @@ -74,36 +72,44 @@ lib/modules/codeconv/libKSCJOHAB.a lib/modules/codeconv/libMULEENCODING.a lib/modules/codeconv/libTCVN.a lib/modules/codeconv/libVISCII.a -lib/modules/dri/gamma_dri.so -lib/modules/dri/i810_dri.so -lib/modules/dri/mga_dri.so -lib/modules/dri/r128_dri.so -lib/modules/drivers/apm_drv.o -lib/modules/drivers/ati_drv.o -lib/modules/drivers/chips_drv.o -lib/modules/drivers/cirrus_alpine.o -lib/modules/drivers/cirrus_drv.o -lib/modules/drivers/cirrus_laguna.o -lib/modules/drivers/cyrix_drv.o -lib/modules/drivers/fbdev_drv.o +%%DRI%%lib/modules/dri/gamma_dri.so +%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so +%%DRI%%lib/modules/dri/mga_dri.so +%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so +%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so +%%I386:%%lib/modules/drivers/apm_drv.o +%%I386:%%lib/modules/drivers/ark_drv.o +%%I386:%%lib/modules/drivers/ati_drv.o +%%I386:%%lib/modules/drivers/atimisc_drv.o +%%I386:%%lib/modules/drivers/chips_drv.o +%%I386:%%lib/modules/drivers/cirrus_alpine.o +%%I386:%%lib/modules/drivers/cirrus_drv.o +%%I386:%%lib/modules/drivers/cirrus_laguna.o +%%I386:%%lib/modules/drivers/cyrix_drv.o +%%I386:%%lib/modules/drivers/fbdev_drv.o lib/modules/drivers/glint_drv.o -lib/modules/drivers/i740_drv.o -lib/modules/drivers/i810_drv.o +%%I386:%%lib/modules/drivers/i128_drv.o +%%I386:%%lib/modules/drivers/i740_drv.o +%%I386:%%lib/modules/drivers/i810_drv.o lib/modules/drivers/mga_drv.o -lib/modules/drivers/neomagic_drv.o +%%I386:%%lib/modules/drivers/neomagic_drv.o lib/modules/drivers/nv_drv.o -lib/modules/drivers/r128_drv.o +%%I386:%%lib/modules/drivers/r128_drv.o +%%I386:%%lib/modules/drivers/radeon_drv.o lib/modules/drivers/rendition_drv.o lib/modules/drivers/s3virge_drv.o -lib/modules/drivers/sis_drv.o +lib/modules/drivers/savage_drv.o +lib/modules/drivers/siliconmotion_drv.o +%%I386:%%lib/modules/drivers/sis_drv.o lib/modules/drivers/tdfx_drv.o lib/modules/drivers/tga_drv.o -lib/modules/drivers/trident_drv.o -lib/modules/drivers/tseng_drv.o +%%I386:%%lib/modules/drivers/trident_drv.o +%%I386:%%lib/modules/drivers/tseng_drv.o +%%I386:%%lib/modules/drivers/vesa_drv.o lib/modules/drivers/vga_drv.o lib/modules/extensions/libGLcore.a lib/modules/extensions/libdbe.a -lib/modules/extensions/libdri.a +%%DRI%%lib/modules/extensions/libdri.a lib/modules/extensions/libextmod.a lib/modules/extensions/libglx.a lib/modules/extensions/libpex5.a @@ -114,16 +120,21 @@ lib/modules/fonts/libfreetype.a lib/modules/fonts/libspeedo.a lib/modules/fonts/libtype1.a lib/modules/fonts/libxtt.a -lib/modules/freebsd/libdrm.a -lib/modules/input/dynapro_drv.o -lib/modules/input/elo2300_drv.o -lib/modules/input/elographics_drv.o -lib/modules/input/magellan_drv.o -lib/modules/input/microtouch_drv.o +%%DRI%%lib/modules/freebsd/libdrm.a +%%XIE:%%lib/modules/input/citron_drv.o +%%XIE:%%lib/modules/input/digitaledge_drv.o +%%XIE:%%lib/modules/input/dynapro_drv.o +%%XIE:%%lib/modules/input/elo2300_drv.o +%%XIE:%%lib/modules/input/elographics_drv.o +%%XIE:%%lib/modules/input/joystick_drv.o +%%XIE:%%lib/modules/input/magellan_drv.o +%%XIE:%%lib/modules/input/microtouch_drv.o lib/modules/input/mouse_drv.o -lib/modules/input/mutouch_drv.o -lib/modules/input/spaceorb_drv.o -lib/modules/input/wacom_drv.o +%%XIE:%%lib/modules/input/mutouch_drv.o +%%XIE:%%lib/modules/input/spaceorb_drv.o +%%XIE:%%lib/modules/input/summa_drv.o +%%XIE:%%lib/modules/input/void_drv.o +%%XIE:%%lib/modules/input/wacom_drv.o lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a @@ -138,6 +149,7 @@ lib/modules/libpcidata.a lib/modules/librac.a lib/modules/libramdac.a lib/modules/libscanpci.a +lib/modules/libshadow.a lib/modules/libshadowfb.a lib/modules/libvbe.a lib/modules/libvgahw.a diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index baf9551c37dd..8d71e1620f56 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -22,10 +22,6 @@ configure () { grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - if [ X$ExtendedInputDevices = "X" ]; then - ExtendedInputDevices=YES - fi - # It's good for FreeBSD ports/packages system. echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF @@ -33,6 +29,26 @@ configure () { # Thanks, Trevor Johnson <trevor@jpj.net> echo "#define InstallXserverSetUID NO" >> $LOCALDEF + # User Config. + if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then + echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF + fi + if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then + echo "#define HasPam $HasPam" >> $LOCALDEF + fi + if [ ! -d /sys -a ! -d /usr/src/sys ]; then + echo "#define BuildXF86DRI NO" >> $LOCALDEF + fi + if [ X$ExtendedInputDevices = XDEFAULT -o X$ExtendedInputDevices = XYES ]; then + echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \ + elographics magellan \ + microtouch mutouch spaceorb summa \ + wacom void citron" >> $LOCALDEF + echo "#define JoystickSupport YES" >> $LOCALDEF + else + echo "#define XInputDrivers mouse" >> $LOCALDEF + fi + # disable some configs: there are not used this ports for i in \ BuildFonts \ @@ -56,32 +72,29 @@ configure () { done echo "#define BuildServer YES" >> $LOCALDEF echo "#define LibInstallBuild YES" >> $LOCALDEF + echo "#define ModInstall YES" >> $LOCALDEF echo "#define XF86Server YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF cat >> $LOCALDEF <<END +#ifndef XF86CardDrivers #ifdef i386Architecture #define XF86CardDrivers mga glint nv tga s3virge sis rendition \ - neomagic i740 tdfx \ + neomagic i740 tdfx savage \ cirrus tseng trident chips apm \ - GlideDriver fbdev \ - ati r128 AgpGartDrivers cyrix \ - vga XF86OSCardDrivers XF86ExtraCardDrivers + GlideDriver fbdev i128 \ + ati AgpGartDrivers DevelDrivers ark cyrix \ + siliconmotion \ + vesa vga XF86OSCardDrivers XF86ExtraCardDrivers #else -#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ - neomagic i740 tdfx \ - cirrus tseng trident chips apm \ - GlideDriver fbdev \ - ati r128 cyrix \ - vga XF86OSCardDrivers XF86ExtraCardDrivers +#ifdef AlphaArchitecture +#define XF86CardDrivers mga tdfx glint s3virge rendition tga \ + savage nv DevelDrivers siliconmotion vga \ + XF86OSCardDrivers XF86xtraCardDrivers +#endif +#endif #endif END - if [ $ExtendedInputDevices != "YES" ]; then - echo "#define XInputDrivers mouse" >> $LOCALDEF - else - echo "#define XInputDrivers mouse dynapro elo2300 elographics \ - magellan microtouch \ - mutouch spaceorb wacom" >> $LOCALDEF - fi + echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF # Check Wraphelp.c @@ -104,6 +117,9 @@ END grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF echo "#define HasXdmAuth NO" >> $DESTDEF else + if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then + echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF + fi cp -f $ORIGDEF $DESTDEF fi diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 2096859cccab..6e425c0e7244 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -6,47 +6,38 @@ # PORTNAME= Server -PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTVERSION= 4.0.3 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz -MAINTAINER= taguchi@tohoku.iij.ad.jp +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz +PATCH_DIST_STRIP= -p1 -RUN_DEPENDS= Xwrapper:${PORTSDIR}/x11/wrapper +MAINTAINER= taguchi@tohoku.iij.ad.jp XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files -SCRIPTS_ENV+= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} \ +PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files +SCRIPTS_ENV= HasXdmAuth=${HasXdmAuth} \ + HasSecureRPC=${HasSecureRPC} \ + HasPam=${HasPam} \ ExtendedInputDevices=${ExtendedInputDevices} +MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man ALL_TARGET= FreeBSDPortsBuild INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man -MANCOMPRESSED= yes MAN1= SuperProbe.1 \ XFree86.1 \ Xserver.1 \ - imake.1 \ kbd_mode.1 \ - lndir.1 \ - makedepend.1 \ - makeg.1 \ - makestrs.1 \ - mkdirhier.1 \ - pswrap.1 \ - revpath.1 \ - rman.1 \ - showrgb.1 \ - xf86config.1 \ - xmkmf.1 + pcitweak.1 \ + scanpci.1 \ + xf86config.1 MAN3= XF86VidMode.3 \ XF86VidModeDeleteModeLine.3 \ XF86VidModeGetAllModeLines.3 \ @@ -60,50 +51,82 @@ MAN3= XF86VidMode.3 \ XF86VidModeSetViewPort.3 \ XF86VidModeSwitchMode.3 \ XF86VidModeSwitchToMode.3 -MAN4= apm.4 \ - ati.4 \ - chips.4 \ - cirrus.4 \ - cyrix.4 \ - dynapro.4 \ - elographics.4 \ - fbdev.4 \ +MAN4= mga.4 \ + tdfx.4 \ glint.4 \ - i740.4 \ - i810.4 \ - keyboard.4 \ - mga.4 \ - microtouch.4 \ - mouse.4 \ - mutouch.4 \ - neomagic.4 \ - nv.4 \ - r128.4 \ - rendition.4 \ s3virge.4 \ - sis.4 \ - tdfx.4 \ - trident.4 \ - tseng.4 \ + rendition.4 \ + savage.4 \ + nv.4 \ + siliconmotion.4 \ vga.4 \ - wacom.4 + keyboard.4 \ + mouse.4 MAN5= XF86Config.5 -# User Config: -# If you want to disabe Extended input devices (such as wacom tablets), -# Set following as NO. or type make ExtendefInputDevices=NO -ExtendedInputDevices?= YES +# XFree86 User Config: +# --- +# Name Default Meaning +# ---------------------------------------------------------------------------- +# HasXdmAuth YES support XDM-AUTHORIZATION-1. +# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later) +# HasPam YES support PAM (require FreeBSD-3.1 or later) +# ExtendedInputDevices YES support extended input devices +HasXdmAuth?= DEFAULT +HasSecureRPC?= DEFAULT +HasPam?= DEFAULT +ExtendedInputDevices?= DEFAULT +.if !exists(/sys) && !exists(/usr/src/sys) +BuildXF86DRI= NO +PLIST_SUB+= DRI="@comment " +.else +PLIST_SUB+= DRI="" +.endif + +.if ${ExtendedInputDevices} == DEFAULT || ${ExtendedInputDevices} == YES +PLIST_SUB+= XIE:="" +MAN4+= citron.4 \ + dynapro.4 \ + elographics.4 \ + microtouch.4 \ + mutouch.4 \ + wacom.4 \ + void.4 +.else +PLIST_SUB+= XIE:="@comment " +.endif -#.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -#pre-everything: -# ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -#.endif +.if defined(BuildXF86DRI) && ${BuildXF86DRI} == NO +pre-fetch: + @${ECHO_MSG} "DRI would not build: kernel source required in /sys." +.endif do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure +.include <bsd.port.pre.mk> +.if ${ARCH} == i386 +PLIST_SUB+= I386:="" +MAN4+= apm.4 \ + chips.4 \ + cirrus.4 \ + cyrix.4 \ + fbdev.4 \ + fbdevhw.4 \ + i128.4 \ + i740.4 \ + i810.4 \ + neomagic.4 \ + r128.4 \ + sis.4 \ + trident.4 \ + tseng.4 \ + vesa.4 +.else +PLIST_SUB+= I386:="@comment " +.endif + post-install: - [ -x ${PREFIX}/bin/Xwrapper ] && ( cd ${PREFIX}/bin ; ${LN} -sf Xwrapper X ) - ${CHMOD} a-s ${PREFIX}/bin/XFree86 + strip ${PREFIX}/bin/XFree86 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo index e9125a5f32c4..073d54832d2d 100644 --- a/x11-servers/XFree86-4-Server/distinfo +++ b/x11-servers/XFree86-4-Server/distinfo @@ -1 +1,2 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index 7f9f241ba469..e2d10250b3e6 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -1,10 +1,10 @@ bin/SuperProbe bin/X bin/XFree86 +%%XIE:%%bin/joycal bin/kbd_mode bin/pcitweak bin/scanpci -bin/showrgb bin/xf86config lib/X11/Cards lib/X11/XF86Config.98 @@ -18,33 +18,31 @@ lib/X11/doc/README.DECtga lib/X11/doc/README.DGA lib/X11/doc/README.DRI lib/X11/doc/README.DRIcomp -lib/X11/doc/README.SiS -lib/X11/doc/README.apm -lib/X11/doc/README.ati -lib/X11/doc/README.chips -lib/X11/doc/README.cyrix +%%I386:%%lib/X11/doc/README.I128 +%%I386:%%lib/X11/doc/README.SiS +%%I386:%%lib/X11/doc/README.apm +%%I386:%%lib/X11/doc/README.ati +%%I386:%%lib/X11/doc/README.chips +%%I386:%%lib/X11/doc/README.cyrix lib/X11/doc/README.fonts -lib/X11/doc/README.i740 -lib/X11/doc/README.i810 +%%I386:%%lib/X11/doc/README.i740 +%%I386:%%lib/X11/doc/README.i810 lib/X11/doc/README.mouse -lib/X11/doc/README.r128 +%%I386:%%lib/X11/doc/README.newport +%%I386:%%lib/X11/doc/README.r128 lib/X11/doc/README.rendition lib/X11/doc/README.s3virge lib/X11/doc/RELNOTES lib/X11/doc/ServersOnly lib/X11/doc/Status +lib/X11/doc/Versions lib/X11/doc/VideoBoard98 -lib/X11/doc/html/manindex1.html -lib/X11/doc/html/manindex3.html -lib/X11/doc/html/manindex4.html -lib/X11/doc/html/manindex5.html lib/X11/etc/Xinstall.sh lib/X11/etc/sun.termcap lib/X11/etc/sun.terminfo lib/X11/etc/xmodmap.std lib/X11/etc/xterm.termcap lib/X11/etc/xterm.terminfo -lib/X11/rgb.txt lib/X11/xserver/SecurityPolicy lib/modules/codeconv/libARABIC.a lib/modules/codeconv/libARMSCII8.a @@ -74,36 +72,44 @@ lib/modules/codeconv/libKSCJOHAB.a lib/modules/codeconv/libMULEENCODING.a lib/modules/codeconv/libTCVN.a lib/modules/codeconv/libVISCII.a -lib/modules/dri/gamma_dri.so -lib/modules/dri/i810_dri.so -lib/modules/dri/mga_dri.so -lib/modules/dri/r128_dri.so -lib/modules/drivers/apm_drv.o -lib/modules/drivers/ati_drv.o -lib/modules/drivers/chips_drv.o -lib/modules/drivers/cirrus_alpine.o -lib/modules/drivers/cirrus_drv.o -lib/modules/drivers/cirrus_laguna.o -lib/modules/drivers/cyrix_drv.o -lib/modules/drivers/fbdev_drv.o +%%DRI%%lib/modules/dri/gamma_dri.so +%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so +%%DRI%%lib/modules/dri/mga_dri.so +%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so +%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so +%%I386:%%lib/modules/drivers/apm_drv.o +%%I386:%%lib/modules/drivers/ark_drv.o +%%I386:%%lib/modules/drivers/ati_drv.o +%%I386:%%lib/modules/drivers/atimisc_drv.o +%%I386:%%lib/modules/drivers/chips_drv.o +%%I386:%%lib/modules/drivers/cirrus_alpine.o +%%I386:%%lib/modules/drivers/cirrus_drv.o +%%I386:%%lib/modules/drivers/cirrus_laguna.o +%%I386:%%lib/modules/drivers/cyrix_drv.o +%%I386:%%lib/modules/drivers/fbdev_drv.o lib/modules/drivers/glint_drv.o -lib/modules/drivers/i740_drv.o -lib/modules/drivers/i810_drv.o +%%I386:%%lib/modules/drivers/i128_drv.o +%%I386:%%lib/modules/drivers/i740_drv.o +%%I386:%%lib/modules/drivers/i810_drv.o lib/modules/drivers/mga_drv.o -lib/modules/drivers/neomagic_drv.o +%%I386:%%lib/modules/drivers/neomagic_drv.o lib/modules/drivers/nv_drv.o -lib/modules/drivers/r128_drv.o +%%I386:%%lib/modules/drivers/r128_drv.o +%%I386:%%lib/modules/drivers/radeon_drv.o lib/modules/drivers/rendition_drv.o lib/modules/drivers/s3virge_drv.o -lib/modules/drivers/sis_drv.o +lib/modules/drivers/savage_drv.o +lib/modules/drivers/siliconmotion_drv.o +%%I386:%%lib/modules/drivers/sis_drv.o lib/modules/drivers/tdfx_drv.o lib/modules/drivers/tga_drv.o -lib/modules/drivers/trident_drv.o -lib/modules/drivers/tseng_drv.o +%%I386:%%lib/modules/drivers/trident_drv.o +%%I386:%%lib/modules/drivers/tseng_drv.o +%%I386:%%lib/modules/drivers/vesa_drv.o lib/modules/drivers/vga_drv.o lib/modules/extensions/libGLcore.a lib/modules/extensions/libdbe.a -lib/modules/extensions/libdri.a +%%DRI%%lib/modules/extensions/libdri.a lib/modules/extensions/libextmod.a lib/modules/extensions/libglx.a lib/modules/extensions/libpex5.a @@ -114,16 +120,21 @@ lib/modules/fonts/libfreetype.a lib/modules/fonts/libspeedo.a lib/modules/fonts/libtype1.a lib/modules/fonts/libxtt.a -lib/modules/freebsd/libdrm.a -lib/modules/input/dynapro_drv.o -lib/modules/input/elo2300_drv.o -lib/modules/input/elographics_drv.o -lib/modules/input/magellan_drv.o -lib/modules/input/microtouch_drv.o +%%DRI%%lib/modules/freebsd/libdrm.a +%%XIE:%%lib/modules/input/citron_drv.o +%%XIE:%%lib/modules/input/digitaledge_drv.o +%%XIE:%%lib/modules/input/dynapro_drv.o +%%XIE:%%lib/modules/input/elo2300_drv.o +%%XIE:%%lib/modules/input/elographics_drv.o +%%XIE:%%lib/modules/input/joystick_drv.o +%%XIE:%%lib/modules/input/magellan_drv.o +%%XIE:%%lib/modules/input/microtouch_drv.o lib/modules/input/mouse_drv.o -lib/modules/input/mutouch_drv.o -lib/modules/input/spaceorb_drv.o -lib/modules/input/wacom_drv.o +%%XIE:%%lib/modules/input/mutouch_drv.o +%%XIE:%%lib/modules/input/spaceorb_drv.o +%%XIE:%%lib/modules/input/summa_drv.o +%%XIE:%%lib/modules/input/void_drv.o +%%XIE:%%lib/modules/input/wacom_drv.o lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a @@ -138,6 +149,7 @@ lib/modules/libpcidata.a lib/modules/librac.a lib/modules/libramdac.a lib/modules/libscanpci.a +lib/modules/libshadow.a lib/modules/libshadowfb.a lib/modules/libvbe.a lib/modules/libvgahw.a diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index baf9551c37dd..8d71e1620f56 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -22,10 +22,6 @@ configure () { grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - if [ X$ExtendedInputDevices = "X" ]; then - ExtendedInputDevices=YES - fi - # It's good for FreeBSD ports/packages system. echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF @@ -33,6 +29,26 @@ configure () { # Thanks, Trevor Johnson <trevor@jpj.net> echo "#define InstallXserverSetUID NO" >> $LOCALDEF + # User Config. + if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then + echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF + fi + if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then + echo "#define HasPam $HasPam" >> $LOCALDEF + fi + if [ ! -d /sys -a ! -d /usr/src/sys ]; then + echo "#define BuildXF86DRI NO" >> $LOCALDEF + fi + if [ X$ExtendedInputDevices = XDEFAULT -o X$ExtendedInputDevices = XYES ]; then + echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \ + elographics magellan \ + microtouch mutouch spaceorb summa \ + wacom void citron" >> $LOCALDEF + echo "#define JoystickSupport YES" >> $LOCALDEF + else + echo "#define XInputDrivers mouse" >> $LOCALDEF + fi + # disable some configs: there are not used this ports for i in \ BuildFonts \ @@ -56,32 +72,29 @@ configure () { done echo "#define BuildServer YES" >> $LOCALDEF echo "#define LibInstallBuild YES" >> $LOCALDEF + echo "#define ModInstall YES" >> $LOCALDEF echo "#define XF86Server YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF cat >> $LOCALDEF <<END +#ifndef XF86CardDrivers #ifdef i386Architecture #define XF86CardDrivers mga glint nv tga s3virge sis rendition \ - neomagic i740 tdfx \ + neomagic i740 tdfx savage \ cirrus tseng trident chips apm \ - GlideDriver fbdev \ - ati r128 AgpGartDrivers cyrix \ - vga XF86OSCardDrivers XF86ExtraCardDrivers + GlideDriver fbdev i128 \ + ati AgpGartDrivers DevelDrivers ark cyrix \ + siliconmotion \ + vesa vga XF86OSCardDrivers XF86ExtraCardDrivers #else -#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ - neomagic i740 tdfx \ - cirrus tseng trident chips apm \ - GlideDriver fbdev \ - ati r128 cyrix \ - vga XF86OSCardDrivers XF86ExtraCardDrivers +#ifdef AlphaArchitecture +#define XF86CardDrivers mga tdfx glint s3virge rendition tga \ + savage nv DevelDrivers siliconmotion vga \ + XF86OSCardDrivers XF86xtraCardDrivers +#endif +#endif #endif END - if [ $ExtendedInputDevices != "YES" ]; then - echo "#define XInputDrivers mouse" >> $LOCALDEF - else - echo "#define XInputDrivers mouse dynapro elo2300 elographics \ - magellan microtouch \ - mutouch spaceorb wacom" >> $LOCALDEF - fi + echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF # Check Wraphelp.c @@ -104,6 +117,9 @@ END grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF echo "#define HasXdmAuth NO" >> $DESTDEF else + if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then + echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF + fi cp -f $ORIGDEF $DESTDEF fi diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index f2ad3f856a91..99cf5368d5ae 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -6,12 +6,16 @@ # PORTNAME= VirtualFramebufferServer -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz + +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -19,14 +23,10 @@ XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files -SCRIPTS_ENV+= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} +PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= installXvfb installXvfb.man -MANCOMPRESSED= yes +INSTALL_TARGET= installXvfb installXserver.man +MAKE_ENV= MAN_INSTALL_TARGET=installXvfb.man MAN1= Xserver.1 Xvfb.1 do-configure: diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo index e9125a5f32c4..073d54832d2d 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo @@ -1 +1,2 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist index 0187e20ffad8..e2d161bbca7f 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist @@ -1,3 +1 @@ bin/Xvfb -lib/X11/doc/html/manindex1.html -lib/X11/doc/html/manindex3.html diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 68a240fb23ed..fcfaab2804c8 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -6,12 +6,17 @@ # PORTNAME= clients -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz X402src-2.tgz +EXTRACT_ONLY= X402src-1.tgz + +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -19,117 +24,40 @@ XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${PORTSDIR}/x11/XFree86-4-libraries/files -SCRIPTS_ENV+= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} \ - InstallXdmConfig=${InstallXdmConfig} \ +PATCHDIR= ${.CURDIR}/../XFree86-4-libraries/files +SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \ InstallXinitConfig=${InstallXinitConfig} \ InstallAppDefFiles=${InstallAppDefFiles} \ - BuildAoutLibraries=${BuildAoutLibraries} + HasXdmAuth=${HasXdmAuth} \ + HasSecureRPC=${HasSecureRPC} \ + HasPam=${HasPam} +MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ + PORTNAME=${PORTNAME} \ + PORTVERSION=${PORTVERSION} ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man -MANCOMPRESSED= yes -MAN1= appres.1 \ - atobm.1 \ - bdftopcf.1 \ - beforelight.1 \ - bitmap.1 \ - bmtoa.1 \ - cxpm.1 \ - dga.1 \ - editres.1 \ - fsinfo.1 \ - fslsfonts.1 \ - fstobdf.1 \ - iceauth.1 \ - ico.1 \ - imake.1 \ - lbxproxy.1 \ - libxrx.1 \ - listres.1 \ - lndir.1 \ - makedepend.1 \ - makeg.1 \ - makepsres.1 \ - makestrs.1 \ - mkcfm.1 \ - mkdirhier.1 \ - mkfontdir.1 \ - oclock.1 \ - proxymngr.1 \ - pswrap.1 \ - resize.1 \ - revpath.1 \ - rman.1 \ - rstart.1 \ - rstartd.1 \ - sessreg.1 \ - setxkbmap.1 \ - showfont.1 \ - smproxy.1 \ - startx.1 \ - sxpm.1 \ - twm.1 \ - viewres.1 \ - x11perf.1 \ - x11perfcomp.1 \ - xauth.1 \ - xbiff.1 \ - xcalc.1 \ - xclipboard.1 \ - xclock.1 \ - xcmsdb.1 \ - xconsole.1 \ - xcutsel.1 \ - xditview.1 \ - xdm.1 \ - xdpyinfo.1 \ - xedit.1 \ - xev.1 \ - xeyes.1 \ - xf86cfg.1 \ - xfd.1 \ - xfindproxy.1 \ - xfontsel.1 \ - xfwp.1 \ - xgamma.1 \ - xgc.1 \ - xhost.1 \ - xieperf.1 \ - xinit.1 \ - xkbcomp.1 \ - xkbevd.1 \ - xkbprint.1 \ - xkill.1 \ - xload.1 \ - xlogo.1 \ - xlsatoms.1 \ - xlsclients.1 \ - xlsfonts.1 \ - xmag.1 \ - xman.1 \ - xmessage.1 \ - xmkmf.1 \ - xmodmap.1 \ - xon.1 \ - xprop.1 \ - xrdb.1 \ - xrefresh.1 \ - xset.1 \ - xsetmode.1 \ - xsetpointer.1 \ - xsetroot.1 \ - xsm.1 \ - xstdcmap.1 \ - xterm.1 \ - xvidtune.1 \ - xwd.1 \ - xwininfo.1 \ - xwud.1 +INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man + +# --- +# XFree86 User Config: +# Name Default Meaning +# ---------------------------------------------------------------------------- +# HasXdmAuth YES support XDM-AUTHORIZATION-1. +# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later) +# HasPam YES support PAM (require FreeBSD-3.1 or later) +# InstallXdmConfig YES install config files for xdm. +# InstallXinitConfig YES install config files for xinit. +# InstallAppDefFiles YES install resource files. +# ---------------------------------------------------------------------------- +# DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4 +# +InstallXdmConfig?= DEFAULT +InstallXinitConfig?= DEFAULT +InstallAppDefFiles?= DEFAULT +HasXdmAuth?= DEFAULT +HasSecureRPC?= DEFAULT +HasPam?= DEFAULT -.if defined(XDM_DES) +.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES .if ${USA_RESIDENT} == YES pre-fetch: @${ECHO} @@ -138,25 +66,22 @@ pre-fetch: MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/ -EXTRACT_ONLY= X401src-1.tgz +EXTRACT_ONLY= X402src-1.tgz DISTFILES+= Wraphelp.c IGNOREFILES= Wraphelp.c .endif .endif +.include <bsd.port.pre.mk> +.include "${FILESDIR}/manpages" + +post-extract: + ( cd ${WRKDIR} && \ + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ + ${DISTDIR}/${DIST_SUBDIR}/X402src-2.tgz \ + | ${TAR} -xf - xc/fonts/util ) + do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure -# User Config: -# If you want to save your current config files for Xdm, set following as NO -InstallXdmConfig?= YES -# If you want to save your current config files for Xinit, set following as NO -InstallXinitConfig?= YES -# If you want to save your current apprication default files (aka. resource -# files), set following as NO -InstallAppDefFiles?= YES -# If you want to build Aout libraries (for some application which use legacy -# aout libs, such as Netscape), then set following as YES -BuildAoutLibraries?= NO - -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo index e9125a5f32c4..f8914f6e46bf 100644 --- a/x11/XFree86-4-clients/distinfo +++ b/x11/XFree86-4-clients/distinfo @@ -1 +1,4 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 +MD5 (xc/Wraphelp.c) = IGNORE diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages new file mode 100644 index 000000000000..14c113d49973 --- /dev/null +++ b/x11/XFree86-4-clients/files/manpages @@ -0,0 +1,90 @@ +MAN1= Xmark.1 \ + appres.1 \ + atobm.1 \ + bdftopcf.1 \ + beforelight.1 \ + bitmap.1 \ + bmtoa.1 \ + cxpm.1 \ + dga.1 \ + editres.1 \ + fsinfo.1 \ + fslsfonts.1 \ + fstobdf.1 \ + glxinfo.1 \ + iceauth.1 \ + ico.1 \ + lbxproxy.1 \ + listres.1 \ + makepsres.1 \ + mkcfm.1 \ + mkfontdir.1 \ + oclock.1 \ + proxymngr.1 \ + resize.1 \ + rstart.1 \ + rstartd.1 \ + sessreg.1 \ + setxkbmap.1 \ + showfont.1 \ + showrgb.1 \ + smproxy.1 \ + startx.1 \ + sxpm.1 \ + twm.1 \ + viewres.1 \ + x11perf.1 \ + x11perfcomp.1 \ + xauth.1 \ + xbiff.1 \ + xcalc.1 \ + xclipboard.1 \ + xclock.1 \ + xcmsdb.1 \ + xconsole.1 \ + xcutsel.1 \ + xditview.1 \ + xdm.1 \ + xdpyinfo.1 \ + xedit.1 \ + xev.1 \ + xeyes.1 \ + xf86cfg.1 \ + xfd.1 \ + xfindproxy.1 \ + xfontsel.1 \ + xfwp.1 \ + xgamma.1 \ + xgc.1 \ + xhost.1 \ + xieperf.1 \ + xinit.1 \ + xkbcomp.1 \ + xkbevd.1 \ + xkbprint.1 \ + xkill.1 \ + xload.1 \ + xlogo.1 \ + xlsatoms.1 \ + xlsclients.1 \ + xlsfonts.1 \ + xmag.1 \ + xman.1 \ + xmessage.1 \ + xmodmap.1 \ + xon.1 \ + xprop.1 \ + xrdb.1 \ + xrefresh.1 \ + xset.1 \ + xsetmode.1 \ + xsetpointer.1 \ + xsetroot.1 \ + xsm.1 \ + xstdcmap.1 \ + xterm.1 \ + xvidtune.1 \ + xvinfo.1 \ + xwd.1 \ + xwininfo.1 \ + xwud.1 diff --git a/x11/XFree86-4-clients/pkg-comment b/x11/XFree86-4-clients/pkg-comment index 24c2812bf87e..98276b17a4c4 100644 --- a/x11/XFree86-4-clients/pkg-comment +++ b/x11/XFree86-4-clients/pkg-comment @@ -1 +1 @@ -X11R6.4/XFree86-4.0: only Client environments +X11R6.4/XFree86-4.0 Client environments diff --git a/x11/XFree86-4-clients/pkg-descr b/x11/XFree86-4-clients/pkg-descr index 9a634d26a952..8dbac99e617f 100644 --- a/x11/XFree86-4-clients/pkg-descr +++ b/x11/XFree86-4-clients/pkg-descr @@ -4,8 +4,3 @@ included this package. Also library files and resource files are included. WWW: http://www.xfree86.org/ - -Note: -This is part of the XFree86 distribution, there is a -complete distribution available in the ports collection -as well. diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist index 0666883a7322..bacda37e4438 100644 --- a/x11/XFree86-4-clients/pkg-plist +++ b/x11/XFree86-4-clients/pkg-plist @@ -2,6 +2,7 @@ bin/Xmark bin/appres bin/atobm bin/bdftopcf +bin/bdftruncate.pl bin/beforelight bin/bitmap bin/bmtoa @@ -11,6 +12,7 @@ bin/editres bin/fsinfo bin/fslsfonts bin/fstobdf +bin/glxinfo bin/iceauth bin/ico bin/lbxproxy @@ -26,10 +28,12 @@ bin/rstartd bin/sessreg bin/setxkbmap bin/showfont +bin/showrgb bin/smproxy bin/startx bin/sxpm bin/twm +bin/ucs2any.pl bin/viewres bin/x11perf bin/x11perfcomp @@ -85,6 +89,7 @@ bin/xsm bin/xstdcmap bin/xterm bin/xvidtune +bin/xvinfo bin/xwd bin/xwininfo bin/xwud @@ -101,8 +106,8 @@ include/X11/bitmaps/RotateRight include/X11/bitmaps/Stipple include/X11/bitmaps/Term include/X11/bitmaps/Up -include/bitmaps/ldblarrow -include/bitmaps/rdblarrow +include/X11/bitmaps/ldblarrow +include/X11/bitmaps/rdblarrow lib/X11/XErrorDB lib/X11/XKeysymDB lib/X11/app-defaults/Beforelight @@ -138,8 +143,23 @@ lib/X11/app-defaults/Xmessage lib/X11/app-defaults/Xvidtune lib/X11/doc/html/manindex1.html lib/X11/doc/html/manindex3.html +lib/X11/fonts/util/map-ISO8859-1 +lib/X11/fonts/util/map-ISO8859-2 +lib/X11/fonts/util/map-ISO8859-3 +lib/X11/fonts/util/map-ISO8859-4 +lib/X11/fonts/util/map-ISO8859-5 +lib/X11/fonts/util/map-ISO8859-7 +lib/X11/fonts/util/map-ISO8859-8 +lib/X11/fonts/util/map-ISO8859-9 +lib/X11/fonts/util/map-ISO8859-10 +lib/X11/fonts/util/map-ISO8859-13 +lib/X11/fonts/util/map-ISO8859-14 +lib/X11/fonts/util/map-ISO8859-15 +lib/X11/fonts/util/map-JISX0201.1976-0 +lib/X11/fonts/util/map-KOI8-R lib/X11/lbxproxy/AtomControl lib/X11/proxymngr/pmconfig +lib/X11/rgb.txt lib/X11/rstart/commands/@List lib/X11/rstart/commands/ListContexts lib/X11/rstart/commands/ListGenericCommands @@ -179,6 +199,7 @@ lib/X11/xkb/compat/group_led lib/X11/xkb/compat/iso9995 lib/X11/xkb/compat/japan lib/X11/xkb/compat/keypad +lib/X11/xkb/compat/leds lib/X11/xkb/compat/misc lib/X11/xkb/compat/mousekeys lib/X11/xkb/compat/norepeat @@ -218,6 +239,7 @@ lib/X11/xkb/keycodes/fujitsu lib/X11/xkb/keycodes/hp lib/X11/xkb/keycodes/ibm lib/X11/xkb/keycodes/macintosh +lib/X11/xkb/keycodes/powerpcps2 lib/X11/xkb/keycodes/sgi/indigo lib/X11/xkb/keycodes/sgi/indy lib/X11/xkb/keycodes/sgi/iris @@ -256,7 +278,14 @@ lib/X11/xkb/keymap/sgi/th lib/X11/xkb/keymap/sgi/us lib/X11/xkb/keymap/sony lib/X11/xkb/keymap/sun/de +lib/X11/xkb/keymap/sun/es +lib/X11/xkb/keymap/sun/fi +lib/X11/xkb/keymap/sun/fr +lib/X11/xkb/keymap/sun/no +lib/X11/xkb/keymap/sun/pl +lib/X11/xkb/keymap/sun/ru lib/X11/xkb/keymap/sun/se +lib/X11/xkb/keymap/sun/uk lib/X11/xkb/keymap/sun/us lib/X11/xkb/keymap/xfree86 lib/X11/xkb/keymap/xfree98 @@ -272,12 +301,15 @@ lib/X11/xkb/semantics/complete lib/X11/xkb/semantics/default lib/X11/xkb/semantics/xtest lib/X11/xkb/symbols.dir +lib/X11/xkb/symbols/am +lib/X11/xkb/symbols/az lib/X11/xkb/symbols/be lib/X11/xkb/symbols/bg lib/X11/xkb/symbols/br lib/X11/xkb/symbols/ca lib/X11/xkb/symbols/ca_enhanced lib/X11/xkb/symbols/cs +lib/X11/xkb/symbols/cs_qwerty lib/X11/xkb/symbols/ctrl lib/X11/xkb/symbols/czsk lib/X11/xkb/symbols/de @@ -297,9 +329,13 @@ lib/X11/xkb/symbols/fr_CH lib/X11/xkb/symbols/fujitsu/jp lib/X11/xkb/symbols/fujitsu/us lib/X11/xkb/symbols/gb +lib/X11/xkb/symbols/gr lib/X11/xkb/symbols/group lib/X11/xkb/symbols/hp/us lib/X11/xkb/symbols/hu +lib/X11/xkb/symbols/hu_US +lib/X11/xkb/symbols/il +lib/X11/xkb/symbols/il_phonetic lib/X11/xkb/symbols/inet lib/X11/xkb/symbols/is lib/X11/xkb/symbols/iso9995-3 @@ -307,25 +343,46 @@ lib/X11/xkb/symbols/it lib/X11/xkb/symbols/jp lib/X11/xkb/symbols/keypad lib/X11/xkb/symbols/lock +lib/X11/xkb/symbols/lt +lib/X11/xkb/symbols/lt_p +lib/X11/xkb/symbols/lt_std +lib/X11/xkb/symbols/macintosh/de +lib/X11/xkb/symbols/macintosh/de_CH +lib/X11/xkb/symbols/macintosh/dk +lib/X11/xkb/symbols/macintosh/es +lib/X11/xkb/symbols/macintosh/fi +lib/X11/xkb/symbols/macintosh/fr +lib/X11/xkb/symbols/macintosh/fr_CH +lib/X11/xkb/symbols/macintosh/gb +lib/X11/xkb/symbols/macintosh/it +lib/X11/xkb/symbols/macintosh/nl +lib/X11/xkb/symbols/macintosh/no +lib/X11/xkb/symbols/macintosh/pt +lib/X11/xkb/symbols/macintosh/se lib/X11/xkb/symbols/macintosh/us +lib/X11/xkb/symbols/mk lib/X11/xkb/symbols/nec/jp lib/X11/xkb/symbols/no lib/X11/xkb/symbols/pc104 lib/X11/xkb/symbols/pl lib/X11/xkb/symbols/pt lib/X11/xkb/symbols/ralt +lib/X11/xkb/symbols/ro lib/X11/xkb/symbols/ru lib/X11/xkb/symbols/se lib/X11/xkb/symbols/sgi/jp lib/X11/xkb/symbols/si lib/X11/xkb/symbols/sony/us +lib/X11/xkb/symbols/sr lib/X11/xkb/symbols/sun/se lib/X11/xkb/symbols/sun/us lib/X11/xkb/symbols/th +lib/X11/xkb/symbols/tr lib/X11/xkb/symbols/ua lib/X11/xkb/symbols/us lib/X11/xkb/symbols/us_group3 lib/X11/xkb/symbols/us_intl +lib/X11/xkb/symbols/vn lib/X11/xkb/symbols/xfree68/amiga lib/X11/xkb/symbols/xfree68/ataritt lib/X11/xkb/types.dir diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index 0bc42cf5417a..082d6ae1f6cf 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -22,25 +22,29 @@ configure () { grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - # setdefault values - if [ X$InstallXdmConfig = "X" ]; then - InstallXdmConfig=YES + # It's good for FreeBSD ports/packages system. + echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF + echo "#define InstallXserverSetUID NO" >> $LOCALDEF + + # User Config. + if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then + echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF fi - if [ X$InstallXinitConfig = "X" ]; then - InstallXinitConfig=YES + if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then + echo "#define HasPam $HasPam" >> $LOCALDEF fi - if [ X$InstallAppDefFiles = "X" ]; then - InstallAppDefFiles=YES + if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then + echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF fi - if [ X$BuildAoutLibraries = "X" ]; then - BuildAoutLibraries=NO + if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then + echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF + fi + if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then + echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF + fi + if [ ! -d /sys -a ! -d /usr/src/sys ]; then + echo "#define BuildXF86DRI NO" >> $LOCALDEF fi - - echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - - # I want to set this line. - # but the probrem is too deep. not yet done. - # echo "#define InstallXserverSetUID NO" >> $LOCALDEF # disable some configs: there are not used this ports for i in \ @@ -58,17 +62,14 @@ configure () { LibHeaders \ LibInstall \ ForceNormalLib \ - ModuleInstall + ModInstall \ + XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF done echo "#define LibInstallBuild YES" >> $LOCALDEF echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF - echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF - echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF - echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF - echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $LOCALDEF # Check Wraphelp.c WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c @@ -90,6 +91,9 @@ configure () { grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF echo "#define HasXdmAuth NO" >> $DESTDEF else + if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then + echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF + fi cp -f $ORIGDEF $DESTDEF fi diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile index 53ecec6ec896..fcef66f2fbd4 100644 --- a/x11/XFree86-4-documents/Makefile +++ b/x11/XFree86-4-documents/Makefile @@ -6,13 +6,13 @@ # PORTNAME= documents -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz X401src-2.tgz -EXTRACT_ONLY= X401src-2.tgz +DISTFILES= X402src-1.tgz X402src-2.tgz X402src-3.tgz +EXTRACT_ONLY= X402src-2.tgz X402src-3.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -27,15 +27,17 @@ INSTALL_TARGET= install install.man post-extract: (cd ${WRKDIR} && \ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/X401src-1.tgz \ + ${DISTDIR}/${DIST_SUBDIR}/X402src-1.tgz \ ${EXTRACT_AFTER_ARGS} xc/doc) do-configure: - (cd ${WRKSRC} && \ - imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \ - -DBuildMiscDocs=YES -DBuildSpecsDocs=YES \ - -DBuildLinuxDocPS=NO \ - -DFreeBSDBuildXdoc=YES \ + (cd ${WRKSRC} ; \ + ${ECHO} "#define BuildMiscDocs YES" > host.def ; \ + ${ECHO} "#define BuildSpecsDocs YES" >> host.def ; \ + ${ECHO} "#define BuildLinuxDocPS NO" >> host.def ; \ + ${ECHO} "#define InstallHardcopyDocs YES" >> host.def ; \ + ${ECHO} "#define FreeBSDBuildXdoc YES" >> host.def ; \ + imake -DUseInstalled ${PROJECTROOT} -I. -I${PREFIX}/lib/X11/config \ -DTOPDIR=.. -DCURDIR=.; \ ${MAKE} Makefiles ; \ ${MAKE} includes ; \ diff --git a/x11/XFree86-4-documents/distinfo b/x11/XFree86-4-documents/distinfo index d88dbd78fa11..9920e6bd5446 100644 --- a/x11/XFree86-4-documents/distinfo +++ b/x11/XFree86-4-documents/distinfo @@ -1,2 +1,3 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 -MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae +MD5 (xc/X402src-3.tgz) = 3126d1ef38e3ece0260804ed3c691144 diff --git a/x11/XFree86-4-documents/files/patch-01 b/x11/XFree86-4-documents/files/patch-01 index 17e19a17c257..b79727b8a302 100644 --- a/x11/XFree86-4-documents/files/patch-01 +++ b/x11/XFree86-4-documents/files/patch-01 @@ -1,13 +1,13 @@ ---- Imakefile~ Mon Dec 21 07:51:33 1998 -+++ Imakefile Wed May 10 15:28:41 2000 -@@ -12,7 +12,11 @@ - SPECSDIR = specs +--- Imakefile.orig Fri Dec 15 04:24:23 2000 ++++ Imakefile Wed Dec 20 16:22:14 2000 +@@ -16,7 +16,11 @@ + HARDCOPYDIR = hardcopy #endif +#if defined(FreeBSDBuildXdoc) || FreeBSDBuildXdoc -+SUBDIRS = $(MISCDIR) $(SPECSDIR) ++SUBDIRS = $(MISCDIR) $(SPECSDIR) $(HARDCOPYDIR) +#else - SUBDIRS = man $(MISCDIR) $(SPECSDIR) + SUBDIRS = man $(MISCDIR) $(SPECSDIR) $(HARDCOPYDIR) +#endif all:: diff --git a/x11/XFree86-4-documents/files/patch-02 b/x11/XFree86-4-documents/files/patch-02 deleted file mode 100644 index 82caed5ec87e..000000000000 --- a/x11/XFree86-4-documents/files/patch-02 +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/INSTALL.ms.orig Mon Oct 5 12:54:10 1998 -+++ misc/INSTALL.ms Wed May 10 15:54:53 2000 -@@ -580,7 +580,7 @@ - - On NT, make certain your Path, Include, and Lib environment variables - are set accordingly. For example here we use the command line compiler --in VC++ 4.0 Standard Edition, which is installed in C:\MSDEVSTD. To -+in VC++ 4.0 Standard Edition, which is installed in C:\\MSDEVSTD. To - setup the environment type: - .ID - > set Path=\fIold-path\fP;C:\\MSDEVSTD\\bin;C:\\\fIpath-to-RmTreeCmd\fP diff --git a/x11/XFree86-4-documents/files/patch-03 b/x11/XFree86-4-documents/files/patch-03 deleted file mode 100644 index 0ab3829730ad..000000000000 --- a/x11/XFree86-4-documents/files/patch-03 +++ /dev/null @@ -1,1392 +0,0 @@ ---- specs/XProtocol/X11.protocol.orig Wed May 10 15:48:38 2000 -+++ specs/XProtocol/X11.protocol Wed May 10 15:49:24 2000 -@@ -1471,7 +1471,6 @@ - .PN Pixmap , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request creates an unmapped window and assigns the identifier wid to it. -@@ -1961,7 +1960,6 @@ - .PN Pixmap , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - The value-mask and value-list specify which attributes are to be changed. -@@ -2036,7 +2034,6 @@ - .in +.2i - .LP - \fIwindow\fP\^: WINDOW --.in -.2i - .LP - \(-> - .in +.2i -@@ -2080,7 +2077,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - This request returns the current attributes of the window. -@@ -2101,7 +2097,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - If the argument window is mapped, -@@ -2135,7 +2130,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - This request performs a -@@ -2158,7 +2152,6 @@ - .PN Match , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request adds or removes the specified window from the client's -@@ -2185,7 +2178,6 @@ - Errors: - .PN Match , - .PN Window --.in -.2i - .eM - .LP - If the window is mapped, -@@ -2240,7 +2232,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - If the window is already mapped, this request has no effect. -@@ -2278,7 +2269,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - This request performs a -@@ -2296,7 +2286,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - If the window is already unmapped, this request has no effect. -@@ -2315,7 +2304,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - This request performs an -@@ -2339,7 +2327,6 @@ - .PN Match , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request changes the configuration of the window. -@@ -2686,7 +2673,6 @@ - Errors: - .PN Value , - .PN Window --.in -.2i - .eM - .LP - If some other client has selected -@@ -2717,7 +2703,6 @@ - .in +.2i - .LP - \fIdrawable\fP\^: DRAWABLE --.in -.2i - .LP - \(-> - .in +.2i -@@ -2732,7 +2717,6 @@ - .LP - Errors: - .PN Drawable --.in -.2i - .eM - .LP - This request returns the root and current geometry of the drawable. -@@ -2755,7 +2739,6 @@ - .LP - \fIwindow\fP\^: WINDOW - .LP --.in -.2i - \(-> - .in +.2i - .LP -@@ -2768,7 +2751,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - This request returns the root, the parent, and the children of the window. -@@ -2783,7 +2765,6 @@ - \fIname\fP\^: STRING8 - .br - \fIonly-if-exists\fP\^: BOOL --.in -.2i - .LP - \(-> - .in +.2i -@@ -2794,7 +2775,6 @@ - Errors: - .PN Alloc , - .PN Value --.in -.2i - .eM - .LP - This request returns the atom for the given name. -@@ -2814,7 +2794,6 @@ - .in +.2i - .LP - \fIatom\fP\^: ATOM --.in -.2i - .LP - \(-> - .in +.2i -@@ -2823,7 +2802,6 @@ - .LP - Errors: - .PN Atom --.in -.2i - .eM - .LP - This request returns the name for the given atom. -@@ -2853,7 +2831,6 @@ - .PN Match , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request alters the property for the specified window. -@@ -2904,7 +2881,6 @@ - Errors: - .PN Atom , - .PN Window --.in -.2i - .eM - .LP - This request deletes the property from the specified window -@@ -2928,7 +2904,6 @@ - \fIlong-offset\fP, \fIlong-length\fP\^: CARD32 - .br - \fIdelete\fP\^: BOOL --.in -.2i - .LP - \(-> - .in +.2i -@@ -2946,7 +2921,6 @@ - .PN Atom , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - If the specified property does not exist for the specified window, -@@ -3009,7 +2983,6 @@ - .PN Atom , - .PN Match , - .PN Window --.in -.2i - .eM - .LP - If the property names in the list are viewed as being numbered starting -@@ -3042,7 +3015,6 @@ - .in +.2i - .LP - \fIwindow\fP\^: WINDOW --.in -.2i - .LP - \(-> - .in +.2i -@@ -3051,7 +3023,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - This request returns the atoms of properties currently defined on the window. -@@ -3073,7 +3044,6 @@ - Errors: - .PN Atom , - .PN Window --.in -.2i - .eM - .LP - This request changes the owner, owner window, -@@ -3125,7 +3095,6 @@ - .in +.2i - .LP - \fIselection\fP\^: ATOM --.in -.2i - .LP - \(-> - .in +.2i -@@ -3135,7 +3104,6 @@ - .LP - Errors: - .PN Atom --.in -.2i - .eM - .LP - This request returns the current owner window of the specified selection, -@@ -3163,7 +3131,6 @@ - Errors: - .PN Atom , - .PN Window --.in -.2i - .eM - .LP - If the specified selection has an owner, -@@ -3197,7 +3164,6 @@ - Errors: - .PN Value , - .PN Window --.in -.2i - .eM - .LP - If -@@ -3270,7 +3236,6 @@ - .br - \fItime\fP\^: TIMESTAMP or - .PN CurrentTime --.in -.2i - .LP - \(-> - .in +.2i -@@ -3286,7 +3251,6 @@ - .PN Cursor , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request actively grabs control of the pointer. -@@ -3384,7 +3348,6 @@ - .LP - \fItime\fP\^: TIMESTAMP or - .PN CurrentTime --.in -.2i - .eM - .LP - This request releases the pointer if this client has it actively grabbed (from -@@ -3442,7 +3405,6 @@ - .PN Cursor , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request establishes a passive grab. -@@ -3520,7 +3482,6 @@ - Errors: - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request releases the passive button/key combination -@@ -3551,7 +3512,6 @@ - Errors: - .PN Cursor , - .PN Value --.in -.2i - .eM - .LP - This request changes the specified dynamic parameters if the pointer is -@@ -3579,7 +3539,6 @@ - .br - \fItime\fP\^: TIMESTAMP or - .PN CurrentTime --.in -.2i - .LP - \(-> - .in +.2i -@@ -3594,7 +3553,6 @@ - Errors: - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request actively grabs control of the keyboard. -@@ -3675,7 +3633,6 @@ - .LP - \fItime\fP\^: TIMESTAMP or - .PN CurrentTime --.in -.2i - .eM - .LP - This request releases the keyboard if this client has it actively grabbed -@@ -3722,7 +3679,6 @@ - .PN Access , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request establishes a passive grab on the keyboard. -@@ -3802,7 +3758,6 @@ - Errors: - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request releases the key combination on the specified window -@@ -3839,7 +3794,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - This request releases some queued events if the client has caused a device to -@@ -4018,7 +3972,6 @@ - .in +.2i - .LP - \fIwindow\fP\^: WINDOW --.in -.2i - .LP - \(-> - .in +.2i -@@ -4036,7 +3989,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - The root window the pointer is logically on and the pointer coordinates -@@ -4067,7 +4019,6 @@ - .PN CurrentTime - .br - \fIwindow\fP\^: WINDOW --.in -.2i - .LP - \(-> - .in +.2i -@@ -4084,7 +4035,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - This request returns all events in the motion history buffer that fall -@@ -4107,7 +4057,6 @@ - \fIsrc-window\fP, \fIdst-window\fP: WINDOW - .br - \fIsrc-x\fP, \fIsrc-y\fP\^: INT16 --.in -.2i - .LP - \(-> - .in +.2i -@@ -4121,7 +4070,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - The src-x and src-y coordinates are taken relative to src-window's -@@ -4154,7 +4102,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - If dst-window is -@@ -4206,7 +4153,6 @@ - .PN Match , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request changes the input focus and the last-focus-change time. -@@ -4282,7 +4228,6 @@ - .Pn { Parent , - .PN PointerRoot , - .PN None } --.in -.2i - .eM - .LP - This request returns the current focus state. -@@ -4296,7 +4241,6 @@ - .in +.2i - .LP - keys: LISTofCARD8 --.in -.2i - .eM - .LP - This request returns a bit vector for the logical state of the keyboard. -@@ -4321,7 +4265,6 @@ - .PN Alloc , - .PN IDChoice , - .PN Name --.in -.2i - .eM - .LP - This request loads the specified font, if necessary, -@@ -4350,7 +4293,6 @@ - .LP - Errors: - .PN Font --.in -.2i - .eM - .LP - This request deletes the association between the resource ID and the font. -@@ -4363,7 +4305,6 @@ - .in +.2i - .LP - \fIfont\fP\^: FONTABLE --.in -.2i - .LP - \(-> - .in +.2i -@@ -4404,7 +4345,6 @@ - .LP - Errors: - .PN Font --.in -.2i - .eM - .LP - This request returns logical information about a font. -@@ -4544,7 +4484,6 @@ - \fIfont\fP\^: FONTABLE - .br - \fIstring\fP\^: STRING16 --.in -.2i - .LP - \(-> - .in +.2i -@@ -4569,7 +4508,6 @@ - .LP - Errors: - .PN Font --.in -.2i - .eM - .LP - This request returns the logical extents of the specified string of characters -@@ -4609,13 +4547,11 @@ - \fIpattern\fP\^: STRING8 - .br - \fImax-names\fP\^: CARD16 --.in -.2i - .LP - \(-> - .in +.2i - .LP - names: LISTofSTRING8 --.in -.2i - .eM - .LP - This request returns a list -@@ -4641,7 +4577,6 @@ - \fIpattern\fP\^: STRING8 - .br - \fImax-names\fP\^: CARD16 --.in -.2i - .LP - \(->+ - .in +.2i -@@ -4656,7 +4591,6 @@ - .LP - FONTINFO: <same type definition as in - .PN QueryFont > --.in -.2i - .eM - .LP - This request is similar to -@@ -4685,7 +4619,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - This request defines the search path for font lookup. -@@ -4712,7 +4645,6 @@ - .in +.2i - .LP - path: LISTofSTRING8 --.in -.2i - .eM - .LP - This request returns the current search path for fonts. -@@ -4736,7 +4668,6 @@ - .PN Drawable , - .PN IDChoice , - .PN Value --.in -.2i - .eM - .LP - This request creates a pixmap and assigns the identifier pid to it. -@@ -4763,7 +4694,6 @@ - .LP - Errors: - .PN Pixmap --.in -.2i - .eM - .LP - This request deletes the association between the resource ID and the pixmap. -@@ -4791,7 +4721,6 @@ - .PN Match , - .PN Pixmap , - .PN Value --.in -.2i - .eM - .LP - This request creates a graphics context -@@ -5670,7 +5599,6 @@ - .PN Match , - .PN Pixmap , - .PN Value --.in -.2i - .eM - .LP - This request changes components in gc. -@@ -5705,7 +5633,6 @@ - .PN GContext , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request copies components from src-gc to dst-gc. -@@ -5731,7 +5658,6 @@ - .PN Alloc , - .PN GContext , - .PN Value --.in -.2i - .eM - .LP - This request sets dash-offset and dashes in gc for dashed line styles. -@@ -5810,7 +5736,6 @@ - .PN GContext , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request changes clip-mask in gc to the specified list of rectangles -@@ -5866,7 +5791,6 @@ - .LP - Errors: - .PN GContext --.in -.2i - .eM - .LP - This request deletes the association between the resource ID and the gcontext -@@ -5890,7 +5814,6 @@ - .PN Match , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - The x and y coordinates are relative to the window's origin -@@ -5939,7 +5862,6 @@ - .PN Drawable , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - This request combines the specified rectangle of src-drawable with the -@@ -6006,7 +5928,6 @@ - .PN GContext , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - The src-drawable must have the same root as dst-drawable (or a -@@ -6053,7 +5974,6 @@ - .PN GContext , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request combines the foreground pixel in gc with the pixel -@@ -6088,7 +6008,6 @@ - .PN GContext , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request draws lines between each pair of points (point[i], point[i+1]). -@@ -6145,7 +6064,6 @@ - .PN Drawable , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - For each segment, -@@ -6180,7 +6098,6 @@ - .PN Drawable , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - This request draws the outlines of the specified rectangles, as if a five-point -@@ -6223,7 +6140,6 @@ - .PN Drawable , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - This request draws circular or elliptical arcs. -@@ -6362,7 +6278,6 @@ - .PN GContext , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request fills the region closed by the specified path. -@@ -6428,7 +6343,6 @@ - .PN Drawable , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - This request fills the specified rectangles, as if a four-point -@@ -6469,7 +6383,6 @@ - .PN Drawable , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - For each arc, -@@ -6547,7 +6460,6 @@ - .PN GContext , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request combines an image with a rectangle of the drawable. -@@ -6617,7 +6529,6 @@ - \fIformat\fP\^: - .Pn { XYPixmap , - .PN ZPixmap } --.in -.2i - .LP - \(-> - .in +.2i -@@ -6633,7 +6544,6 @@ - .PN Drawable , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request returns the contents of the given rectangle of the drawable in the -@@ -6715,7 +6625,6 @@ - .PN Font , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - The x and y coordinates are relative to the drawable's origin -@@ -6776,7 +6685,6 @@ - .PN Font , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - This request is similar to -@@ -6805,7 +6713,6 @@ - .PN Drawable , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - The x and y coordinates are relative to the drawable's origin -@@ -6863,7 +6770,6 @@ - .PN Drawable , - .PN GContext , - .PN Match --.in -.2i - .eM - .LP - This request is similar to -@@ -6896,7 +6802,6 @@ - .PN Match , - .PN Value , - .PN Window --.in -.2i - .eM - .LP - This request creates a colormap of the specified visual type for the screen -@@ -6965,7 +6870,6 @@ - .LP - Errors: - .PN Colormap --.in -.2i - .eM - .LP - This request deletes the association between the resource ID and the colormap -@@ -7000,7 +6904,6 @@ - .PN Alloc , - .PN Colormap , - .PN IDChoice --.in -.2i - .eM - .LP - This request creates a colormap of the same visual type -@@ -7041,7 +6944,6 @@ - .LP - Errors: - .PN Colormap --.in -.2i - .eM - .LP - This request makes this colormap an installed map for its screen. -@@ -7091,7 +6993,6 @@ - .LP - Errors: - .PN Colormap --.in -.2i - .eM - .LP - If cmap is on the required list for its screen (see -@@ -7120,7 +7021,6 @@ - .in +.2i - .LP - \fIwindow\fP\^: WINDOW --.in -.2i - .LP - \(-> - .in +.2i -@@ -7129,7 +7029,6 @@ - .LP - Errors: - .PN Window --.in -.2i - .eM - .LP - This request returns a list of the currently installed colormaps for the -@@ -7148,7 +7047,6 @@ - \fIcmap\fP\^: COLORMAP - .br - \fIred\fP, \fIgreen\fP, \fIblue\fP\^: CARD16 --.in -.2i - .LP - \(-> - .in +.2i -@@ -7160,7 +7058,6 @@ - Errors: - .PN Alloc , - .PN Colormap --.in -.2i - .eM - .LP - This request allocates a read-only colormap entry corresponding to the closest -@@ -7178,7 +7075,6 @@ - \fIcmap\fP\^: COLORMAP - .br - \fIname\fP\^: STRING8 --.in -.2i - .LP - \(-> - .in +.2i -@@ -7193,7 +7089,6 @@ - .PN Alloc , - .PN Colormap , - .PN Name --.in -.2i - .eM - .LP - This request looks up the named color with respect to the screen associated -@@ -7217,7 +7112,6 @@ - \fIcolors\fP, \fIplanes\fP\^: CARD16 - .br - \fIcontiguous\fP\^: BOOL --.in -.2i - .LP - \(-> - .in +.2i -@@ -7228,7 +7122,6 @@ - .PN Alloc , - .PN Colormap , - .PN Value --.in -.2i - .eM - .LP - The number of colors must be positive, -@@ -7271,7 +7164,6 @@ - \fIcolors\fP, \fIreds\fP, \fIgreens\fP, \fIblues\fP\^: CARD16 - .br - \fIcontiguous\fP\^: BOOL --.in -.2i - .LP - \(-> - .in +.2i -@@ -7284,7 +7176,6 @@ - .PN Alloc , - .PN Colormap , - .PN Value --.in -.2i - .eM - .LP - The number of colors must be positive, -@@ -7335,7 +7226,6 @@ - .PN Access , - .PN Colormap , - .PN Value --.in -.2i - .eM - .LP - The plane-mask should not have any bits in common with any of the -@@ -7400,7 +7290,6 @@ - .PN Access , - .PN Colormap , - .PN Value --.in -.2i - .eM - .LP - This request changes the colormap entries of the specified pixels. -@@ -7439,7 +7328,6 @@ - .PN Colormap , - .PN Name , - .PN Value --.in -.2i - .eM - .LP - This request looks up the named color with respect to the screen associated -@@ -7464,7 +7352,6 @@ - \fIcmap\fP\^: COLORMAP - .br - \fIpixels\fP\^: LISTofCARD32 --.in -.2i - .LP - \(-> - .in +.2i -@@ -7479,7 +7366,6 @@ - Errors: - .PN Colormap , - .PN Value --.in -.2i - .eM - .LP - This request returns the hardware-specific color values stored in cmap for -@@ -7500,7 +7386,6 @@ - \fIcmap\fP\^: COLORMAP - .br - \fIname\fP\^: STRING8 --.in -.2i - .LP - \(-> - .in +.2i -@@ -7512,7 +7397,6 @@ - Errors: - .PN Colormap , - .PN Name --.in -.2i - .eM - .LP - This request looks up the string name of a color with respect to the screen -@@ -7546,7 +7430,6 @@ - .PN IDChoice , - .PN Match , - .PN Pixmap --.in -.2i - .eM - .LP - This request creates a cursor and associates identifier cid with it. -@@ -7610,7 +7493,6 @@ - .PN Font , - .PN IDChoice , - .PN Value --.in -.2i - .eM - .LP - This request is similar to -@@ -7650,7 +7532,6 @@ - .LP - Errors: - .PN Cursor --.in -.2i - .eM - .LP - This request deletes the association between the resource ID and the cursor. -@@ -7670,7 +7551,6 @@ - .LP - Errors: - .PN Cursor --.in -.2i - .eM - .LP - This request changes the color of a cursor. -@@ -7691,7 +7571,6 @@ - \fIdrawable\fP\^: DRAWABLE - .br - \fIwidth\fP, \fIheight\fP\^: CARD16 --.in -.2i - .LP - \(-> - .in +.2i -@@ -7702,7 +7581,6 @@ - .PN Drawable , - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request returns the best size that is closest to the argument size. -@@ -7741,7 +7619,6 @@ - .in +.2i - .LP - \fIname\fP\^: STRING8 --.in -.2i - .LP - \(-> - .in +.2i -@@ -7753,7 +7630,6 @@ - first-event: CARD8 - .br - first-error: CARD8 --.in -.2i - .eM - .LP - This request determines if the named extension is present. -@@ -7782,7 +7658,6 @@ - .in +.2i - .LP - names: LISTofSTRING8 --.in -.2i - .eM - .LP - This request returns a list of all extensions supported by the server. -@@ -7795,7 +7670,6 @@ - \fIkeycodes-per-modifier\fP\^: CARD8 - .br - \fIkeycodes\fP\^: LISTofKEYCODE --.in -.2i - .LP - \(-> - .in +.2i -@@ -7808,7 +7682,6 @@ - Errors: - .PN Alloc , - .PN Value --.in -.2i - .eM - .LP - This request specifies the keycodes (if any) of the keys to be used as -@@ -7875,7 +7748,6 @@ - keycodes-per-modifier: CARD8 - .br - keycodes: LISTofKEYCODE --.in -.2i - .eM - .LP - This request returns the keycodes of the keys being used as modifiers. -@@ -7914,7 +7786,6 @@ - Errors: - .PN Alloc , - .PN Value --.in -.2i - .eM - .LP - This request defines the symbols for the specified number of keycodes, -@@ -7968,7 +7839,6 @@ - \fIfirst-keycode\fP\^: KEYCODE - .br - \fIcount\fP\^: CARD8 --.in -.2i - .LP - \(-> - .in +.2i -@@ -7979,7 +7849,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - This request returns the symbols for the specified number of keycodes, -@@ -8027,7 +7896,6 @@ - Errors: - .PN Match , - .PN Value --.in -.2i - .eM - .LP - This request controls various aspects of the keyboard. -@@ -8185,7 +8053,6 @@ - .PN Off } - .br - auto-repeats: LISTofCARD8 --.in -.2i - .eM - .LP - This request returns the current control values for the keyboard. -@@ -8208,7 +8075,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - This request rings the bell on the keyboard at a volume relative to the -@@ -8233,7 +8099,6 @@ - .in +.2i - .LP - \fImap\fP\^: LISTofCARD8 --.in -.2i - .LP - \(-> - .in +.2i -@@ -8244,7 +8109,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - This request sets the mapping of the pointer. -@@ -8283,7 +8147,6 @@ - .in +.2i - .LP - map: LISTofCARD8 --.in -.2i - .eM - .LP - This request returns the current mapping of the pointer. -@@ -8306,7 +8169,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - This request defines how the pointer moves. -@@ -8332,7 +8194,6 @@ - acceleration-numerator, acceleration-denominator: CARD16 - .br - threshold: CARD16 --.in -.2i - .eM - .LP - This request returns the current acceleration and threshold for the pointer. -@@ -8357,7 +8218,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - The timeout and interval are specified in seconds; -@@ -8412,7 +8272,6 @@ - allow-exposures: - .Pn { Yes , - .PN No } --.in -.2i - .eM - .LP - This request returns the current screen-saver control values. -@@ -8429,7 +8288,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - If the mode is -@@ -8459,7 +8317,6 @@ - Errors: - .PN Access , - .PN Value --.in -.2i - .eM - .LP - This request adds or removes the specified host from the access control list. -@@ -8526,7 +8383,6 @@ - .PN Disabled } - .br - hosts: LISTofHOST --.in -.2i - .eM - .LP - This request returns the hosts on the access control list -@@ -8548,7 +8404,6 @@ - Errors: - .PN Access , - .PN Value --.in -.2i - .eM - .LP - This request enables or disables the use of the access control list -@@ -8573,7 +8428,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - This request defines what will happen to the client's resources -@@ -8594,7 +8448,6 @@ - .LP - Errors: - .PN Value --.in -.2i - .eM - .LP - If a valid resource is specified, -@@ -8811,7 +8664,6 @@ - \fIstate\fP\^: SETofKEYBUTMASK - .br - \fItime\fP\^: TIMESTAMP --.in -.2i - .eM - .LP - These events are generated either when a key or button logically changes state -@@ -8953,7 +8805,6 @@ - \fIstate\fP\^: SETofKEYBUTMASK - .br - \fItime\fP\^: TIMESTAMP --.in -.2i - .eM - .LP - If pointer motion or window hierarchy change causes the pointer to be -@@ -9181,7 +9032,6 @@ - \ \ \ \ \ \ \ \ \ \ \ - .PN PointerRoot , - .PN None } --.in -.2i - .eM - .LP - These events are generated when the input focus changes -@@ -9487,7 +9337,6 @@ - .in +.2i - .LP - \fIkeys\fP\^: LISTofCARD8 --.in -.2i - .eM - .LP - The value is a bit vector as described in -@@ -9510,7 +9359,6 @@ - \fIx\fP, \fIy\fP, \fIwidth\fP, \fIheight\fP\^: CARD16 - .br - \fIcount\fP\^: CARD16 --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9592,7 +9440,6 @@ - \fImajor-opcode\fP\^: CARD8 - .br - \fIminor-opcode\fP\^: CARD16 --.in -.2i - .eM - .LP - This event is reported to a client using a graphics context -@@ -9632,7 +9479,6 @@ - \fImajor-opcode\fP\^: CARD8 - .br - \fIminor-opcode:\fP\^ CARD16 --.in -.2i - .eM - .LP - This event is reported to a client using a graphics context -@@ -9663,7 +9509,6 @@ - .Pn { Unobscured , - .PN PartiallyObscured , - .PN FullyObscured } --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9735,7 +9580,6 @@ - \fIwidth\fP, \fIheight\fP, \fIborder-width\fP\^: CARD16 - .br - \fIoverride-redirect\fP\^: BOOL --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9753,7 +9597,6 @@ - .in +.2i - .LP - \fIevent\fP, \fIwindow\fP\^: WINDOW --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9783,7 +9626,6 @@ - \fIevent\fP, \fIwindow\fP\^: WINDOW - .br - \fIfrom-configure\fP\^: BOOL --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9809,7 +9651,6 @@ - \fIevent\fP, \fIwindow\fP\^: WINDOW - .br - \fIoverride-redirect\fP\^: BOOL --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9829,7 +9670,6 @@ - .in +.2i - .LP - \fIparent\fP, \fIwindow\fP\^: WINDOW --.in -.2i - .eM - .LP - This event is reported to the client selecting -@@ -9850,7 +9690,6 @@ - \fIx\fP, \fIy\fP\^: INT16 - .br - \fIoverride-redirect\fP\^: BOOL --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9882,7 +9721,6 @@ - .PN None - .br - \fIoverride-redirect\fP\^: BOOL --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9913,7 +9751,6 @@ - \fIevent\fP, \fIwindow\fP\^: WINDOW - .br - \fIx\fP, \fIy\fP\^: INT16 --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -9937,7 +9774,6 @@ - \fIwindow\fP\^: WINDOW - .br - \fIwidth\fP, \fIheight\fP\^: CARD16 --.in -.2i - .eM - .LP - This event is reported to the client selecting -@@ -9971,7 +9807,6 @@ - .PN Opposite } - .br - \fIvalue-mask\fP\^: BITMASK --.in -.2i - .eM - .LP - This event is reported to the client selecting -@@ -10001,7 +9836,6 @@ - \fIplace\fP\^: - .Pn { Top , - .PN Bottom } --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -10030,7 +9864,6 @@ - \fIplace\fP: - .Pn { Top , - .PN Bottom } --.in -.2i - .eM - .LP - This event is reported to the client selecting -@@ -10056,7 +9889,6 @@ - .PN Deleted } - .br - \fItime\fP\^: TIMESTAMP --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -10093,7 +9925,6 @@ - \fIselection\fP\^: ATOM - .br - \fItime\fP\^: TIMESTAMP --.in -.2i - .eM - .LP - This event is reported to the current owner of a selection -@@ -10123,7 +9954,6 @@ - .br - \fItime\fP\^: TIMESTAMP or - .PN CurrentTime --.in -.2i - .eM - .LP - This event is reported to the owner of a selection -@@ -10159,7 +9989,6 @@ - .br - \fItime\fP\^: TIMESTAMP or - .PN CurrentTime --.in -.2i - .eM - .LP - This event is generated by the server in response to a -@@ -10189,7 +10018,6 @@ - \fIstate\fP\^: - .Pn { Installed , - .PN Uninstalled } --.in -.2i - .eM - .LP - This event is reported to clients selecting -@@ -10216,7 +10044,6 @@ - .PN Pointer } - .br - \fIfirst-keycode\fP, \fIcount\fP\^: CARD8 --.in -.2i - .eM - .LP - This event is sent to all clients. -@@ -10249,7 +10076,6 @@ - \fIformat\fP\^: {8, 16, 32} - .br - \fIdata\fP\^: LISTofINT8 or LISTofINT16 or LISTofINT32 --.in -.2i - .eM - .LP - This event is only generated by clients using diff --git a/x11/XFree86-4-documents/files/patch-04 b/x11/XFree86-4-documents/files/patch-04 index 8b9208c747c3..503766c8ccbf 100644 --- a/x11/XFree86-4-documents/files/patch-04 +++ b/x11/XFree86-4-documents/files/patch-04 @@ -1,13 +1,14 @@ ---- specs/Imakefile~ Sat Mar 4 13:35:49 2000 -+++ specs/Imakefile Wed May 10 16:17:32 2000 -@@ -8,8 +8,8 @@ +--- specs/Imakefile.orig Sat Dec 16 15:39:49 2000 ++++ specs/Imakefile Wed Dec 20 17:51:49 2000 +@@ -7,9 +7,9 @@ + #if defined(SpecsDocDirs) && !BuildAllSpecsDocs SUBDIRS = SpecsDocDirs #else - SUBDIRS = BDF CTEXT FSProtocol ICCCM XProtocol Xserver X11 XDMCP XLFD \ -- Xaw Xmu Xt Xext Xi xfs PEX5 ICE SM xtrans XIM xterm rstart \ -- GL Xv i18n programs -+ Xaw Xmu Xt Xext xfs ICE SM xtrans xterm rstart \ -+ GL Xv i18n +-SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE PEX5 PM Render SM X11 XDMCP \ ++SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE PM Render SM X11 XDMCP \ + XIM XLFD XProtocol Xaw Xext Xi Xmu Xserver Xt Xv \ +- i18n programs rstart xfs xterm xtrans ++ i18n rstart xfs xterm xtrans #endif all:: diff --git a/x11/XFree86-4-documents/files/patch-05 b/x11/XFree86-4-documents/files/patch-05 deleted file mode 100644 index bf1e48b70a79..000000000000 --- a/x11/XFree86-4-documents/files/patch-05 +++ /dev/null @@ -1,10 +0,0 @@ ---- specs/i18n/Framework.ms.orig Wed May 10 16:13:03 2000 -+++ specs/i18n/Framework.ms Wed May 10 16:13:25 2000 -@@ -298,7 +298,6 @@ - .sp 1+4.344i - .PE - .if \n(00 .fi --.in -1c - .\" figure end - .LP - .ce diff --git a/x11/XFree86-4-documents/pkg-descr b/x11/XFree86-4-documents/pkg-descr index 5a6eae0451f8..c4473976a7a0 100644 --- a/x11/XFree86-4-documents/pkg-descr +++ b/x11/XFree86-4-documents/pkg-descr @@ -1,8 +1,3 @@ This package contains XFree86-4.0 documentations. WWW: http://www.xfree86.org/ - -Note: -This is part of the XFree86 distribution, there is a -complete distribution available in the ports collection -as well. diff --git a/x11/XFree86-4-documents/pkg-plist b/x11/XFree86-4-documents/pkg-plist index a2604e4f0c95..19ef485beeb3 100644 --- a/x11/XFree86-4-documents/pkg-plist +++ b/x11/XFree86-4-documents/pkg-plist @@ -1,6 +1,7 @@ lib/X11/doc/DPMS.TXT lib/X11/doc/DPMSLib.TXT lib/X11/doc/INSTALL.TXT +lib/X11/doc/PM_spec.TXT lib/X11/doc/PostScript/DPMS.PS lib/X11/doc/PostScript/DPMSLib.PS lib/X11/doc/PostScript/INSTALL.PS @@ -27,6 +28,7 @@ lib/X11/doc/libGL.TXT lib/X11/doc/mit-shm.TXT lib/X11/doc/record.TXT lib/X11/doc/recordlib.TXT +lib/X11/doc/render-protocol.TXT lib/X11/doc/shape.TXT lib/X11/doc/shapelib.TXT lib/X11/doc/tog-cup.TXT diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index efa8999eb623..72d32403376c 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -6,34 +6,70 @@ # PORTNAME= libraries -PORTVERSION= 4.0.1 -PORTREVISION= 2 +PORTVERSION= 4.0.3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz + +PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} +PATCHFILES= 4.0.2-4.0.3.diff.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= taguchi@tohoku.iij.ad.jp BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 +RUN_DEPENDS= mkhtmlindex:${PORTSDIR}/devel/imake-4 XFREE86_VERSION= 4 -XFREE86_HTML_MAN= yes PREFIX?= ${X11BASE} +MANCOMPRESSED= yes +XFREE86_HTML_MAN= yes MTREE_FILE= /etc/mtree/BSD.x11-4.dist INSTALLS_SHLIB= yes DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc -SCRIPTS_ENV+= PREFIX=${PREFIX} \ - X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} \ - DISTDIR=${DISTDIR} +SCRIPTS_ENV= HasXdmAuth=${HasXdmAuth} \ + HasSecureRPC=${HasSecureRPC} \ + BuildPexExt=${BuildPexExt} \ + BuildXinerama=${BuildXinerama} \ + BuildXIE=${BuildXIE} \ + BuildAoutLibraries=${BuildAoutLibraries} \ + ForceNormalLib=${ForceNormalLib} \ + DebuggableLibraries=${DebuggableLibraries} +MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ + PORTNAME=${PORTNAME} \ + PORTVERSION=${PORTVERSION} ALL_TARGET= FreeBSDPortsBuild INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man installXlib -MANCOMPRESSED= yes MAN1= libxrx.1 -MAN3= Xaw.3 +MAN3= Xaw.3 Xft.3 + +# XFree86 User Config: +# --- +# Name Default Meaning +# ---------------------------------------------------------------------------- +# HasXdmAuth YES support XDM-AUTHORIZATION-1. +# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later) +# BuildPexExt YES build PEX extension +# BuildXinerama YES build Xinerama extension +# BuildXIE YES build XIE extension +# BuildAoutLibraries NO build with old Aout libs. +# ForceNormalLib YES build with static libs. +# DebuggableLibraries NO build with debug libs (require FreeBSD-4 or later) +# ---------------------------------------------------------------------------- +# DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4 +# +HasXdmAuth?= DEFAULT +HasSecureRPC?= DEFAULT +BuildPexExt?= DEFAULT +BuildXinerama?= DEFAULT +BuildXIE?= DEFAULT +BuildAoutLibraries?= DEFAULT +ForceNormalLib?= DEFAULT +DebuggableLibraries?= DEFAULT +# End of XFree86 User Config .include <bsd.port.pre.mk> @@ -44,7 +80,7 @@ PLIST_SUB+= OSMESA:="@comment " PLIST_SUB+= OSMESA:="" .endif -.if defined(XDM_DES) +.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES .if ${USA_RESIDENT} == YES pre-fetch: @${ECHO} @@ -53,10 +89,13 @@ pre-fetch: MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/ -EXTRACT_ONLY= X401src-1.tgz +EXTRACT_ONLY= X402src-1.tgz DISTFILES+= Wraphelp.c IGNOREFILES= Wraphelp.c .endif .endif +do-configure: + cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index e9125a5f32c4..d680d0749a4e 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1 +1,3 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 +MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 +MD5 (xc/Wraphelp.c) = IGNORE diff --git a/x11/XFree86-4-libraries/files/patch-1 b/x11/XFree86-4-libraries/files/patch-1 deleted file mode 100644 index 31c93888d672..000000000000 --- a/x11/XFree86-4-libraries/files/patch-1 +++ /dev/null @@ -1,16 +0,0 @@ ---- programs/Xserver/hw/xfree86/input/joystick/Imakefile~ Fri Oct 8 01:24:05 1999 -+++ programs/Xserver/hw/xfree86/input/joystick/Imakefile Fri Oct 8 14:17:12 1999 -@@ -12,11 +12,11 @@ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) - - #ifdef LinuxArchitecture -- ARCH_JSTK = ../os-support/linux/lnx_jstk.o -+ARCH_JSTK = ../os-support/linux/lnx_jstk.o - #endif - - #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) -- ARCH_JSTK = ../os-support/bsd/bsd_jstk.o -+ARCH_JSTK = ../os-support/bsd/bsd_jstk.o - #endif - - #if MakeHasPosixVariableSubstitutions diff --git a/x11/XFree86-4-libraries/files/patch-2 b/x11/XFree86-4-libraries/files/patch-2 index 9a21575f9c0e..98d660a8c113 100644 --- a/x11/XFree86-4-libraries/files/patch-2 +++ b/x11/XFree86-4-libraries/files/patch-2 @@ -1,10 +1,26 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c~ Sun Aug 2 08:43:34 1998 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Mon Oct 11 02:27:32 1999 -@@ -97,7 +97,6 @@ +--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig Sun Jul 26 01:56:34 1998 ++++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Fri Jan 5 09:48:25 2001 +@@ -56,6 +56,7 @@ + int changed = 0; + int timeinmicros; + struct joystick js; ++ extern int errno; + + #ifdef DEBUG + ErrorF("xf86JoystickOn: %s\n", name); +@@ -96,7 +97,6 @@ + if (*centerY < 0) { *centerY = js.y; xf86Msg(X_PROBED, "Joystick: CenterY set to %d\n", *centerY); - } -- } +- } + } return status; +@@ -173,6 +173,7 @@ } + + #ifdef XFree86LOADER ++#define MAGIC_DONE 1 + /* + * Entry point for XFree86 Loader + */ diff --git a/x11/XFree86-4-libraries/files/patch-5 b/x11/XFree86-4-libraries/files/patch-5 deleted file mode 100644 index e238bcd921b4..000000000000 --- a/x11/XFree86-4-libraries/files/patch-5 +++ /dev/null @@ -1,12 +0,0 @@ ---- nls/Imakefile.old Tue Feb 15 18:25:36 2000 -+++ nls/Imakefile Tue Feb 15 18:25:39 2000 -@@ -9,6 +9,9 @@ - - SUBDIRS = XLC_LOCALE Compose - DEFINES = -DR63_COMPAT -+#if defined(FreeBSDArchitecture) -+STD_CPP_DEFINES+= -DINCLUDE_ru_SU -+#endif - - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) diff --git a/x11/XFree86-4-libraries/files/patch-6 b/x11/XFree86-4-libraries/files/patch-6 deleted file mode 100644 index 83a9a84943af..000000000000 --- a/x11/XFree86-4-libraries/files/patch-6 +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/xdm/sessreg.c.old Tue Feb 15 18:26:57 2000 -+++ programs/xdm/sessreg.c Tue Feb 15 18:26:59 2000 -@@ -76,7 +76,9 @@ - - #ifdef CSRG_BASED - /* *BSD doesn't like a ':0' type entry in utmp */ -+#ifndef __FreeBSD__ - #define NO_UTMP -+#endif - #endif - - #ifndef WTMP_FILE diff --git a/x11/XFree86-4-libraries/files/patch-8 b/x11/XFree86-4-libraries/files/patch-8 deleted file mode 100644 index db57387d876a..000000000000 --- a/x11/XFree86-4-libraries/files/patch-8 +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.old Tue Feb 15 19:36:32 2000 -+++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl Tue Feb 15 19:36:37 2000 -@@ -590,6 +590,9 @@ - if { $mseRes <= 0 } { - set mseRes 100 - } -+ if { $mseRes > 200 } { -+ set mseRes 200 -+ } - $w.mouse.resolution.$mseRes invoke - set mseButtons $initbtn - if { $mseButtons < 3 } { diff --git a/x11/XFree86-4-libraries/files/patch-9 b/x11/XFree86-4-libraries/files/patch-9 deleted file mode 100644 index 0cf20b3fa946..000000000000 --- a/x11/XFree86-4-libraries/files/patch-9 +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig Sun Aug 20 09:21:07 2000 -+++ programs/Xserver/hw/xfree86/loader/xf86sym.c Sun Aug 20 09:22:28 2000 -@@ -861,7 +861,7 @@ - of the X server) easier. */ - SYMFUNC(xf86InstallSIGIOHandler) - SYMFUNC(xf86RemoveSIGIOHandler) --#ifdef __alpha__ -+#if defined(__alpha__) && defined(linux) - SYMFUNC(_bus_base) - #endif - #endif diff --git a/x11/XFree86-4-libraries/files/patch-c b/x11/XFree86-4-libraries/files/patch-c index 4043a25bd8bc..ea9412dd52f7 100644 --- a/x11/XFree86-4-libraries/files/patch-c +++ b/x11/XFree86-4-libraries/files/patch-c @@ -1,6 +1,6 @@ ---- config/cf/Imake.tmpl.orig Tue Jun 27 09:55:44 2000 -+++ config/cf/Imake.tmpl Wed Sep 6 14:22:34 2000 -@@ -1385,7 +1385,7 @@ +--- config/cf/Imake.tmpl.orig Tue Dec 5 10:16:28 2000 ++++ config/cf/Imake.tmpl Tue Dec 5 10:39:48 2000 +@@ -1425,7 +1425,7 @@ CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) @@ -9,12 +9,11 @@ #endif COMPRESS = CompressCmd GZIPCMD = GzipCmd -@@ -1574,7 +1574,8 @@ +@@ -1616,7 +1616,7 @@ */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) + CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib diff --git a/x11/XFree86-4-libraries/files/patch-c2 b/x11/XFree86-4-libraries/files/patch-c2 new file mode 100644 index 000000000000..e585d0765e41 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-c2 @@ -0,0 +1,41 @@ +--- /usr/local/src/XFree86-4/ORIG/xc/config/cf/Library.tmpl Tue Dec 5 11:59:31 2000 ++++ config/cf/Library.tmpl Tue Dec 19 17:18:56 2000 +@@ -67,7 +67,7 @@ + STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) + CDEBUGFLAGS = LibraryCDebugFlags + CLIBDEBUGFLAGS = LibraryDebugOpt +- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) ++ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) + # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) + PICFLAGS = LargePositionIndependentCFlags + # endif +@@ -92,7 +92,7 @@ + STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) + CXXDEBUGFLAGS = LibraryCplusplusDebugFlags + CXXLIBDEBUGFLAGS = LibraryDebugOpt +- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) ++ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) + # if defined(LargePICTable) && LargePICTable + # ifdef LargePositionIndependentCplusplusFlags + CXXPICFLAGS = LargePositionIndependentCplusplusFlags +@@ -434,15 +434,19 @@ + # ifdef IncSubdir + # ifdef IncSubSubdir + BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..) ++# if !defined(LibHeaders) || LibHeaders + InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS)) ++# endif /* LibHeaders */ + # else + BuildIncludes($(HEADERS),IncSubdir,..) ++# if !defined(LibHeaders) || LibHeaders + InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS)) ++# endif /* LibHeaders */ + # endif + # else + # ifndef CplusplusSource +-# if !defined(LibHeaders) || LibHeaders + BuildIncludesTop($(HEADERS)) ++# if !defined(LibHeaders) || LibHeaders + InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS)) + # endif + # endif diff --git a/x11/XFree86-4-libraries/files/patch-config_cf_Server_tmpl b/x11/XFree86-4-libraries/files/patch-config_cf_Server_tmpl deleted file mode 100644 index dde9241e3eda..000000000000 --- a/x11/XFree86-4-libraries/files/patch-config_cf_Server_tmpl +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/Server.tmpl.orig Fri Feb 18 08:23:07 2000 -+++ config/cf/Server.tmpl Sat Oct 28 10:09:07 2000 -@@ -41,7 +41,7 @@ - #ifndef SetUIDServerTarget - #if InstallServerSetUID - #define SetUIDServerTarget(server,subdirs,objects,libs,syslibs) @@\ --ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTUIDFLAGS)) -+ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTBINFLAGS)) - #else - #define SetUIDServerTarget ServerTarget - #endif diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d index 38955bdd8011..f06579be92ca 100644 --- a/x11/XFree86-4-libraries/files/patch-d +++ b/x11/XFree86-4-libraries/files/patch-d @@ -1,33 +1,6 @@ ---- config/cf/FreeBSD.cf.orig Sat Jun 24 21:15:53 2000 -+++ config/cf/FreeBSD.cf Tue Aug 1 15:19:44 2000 -@@ -135,6 +135,18 @@ - #endif - #endif - -+#ifndef HasAgpGart -+# ifdef i386Architecture -+# if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1) -+# define HasAgpGart YES -+# else -+# define HasAgpGart NO -+# endif -+# else -+# define HasAgpGart NO -+# endif -+#endif -+ - /* - * This doesn't work the way it does on every other system. On FreeBSD it's - * only a "hint, not a demand", whatever that means. Note that this is not -@@ -351,19 +368,22 @@ - #else - #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC -+#endif -+#ifndef HasPam -+#define HasPam YES - #endif - +--- config/cf/FreeBSD.cf~ Tue Dec 5 10:16:28 2000 ++++ config/cf/FreeBSD.cf Tue Dec 5 10:45:42 2000 +@@ -371,14 +371,14 @@ /* 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) diff --git a/x11/XFree86-4-libraries/files/patch-f b/x11/XFree86-4-libraries/files/patch-f index df8aca1cf623..33642a0326d4 100644 --- a/x11/XFree86-4-libraries/files/patch-f +++ b/x11/XFree86-4-libraries/files/patch-f @@ -1,29 +1,28 @@ ---- nls/compose.dir.orig Sun Mar 19 23:18:49 2000 -+++ nls/compose.dir Sun Mar 19 23:19:10 2000 -@@ -179,7 +179,7 @@ - vi_VN.tcvn/Compose vi_VN.TCVN - iso8859-1/Compose wa_BE.ISO8859-1 +--- nls/compose.dir~ Tue Dec 12 03:52:39 2000 ++++ nls/compose.dir Tue Dec 12 03:53:04 2000 +@@ -209,7 +209,7 @@ zh/Compose zh_CN.eucCN --zh_TW.big5/Compose zh_TW.big5 + zh/Compose zh_CN.GB2312 + zh_TW.big5/Compose zh_TW.big5 +-zh_TW.big5/Compose zh_TW.Big5 +zh_TW.Big5/Compose zh_TW.Big5 zh_TW/Compose zh_TW.eucTW - en_US.utf/Compose en_US.utf #endif /* R63_COMPAT */ -@@ -355,6 +355,6 @@ - vi_VN.tcvn/Compose: vi_VN.TCVN - iso8859-1/Compose: wa_BE.ISO8859-1 - zh/Compose: zh_CN.eucCN --zh_TW.big5/Compose: zh_TW.big5 + +@@ -415,5 +415,5 @@ + zh/Compose: zh_CN.GB2312 + microsoft-cp1255/Compose: yi_US.CP1256 + zh_TW.big5/Compose: zh_TW.big5 +-zh_TW.big5/Compose: zh_TW.Big5 +zh_TW.Big5/Compose: zh_TW.Big5 zh_TW/Compose: zh_TW.eucTW - en_US.utf/Compose: en_US.utf ---- nls/locale.alias.orig Sun Mar 19 23:19:31 2000 -+++ nls/locale.alias Sun Mar 19 23:19:57 2000 -@@ -437,14 +437,14 @@ - wa_BE.iso885915 wa_BE.ISO8859-15 +--- nls/locale.alias~ Tue Dec 12 03:18:29 2000 ++++ nls/locale.alias Tue Dec 12 03:58:51 2000 +@@ -444,11 +444,11 @@ zh zh_CN.eucCN zh_CN zh_CN.eucCN --zh_CN.big5 zh_TW.big5 + zh_CN.big5 zh_TW.big5 +-zh_CN.Big5 zh_TW.big5 +zh_CN.Big5 zh_TW.Big5 zh_CN.EUC zh_CN.eucCN zh_CN.euc zh_CN.eucCN @@ -32,22 +31,19 @@ +zh_TW zh_TW.Big5 zh_TW.EUC zh_TW.eucTW zh_TW.euc zh_TW.eucTW --zh_TW.big5 zh_TW.big5 -+zh_TW.Big5 zh_TW.Big5 - XCOMM The following locale names are used in SCO 3.0 - english_uk.8859 en_GB.ISO8859-1 -@@ -933,14 +933,14 @@ - wa_BE.iso885915: wa_BE.ISO8859-15 +@@ -1034,15 +1034,15 @@ + yi_US.MICROSOFT-CP1255: yi_US.CP1255 zh: zh_CN.eucCN zh_CN: zh_CN.eucCN -zh_CN.big5: zh_TW.big5 +-zh_CN.Big5: zh_TW.big5 ++zh_CN.Big5: zh_TW.Big5 +zh_CN.Big5: zh_TW.Big5 zh_CN.EUC: zh_CN.eucCN zh_CN.euc: zh_CN.eucCN zh_CN.gb2312: zh_CN.eucCN --zh_TW: zh_TW.big5 -+zh_TW: zh_TW.Big5 + zh_TW: zh_TW.big5 zh_TW.EUC: zh_TW.eucTW zh_TW.euc: zh_TW.eucTW -zh_TW.big5: zh_TW.big5 @@ -55,37 +51,37 @@ XCOMM The following locale names are used in SCO 3.0 english_uk.8859: en_GB.ISO8859-1 ---- nls/locale.dir.orig Sun Mar 19 23:20:02 2000 -+++ nls/locale.dir Sun Mar 19 23:20:17 2000 -@@ -165,7 +165,7 @@ - iso8859-1/XLC_LOCALE wa_BE.ISO8859-1 - iso8859-15/XLC_LOCALE wa_BE.ISO8859-15 +--- nls/locale.dir~ Tue Dec 12 03:18:29 2000 ++++ nls/locale.dir Tue Dec 12 04:01:54 2000 +@@ -199,7 +199,7 @@ zh/XLC_LOCALE zh_CN.eucCN --zh_TW.big5/XLC_LOCALE zh_TW.big5 + zh/XLC_LOCALE zh_CN.GB2312 + zh_TW.big5/XLC_LOCALE zh_TW.big5 +-zh_TW.big5/XLC_LOCALE zh_TW.Big5 +zh_TW.Big5/XLC_LOCALE zh_TW.Big5 - zh_TW.cns11643/XLC_LOCALE zh_TW.eucTW - en_US.utf/XLC_LOCALE en_US.utf + zh_TW/XLC_LOCALE zh_TW.eucTW XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress. -@@ -447,7 +447,7 @@ - iso8859-1/XLC_LOCALE: wa_BE.ISO8859-1 - iso8859-15/XLC_LOCALE: wa_BE.ISO8859-15 + en_US.UTF-8/XLC_LOCALE af_ZA.UTF-8 +@@ -533,7 +533,7 @@ zh/XLC_LOCALE: zh_CN.eucCN --zh_TW.big5/XLC_LOCALE: zh_TW.big5 + zh/XLC_LOCALE: zh_CN.GB2312 + zh_TW.big5/XLC_LOCALE: zh_TW.big5 +-zh_TW.big5/XLC_LOCALE: zh_TW.Big5 +zh_TW.Big5/XLC_LOCALE: zh_TW.Big5 - zh_TW.cns11643/XLC_LOCALE: zh_TW.eucTW - en_US.utf/XLC_LOCALE: en_US.utf + zh_TW/XLC_LOCALE: zh_TW.eucTW XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress. ---- nls/Compose/Imakefile.orig Sun Aug 29 21:59:37 1999 -+++ nls/Compose/Imakefile Mon Mar 20 07:19:11 2000 -@@ -52,5 +52,5 @@ + en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8 +--- nls/Compose/Imakefile.orig Fri Dec 8 02:52:48 2000 ++++ nls/Compose/Imakefile Tue Dec 12 03:18:29 2000 +@@ -58,5 +58,5 @@ ComposeTarget(vi_VN.viscii) ComposeTarget(zh) ComposeTarget(zh_TW) -ComposeTarget(zh_TW.big5) +ComposeTarget(zh_TW.Big5) ---- nls/Compose/zh_TW.Big5.orig Sun Mar 19 23:27:50 2000 -+++ nls/Compose/zh_TW.Big5 Sat Aug 28 17:00:40 1999 +--- nls/Compose/zh_TW.Big5.orig Sun Jul 16 04:33:35 2000 ++++ nls/Compose/zh_TW.Big5 Sun Jul 16 04:33:35 2000 @@ -0,0 +1,15 @@ +# +# zh_TW.big5 Compose Sequence @@ -102,19 +98,20 @@ +# Special Character + +# End of Sequence Definition ---- nls/XLC_LOCALE/Imakefile.orig Sat Feb 12 14:28:24 2000 -+++ nls/XLC_LOCALE/Imakefile Mon Mar 20 07:21:26 2000 -@@ -76,6 +76,7 @@ +--- nls/XLC_LOCALE/Imakefile~ Tue Dec 12 03:18:29 2000 ++++ nls/XLC_LOCALE/Imakefile Tue Dec 12 04:07:10 2000 +@@ -86,7 +86,7 @@ LTarget(vi_VN.viscii) LTarget(zh) LTarget(zh_TW) +-LTarget(zh_TW.big5) +LTarget(zh_TW.Big5) LTarget(th_TH.TACTIS) - LTarget(en_US.utf) LTarget(en_US.UTF-8) ---- nls/XLC_LOCALE/zh_TW.Big5.orig Sun Mar 19 23:27:55 2000 -+++ nls/XLC_LOCALE/zh_TW.Big5 Sun Mar 19 23:27:33 2000 -@@ -0,0 +1,69 @@ + #ifdef UXPArchitecture +--- nls/XLC_LOCALE/zh_TW.Big5.orig Sun Jul 16 04:33:35 2000 ++++ nls/XLC_LOCALE/zh_TW.Big5 Sun Jul 16 04:36:58 2000 +@@ -0,0 +1,70 @@ +XCOMM +XCOMM (c) 1996, X11R6 L10N for Taiwan and Big5 Encoding Project +XCOMM @@ -142,6 +139,7 @@ + } + font { + primary BIG5-0:GLGR ++ substitute BIG5-0:GLGR + } +} +END XLC_FONTSET @@ -151,15 +149,15 @@ +XCOMM +XLC_XLOCALE + -+encoding_name zh_TW.big5 ++encoding_name zh_TW.Big5 +mb_cur_max 2 +state_depend_encoding False + +wc_encoding_mask \x00008000 +wc_shift_bits 8 + -+XCOMMuse_stdc_env False -+XCOMMforce_convert_to_mb True ++use_stdc_env True ++force_convert_to_mb True + +XCOMM cs0 class +cs0 { diff --git a/x11/XFree86-4-libraries/files/patch-g b/x11/XFree86-4-libraries/files/patch-g deleted file mode 100644 index 25d4e7688839..000000000000 --- a/x11/XFree86-4-libraries/files/patch-g +++ /dev/null @@ -1,317 +0,0 @@ ---- extras/X-TrueType/BIG5/BIG5toUCS2.c.orig Fri Feb 18 01:11:40 2000 -+++ extras/X-TrueType/BIG5/BIG5toUCS2.c Sat Jun 24 23:07:30 2000 -@@ -49,9 +49,9 @@ - static ucs2_t tblBig5ToUcs2[] = { - /* 0xA140 - 0xA1FF */ - 0x3000, 0xFF0C, 0x3001, 0x3002, 0xFF0E, 0x2022, 0xFF1B, 0xFF1A, -- 0xFF1F, 0xFF01, 0xFE30, 0x2026, 0x2025, 0xFE50, 0xFF64, 0xFE52, -+ 0xFF1F, 0xFF01, 0xFE30, 0x2026, 0x2025, 0xFE50, 0xFE51, 0xFE52, - 0x00B7, 0xFE54, 0xFE55, 0xFE56, 0xFE57, 0xFF5C, 0x2013, 0xFE31, -- 0x2014, 0xFE33, 0xFFFD, 0xFE34, 0xFE4F, 0xFF08, 0xFF09, 0xFE35, -+ 0x2014, 0xFE33, 0x02CD, 0xFE34, 0xFE4F, 0xFF08, 0xFF09, 0xFE35, - 0xFE36, 0xFF5B, 0xFF5D, 0xFE37, 0xFE38, 0x3014, 0x3015, 0xFE39, - 0xFE3A, 0x3010, 0x3011, 0xFE3B, 0xFE3C, 0x300A, 0x300B, 0xFE3D, - 0xFE3E, 0x3008, 0x3009, 0xFE3F, 0xFE40, 0x300C, 0x300D, 0xFE41, -@@ -64,16 +64,16 @@ - 0x201D, 0x301D, 0x301E, 0x2035, 0x2032, 0xFF03, 0xFF06, 0xFF0A, - 0x203B, 0x00A7, 0x3003, 0x25CB, 0x25CF, 0x25B3, 0x25B2, 0x25CE, - 0x2606, 0x2605, 0x25C7, 0x25C6, 0x25A1, 0x25A0, 0x25BD, 0x25BC, -- 0x32A3, 0x2105, 0x203E, 0xFFFD, 0xFF3F, 0xFFFD, 0xFE49, 0xFE4A, -+ 0x32A3, 0x2105, 0x203E, 0xFFE3, 0xFF3F, 0x02CD, 0xFE49, 0xFE4A, - 0xFE4D, 0xFE4E, 0xFE4B, 0xFE4C, 0xFE5F, 0xFE60, 0xFE61, 0xFF0B, - 0xFF0D, 0x00D7, 0x00F7, 0x00B1, 0x221A, 0xFF1C, 0xFF1E, 0xFF1D, - 0x2266, 0x2267, 0x2260, 0x221E, 0x2252, 0x2261, 0xFE62, 0xFE63, -- 0xFE64, 0xFE65, 0xFE66, 0x223C, 0x2229, 0x222A, 0x22A5, 0x2220, -+ 0xFE64, 0xFE65, 0xFE66, 0xFF5E, 0x2229, 0x222A, 0x22A5, 0x2220, - 0x221F, 0x22BF, 0x33D2, 0x33D1, 0x222B, 0x222E, 0x2235, 0x2234, - 0x2640, 0x2642, 0x2641, 0x2609, 0x2191, 0x2193, 0x2190, 0x2192, -- 0x2196, 0x2197, 0x2199, 0x2198, 0x2225, 0x2223, 0xFFFD, ALTCHR, -+ 0x2196, 0x2197, 0x2199, 0x2198, 0x2225, 0x2223, 0xFF0F, ALTCHR, - /* 0xA240 - 0xA2FF */ -- 0xFFFD, 0xFF0F, 0xFF3C, 0xFF04, 0x00A5, 0x3012, 0x00A2, 0x00A3, -+ 0xFF3C, 0xFF0F, 0xFF3C, 0xFF04, 0xFFE5, 0x3012, 0x00A2, 0x00A3, - 0xFF05, 0xFF20, 0x2103, 0x2109, 0xFE69, 0xFE6A, 0xFE6B, 0x33D5, - 0x339C, 0x339D, 0x339E, 0x33CE, 0x33A1, 0x338E, 0x338F, 0x33C4, - 0x00B0, 0x5159, 0x515B, 0x515E, 0x515D, 0x5161, 0x5163, 0x55E7, -@@ -90,7 +90,7 @@ - 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, - 0xFF19, 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, - 0x2167, 0x2168, 0x2169, 0x3021, 0x3022, 0x3023, 0x3024, 0x3025, -- 0x3026, 0x3027, 0x3028, 0x3029, 0xFFFD, 0x5344, 0xFFFD, 0xFF21, -+ 0x3026, 0x3027, 0x3028, 0x3029, 0x5341, 0x5344, 0x5345, 0xFF21, - 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27, 0xFF28, 0xFF29, - 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F, 0xFF30, 0xFF31, - 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37, 0xFF38, 0xFF39, -@@ -985,68 +985,68 @@ - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, 0x30FE, 0x309D, 0x309E, 0x3005, 0x3041, 0x3042, 0x3043, -- 0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, 0x304A, 0x304B, -- 0x304C, 0x304D, 0x304E, 0x304F, 0x3050, 0x3051, 0x3052, 0x3053, -- 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305A, 0x305B, -- 0x305C, 0x305D, 0x305E, 0x305F, 0x3060, 0x3061, 0x3062, 0x3063, -- 0x3064, 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306A, 0x306B, -- 0x306C, 0x306D, 0x306E, 0x306F, 0x3070, 0x3071, 0x3072, 0x3073, -- 0x3074, 0x3075, 0x3076, 0x3077, 0x3078, 0x3079, 0x307A, 0x307B, -- 0x307C, 0x307D, 0x307E, 0x307F, 0x3080, 0x3081, 0x3082, 0x3083, -- 0x3084, 0x3085, 0x3086, 0x3087, 0x3088, 0x3089, 0x308A, 0x308B, -- 0x308C, 0x308D, 0x308E, 0x308F, 0x3090, 0x3091, 0x3092, 0x3093, -- 0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7, ALTCHR, --/* 0xC740 - 0xC7FF */ -- 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF, -- 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7, -- 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF, -- 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7, -- 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF, -- 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7, -- 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF, -- 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, 0x30E7, 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, -- 0x30EE, 0x30EF, 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, -- 0x30F6, 0x0414, 0x0415, 0x0401, 0x0416, 0x0417, 0x0418, 0x0419, -- 0x041A, 0x041B, 0x041C, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, -- 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, -- 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436, -- 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, -- 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, -- 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, -- 0x044F, 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, -- 0x2467, 0x2468, 0x2469, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, -- 0x2479, 0x247A, 0x247B, 0x247C, 0x247D, ALTCHR, ALTCHR, ALTCHR, --/* 0xC840 - 0xC8FF */ -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xF6B1, 0xF6B2, 0xF6B3, 0xF6B4, 0xF6B5, 0xF6B6, 0xF6B7, -+ 0xF6B8, 0xF6B9, 0xF6BA, 0xF6BB, 0xF6BC, 0xF6BD, 0xF6BE, 0xF6BF, -+ 0xF6C0, 0xF6C1, 0xF6C2, 0xF6C3, 0xF6C4, 0xF6C5, 0xF6C6, 0xF6C7, -+ 0xF6C8, 0xF6C9, 0xF6CA, 0xF6CB, 0xF6CC, 0xF6CD, 0xF6CE, 0xF6CF, -+ 0xF6D0, 0xF6D1, 0xF6D2, 0xF6D3, 0xF6D4, 0xF6D5, 0xF6D6, 0xF6D7, -+ 0xF6D8, 0xF6D9, 0xF6DA, 0xF6DB, 0xF6DC, 0xF6DD, 0xF6DE, 0xF6DF, -+ 0xF6E0, 0xF6E1, 0xF6E2, 0xF6E3, 0xF6E4, 0xF6E5, 0xF6E6, 0xF6E7, -+ 0xF6E8, 0xF6E9, 0xF6EA, 0xF6EB, 0xF6EC, 0xF6ED, 0xF6EE, 0xF6EF, -+ 0xF6F0, 0xF6F1, 0xF6F2, 0xF6F3, 0xF6F4, 0xF6F5, 0xF6F6, 0xF6F7, -+ 0xF6F8, 0xF6F9, 0xF6FA, 0xF6FB, 0xF6FC, 0xF6FD, 0xF6FE, 0xF6FF, -+ 0xF700, 0xF701, 0xF702, 0xF703, 0xF704, 0xF705, 0xF706, 0xF707, -+ 0xF708, 0xF709, 0xF70A, 0xF70B, 0xF70C, 0xF70D, 0xF70E, ALTCHR, -+/* 0xC740 - 0xC7FF */ -+ 0xF70F, 0xF710, 0xF711, 0xF712, 0xF713, 0xF714, 0xF715, 0xF716, -+ 0xF717, 0xF718, 0xF719, 0xF71A, 0xF71B, 0xF71C, 0xF71D, 0xF71E, -+ 0xF71F, 0xF720, 0xF721, 0xF722, 0xF723, 0xF724, 0xF725, 0xF726, -+ 0xF727, 0xF728, 0xF729, 0xF72A, 0xF72B, 0xF72C, 0xF72D, 0xF72E, -+ 0xF72F, 0xF730, 0xF731, 0xF732, 0xF733, 0xF734, 0xF735, 0xF736, -+ 0xF737, 0xF738, 0xF739, 0xF73A, 0xF73B, 0xF73C, 0xF73D, 0xF73E, -+ 0xF73F, 0xF740, 0xF741, 0xF742, 0xF743, 0xF744, 0xF745, 0xF746, -+ 0xF747, 0xF748, 0xF749, 0xF74A, 0xF74B, 0xF74C, 0xF74D, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xF74E, 0xF74F, 0xF750, 0xF751, 0xF752, 0xF753, 0xF754, -+ 0xF755, 0xF756, 0xF757, 0xF758, 0xF759, 0xF75A, 0xF75B, 0xF75C, -+ 0xF75D, 0xF75E, 0xF75F, 0xF760, 0xF761, 0xF762, 0xF763, 0xF764, -+ 0xF765, 0xF766, 0xF767, 0xF768, 0xF769, 0xF76A, 0xF76B, 0xF76C, -+ 0xF76D, 0xF76E, 0xF76F, 0xF770, 0xF771, 0xF772, 0xF773, 0xF774, -+ 0xF775, 0xF776, 0xF777, 0xF778, 0xF779, 0xF77A, 0xF77B, 0xF77C, -+ 0xF77D, 0xF77E, 0xF77F, 0xF780, 0xF781, 0xF782, 0xF783, 0xF784, -+ 0xF785, 0xF786, 0xF787, 0xF788, 0xF789, 0xF78A, 0xF78B, 0xF78C, -+ 0xF78D, 0xF78E, 0xF78F, 0xF790, 0xF791, 0xF792, 0xF793, 0xF794, -+ 0xF795, 0xF796, 0xF797, 0xF798, 0xF799, 0xF79A, 0xF79B, 0xF79C, -+ 0xF79D, 0xF79E, 0xF79F, 0xF7A0, 0xF7A1, 0xF7A2, 0xF7A3, 0xF7A4, -+ 0xF7A5, 0xF7A6, 0xF7A7, 0xF7A8, 0xF7A9, 0xF7AA, 0xF7AB, ALTCHR, -+/* 0xC840 - 0xC8FF */ -+ 0xF7AC, 0xF7AD, 0xF7AE, 0xF7AF, 0xF7B0, 0xF7B1, 0xF7B2, 0xF7B3, -+ 0xF7B4, 0xF7B5, 0xF7B6, 0xF7B7, 0xF7B8, 0xF7B9, 0xF7BA, 0xF7BB, -+ 0xF7BC, 0xF7BD, 0xF7BE, 0xF7BF, 0xF7C0, 0xF7C1, 0xF7C2, 0xF7C3, -+ 0xF7C4, 0xF7C5, 0xF7C6, 0xF7C7, 0xF7C8, 0xF7C9, 0xF7CA, 0xF7CB, -+ 0xF7CC, 0xF7CD, 0xF7CE, 0xF7CF, 0xF7D0, 0xF7D1, 0xF7D2, 0xF7D3, -+ 0xF7D4, 0xF7D5, 0xF7D6, 0xF7D7, 0xF7D8, 0xF7D9, 0xF7DA, 0xF7DB, -+ 0xF7DC, 0xF7DD, 0xF7DE, 0xF7DF, 0xF7E0, 0xF7E1, 0xF7E2, 0xF7E3, -+ 0xF7E4, 0xF7E5, 0xF7E6, 0xF7E7, 0xF7E8, 0xF7E9, 0xF7EA, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, - ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xF7EB, 0xF7EC, 0xF7ED, 0xF7EE, 0xF7EF, 0xF7F0, 0xF7F1, -+ 0xF7F2, 0xF7F3, 0xF7F4, 0xF7F5, 0xF7F6, 0xF7F7, 0xF7F8, 0xF7F9, -+ 0xF7FA, 0xF7FB, 0xF7FC, 0xF7FD, 0xF7FE, 0xF7FF, 0xF800, 0xF801, -+ 0xF802, 0xF803, 0xF804, 0xF805, 0xF806, 0xF807, 0xF808, 0xF809, -+ 0xF80A, 0xF80B, 0xF80C, 0xF80D, 0xF80E, 0xF80F, 0xF810, 0xF811, -+ 0xF812, 0xF813, 0xF814, 0xF815, 0xF816, 0xF817, 0xF818, 0xF819, -+ 0xF81A, 0xF81B, 0xF81C, 0xF81D, 0xF81E, 0xF81F, 0xF820, 0xF821, -+ 0xF822, 0xF823, 0xF824, 0xF825, 0xF826, 0xF827, 0xF828, 0xF829, -+ 0xF82A, 0xF82B, 0xF82C, 0xF82D, 0xF82E, 0xF82F, 0xF830, 0xF831, -+ 0xF832, 0xF833, 0xF834, 0xF835, 0xF836, 0xF837, 0xF838, 0xF839, -+ 0xF83A, 0xF83B, 0xF83C, 0xF83D, 0xF83E, 0xF83F, 0xF840, 0xF841, -+ 0xF842, 0xF843, 0xF844, 0xF845, 0xF846, 0xF847, 0xF848, ALTCHR, - /* 0xC940 - 0xC9FF */ - 0x4E42, 0x4E5C, 0x51F5, 0x531A, 0x5382, 0x4E07, 0x4E0C, 0x4E47, - 0x4E8D, 0x56D7, 0xFA0C, 0x5C6E, 0x5F73, 0x4E0F, 0x5187, 0x4E0E, -@@ -2266,17 +2266,142 @@ - 0x9E17, 0x9F48, 0x6207, 0x6B1E, 0x7227, 0x864C, 0x8EA8, 0x9482, - 0x9480, 0x9481, 0x9A69, 0x9A68, 0x9B2E, 0x9E19, 0x7229, 0x864B, - 0x8B9F, 0x9483, 0x9C79, 0x9EB7, 0x7675, 0x9A6B, 0x9C7A, 0x9E1D, -- 0x7069, 0x706A, 0x9EA4, 0x9F7E, 0x9F49, 0x9F98, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -- ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ 0x7069, 0x706A, 0x9EA4, 0x9F7E, 0x9F49, 0x9F98, 0x7881, 0x92B9, -+ 0x88CF, 0x58BB, 0x6052, 0x7CA7, 0x5AFA, 0x2554, 0x2566, 0x2557, -+ 0x2560, 0x256C, 0x2563, 0x255A, 0x2569, 0x255D, 0x2552, 0x2564, -+ 0x2555, 0x255E, 0x256A, 0x2561, 0x2558, 0x2567, 0x255B, 0x2553, -+ 0x2565, 0x2556, 0x255F, 0x256B, 0x2562, 0x2559, 0x2568, 0x255C, -+ 0x2551, 0x2550, 0x256D, 0x256E, 0x2570, 0x256F, 0x2593, ALTCHR, -+/* 0xFA40 - 0xFAFF */ -+ 0xE000, 0xE001, 0xE002, 0xE003, 0xE004, 0xE005, 0xE006, 0xE007, -+ 0xE008, 0xE009, 0xE00A, 0xE00B, 0xE00C, 0xE00D, 0xE00E, 0xE00F, -+ 0xE010, 0xE011, 0xE012, 0xE013, 0xE014, 0xE015, 0xE016, 0xE017, -+ 0xE018, 0xE019, 0xE01A, 0xE01B, 0xE01C, 0xE01D, 0xE01E, 0xE01F, -+ 0xE020, 0xE021, 0xE022, 0xE023, 0xE024, 0xE025, 0xE026, 0xE027, -+ 0xE028, 0xE029, 0xE02A, 0xE02B, 0xE02C, 0xE02D, 0xE02E, 0xE02F, -+ 0xE030, 0xE031, 0xE032, 0xE033, 0xE034, 0xE035, 0xE036, 0xE037, -+ 0xE038, 0xE039, 0xE03A, 0xE03B, 0xE03C, 0xE03D, 0xE03E, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE03F, 0xE040, 0xE041, 0xE042, 0xE043, 0xE044, 0xE045, -+ 0xE046, 0xE047, 0xE048, 0xE049, 0xE04A, 0xE04B, 0xE04C, 0xE04D, -+ 0xE04E, 0xE04F, 0xE050, 0xE051, 0xE052, 0xE053, 0xE054, 0xE055, -+ 0xE056, 0xE057, 0xE058, 0xE059, 0xE05A, 0xE05B, 0xE05C, 0xE05D, -+ 0xE05E, 0xE05F, 0xE060, 0xE061, 0xE062, 0xE063, 0xE064, 0xE065, -+ 0xE066, 0xE067, 0xE068, 0xE069, 0xE06A, 0xE06B, 0xE06C, 0xE06D, -+ 0xE06E, 0xE06F, 0xE070, 0xE071, 0xE072, 0xE073, 0xE074, 0xE075, -+ 0xE076, 0xE077, 0xE078, 0xE079, 0xE07A, 0xE07B, 0xE07C, 0xE07D, -+ 0xE07E, 0xE07F, 0xE080, 0xE081, 0xE082, 0xE083, 0xE084, 0xE085, -+ 0xE086, 0xE087, 0xE088, 0xE089, 0xE08A, 0xE08B, 0xE08C, 0xE08D, -+ 0xE08E, 0xE08F, 0xE090, 0xE091, 0xE092, 0xE093, 0xE094, 0xE095, -+ 0xE096, 0xE097, 0xE098, 0xE099, 0xE09A, 0xE09B, 0xE09C, ALTCHR, -+/* 0xFB40 - 0xFBFF */ -+ 0xE09D, 0xE09E, 0xE09F, 0xE0A0, 0xE0A1, 0xE0A2, 0xE0A3, 0xE0A4, -+ 0xE0A5, 0xE0A6, 0xE0A7, 0xE0A8, 0xE0A9, 0xE0AA, 0xE0AB, 0xE0AC, -+ 0xE0AD, 0xE0AE, 0xE0AF, 0xE0B0, 0xE0B1, 0xE0B2, 0xE0B3, 0xE0B4, -+ 0xE0B5, 0xE0B6, 0xE0B7, 0xE0B8, 0xE0B9, 0xE0BA, 0xE0BB, 0xE0BC, -+ 0xE0BD, 0xE0BE, 0xE0BF, 0xE0C0, 0xE0C1, 0xE0C2, 0xE0C3, 0xE0C4, -+ 0xE0C5, 0xE0C6, 0xE0C7, 0xE0C8, 0xE0C9, 0xE0CA, 0xE0CB, 0xE0CC, -+ 0xE0CD, 0xE0CE, 0xE0CF, 0xE0D0, 0xE0D1, 0xE0D2, 0xE0D3, 0xE0D4, -+ 0xE0D5, 0xE0D6, 0xE0D7, 0xE0D8, 0xE0D9, 0xE0DA, 0xE0DB, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE0DC, 0xE0DD, 0xE0DE, 0xE0DF, 0xE0E0, 0xE0E1, 0xE0E2, -+ 0xE0E3, 0xE0E4, 0xE0E5, 0xE0E6, 0xE0E7, 0xE0E8, 0xE0E9, 0xE0EA, -+ 0xE0EB, 0xE0EC, 0xE0ED, 0xE0EE, 0xE0EF, 0xE0F0, 0xE0F1, 0xE0F2, -+ 0xE0F3, 0xE0F4, 0xE0F5, 0xE0F6, 0xE0F7, 0xE0F8, 0xE0F9, 0xE0FA, -+ 0xE0FB, 0xE0FC, 0xE0FD, 0xE0FE, 0xE0FF, 0xE100, 0xE101, 0xE102, -+ 0xE103, 0xE104, 0xE105, 0xE106, 0xE107, 0xE108, 0xE109, 0xE10A, -+ 0xE10B, 0xE10C, 0xE10D, 0xE10E, 0xE10F, 0xE110, 0xE111, 0xE112, -+ 0xE113, 0xE114, 0xE115, 0xE116, 0xE117, 0xE118, 0xE119, 0xE11A, -+ 0xE11B, 0xE11C, 0xE11D, 0xE11E, 0xE11F, 0xE120, 0xE121, 0xE122, -+ 0xE123, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128, 0xE129, 0xE12A, -+ 0xE12B, 0xE12C, 0xE12D, 0xE12E, 0xE12F, 0xE130, 0xE131, 0xE132, -+ 0xE133, 0xE134, 0xE135, 0xE136, 0xE137, 0xE138, 0xE139, ALTCHR, -+/* 0xFC40 - 0xFCFF */ -+ 0xE13A, 0xE13B, 0xE13C, 0xE13D, 0xE13E, 0xE13F, 0xE140, 0xE141, -+ 0xE142, 0xE143, 0xE144, 0xE145, 0xE146, 0xE147, 0xE148, 0xE149, -+ 0xE14A, 0xE14B, 0xE14C, 0xE14D, 0xE14E, 0xE14F, 0xE150, 0xE151, -+ 0xE152, 0xE153, 0xE154, 0xE155, 0xE156, 0xE157, 0xE158, 0xE159, -+ 0xE15A, 0xE15B, 0xE15C, 0xE15D, 0xE15E, 0xE15F, 0xE160, 0xE161, -+ 0xE162, 0xE163, 0xE164, 0xE165, 0xE166, 0xE167, 0xE168, 0xE169, -+ 0xE16A, 0xE16B, 0xE16C, 0xE16D, 0xE16E, 0xE16F, 0xE170, 0xE171, -+ 0xE172, 0xE173, 0xE174, 0xE175, 0xE176, 0xE177, 0xE178, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE179, 0xE17A, 0xE17B, 0xE17C, 0xE17D, 0xE17E, 0xE17F, -+ 0xE180, 0xE181, 0xE182, 0xE183, 0xE184, 0xE185, 0xE186, 0xE187, -+ 0xE188, 0xE189, 0xE18A, 0xE18B, 0xE18C, 0xE18D, 0xE18E, 0xE18F, -+ 0xE190, 0xE191, 0xE192, 0xE193, 0xE194, 0xE195, 0xE196, 0xE197, -+ 0xE198, 0xE199, 0xE19A, 0xE19B, 0xE19C, 0xE19D, 0xE19E, 0xE19F, -+ 0xE1A0, 0xE1A1, 0xE1A2, 0xE1A3, 0xE1A4, 0xE1A5, 0xE1A6, 0xE1A7, -+ 0xE1A8, 0xE1A9, 0xE1AA, 0xE1AB, 0xE1AC, 0xE1AD, 0xE1AE, 0xE1AF, -+ 0xE1B0, 0xE1B1, 0xE1B2, 0xE1B3, 0xE1B4, 0xE1B5, 0xE1B6, 0xE1B7, -+ 0xE1B8, 0xE1B9, 0xE1BA, 0xE1BB, 0xE1BC, 0xE1BD, 0xE1BE, 0xE1BF, -+ 0xE1C0, 0xE1C1, 0xE1C2, 0xE1C3, 0xE1C4, 0xE1C5, 0xE1C6, 0xE1C7, -+ 0xE1C8, 0xE1C9, 0xE1CA, 0xE1CB, 0xE1CC, 0xE1CD, 0xE1CE, 0xE1CF, -+ 0xE1D0, 0xE1D1, 0xE1D2, 0xE1D3, 0xE1D4, 0xE1D5, 0xE1D6, ALTCHR, -+/* 0xFD40 - 0xFDFF */ -+ 0xE1D7, 0xE1D8, 0xE1D9, 0xE1DA, 0xE1DB, 0xE1DC, 0xE1DD, 0xE1DE, -+ 0xE1DF, 0xE1E0, 0xE1E1, 0xE1E2, 0xE1E3, 0xE1E4, 0xE1E5, 0xE1E6, -+ 0xE1E7, 0xE1E8, 0xE1E9, 0xE1EA, 0xE1EB, 0xE1EC, 0xE1ED, 0xE1EE, -+ 0xE1EF, 0xE1F0, 0xE1F1, 0xE1F2, 0xE1F3, 0xE1F4, 0xE1F5, 0xE1F6, -+ 0xE1F7, 0xE1F8, 0xE1F9, 0xE1FA, 0xE1FB, 0xE1FC, 0xE1FD, 0xE1FE, -+ 0xE1FF, 0xE200, 0xE201, 0xE202, 0xE203, 0xE204, 0xE205, 0xE206, -+ 0xE207, 0xE208, 0xE209, 0xE20A, 0xE20B, 0xE20C, 0xE20D, 0xE20E, -+ 0xE20F, 0xE210, 0xE211, 0xE212, 0xE213, 0xE214, 0xE215, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE216, 0xE217, 0xE218, 0xE219, 0xE21A, 0xE21B, 0xE21C, -+ 0xE21D, 0xE21E, 0xE21F, 0xE220, 0xE221, 0xE222, 0xE223, 0xE224, -+ 0xE225, 0xE226, 0xE227, 0xE228, 0xE229, 0xE22A, 0xE22B, 0xE22C, -+ 0xE22D, 0xE22E, 0xE22F, 0xE230, 0xE231, 0xE232, 0xE233, 0xE234, -+ 0xE235, 0xE236, 0xE237, 0xE238, 0xE239, 0xE23A, 0xE23B, 0xE23C, -+ 0xE23D, 0xE23E, 0xE23F, 0xE240, 0xE241, 0xE242, 0xE243, 0xE244, -+ 0xE245, 0xE246, 0xE247, 0xE248, 0xE249, 0xE24A, 0xE24B, 0xE24C, -+ 0xE24D, 0xE24E, 0xE24F, 0xE250, 0xE251, 0xE252, 0xE253, 0xE254, -+ 0xE255, 0xE256, 0xE257, 0xE258, 0xE259, 0xE25A, 0xE25B, 0xE25C, -+ 0xE25D, 0xE25E, 0xE25F, 0xE260, 0xE261, 0xE262, 0xE263, 0xE264, -+ 0xE265, 0xE266, 0xE267, 0xE268, 0xE269, 0xE26A, 0xE26B, 0xE26C, -+ 0xE26D, 0xE26E, 0xE26F, 0xE270, 0xE271, 0xE272, 0xE273, ALTCHR, -+/* 0xFE40 - 0xFEFF */ -+ 0xE274, 0xE275, 0xE276, 0xE277, 0xE278, 0xE279, 0xE27A, 0xE27B, -+ 0xE27C, 0xE27D, 0xE27E, 0xE27F, 0xE280, 0xE281, 0xE282, 0xE283, -+ 0xE284, 0xE285, 0xE286, 0xE287, 0xE288, 0xE289, 0xE28A, 0xE28B, -+ 0xE28C, 0xE28D, 0xE28E, 0xE28F, 0xE290, 0xE291, 0xE292, 0xE293, -+ 0xE294, 0xE295, 0xE296, 0xE297, 0xE298, 0xE299, 0xE29A, 0xE29B, -+ 0xE29C, 0xE29D, 0xE29E, 0xE29F, 0xE2A0, 0xE2A1, 0xE2A2, 0xE2A3, -+ 0xE2A4, 0xE2A5, 0xE2A6, 0xE2A7, 0xE2A8, 0xE2A9, 0xE2AA, 0xE2AB, -+ 0xE2AC, 0xE2AD, 0xE2AE, 0xE2AF, 0xE2B0, 0xE2B1, 0xE2B2, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, ALTCHR, -+ ALTCHR, 0xE2B3, 0xE2B4, 0xE2B5, 0xE2B6, 0xE2B7, 0xE2B8, 0xE2B9, -+ 0xE2BA, 0xE2BB, 0xE2BC, 0xE2BD, 0xE2BE, 0xE2BF, 0xE2C0, 0xE2C1, -+ 0xE2C2, 0xE2C3, 0xE2C4, 0xE2C5, 0xE2C6, 0xE2C7, 0xE2C8, 0xE2C9, -+ 0xE2CA, 0xE2CB, 0xE2CC, 0xE2CD, 0xE2CE, 0xE2CF, 0xE2D0, 0xE2D1, -+ 0xE2D2, 0xE2D3, 0xE2D4, 0xE2D5, 0xE2D6, 0xE2D7, 0xE2D8, 0xE2D9, -+ 0xE2DA, 0xE2DB, 0xE2DC, 0xE2DD, 0xE2DE, 0xE2DF, 0xE2E0, 0xE2E1, -+ 0xE2E2, 0xE2E3, 0xE2E4, 0xE2E5, 0xE2E6, 0xE2E7, 0xE2E8, 0xE2E9, -+ 0xE2EA, 0xE2EB, 0xE2EC, 0xE2ED, 0xE2EE, 0xE2EF, 0xE2F0, 0xE2F1, -+ 0xE2F2, 0xE2F3, 0xE2F4, 0xE2F5, 0xE2F6, 0xE2F7, 0xE2F8, 0xE2F9, -+ 0xE2FA, 0xE2FB, 0xE2FC, 0xE2FD, 0xE2FE, 0xE2FF, 0xE300, 0xE301, -+ 0xE302, 0xE303, 0xE304, 0xE305, 0xE306, 0xE307, 0xE308, 0xE309, -+ 0xE30A, 0xE30B, 0xE30C, 0xE30D, 0xE30E, 0xE30F, 0xE310, ALTCHR, - }; - - CODE_CONV_TWO_OCTET_TO_UCS2(cc_big5_to_ucs2, /* function name */ - tblBig5ToUcs2, /* table name */ -- 0x00A1, 0x00F9, /* code range (high byte) */ -+ 0x00A1, 0x00FE, /* code range (high byte) */ - 0x0040, 0x00FF, /* code range (low byte) */ - ALTCHR /* alt char code (on UCS2) */ - ) diff --git a/x11/XFree86-4-libraries/files/patch-h b/x11/XFree86-4-libraries/files/patch-h index 1a31284da1d5..966a74a47bf7 100644 --- a/x11/XFree86-4-libraries/files/patch-h +++ b/x11/XFree86-4-libraries/files/patch-h @@ -1,17 +1,15 @@ ---- config/cf/Imake.rules.orig Wed Mar 8 00:54:17 2000 -+++ config/cf/Imake.rules Wed Apr 12 18:00:00 2000 -@@ -1297,8 +1297,8 @@ - @@\ +--- config/cf/Imake.rules~ Tue Dec 5 10:16:28 2000 ++++ config/cf/Imake.rules Tue Dec 5 11:01:00 2000 +@@ -1303,7 +1303,7 @@ dest.suffix.html: file.man RmanCmdDependency @@\ RemoveFiles(dest.suffix.html dest.suffix-html) @@\ -- RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) &&\ @@\ + RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\ - $(MV) dest.suffix-html $@ @@\ -+ RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\ + $(MV) dest.suffix-html dest.suffix.html @@\ @@\ install.man:: dest.suffix.html @@\ MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ -@@ -1533,7 +1533,7 @@ +@@ -1539,7 +1539,7 @@ MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ @MakeFlagsToShellFlags(i,set +e); \ @@\ if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ @@ -20,7 +18,7 @@ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ cd Concat($(DESTDIR),opath/cdir); \ @@\ if [ -d rdir -a ! -h rdir ]; then \ @@\ -@@ -1484,7 +1484,7 @@ +@@ -1586,7 +1586,7 @@ MakeDir(Concat($(DESTDIR),npath)) @@\ @MakeFlagsToShellFlags(i,set +e); \ @@\ if [ -d Concat($(DESTDIR),opath) ]; then \ @@\ @@ -29,4 +27,3 @@ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ cd Concat($(DESTDIR),opath); \ @@\ if [ -f lfile -a ! -h lfile ]; then \ @@\ - diff --git a/x11/XFree86-4-libraries/files/patch-i810 b/x11/XFree86-4-libraries/files/patch-i810 deleted file mode 100644 index 2c597830f7f5..000000000000 --- a/x11/XFree86-4-libraries/files/patch-i810 +++ /dev/null @@ -1,51 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v -retrieving revision 1.9 -diff -u -p -r1.9 i810_memory.c ---- programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 2000/06/20 05:08:46 1.9 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 2000/08/01 12:29:11 -@@ -40,6 +40,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #ifdef linux - #include <asm/ioctl.h> - #include <linux/agpgart.h> -+#elif defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/ioctl.h> -+#include <sys/agpio.h> - #endif - - #ifdef XFree86LOADER -@@ -76,7 +80,7 @@ int I810AllocHigh( I810MemRange *result, - - int I810AllocateGARTMemory( ScrnInfoPtr pScrn ) - { --#ifdef linux -+#if defined(linux) || defined(__FreeBSD__) - struct _agp_info agpinf; - struct _agp_bind bind; - struct _agp_allocate alloc; -@@ -111,12 +115,14 @@ int I810AllocateGARTMemory( ScrnInfoPtr - return FALSE; - } - -+#ifndef __FreeBSD__ - if (agpinf.version.major != 0 || - agpinf.version.minor != 99) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Agp kernel driver version not correct\n"); - return FALSE; - } -+#endif - - - /* Treat the gart like video memory - we assume we own all that is -@@ -223,7 +229,7 @@ int I810AllocateGARTMemory( ScrnInfoPtr - - void I810FreeGARTMemory( ScrnInfoPtr pScrn ) - { --#ifdef linux -+#if defined(linux) || defined(__FreeBSD__) - I810Ptr pI810 = I810PTR(pScrn); - - if (pI810->gartfd != -1) { diff --git a/x11/XFree86-4-libraries/files/patch-k b/x11/XFree86-4-libraries/files/patch-k deleted file mode 100644 index f620317a3a66..000000000000 --- a/x11/XFree86-4-libraries/files/patch-k +++ /dev/null @@ -1,41 +0,0 @@ -*** programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jul 1 01:39:02 2000 ---- programs/Xserver/hw/xfree86/input/mouse/mouse.c Fri Sep 22 11:30:18 2000 -*************** -*** 584,591 **** - { 0xc0, 0x00, 0x00, 0x00, 6, 0x00, 0xff, MPF_NONE }, /* NetScroll */ - /* Bus Mouse */ - { 0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff, MPF_NONE }, /* BusMouse */ -! /* Auto */ -! { 0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff, MPF_NONE }, /* dummy entry */ - }; - - /* ---- 584,591 ---- - { 0xc0, 0x00, 0x00, 0x00, 6, 0x00, 0xff, MPF_NONE }, /* NetScroll */ - /* Bus Mouse */ - { 0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff, MPF_NONE }, /* BusMouse */ -! { 0xf8, 0x80, 0x00, 0x00, 5, 0x00, 0xff, MPF_NONE }, /* Auto */ -! { 0xf8, 0x80, 0x00, 0x00, 8, 0x00, 0xff, MPF_NONE }, /* SysMouse */ - }; - - /* -*** programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c.orig Sat Feb 12 21:45:41 2000 ---- programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c Fri Sep 22 11:30:18 2000 -*************** -*** 165,171 **** ---- 165,179 ---- - mode.rate = rate > 0 ? rate : -1; - mode.resolution = res > 0 ? res : -1; - mode.accelfactor = -1; -+ #if defined(__FreeBSD__) -+ /* -+ * As the FreeBSD sysmouse driver defaults to protocol level 0 everytime -+ * it is opened we enforce protocol level 1 again at this point. -+ */ -+ mode.level = 1; -+ #else - mode.level = -1; -+ #endif - ioctl(pInfo->fd, MOUSE_SETMODE, &mode); - } - #endif diff --git a/x11/XFree86-4-libraries/files/patch-l b/x11/XFree86-4-libraries/files/patch-l deleted file mode 100644 index d1839b1b9a9d..000000000000 --- a/x11/XFree86-4-libraries/files/patch-l +++ /dev/null @@ -1,25 +0,0 @@ -*** programs/Xserver/hw/xfree86/common/xf86pciBus.c Tue Jun 20 21:38:23 2000 ---- programs/Xserver/hw/xfree86/common/xf86pciBus.c Tue Jul 11 10:00:11 2000 -*************** -*** 1207,1216 **** - (*p_size)++; - (*p_base) = H2B(tag,range.rBegin,type); - -- #ifdef DEBUG - ErrorF("New PCI res %i base: 0x%lx, size: 0x%lx, type %s\n", - res_n,(*p_base),(1 << (*p_size)),type | ResMem ? "Mem" : "Io"); -- #endif - - if (res_n != 0xff) { - pciWriteLong(tag,PCI_CMD_BASE_REG + res_n * sizeof(CARD32), ---- 1207,1214 ---- -*************** -*** 1724,1730 **** - resPtr tmp, avoid = NULL; - - if (!pvp->validate) continue; -- avoid = xf86DupResList(pciAvoidRes); - NonSys = xf86DupResList(Sys); - m = n; - while ((pvp1 = xf86PciVideoInfo[m++])) { ---- 1722,1727 ---- diff --git a/x11/XFree86-4-libraries/files/patch-riva_hw.c b/x11/XFree86-4-libraries/files/patch-riva_hw.c new file mode 100644 index 000000000000..0e5b50f8c2d0 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-riva_hw.c @@ -0,0 +1,27 @@ +reverse frequency parameter only for Riva128/SGRAM + +Index: programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c +=================================================================== +RCS file: /home/cvs/X/xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c,v +retrieving revision 1.12 +diff -u -u -2 -r1.12 riva_hw.c +--- programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c 2001/02/21 00:42:57 1.12 ++++ programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c 2001/03/25 16:20:00 +@@ -1780,4 +1780,5 @@ + * Fill in chip configuration. + */ ++ chip->CrystalFreqKHz = (chip->PEXTDEV[0x00000000/4] & 0x00000020) ? 13500 : 14318; /* this was reversed, not sure that it is right this way either (HCS) */ + if (chip->PFB[0x00000000/4] & 0x00000020) + { +@@ -1813,4 +1814,5 @@ + * SGRAM 128. + */ ++ chip->CrystalFreqKHz = (chip->PEXTDEV[0x00000000/4] & 0x00000020) ? 14318 : 13500; + chip->RamBandwidthKBytesPerSec = 1000000; + switch (chip->PFB[0x00000000/4] & 0x00000003) +@@ -1827,5 +1829,4 @@ + } + } +- chip->CrystalFreqKHz = (chip->PEXTDEV[0x00000000/4] & 0x00000020) ? 13500 : 14318; /* this was reversed, not sure that it is right this way either (HCS) */ + chip->CURSOR = &(chip->PRAMIN[0x00008000/4 - 0x0800/4]); + chip->CURSORPOS = &(chip->PRAMDAC[0x0300/4]); diff --git a/x11/XFree86-4-libraries/files/patch-s01 b/x11/XFree86-4-libraries/files/patch-s01 deleted file mode 100644 index 6447aea41198..000000000000 --- a/x11/XFree86-4-libraries/files/patch-s01 +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/xfree86.cf.orig Fri Jul 28 11:35:18 2000 -+++ config/cf/xfree86.cf Fri Jul 28 11:35:50 2000 -@@ -555,7 +555,7 @@ - */ - #if !defined(i386MachArchitecture) && !defined(OS2Architecture) - # ifndef InstallXserverSetUID --# define InstallXserverSetUID YES -+# define InstallXserverSetUID NO - # endif - #endif - diff --git a/x11/XFree86-4-libraries/files/patch-t01 b/x11/XFree86-4-libraries/files/patch-t01 index 274f3a7c95d6..f65c915cbbff 100644 --- a/x11/XFree86-4-libraries/files/patch-t01 +++ b/x11/XFree86-4-libraries/files/patch-t01 @@ -1,6 +1,15 @@ ---- config/imake/imake.c~ Thu Jun 15 04:36:17 2000 -+++ config/imake/imake.c Thu Sep 28 13:58:02 2000 -@@ -1184,6 +1184,19 @@ +--- config/imake/imake.c.ORIG Mon Dec 18 14:54:34 2000 ++++ config/imake/imake.c Mon Dec 18 14:55:25 2000 +@@ -399,7 +399,7 @@ + int + main(int argc, char *argv[]) + { +- FILE *tmpfd; ++ FILE *tmpfd = (FILE *)NULL; + char makeMacro[ BUFSIZ ]; + char makefileMacro[ BUFSIZ ]; + +@@ -1208,6 +1208,19 @@ if (uname(&name) < 0) LogFatal("Cannot invoke uname", ""); diff --git a/x11/XFree86-4-libraries/files/patch-t02 b/x11/XFree86-4-libraries/files/patch-t02 deleted file mode 100644 index 96ae9c2843a0..000000000000 --- a/x11/XFree86-4-libraries/files/patch-t02 +++ /dev/null @@ -1,50 +0,0 @@ -diff -u lib/X11.orig/omGeneric.c lib/X11/omGeneric.c ---- lib/X11.orig/omGeneric.c Tue Feb 29 12:09:04 2000 -+++ lib/X11/omGeneric.c Tue Oct 31 17:01:34 2000 -@@ -1129,6 +1129,7 @@ - if(font_set->vrotate == (VRotate)NULL) - return (-1); - -+ memset(vrotate, 0x00, sizeof(VRotateRec) * sub_num); - for(i = 0 ; i < sub_num ; i++) { - vrotate[i].charset_name = font_set->substitute[i].name; - vrotate[i].side = font_set->substitute[i].side; -diff -u lib/X11.orig/omText.c lib/X11/omText.c ---- lib/X11.orig/omText.c Sun May 9 19:50:42 1999 -+++ lib/X11/omText.c Tue Oct 31 17:01:43 2000 -@@ -196,12 +196,9 @@ - * *always* contain good data. We should probably remove - * the check for "fd->font", but we won't :-) -- jjw/pma (HP) - */ -- if(fd == (FontData) NULL || -- (font = fs->font) == (XFontStruct *) NULL){ -- -- if((font = fd->font) == (XFontStruct *) NULL) -- break; -- } -+ if ((font = fs->font) == (XFontStruct *) NULL) -+ if (fd != (FontData) NULL) font = fd->font; -+ if (font == (XFontStruct *) NULL) break; - - switch(oc->core.orientation) { - case XOMOrientation_LTR_TTB: -diff -u lib/X11.orig/omTextEsc.c lib/X11/omTextEsc.c ---- lib/X11.orig/omTextEsc.c Sun May 9 19:50:42 1999 -+++ lib/X11/omTextEsc.c Tue Oct 31 17:01:49 2000 -@@ -151,12 +151,9 @@ - is_xchar2b, FONTSCOPE); - if(ptr_len <= 0) - break; -- if(fd == (FontData) NULL || -- (font = fd->font) == (XFontStruct *) NULL) { -- -- if((font = font_set->font) == (XFontStruct *) NULL) -- break; -- } -+ if ((font = font_set->font) == (XFontStruct *) NULL) -+ if (fd != (FontData) NULL) font = fd->font; -+ if (font == (XFontStruct *) NULL) break; - - switch(oc->core.orientation) { - case XOMOrientation_LTR_TTB: - diff --git a/x11/XFree86-4-libraries/files/patch-t03 b/x11/XFree86-4-libraries/files/patch-t03 new file mode 100644 index 000000000000..8e0b78cab1c2 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-t03 @@ -0,0 +1,31 @@ +--- config/pswrap/main.c.orig Wed Dec 20 15:30:23 2000 ++++ config/pswrap/main.c Wed Dec 20 15:32:06 2000 +@@ -129,7 +129,7 @@ + strcpy(headid, slash ? slash+1 : hfile); + for (c = headid; *c != '\0'; c++) { + if (*c == '.') *c = '_'; +- else isascii(*c) && islower(*c) && (*c = toupper(*c)); ++ else if (isascii(*c) && islower(*c)) *c = toupper(*c); + } + break; + case 'o': +--- config/pswrap/lexer.l.orig Wed Dec 20 15:33:37 2000 ++++ config/pswrap/lexer.l Wed Dec 20 15:33:57 2000 +@@ -346,7 +346,7 @@ + DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext)); + /* I have no idea why the cast is needed in the next line, + but it seems to make the compiler happy on alpha */ +- sscanf((char *) yytext,"%o",&yylval.intobj); ++ sscanf((char *) yytext,"%lo",&yylval.intobj); + return CINTEGER; + } + } +@@ -355,7 +355,7 @@ + if (nonComment) { + DEBUGP((stderr,"DEF ->CINTEGER %s\n",yytext)); + /* See previous comment... */ +- sscanf((char *) yytext,"0x%x",&yylval.intobj); ++ sscanf((char *) yytext,"0x%lx",&yylval.intobj); + return CINTEGER; + } + } diff --git a/x11/XFree86-4-libraries/files/patch-xdm b/x11/XFree86-4-libraries/files/patch-xdm new file mode 100644 index 000000000000..2eb9d293b899 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-xdm @@ -0,0 +1,11 @@ +--- 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 $ + +-SERVERSTYPE = XdmServersType ++SERVERSTYPE = ws + + all:: Xservers.ws xdm-config Xservers Xresources + diff --git a/x11/XFree86-4-libraries/files/patch-xthreads b/x11/XFree86-4-libraries/files/patch-xthreads new file mode 100644 index 000000000000..5fb6641c724c --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-xthreads @@ -0,0 +1,110 @@ +--- include/Xos_r.h.orig Sat Mar 24 17:03:44 2001 ++++ include/Xos_r.h Sat Mar 24 17:03:56 2001 +@@ -245,7 +245,7 @@ + + /* NetBSD, at least, is missing several of the unixware passwd fields. */ + +-#if defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) + __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) + { + memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); +@@ -412,7 +412,7 @@ + /* UnixWare 2.0, or other systems with thread support but no _r API. */ + /* WARNING: The h_addr_list and s_aliases values are *not* copied! */ + +-#if defined(__NetBSD__) ++#if defined(__NetBSD__) || defined(__FreeBSD__) + #include <sys/param.h> + #endif + +--- config/cf/FreeBSD.cf.orig Sat Mar 24 17:03:55 2001 ++++ config/cf/FreeBSD.cf Sat Mar 24 17:04:13 2001 +@@ -66,6 +66,41 @@ + #define InstallXloadSetGID YES + #endif + ++/* ++ * Multi-thread safe libs ++ */ ++/* 2.2.7 and later has libc_r (POSIX threads) */ ++#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \ ++ OSMajorVersion >= 3 ++# ifndef HasLibPthread ++# define HasLibPthread NO ++# endif ++# define HasPosixThreads YES ++# define ThreadedX YES ++/* ++ * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. ++ */ ++# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE ++/* ++ * 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 ++# else ++# define BuildThreadStubLibrary YES ++# define NeedUIThrStubs YES ++# if (OSRelVersion >= 500016) ++# define ThreadsLibraries -lc_r ++# else ++# define ThreadsLibraries -pthread ++# endif ++# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) ++# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) ++# endif ++#endif ++ + #define AvoidNullMakeCommand YES + #define StripInstalledPrograms YES + #define CompressAllFonts YES +@@ -97,7 +132,23 @@ + #endif + #endif + +-#define CcCmd cc ++/* ++ * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP), ++ * when building X to avoid that for each client ld give the message ++ * ++ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found ++ */ ++#if BuildThreadStubLibrary && !UseInstalled ++# define CcCmd $(CLIENTENVSETUP) cc ++# define CplusplusCmd $(CLIENTENVSETUP) c++ ++#else ++# define CcCmd cc ++# define CplusplusCmd c++ ++#endif ++ ++#define CppCmd /usr/bin/cpp ++#define PreProcessCmd CppCmd ++#define StandardCppOptions -traditional + #define CppCmd /usr/bin/cpp + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional +--- config/cf/bsdLib.tmpl.orig Tue Aug 29 03:43:49 2000 ++++ config/cf/bsdLib.tmpl Sat Mar 24 17:03:56 2001 +@@ -47,7 +47,9 @@ + #define SharedX11Reqs + #endif + #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) ++#ifndef SharedXtReqs + #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) ++#endif + #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) + #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) + #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) +--- programs/glxinfo/Imakefile.orig Fri Sep 22 20:35:46 2000 ++++ programs/glxinfo/Imakefile Sat Mar 24 17:03:56 2001 +@@ -1,5 +1,6 @@ + XCOMM $XConsortium: Imakefile /main/7 1995/12/04 15:10:00 dpw $ + XCOMM $XFree86: xc/programs/glxinfo/Imakefile,v 1.1 2000/09/22 11:35:46 alanh Exp $ ++#include <Threads.tmpl> + DEPLIBS = $(DEPXTESTLIB) $(DEPXIELIB) $(DEPXLIB) $(DEPXKBFILELIB) $(DEPXF86LIBS) $(DEPXILIB) + #ifndef OS2Architecture + LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) diff --git a/x11/XFree86-4-libraries/files/patch-z01 b/x11/XFree86-4-libraries/files/patch-z01 index ddc4d6071064..1c36957378bd 100644 --- a/x11/XFree86-4-libraries/files/patch-z01 +++ b/x11/XFree86-4-libraries/files/patch-z01 @@ -1,6 +1,28 @@ ---- Makefile.orig Sun Aug 15 22:19:32 1999 -+++ Makefile Tue May 9 16:01:21 2000 -@@ -192,3 +192,33 @@ +--- Makefile.orig Wed Mar 22 21:23:30 2000 ++++ Makefile Mon Mar 19 20:08:33 2001 +@@ -24,6 +24,12 @@ + MAKE_CMD = $(MAKE) $(MAKE_OPTS) + FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)" + ++# Quick Hack! ++# FreeBSD ports system always call 'install.man' ++# It's good for almost ports. but not Dividing XFree86-4 ports. ++# Here is a quick hack for it. ++MAN_INSTALL_TARGET?= install.man ++ + all: + @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial + @$(MAKE_CMD) $@ +@@ -181,7 +187,7 @@ + install.ln: + $(MAKE_CMD) $@ + install.man: +- $(MAKE_CMD) $@ ++ $(MAKE_CMD) $(MAN_INSTALL_TARGET) + install: + $(MAKE_CMD) $@ + Makefiles: +@@ -192,3 +198,43 @@ $(MAKE_CMD) $@ VerifyOS: $(MAKE_CMD) $@ @@ -8,7 +30,7 @@ +##### +FreeBSDPortsBuild: + @echo "" -+ @echo Building $(RELEASE) of the X Window System: $@ distribution ++ @echo Building $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION) + @echo "" + @date + @echo "" @@ -23,14 +45,24 @@ + @echo "" + @date + @echo "" -+ @echo build of X Window System: $@ distribution complete. ++ @echo build of X Window System complete. + @echo "" + -+FreeBSDPortsInstall FreeBSDPortsInstall.man installXlib: ++FreeBSDPortsInstall installXlib installXnest installXprt installXvfb: + $(MAKE_CMD) $@ + -+installXnest installXnest.man installXprt: -+ $(MAKE_CMD) $@ ++FreeBSDPortsInstall.man: ++ $(MAKE_CMD) FreeBSDPortsInstall.man ++ ++installXnest.man: ++ $(MAKE_CMD) installXnest.man ++ ++installXvfb.man: ++ $(MAKE_CMD) installXvfb.man ++ ++installXserver.man: ++ $(MAKE_CMD) installXserver.man ++ ++NOOP: ++ @echo : + -+installXvfb installXvfb.man: -+ $(MAKE_CMD) $@ diff --git a/x11/XFree86-4-libraries/files/patch-z02 b/x11/XFree86-4-libraries/files/patch-z02 index 5a086db27a1e..cbf157626f02 100644 --- a/x11/XFree86-4-libraries/files/patch-z02 +++ b/x11/XFree86-4-libraries/files/patch-z02 @@ -1,6 +1,6 @@ ---- Imakefile.orig Thu Jun 15 04:36:13 2000 -+++ Imakefile Fri Aug 18 14:40:02 2000 -@@ -18,8 +18,26 @@ +--- Imakefile.orig Thu Aug 3 22:25:52 2000 ++++ Imakefile Mon Mar 26 03:32:39 2001 +@@ -18,8 +18,32 @@ #endif #endif @@ -13,7 +13,13 @@ +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin + SUBDIRS = include config lib $(NLSSUBDIR) \ + programs/Xserver/include programs/Xserver/hw/xfree86/parser \ -+ programs programs/Xserver/hw/xfree86/xf86cfg ++ programs/Xserver/hw/xfree86/dummylib \ ++ programs/Xserver/hw/xfree86/loader \ ++ programs/Xserver/hw/xfree86/xf86cfg \ ++ programs/Xserver/hw/xfree86/os-support \ ++ programs/rgb \ ++ programs \ ++ fonts/util +#else +#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs + SUBDIRS = include config lib $(NLSSUBDIR) \ @@ -27,21 +33,24 @@ LNINSTALLDIRS = lib #if HasParallelMake -@@ -206,3 +224,97 @@ +@@ -210,3 +234,98 @@ #undef BootstrapCleanSubdirs #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" BOOTSTRAPSUBDIRS = imake makedepend + ++#if defined(BuildXF86DRI) && BuildXF86DRI ++FreeBSDPortsDRIDir = lib/GL/mesa/src/drv ++#endif +#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib +FreeBSDPortsInstallDir = include lib nls programs/Xserver/include \ + programs/xrx/plugin \ + programs/Xserver/hw/xfree86/parser +#else +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin -+FreeBSDPortsInstallDir = lib programs programs programs/Xserver/hw/xfree86/xf86cfg ++FreeBSDPortsInstallDir = lib programs programs programs/Xserver/hw/xfree86/xf86cfg fonts/util programs/rgb +#else +#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv -+FreeBSDPortsInstallDir = programs lib/font lib/GL/mesa/src/drv ++FreeBSDPortsInstallDir = programs lib/font $(FreeBSDPortsDRIDir) +#else +#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs +FreeBSDPortsInstallDir = programs/xfs @@ -105,11 +114,7 @@ + $(INSTALL) -c $(INSTALLFLAGS) $(INSTPGMFLAGS) Xnest $(DESTDIR)$(BINDIR)/Xnest) + +installXnest.man:: -+ (cd programs/Xserver/hw/xnest && \ -+ $(RM) $(DESTDIR)$(MANDIR)/Xnest.$(MANSUFFIX)*; \ -+ $(INSTALL) -c $(INSTMANFLAGS) Xnest.man \ -+ $(DESTDIR)$(MANDIR)/Xnest.$(MANSUFFIX); \ -+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/Xnest.$(MANSUFFIX)) ++ (cd programs/Xserver/hw/xnest && $(MAKE) install.man) + +installXprt:: + (cd programs/Xserver && \ @@ -120,8 +125,10 @@ + $(INSTALL) -c $(INSTALLFLAGS) $(INSTPGMFLAGS) Xvfb $(DESTDIR)$(BINDIR)/Xvfb) + +installXvfb.man:: -+ (cd programs/Xserver/hw/vfb && \ -+ $(RM) $(DESTDIR)$(MANDIR)/Xvfb.$(MANSUFFIX)*; \ -+ $(INSTALL) -c $(INSTMANFLAGS) Xvfb.man \ -+ $(DESTDIR)$(MANDIR)/Xvfb.$(MANSUFFIX); \ -+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/Xvfb.$(MANSUFFIX)) ++ (cd programs/Xserver/hw/vfb && $(MAKE) install.man) ++ ++installXserver.man:: ++ (cd programs/Xserver && $(MAKE) install.man) ++ ++NOOP: ++ @echo : diff --git a/x11/XFree86-4-libraries/files/patch-z03 b/x11/XFree86-4-libraries/files/patch-z03 deleted file mode 100644 index cec66a9790ca..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z03 +++ /dev/null @@ -1,26 +0,0 @@ ---- config/cf/Library.tmpl.orig Wed Oct 13 13:20:41 1999 -+++ config/cf/Library.tmpl Wed Sep 6 14:25:44 2000 -@@ -67,7 +67,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CDEBUGFLAGS = LibraryCDebugFlags - CLIBDEBUGFLAGS = LibraryDebugOpt -- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(SYSCFLAGS) $(CLIBDEBUGFLAGS) - # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags - # endif -@@ -434,10 +434,14 @@ - # ifdef IncSubdir - # ifdef IncSubSubdir - BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..) -+# if !defined(LibHeaders) || LibHeaders - InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS)) -+# endif - # else - BuildIncludes($(HEADERS),IncSubdir,..) -+# if !defined(LibHeaders) || LibHeaders - InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS)) -+# endif - # endif - # else - # ifndef CplusplusSource diff --git a/x11/XFree86-4-libraries/files/patch-z04 b/x11/XFree86-4-libraries/files/patch-z04 index f533ae8a2688..5874d642de28 100644 --- a/x11/XFree86-4-libraries/files/patch-z04 +++ b/x11/XFree86-4-libraries/files/patch-z04 @@ -1,14 +1,12 @@ ---- lib/X11/Imakefile.orig Sun Jun 18 03:41:29 2000 -+++ lib/X11/Imakefile Tue Jul 18 22:01:12 2000 -@@ -950,8 +950,12 @@ +--- lib/X11/Imakefile.orig Fri Dec 15 15:10:40 2000 ++++ lib/X11/Imakefile Fri Dec 15 15:12:30 2000 +@@ -939,8 +939,10 @@ #if InstallXcmsTxt InstallNonExecFile(Xcms.txt,$(LIBDIR)) #endif +#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib InstallNonExecFile(XErrorDB,$(LIBDIR)) InstallNonExecFile(XKeysymDB,$(LIBDIR)) -+test: -+ _LinkBuildLibrary($@) +#endif InstallLintLibrary(X11,$(LINTLIBDIR)) diff --git a/x11/XFree86-4-libraries/files/patch-z07 b/x11/XFree86-4-libraries/files/patch-z07 deleted file mode 100644 index 090c07cbc828..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z07 +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/Imakefile.orig Sat Jul 1 08:38:03 2000 -+++ programs/Xserver/hw/xfree86/common/Imakefile Sun Jul 16 21:39:40 2000 -@@ -158,6 +158,8 @@ - -I$(XF86SRC)/scanpci -I$(XF86OSSRC)/vbe -I$(XF86SRC)/int10 \ - -I$(XF86SRC)/ddc - -+HEADERS = xf86Module.h -+ - OSNAME = OSName - OSVENDOR = OSVendor - OSNAMEDEF = -DOSNAME='"$(OSNAME)"' -DOSVENDOR='"$(OSVENDOR)"' diff --git a/x11/XFree86-4-libraries/files/patch-z08 b/x11/XFree86-4-libraries/files/patch-z08 deleted file mode 100644 index 008f4f5ce005..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z08 +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/font/bitmap/Imakefile.orig Wed Apr 26 11:26:28 2000 -+++ lib/font/bitmap/Imakefile Wed Apr 26 11:33:38 2000 -@@ -2,10 +2,12 @@ - XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.8 1999/11/19 13:53:27 hohndel Exp $ - - #if DoLoadableServer -+#define PassCDebugFlags -+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib - #define IHaveSubdirs - #define NoLibSubdirs --#define PassCDebugFlags - SUBDIRS = module -+#endif - #endif - - #ifndef KDriveXServer diff --git a/x11/XFree86-4-libraries/files/patch-z09 b/x11/XFree86-4-libraries/files/patch-z09 deleted file mode 100644 index 3f04f5308da6..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z09 +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/font/FreeType/Imakefile.orig Wed Apr 26 11:32:05 2000 -+++ lib/font/FreeType/Imakefile Wed Apr 26 11:32:49 2000 -@@ -5,10 +5,12 @@ - XCOMM Juliusz Chroboczek <jec@dcs.ed.ac.uk> - - #if DoLoadableServer -+#define PassCDebugFlags -+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib - #define IHaveSubdirs - #define NoLibSubdirs --#define PassCDebugFlags - SUBDIRS = module -+#endif - #endif - - /* diff --git a/x11/XFree86-4-libraries/files/patch-z10 b/x11/XFree86-4-libraries/files/patch-z10 deleted file mode 100644 index bd0eee14e9cb..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z10 +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/font/Speedo/Imakefile.orig Wed Apr 26 11:34:18 2000 -+++ lib/font/Speedo/Imakefile Wed Apr 26 11:34:41 2000 -@@ -2,10 +2,12 @@ - XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.7 1999/03/02 02:49:14 dawes Exp $ - - #if DoLoadableServer -+#define PassCDebugFlags -+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib - #define IHaveSubdirs - #define NoLibSubdirs --#define PassCDebugFlags - SUBDIRS = module -+#endif - #endif - - INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include diff --git a/x11/XFree86-4-libraries/files/patch-z11 b/x11/XFree86-4-libraries/files/patch-z11 deleted file mode 100644 index d54906390d82..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z11 +++ /dev/null @@ -1,25 +0,0 @@ ---- lib/font/Type1/Imakefile.orig Wed Apr 26 11:35:22 2000 -+++ lib/font/Type1/Imakefile Wed Apr 26 11:35:55 2000 -@@ -2,11 +2,13 @@ - XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.8 1999/05/03 05:58:44 dawes Exp $ - - #if DoLoadableServer -+#define PassCDebugFlags -+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib - #define IHaveSubdirs - #define NoLibSubdirs --#define PassCDebugFlags - SUBDIRS = module - #endif -+#endif - - INCLUDES = -I$(FONTINCSRC) -I../include -I$(XTOP)/include \ - -I$(SERVERSRC)/include -@@ -42,7 +44,6 @@ - util.c \ - $(CIDSRCS) \ - t1unicode.c -- - - OBJS = \ - arith.o \ diff --git a/x11/XFree86-4-libraries/files/patch-z12 b/x11/XFree86-4-libraries/files/patch-z12 deleted file mode 100644 index 08fa552d4b20..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z12 +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/font/X-TrueType/Imakefile.orig Sun Feb 13 16:50:36 2000 -+++ lib/font/X-TrueType/Imakefile Tue May 23 15:59:44 2000 -@@ -5,8 +5,10 @@ - #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" - - #if DoLoadableServer -+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib - MODULE_SUBDIRS = module - #endif -+#endif - - INCLUDES = -I. -I$(FONTINCSRC) -I../include -I../fontcache \ - -I$(XTOP)/include -I$(SERVERSRC)/include \ -@@ -22,8 +24,10 @@ - CCONVHEADERS = \ - xttcap.h xttcconv.h xttcconvP.h xttcommon.h xttversion.h cconvversion.h - #if XTrueTypeInstallCConvHeaders -+#if !defined(LibHeaders) || (defined(LibHeaders) && LibHeaders) - CCONVINSTDIR = XTrueTypeCConvIncDir - InstallMultipleFlags($(CCONVHEADERS),$(CCONVINSTDIR),$(INSTINCFLAGS)) -+#endif - #endif - - #if XTTInLibXFont diff --git a/x11/XFree86-4-libraries/files/patch-z13 b/x11/XFree86-4-libraries/files/patch-z13 deleted file mode 100644 index 1d524a91ec48..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z13 +++ /dev/null @@ -1,14 +0,0 @@ ---- programs/Imakefile.orig Sun Jun 18 03:42:14 2000 -+++ programs/Imakefile Sun Jul 16 21:40:39 2000 -@@ -65,7 +65,11 @@ - XPMCLIENTDIRS = cxpm sxpm - - #if BuildServersOnly -+#if FreeBSDBuildXxserv -+SUBDIRS = $(XSSRCDIR) $(RGBSRCDIR) -+#else - SUBDIRS = $(XSSRCDIR) -+#endif - #else - SUBDIRS = \ - appres bdftopcf bitmap \ diff --git a/x11/XFree86-4-libraries/files/patch-z20 b/x11/XFree86-4-libraries/files/patch-z20 deleted file mode 100644 index 7f0dea9bccbd..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z20 +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/Imakefile~ Sat Feb 26 14:39:05 2000 -+++ programs/Xserver/hw/xfree86/loader/Imakefile Mon May 8 16:32:00 2000 -@@ -35,7 +35,8 @@ - -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(SERVERSRC)/os -I$(XINCLUDESRC) -I$(FONTINCSRC) \ - -I$(FONTLIBSRC)/include -I$(FONTLIBSRC)/fontcache \ -- -I$(EXTINCSRC) -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -+ -I$(EXTINCSRC) -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -+ -I$(XF86SRC)/parser - - #ifdef OS2Architecture - SRCS1 = os2funcs.c diff --git a/x11/XFree86-4-libraries/files/patch-z21 b/x11/XFree86-4-libraries/files/patch-z21 deleted file mode 100644 index 1eb5bbc2032d..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z21 +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xnest/Imakefile.orig Sun Jul 16 22:51:45 2000 -+++ programs/Xserver/hw/xnest/Imakefile Sun Jul 16 22:49:18 2000 -@@ -52,7 +52,7 @@ - - INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ - -I../../mi -I../../include -I../../os \ -- -I$(EXTINCSRC) -I$(XINCLUDESRC) -+ -I$(EXTINCSRC) -I$(XINCLUDESRC) -I../xfree86/loader - DEFINES = $(OS_DEFINES) -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ - -UMITSHM -UXF86DRI -UXFree86LOADER - diff --git a/x11/XFree86-4-libraries/files/patch-z30 b/x11/XFree86-4-libraries/files/patch-z30 index ef13579fb010..2365d8400d98 100644 --- a/x11/XFree86-4-libraries/files/patch-z30 +++ b/x11/XFree86-4-libraries/files/patch-z30 @@ -1,10 +1,10 @@ ---- lib/GL/mesa/src/drv/Imakefile~ Sat Jul 1 08:35:56 2000 -+++ lib/GL/mesa/src/drv/Imakefile Tue Jul 18 16:52:39 2000 -@@ -59,6 +59,10 @@ - #endif - #endif +--- lib/GL/mesa/src/drv/Imakefile.orig Tue Dec 5 10:17:23 2000 ++++ lib/GL/mesa/src/drv/Imakefile Tue Dec 5 13:29:59 2000 +@@ -70,6 +70,10 @@ -+#if (defined(FreeBSDBuildXlib) && FreeBSDBuildXlib) || (defined(ModuleInstall) && !ModuleInstall) + #endif /* GlxUseBuiltInDRIDriver */ + ++#if (defined(FreeBSDBuildXlib) && FreeBSDBuildXlib) || (defined(ModInstall) && !ModInstall) +SUBDIRS = common +#endif + diff --git a/x11/XFree86-4-libraries/files/patch-z31 b/x11/XFree86-4-libraries/files/patch-z31 index 263d2ece5950..71fc457bd19e 100644 --- a/x11/XFree86-4-libraries/files/patch-z31 +++ b/x11/XFree86-4-libraries/files/patch-z31 @@ -1,35 +1,37 @@ ---- lib/GL/Imakefile.orig Thu Jul 27 16:05:37 2000 -+++ lib/GL/Imakefile Thu Jul 27 16:08:01 2000 -@@ -283,10 +283,13 @@ +--- lib/GL/Imakefile.orig Wed Dec 20 13:20:28 2000 ++++ lib/GL/Imakefile Wed Dec 20 13:24:16 2000 +@@ -303,10 +303,13 @@ #if NormalLibGlx NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) -+#if !defined(LibInstall) || LibInstall ++# if !defined(LibInstall) || LibInstall InstallLibrary($(LIBNAME),$(USRLIBDIR)) ++# endif /* LibInstall */ #endif -+#endif #if SharedLibGlx SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) -+#if !defined(LibInstall) || LibInstall ++# if !defined(LibInstall) || LibInstall InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) #if LinkGLToUsrLib && AlternateUsrLibDir install:: -@@ -296,13 +299,18 @@ - $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 +@@ -315,15 +318,20 @@ + $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true + $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 + $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true ++# endif /* LibInstall */ #endif #endif -+#endif #if DebugLibGlx DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) -+#if !defined(LibInstall) || LibInstall ++# if !defined(LibInstall) || LibInstall InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) ++# endif /* LibInstall */ #endif -+#endif #if ProfileLibGlx ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) -+#if !defined(LibInstall) || LibInstall ++# if !defined(LibInstall) || LibInstall InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -+#endif ++# endif /* LibInstall */ #endif XCOMM libOSmesa needs libGL, so build it now diff --git a/x11/XFree86-4-libraries/files/patch-z32 b/x11/XFree86-4-libraries/files/patch-z32 index b24439066535..0255cb1e6356 100644 --- a/x11/XFree86-4-libraries/files/patch-z32 +++ b/x11/XFree86-4-libraries/files/patch-z32 @@ -1,10 +1,10 @@ ---- lib/GL/mesa/src/OSmesa/Imakefile.orig Thu Jul 27 16:09:32 2000 -+++ lib/GL/mesa/src/OSmesa/Imakefile Thu Jul 27 16:10:11 2000 -@@ -243,7 +243,8 @@ +--- lib/GL/mesa/src/OSmesa/Imakefile.orig Thu Dec 14 17:30:09 2000 ++++ lib/GL/mesa/src/OSmesa/Imakefile Tue Dec 19 14:26:58 2000 +@@ -281,7 +281,8 @@ /*InstallLibrary($(LIBNAME),$(USRLIBDIR))*/ SharedDepLibraryTarget($(LIBNAME),$(SOREV), $(DONES), $(OBJS), ., .) -+#if !defined(LibInstall) || LibInstall ++#if (!defined(LibInstall) || LibInstall) || (!defined(ModInstall) || ModInstall) InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) - +#endif diff --git a/x11/XFree86-4-libraries/files/patch-z33 b/x11/XFree86-4-libraries/files/patch-z33 index 5c5d7498a63e..05a649c7b839 100644 --- a/x11/XFree86-4-libraries/files/patch-z33 +++ b/x11/XFree86-4-libraries/files/patch-z33 @@ -1,20 +1,70 @@ ---- config/cf/Imake.rules.orig Thu Jul 27 15:15:59 2000 -+++ config/cf/Imake.rules Thu Jul 27 16:21:00 2000 -@@ -2266,7 +2266,7 @@ - #endif - - #ifndef LinkBuildLibrary --#ifdef UseInstalled -+#if defined(UseInstalled) || (defined(LibInstall) && !defined(LibInstallBuild) && !LibInstall) || (defined(LibInstallBuild) && !LibInstallBuild) - #define LinkBuildLibrary(lib) $(_NULLCMD_) - #else - #define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR)) @@\ -@@ -3205,7 +3205,7 @@ - #endif - - #ifndef InstallLibraryModule --#if !DoLoadableServer -+#if !DoLoadableServer || (defined(ModuleInstall) && !ModuleInstall) - #define InstallLibraryModule(module,dest,subdir) /**/ - #else - #if MakeDllModules +--- config/cf/Imake.rules~ Fri Dec 15 14:26:40 2000 ++++ config/cf/Imake.rules Fri Dec 15 14:32:56 2000 +@@ -1193,10 +1193,14 @@ + * short file names). + */ + #ifndef InstallManPageLong ++#if !defined(ManInstall) || ManInstall + #define InstallManPageLong(file,destdir,dest) @@\ + BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ + @@\ + InstallNamedTarget(install.man,file.man,$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) ++#else ++#define InstallManPageLong(file,destdir,dest) ++#endif /* ManInstall */ + #endif /* InstallManPageLong */ + + +@@ -1213,6 +1217,7 @@ + * InstallManPageAliases - generate rules to install manual page aliases. + */ + #ifndef InstallManPageAliases ++#if !defined(ManInstall) || ManInstall + #define InstallManPageAliases(file,destdir,aliases) @@\ + InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ + @@\ +@@ -1224,6 +1229,9 @@ + $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\ + done; \ @@\ + RemoveFile($${TMP})) ++#else ++#define InstallManPageAliases(file,destdir,aliases) ++#endif /* ManInstall */ + #endif /* InstallManPageAliases */ + + +@@ -1232,12 +1240,16 @@ + * doesn't assume MANSUFFIX. + */ + #ifndef InstallGenManPageLong ++#if !define(ManInstall) || ManInstall + #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ + BuildInstallHtmlManPage(file,dest,suffix) @@\ + @@\ + install.man:: file.man @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.man $(DESTDIR)destdir/dest.suffix ++#else ++#define InstallGenManPageLong(file,destdir,dest,suffix) ++#endif /* ManInstall */ + #endif /* InstallGenManPageLong */ + + +@@ -1254,6 +1266,7 @@ + * InstallGenManPageAliases - general equivalent of InstallManPageAliases + */ + #ifndef InstallGenManPageAliases ++#if !defined(ManInstall) || ManInstall + #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ + InstallHtmlManPageAliases(file,aliases,suffix) @@\ + @@\ +@@ -1265,6 +1278,9 @@ + $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\ + done; \ @@\ + RemoveFile($${TMP})) ++#else ++#define InstallGenManPageAliases(file,destdir,suffix,aliases) ++#endif /* ManInstall */ + #endif /* InstallGenManPageAliases */ + + diff --git a/x11/XFree86-4-libraries/files/patch-z34 b/x11/XFree86-4-libraries/files/patch-z34 index 1e19d6e99592..c6ee029a49ca 100644 --- a/x11/XFree86-4-libraries/files/patch-z34 +++ b/x11/XFree86-4-libraries/files/patch-z34 @@ -1,33 +1,33 @@ ---- lib/font/Imakefile~ Sun Feb 13 15:15:23 2000 -+++ lib/font/Imakefile Thu Jul 27 16:26:42 2000 +--- lib/font/Imakefile.orig Wed Dec 20 13:26:25 2000 ++++ lib/font/Imakefile Wed Dec 20 13:29:32 2000 @@ -120,22 +120,30 @@ #if NormalLibFont NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS)) -+#if !defined(LibInstall) || LibInstall ++# if !defined(LibInstall) || LibInstall InstallLibrary($(LIBNAME),$(USRLIBDIR)) -+#endif ++# endif /* LibInstall */ #endif /* NormalLibFont */ #if SharedLibFont SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.) -+#if !defined(LibInstall) || LibInstall ++# if !defined(LibInstall) || LibInstall InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) -+#endif ++# endif /* LibInstall */ #endif /* SharedLibFont */ #if DebugLibFont DebuggedDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(DEBUG_OBJS)) -+#if !defined(LibInstall) || LibInstall ++# if !defined(LibInstall) || LibInstall InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) -+#endif ++# endif /* LibInstall */ #endif /* DebugLibFont */ #if ProfileLibFont ProfiledDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(PROFILE_OBJS)) -+#if !defined(LibInstall) || LibInstall ++# if !defined(LibInstall) || LibInstall InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -+#endif ++# endif /* LibInstall */ #endif /* ProfileLibFont */ - #if DoLoadableServer + #if BuildServer && DoLoadableServer diff --git a/x11/XFree86-4-libraries/files/patch-z35 b/x11/XFree86-4-libraries/files/patch-z35 index ffcd2cac7cdd..66c6d1d8dfba 100644 --- a/x11/XFree86-4-libraries/files/patch-z35 +++ b/x11/XFree86-4-libraries/files/patch-z35 @@ -1,12 +1,12 @@ ---- lib/font/stubs/Imakefile.orig Thu Jul 27 17:02:54 2000 -+++ lib/font/stubs/Imakefile Thu Jul 27 17:03:24 2000 +--- 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 ++# if !defined(LibInstall) || LibInstall InstallLibrary(fntstubs,$(USRLIBDIR)) -+#endif ++# endif /* LibInstall */ NormalLintTarget($(SRCS)) DependTarget() diff --git a/x11/XFree86-4-libraries/files/patch-z37 b/x11/XFree86-4-libraries/files/patch-z37 index 4f6e5a12a07c..1ac6e657ff69 100644 --- a/x11/XFree86-4-libraries/files/patch-z37 +++ b/x11/XFree86-4-libraries/files/patch-z37 @@ -1,17 +1,27 @@ ---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Thu Jun 15 04:42:20 2000 -+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Aug 19 18:09:24 2000 -@@ -2,6 +2,10 @@ +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Fri Dec 15 04:47:46 2000 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Fri Jan 5 16:39:23 2001 +@@ -12,6 +12,11 @@ + TEXTOBJ = text-mode.o + #endif - XCOMM CDEBUGFLAGS=-g -Wall -ansi -pedantic - -+#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin ++#if defined(FreeBSDBuildXbin) +INCLUDES = -I../parser +#endif + ++ SRCS =\ accessx.c\ card-cfg.c\ -@@ -67,8 +71,10 @@ +@@ -82,7 +87,7 @@ + #if DoLoadableServer + LOADERLIB = -L../loader -lxloader -L../dummylib -ldummy + MODULEDEFINES = -DUSE_MODULES +-INCLUDES = -I../common -I../loader -I$(XF86OSSRC) \ ++INCLUDES = -I../common -I../loader -I$(XF86OSSRC) -I$(XF86OSSRC)/bus \ + -I$(SERVERSRC)/include -I$(XINCLUDESRC) + #if !HasSnprintf + SNPRINTF_DEFS = -DNEED_SNPRINTF +@@ -109,8 +114,10 @@ NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),) InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter) @@ -20,5 +30,5 @@ InstallMultipleFlags($(XPMPICS),$(INCDIR)/X11/pixmaps,$(INSTINCFLAGS)) +#endif InstallAppDefaults(XF86Cfg) - InstallManPage(xf86cfg,$(MANDIR)) + CppManTarget(xf86cfg,) diff --git a/x11/XFree86-4-libraries/files/patch-z38 b/x11/XFree86-4-libraries/files/patch-z38 deleted file mode 100644 index 2c8cce6ddcd2..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z38 +++ /dev/null @@ -1,27 +0,0 @@ ---- Original/xc/programs/xdm/Imakefile Tue Oct 24 12:53:55 2000 -+++ programs/xdm/Imakefile Tue Oct 24 12:52:46 2000 -@@ -75,11 +75,6 @@ - PWD_DEFINES = -DUSESHADOW -DSHADOWSUITE - #endif - --#if HasPam --PAM_LIBRARIES = -lpam DlLibrary --PAM_DEFINES = -DUSE_PAM --#endif -- - #if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) - SYS_LIBRARIES3 = -lresolv - #endif -@@ -89,6 +84,11 @@ - #if defined(LinuxArchitecture) && (!UseElfFormat || LinuxShadowSuite) - SYS_LIBRARIES1 = -lshadow - #endif -+#endif -+ -+#if HasPam -+PAM_LIBRARIES = -lpam DlLibrary -+PAM_DEFINES = -DUSE_PAM - #endif - - #if defined(UltrixArchitecture) - diff --git a/x11/XFree86-4-libraries/files/patch-z39 b/x11/XFree86-4-libraries/files/patch-z39 new file mode 100644 index 000000000000..790babc5a470 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z39 @@ -0,0 +1,12 @@ +--- programs/Xserver/include/Imakefile~ Sat Oct 28 10:26:51 2000 ++++ programs/Xserver/include/Imakefile Tue Dec 26 13:22:59 2000 +@@ -55,3 +55,9 @@ + InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR)) + InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR)) + InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR)) ++ ++/* Followings are for programs/rgb (aka. showrgb) */ ++#if !defined(LibHeaders) || LibHeaders ++HEADERS= rgb.h site.h ++InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS)) ++#endif diff --git a/x11/XFree86-4-libraries/files/patch-z40 b/x11/XFree86-4-libraries/files/patch-z40 new file mode 100644 index 000000000000..a311ef54ca4a --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z40 @@ -0,0 +1,15 @@ +--- /usr/local/src/XFree86-4/ORIG/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile Tue Dec 5 11:57:47 2000 ++++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Tue Dec 19 23:50:18 2000 +@@ -74,6 +74,7 @@ + + SRCS = Pci.c $(PCIDRVRSRC) $(SBUSDRVSRC) + OBJS = Pci.o $(PCIDRVROBJ) $(SBUSDRVOBJ) ++HEADERS= xf86Pci.h + + INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ + -I$(SERVERSRC)/include -I$(XINCLUDESRC) +@@ -91,3 +92,4 @@ + + DependTarget() + ++BuildIncludesTop($(HEADERS)) diff --git a/x11/XFree86-4-libraries/files/patch-z41 b/x11/XFree86-4-libraries/files/patch-z41 new file mode 100644 index 000000000000..1c03e9b9709e --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z41 @@ -0,0 +1,18 @@ +--- config/cf/xttMod.tmpl~ Tue Dec 5 11:59:36 2000 ++++ config/cf/xttMod.tmpl Wed Dec 20 13:39:42 2000 +@@ -24,11 +24,15 @@ + + ModuleObjectRule() + LibraryModuleTarget($(MODULENAME),$(OBJS)) ++#if (!defined(LibInstall) || LibInstall) || (!defined(ModInstall) || ModInstall) + InstallLibraryModule($(MODULENAME),$(MODULEDIR),codeconv) ++#endif + + DependTarget() + ++#if (!defined(LibInstall) || LibInstall) || (!defined(ModInstall) || ModInstall) + InstallDriverSDKLibraryModule($(MODULENAME),$(DRIVERSDKMODULEDIR),codeconv) ++#endif + + # else + /* dlopen based code converter */ diff --git a/x11/XFree86-4-libraries/files/patch-z42 b/x11/XFree86-4-libraries/files/patch-z42 new file mode 100644 index 000000000000..b4754338ffe6 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z42 @@ -0,0 +1,11 @@ +--- lib/Imakefile.orig Fri Mar 23 17:33:43 2001 ++++ lib/Imakefile Fri Mar 23 17:34:49 2001 +@@ -123,7 +123,7 @@ + XEXTDIR = Xext + #endif + +-LINTSUBDIRS = Xau Xdmcp X11 $(XINERAMADIR) $(XEXTDIR) $(XKBLIBDIR) \ ++LINTSUBDIRS = Xau Xdmcp $(THRSTUBLIBDIR) X11 ICE SM Xt $(XINERAMADIR) $(XEXTDIR) $(XKBLIBDIR) \ + $(XKBUILIBDIR) $(LBXUTILDIR) $(XF86EXTLIBS) $(XVLIBDIR) \ + $(GLXLIBDIR) $(GLWLIBDIR) $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) \ + $(FREETYPE2BUILDDIR) $(XFTLIBDIR) diff --git a/x11/XFree86-4-libraries/files/patch-z43 b/x11/XFree86-4-libraries/files/patch-z43 new file mode 100644 index 000000000000..6db2365c523b --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z43 @@ -0,0 +1,16 @@ +--- programs/Xserver/hw/xfree86/input/joystick/Imakefile.orig Tue Mar 20 09:10:03 2001 ++++ programs/Xserver/hw/xfree86/input/joystick/Imakefile Tue Mar 20 09:10:18 2001 +@@ -12,11 +12,11 @@ + -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) + + #ifdef LinuxArchitecture +- ARCH_JSTK = ../os-support/linux/lnx_jstk.o ++ ARCH_JSTK = ../../os-support/linux/lnx_jstk.o + #endif + + #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) +- ARCH_JSTK = ../os-support/bsd/bsd_jstk.o ++ ARCH_JSTK = ../../os-support/bsd/bsd_jstk.o + #endif + + #if MakeHasPosixVariableSubstitutions diff --git a/x11/XFree86-4-libraries/pkg-descr b/x11/XFree86-4-libraries/pkg-descr index 5f9ae01d75cd..1ca8ab2b48b7 100644 --- a/x11/XFree86-4-libraries/pkg-descr +++ b/x11/XFree86-4-libraries/pkg-descr @@ -2,8 +2,3 @@ This package containts XFree86 include header files and (shared) library files. WWW: http://www.xfree86.org/ - -Note: -This is part of the XFree86 distribution, there is a -complete distribution available in the ports collection -as well. diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist index 0c83f2b2570a..6143f28b5f88 100644 --- a/x11/XFree86-4-libraries/pkg-plist +++ b/x11/XFree86-4-libraries/pkg-plist @@ -24,9 +24,14 @@ 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/glx.h +include/GL/glxint.h include/GL/glxtokens.h include/GL/osmesa.h include/X11/Composite.h @@ -148,6 +153,8 @@ include/X11/Xaw/XawInit.h include/X11/Xcms.h include/X11/Xdefs.h include/X11/Xdmcp.h +include/X11/Xft/Xft.h +include/X11/Xft/XftFreetype.h include/X11/Xfuncproto.h include/X11/Xfuncs.h include/X11/Xlib.h @@ -303,6 +310,7 @@ include/X11/extensions/Xdbe.h include/X11/extensions/Xdbeproto.h include/X11/extensions/Xext.h include/X11/extensions/Xinerama.h +include/X11/extensions/Xrender.h include/X11/extensions/Xv.h include/X11/extensions/Xvlib.h include/X11/extensions/Xvproto.h @@ -323,6 +331,8 @@ include/X11/extensions/panoramiXext.h include/X11/extensions/panoramiXproto.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 @@ -359,25 +369,79 @@ include/X11/pixmaps/keyboard.xpm include/X11/pixmaps/monitor.xpm include/X11/pixmaps/mouse.xpm include/X11/xpm.h +include/freetype2/freetype/cache/ftcchunk.h +include/freetype2/freetype/cache/ftcglyph.h +include/freetype2/freetype/cache/ftcimage.h +include/freetype2/freetype/cache/ftcmanag.h +include/freetype2/freetype/cache/ftcsbits.h +include/freetype2/freetype/cache/ftlru.h +include/freetype2/freetype/config/ftbuild.h +include/freetype2/freetype/config/ftconfig.h +include/freetype2/freetype/config/ftmodule.h +include/freetype2/freetype/config/ftoption.h +include/freetype2/freetype/freetype.h +include/freetype2/freetype/ftbbox.h +include/freetype2/freetype/ftcache.h +include/freetype2/freetype/fterrors.h +include/freetype2/freetype/ftglyph.h +include/freetype2/freetype/ftimage.h +include/freetype2/freetype/ftlist.h +include/freetype2/freetype/ftmac.h +include/freetype2/freetype/ftmm.h +include/freetype2/freetype/ftmodule.h +include/freetype2/freetype/ftnames.h +include/freetype2/freetype/ftoutln.h +include/freetype2/freetype/ftrender.h +include/freetype2/freetype/ftsynth.h +include/freetype2/freetype/ftsystem.h +include/freetype2/freetype/fttypes.h +include/freetype2/freetype/internal/autohint.h +include/freetype2/freetype/internal/fnttypes.h +include/freetype2/freetype/internal/ftcalc.h +include/freetype2/freetype/internal/ftdebug.h +include/freetype2/freetype/internal/ftdriver.h +include/freetype2/freetype/internal/ftextend.h +include/freetype2/freetype/internal/ftmemory.h +include/freetype2/freetype/internal/ftobjs.h +include/freetype2/freetype/internal/ftstream.h +include/freetype2/freetype/internal/internal.h +include/freetype2/freetype/internal/psaux.h +include/freetype2/freetype/internal/psnames.h +include/freetype2/freetype/internal/sfnt.h +include/freetype2/freetype/internal/t1errors.h +include/freetype2/freetype/internal/t1types.h +include/freetype2/freetype/internal/t2errors.h +include/freetype2/freetype/internal/t2types.h +include/freetype2/freetype/internal/tterrors.h +include/freetype2/freetype/internal/tttypes.h +include/freetype2/freetype/t1tables.h +include/freetype2/freetype/ttnameid.h +include/freetype2/freetype/tttables.h +include/freetype2/freetype/tttags.h +include/rgb.h +include/site.h include/xf86Optrec.h include/xf86Parser.h +lib/X11/XftConfig lib/X11/locale/C/XLC_LOCALE lib/X11/locale/armscii-8/Compose lib/X11/locale/armscii-8/XLC_LOCALE lib/X11/locale/compose.dir lib/X11/locale/en_US.UTF-8/XLC_LOCALE -lib/X11/locale/en_US.utf/Compose -lib/X11/locale/en_US.utf/XLC_LOCALE lib/X11/locale/georgian-academy/Compose lib/X11/locale/georgian-academy/XLC_LOCALE lib/X11/locale/georgian-ps/Compose lib/X11/locale/georgian-ps/XLC_LOCALE lib/X11/locale/ibm-cp1133/Compose lib/X11/locale/ibm-cp1133/XLC_LOCALE +lib/X11/locale/iscii-dev/XLC_LOCALE +lib/X11/locale/isiri-3342/XLC_LOCALE lib/X11/locale/iso8859-1/Compose lib/X11/locale/iso8859-1/XLC_LOCALE lib/X11/locale/iso8859-10/Compose lib/X11/locale/iso8859-10/XLC_LOCALE +lib/X11/locale/iso8859-13/Compose +lib/X11/locale/iso8859-13/XLC_LOCALE lib/X11/locale/iso8859-14/Compose lib/X11/locale/iso8859-14/XLC_LOCALE lib/X11/locale/iso8859-15/Compose @@ -398,6 +462,8 @@ lib/X11/locale/iso8859-8/Compose lib/X11/locale/iso8859-8/XLC_LOCALE lib/X11/locale/iso8859-9/Compose lib/X11/locale/iso8859-9/XLC_LOCALE +lib/X11/locale/iso8859-9e/Compose +lib/X11/locale/iso8859-9e/XLC_LOCALE lib/X11/locale/ja.JIS/Compose lib/X11/locale/ja.JIS/XLC_LOCALE lib/X11/locale/ja.SJIS/Compose @@ -406,42 +472,25 @@ lib/X11/locale/ja/Compose lib/X11/locale/ja/XLC_LOCALE lib/X11/locale/ko/Compose lib/X11/locale/ko/XLC_LOCALE +lib/X11/locale/koi8-c/Compose +lib/X11/locale/koi8-c/XLC_LOCALE lib/X11/locale/koi8-r/Compose lib/X11/locale/koi8-r/XLC_LOCALE lib/X11/locale/koi8-u/Compose lib/X11/locale/koi8-u/XLC_LOCALE lib/X11/locale/locale.alias lib/X11/locale/locale.dir +lib/X11/locale/microsoft-cp1251/XLC_LOCALE +lib/X11/locale/microsoft-cp1255/XLC_LOCALE +lib/X11/locale/microsoft-cp1256/XLC_LOCALE +lib/X11/locale/mk_MK.UTF-8/Compose lib/X11/locale/mulelao-1/Compose lib/X11/locale/mulelao-1/XLC_LOCALE -lib/X11/locale/tbl_data/gb2312 -lib/X11/locale/tbl_data/jis0201 -lib/X11/locale/tbl_data/jis0208 -lib/X11/locale/tbl_data/ksc5601 -lib/X11/locale/tbl_data/tab8859_1 -lib/X11/locale/tbl_data/tab8859_10 -lib/X11/locale/tbl_data/tab8859_14 -lib/X11/locale/tbl_data/tab8859_15 -lib/X11/locale/tbl_data/tab8859_2 -lib/X11/locale/tbl_data/tab8859_3 -lib/X11/locale/tbl_data/tab8859_4 -lib/X11/locale/tbl_data/tab8859_5 -lib/X11/locale/tbl_data/tab8859_6 -lib/X11/locale/tbl_data/tab8859_7 -lib/X11/locale/tbl_data/tab8859_8 -lib/X11/locale/tbl_data/tab8859_9 -lib/X11/locale/tbl_data/tabarmscii_8 -lib/X11/locale/tbl_data/tabgeorgian_academy -lib/X11/locale/tbl_data/tabgeorgian_ps -lib/X11/locale/tbl_data/tabibm_cp1133 -lib/X11/locale/tbl_data/tabkoi8_r -lib/X11/locale/tbl_data/tabkoi8_u -lib/X11/locale/tbl_data/tabmulelao_1 -lib/X11/locale/tbl_data/tabtcvn -lib/X11/locale/tbl_data/tabtis620 -lib/X11/locale/tbl_data/tabviscii +lib/X11/locale/nokhchi-1/XLC_LOCALE +lib/X11/locale/tatar-cyr/XLC_LOCALE lib/X11/locale/th_TH.TACTIS/Compose lib/X11/locale/th_TH.TACTIS/XLC_LOCALE +lib/X11/locale/tscii-0/XLC_LOCALE lib/X11/locale/vi_VN.tcvn/Compose lib/X11/locale/vi_VN.tcvn/XLC_LOCALE lib/X11/locale/vi_VN.viscii/Compose @@ -456,6 +505,7 @@ lib/libFS.a lib/libGL.a lib/libGL.so lib/libGL.so.1 +lib/libGLw.a lib/libICE.a lib/libICE.so lib/libICE.so.6 @@ -467,6 +517,8 @@ lib/libPEX5.so.6 lib/libSM.a lib/libSM.so lib/libSM.so.6 +lib/libXThrStub.so +lib/libXThrStub.so.6 lib/libX11.a lib/libX11.so lib/libX11.so.6 @@ -486,6 +538,9 @@ lib/libXfont.a lib/libXfont.so lib/libXfont.so.1 lib/libXfontcache.a +lib/libXft.a +lib/libXft.so +lib/libXft.so.1 lib/libXi.a lib/libXi.so lib/libXi.so.6 @@ -499,6 +554,9 @@ lib/libXp.so.6 lib/libXpm.a lib/libXpm.so lib/libXpm.so.4 +lib/libXrender.a +lib/libXrender.so +lib/libXrender.so.1 lib/libXss.a lib/libXt.a lib/libXt.so @@ -517,6 +575,9 @@ lib/libdpstk.a lib/libdpstk.so lib/libdpstk.so.1 lib/libfntstubs.a +lib/libfreetype.a +lib/libfreetype.so +lib/libfreetype.so.6 lib/liboldX.a lib/liboldX.so lib/liboldX.so.6 diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index 715c6eededff..c537c86c9898 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -24,10 +24,30 @@ configure () { # It's good for FreeBSD ports/packages system. echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF + echo "#define InstallXserverSetUID NO" >> $LOCALDEF - # I want to set this line. - # but the probrem is too deep. not yet done. - # echo "#define InstallXserverSetUID NO" >> $LOCALDEF + # User Config. + if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then + echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF + fi + if [ X$BuildPexExt != XDEFAULT -a X$BuildPexExt != X ]; then + echo "#define BuildPexExt $BuildPexExt" >> $LOCALDEF + fi + if [ X$BuildXinerama != XDEFAULT -a X$BuildXinerama != X ]; then + echo "#define BuildXinerama $BuildXinerama" >> $LOCALDEF + fi + if [ X$BuildXIE != XDEFAULT -a X$BuildXIE != X ]; then + echo "#define BuildXIE $BuildXIE" >> $LOCALDEF + fi + if [ X$BuildAoutLibraries != XDEFAULT -a X$BuildAoutLibraries != X ]; then + echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $LOCALDEF + fi + if [ X$ForceNormalLib != XDEFAULT -a X$ForceNormalLib != X ]; then + echo "#define ForceNormalLib $ForceNormalLib" >> $LOCALDEF + fi + if [ X$DebuggableLibraries != XDEFAULT -a X$DebuggableLibraries != X ]; then + echo "#define DebuggableLibraries $DebuggableLibraries" >> $LOCALDEF + fi # disable some configs: there are not used this ports for i in \ @@ -48,10 +68,9 @@ configure () { do \ echo "#define $i NO" >> $LOCALDEF done - echo "#define ForceNormalLib YES" >> $LOCALDEF echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF - + # Check Wraphelp.c WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c cpwh=NO @@ -72,6 +91,9 @@ configure () { grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF echo "#define HasXdmAuth NO" >> $DESTDEF else + if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then + echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF + fi cp -f $ORIGDEF $DESTDEF fi diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile index 4b55dcc4365d..14387eccb4bf 100644 --- a/x11/XFree86-4-manuals/Makefile +++ b/x11/XFree86-4-manuals/Makefile @@ -6,1022 +6,34 @@ # PORTNAME= manuals -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X401src-1.tgz +DISTFILES= X402src-1.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp XFREE86_VERSION= 4 USE_IMAKE= YES +EXTRACT_TARGET= xc/doc/man \ + xc/extras/ogl-sample/main/doc/man +EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${EXTRACT_TARGET} PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc/doc/man INSTALL_TARGET= install.man -MANCOMPRESSED= yes -MAN3= AllPlanes.3 \ - BitmapBitOrder.3 \ - BitmapPad.3 \ - BitmapUnit.3 \ - BlackPixel.3 \ - BlackPixelOfScreen.3 \ - CellsOfScreen.3 \ - ClientWhitePointOfCCC.3 \ - ConnectionNumber.3 \ - DBE.3 \ - DefaultColormap.3 \ - DefaultColormapOfScreen.3 \ - DefaultDepth.3 \ - DefaultDepthOfScreen.3 \ - DefaultGC.3 \ - DefaultGCOfScreen.3 \ - DefaultRootWindow.3 \ - DefaultScreen.3 \ - DefaultScreenOfDisplay.3 \ - DefaultVisual.3 \ - DefaultVisualOfScreen.3 \ - DisplayCells.3 \ - DisplayHeight.3 \ - DisplayHeightMM.3 \ - DisplayOfCCC.3 \ - DisplayOfScreen.3 \ - DisplayPlanes.3 \ - DisplayString.3 \ - DisplayWidth.3 \ - DisplayWidthMM.3 \ - DoesBackingStore.3 \ - DoesSaveUnders.3 \ - EventMaskOfScreen.3 \ - HeightMMOfScreen.3 \ - HeightOfScreen.3 \ - ImageByteOrder.3 \ - IsCursorKey.3 \ - IsFunctionKey.3 \ - IsKeypadKey.3 \ - IsMiscFunctionKey.3 \ - IsModiferKey.3 \ - IsPFKey.3 \ - IsPrivateKeypadKey.3 \ - LastKnownRequestProcessed.3 \ - MaxCmapsOfScreen.3 \ - MenuPopdown.3 \ - MenuPopup.3 \ - MinCmapsOfScreen.3 \ - NextRequest.3 \ - PlanesOfScreen.3 \ - ProtocolRevision.3 \ - ProtocolVersion.3 \ - QLength.3 \ - RootWindow.3 \ - RootWindowOfScreen.3 \ - ScreenCount.3 \ - ScreenNumberOfCCC.3 \ - ScreenOfDisplay.3 \ - ScreenWhitePointOfCCC.3 \ - ServerVendor.3 \ - VendorRelease.3 \ - VisualOfCCC.3 \ - WhitePixel.3 \ - WhitePixelOfScreen.3 \ - WidthMMOfScreen.3 \ - WidthOfScreen.3 \ - XActivateScreenSaver.3 \ - XAddConnectionWatch.3 \ - XAddHost.3 \ - XAddHosts.3 \ - XAddPixel.3 \ - XAddToSaveSet.3 \ - XAllocClassHint.3 \ - XAllocColor.3 \ - XAllocColorCells.3 \ - XAllocColorPlanes.3 \ - XAllocIconSize.3 \ - XAllocNamedColor.3 \ - XAllocSizeHints.3 \ - XAllocStandardColormap.3 \ - XAllocWMHints.3 \ - XAllowDeviceEvents.3 \ - XAllowEvents.3 \ - XAnyEvent.3 \ - XArc.3 \ - XAutoRepeatOff.3 \ - XAutoRepeatOn.3 \ - XBaseFontNameListOfFontSet.3 \ - XBell.3 \ - XButtonEvent.3 \ - XChangeActivePointerGrab.3 \ - XChangeDeviceControl.3 \ - XChangeDeviceDontPropagateList.3 \ - XChangeDeviceKeyMapping.3 \ - XChangeFeedbackControl.3 \ - XChangeGC.3 \ - XChangeKeyboardControl.3 \ - XChangeKeyboardDevice.3 \ - XChangeKeyboardMapping.3 \ - XChangePointerControl.3 \ - XChangePointerDevice.3 \ - XChangeProperty.3 \ - XChangeSaveSet.3 \ - XChangeWindowAttributes.3 \ - XChar2b.3 \ - XCharStruct.3 \ - XCheckIfEvent.3 \ - XCheckMaskEvent.3 \ - XCheckTypedEvent.3 \ - XCheckTypedWindowEvent.3 \ - XCheckWindowEvent.3 \ - XCirculateEvent.3 \ - XCirculateRequestEvent.3 \ - XCirculateSubwindows.3 \ - XCirculateSubwindowsDown.3 \ - XCirculateSubwindowsUp.3 \ - XClassHint.3 \ - XClearArea.3 \ - XClearWindow.3 \ - XClientMessageEvent.3 \ - XClipBox.3 \ - XCloseDevice.3 \ - XCloseDisplay.3 \ - XCloseIM.3 \ - XCloseOM.3 \ - XColor.3 \ - XColormapEvent.3 \ - XConfigureEvent.3 \ - XConfigureRequestEvent.3 \ - XConfigureWindow.3 \ - XContextDependentDrawing.3 \ - XContextualDrawing.3 \ - XConvertCase.3 \ - XConvertSelection.3 \ - XCopyArea.3 \ - XCopyColormapAndFree.3 \ - XCopyGC.3 \ - XCopyPlane.3 \ - XCreateBitmapFromData.3 \ - XCreateColormap.3 \ - XCreateFontCursor.3 \ - XCreateFontSet.3 \ - XCreateGC.3 \ - XCreateGlyphCursor.3 \ - XCreateIC.3 \ - XCreateImage.3 \ - XCreateOC.3 \ - XCreatePixmap.3 \ - XCreatePixmapCursor.3 \ - XCreatePixmapFromBitmapData.3 \ - XCreateRegion.3 \ - XCreateSimpleWindow.3 \ - XCreateWindow.3 \ - XCreateWindowEvent.3 \ - XCrossingEvent.3 \ - XDefaultString.3 \ - XDefineCursor.3 \ - XDeleteContext.3 \ - XDeleteModifiermapEntry.3 \ - XDeleteProperty.3 \ - XDestroyIC.3 \ - XDestroyImage.3 \ - XDestroyOC.3 \ - XDestroyRegion.3 \ - XDestroySubwindows.3 \ - XDestroyWindow.3 \ - XDestroyWindowEvent.3 \ - XDeviceBell.3 \ - XDeviceTimeCoord.3 \ - XDirectionalDependentDrawing.3 \ - XDisableAccessControl.3 \ - XDisplayKeycodes.3 \ - XDisplayMotionBufferSize.3 \ - XDisplayName.3 \ - XDisplayOfIM.3 \ - XDisplayOfOM.3 \ - XDrawArc.3 \ - XDrawArcs.3 \ - XDrawImageString.3 \ - XDrawImageString16.3 \ - XDrawLine.3 \ - XDrawLines.3 \ - XDrawPoint.3 \ - XDrawPoints.3 \ - XDrawRectangle.3 \ - XDrawRectangles.3 \ - XDrawSegments.3 \ - XDrawString.3 \ - XDrawString16.3 \ - XDrawText.3 \ - XDrawText16.3 \ - XEmptyRegion.3 \ - XEnableAccessControl.3 \ - XEqualRegion.3 \ - XErrorEvent.3 \ - XEvent.3 \ - XEventsQueued.3 \ - XExposeEvent.3 \ - XExtendedMaxRequestSize.3 \ - XExtentsOfFontSet.3 \ - XFetchBuffer.3 \ - XFetchBytes.3 \ - XFetchName.3 \ - XFillArc.3 \ - XFillArcs.3 \ - XFillPolygon.3 \ - XFillRectangle.3 \ - XFillRectangles.3 \ - XFilterEvent.3 \ - XFindContext.3 \ - XFlush.3 \ - XFocusChangeEvent.3 \ - XFontProp.3 \ - XFontSetExtents.3 \ - XFontStruct.3 \ - XFontsOfFontSet.3 \ - XForceScreenSaver.3 \ - XFree.3 \ - XFreeColormap.3 \ - XFreeColors.3 \ - XFreeCursor.3 \ - XFreeDeviceList.3 \ - XFreeFont.3 \ - XFreeFontInfo.3 \ - XFreeFontNames.3 \ - XFreeFontPath.3 \ - XFreeFontSet.3 \ - XFreeGC.3 \ - XFreeModifierMap.3 \ - XFreePixmap.3 \ - XFreeStringList.3 \ - XGCValues.3 \ - XGContextFromGC.3 \ - XGetAtomName.3 \ - XGetAtomNames.3 \ - XGetClassHint.3 \ - XGetCommand.3 \ - XGetDeviceButtonMapping.3 \ - XGetDeviceControl.3 \ - XGetDeviceDontPropagateList.3 \ - XGetDeviceFocus.3 \ - XGetDeviceKeyMapping.3 \ - XGetDeviceModifierMapping.3 \ - XGetDeviceMotionEvents.3 \ - XGetErrorDatabaseText.3 \ - XGetErrorText.3 \ - XGetExtensionVersion.3 \ - XGetFeedbackControl.3 \ - XGetFontPath.3 \ - XGetFontProperty.3 \ - XGetGCValues.3 \ - XGetGeometry.3 \ - XGetICValues.3 \ - XGetIMValues.3 \ - XGetIconName.3 \ - XGetIconSizes.3 \ - XGetImage.3 \ - XGetInputFocus.3 \ - XGetKeyboardControl.3 \ - XGetKeyboardMapping.3 \ - XGetModifierMapping.3 \ - XGetMotionEvents.3 \ - XGetOCValues.3 \ - XGetOMValues.3 \ - XGetPixel.3 \ - XGetPointerControl.3 \ - XGetPointerMapping.3 \ - XGetRGBColormaps.3 \ - XGetScreenSaver.3 \ - XGetSelectedExtensionEvents.3 \ - XGetSelectionOwner.3 \ - XGetSubImage.3 \ - XGetTextProperty.3 \ - XGetTransientForHint.3 \ - XGetVisualInfo.3 \ - XGetWMClientMachine.3 \ - XGetWMColormapWindows.3 \ - XGetWMHints.3 \ - XGetWMIconName.3 \ - XGetWMName.3 \ - XGetWMNormalHints.3 \ - XGetWMProtocols.3 \ - XGetWMSizeHints.3 \ - XGetWindowAttributes.3 \ - XGetWindowProperty.3 \ - XGrabButton.3 \ - XGrabDevice.3 \ - XGrabDeviceButton.3 \ - XGrabDeviceKey.3 \ - XGrabKey.3 \ - XGrabKeyboard.3 \ - XGrabPointer.3 \ - XGrabServer.3 \ - XGraphicsExposeEvent.3 \ - XGravityEvent.3 \ - XHostAddress.3 \ - XIMOfIC.3 \ - XIconSize.3 \ - XIconifyWindow.3 \ - XIfEvent.3 \ - XInitImage.3 \ - XInitThreads.3 \ - XInsertModifiermapEntry.3 \ - XInstallColormap.3 \ - XInternAtom.3 \ - XInternAtoms.3 \ - XInternalConnectionNumbers.3 \ - XIntersectRegion.3 \ - XKeyEvent.3 \ - XKeyboardControl.3 \ - XKeycodeToKeysym.3 \ - XKeymapEvent.3 \ - XKeysymToKeycode.3 \ - XKeysymToString.3 \ - XKillClient.3 \ - XListDepths.3 \ - XListFonts.3 \ - XListFontsWithInfo.3 \ - XListHosts.3 \ - XListInputDevices.3 \ - XListInstalledColormaps.3 \ - XListPixmapFormats.3 \ - XListProperties.3 \ - XLoadFont.3 \ - XLoadQueryFont.3 \ - XLocaleOfFontSet.3 \ - XLocaleOfIM.3 \ - XLocaleOfOM.3 \ - XLockDisplay.3 \ - XLookupColor.3 \ - XLookupKeysym.3 \ - XLookupString.3 \ - XLowerWindow.3 \ - XMapEvent.3 \ - XMapRaised.3 \ - XMapRequestEvent.3 \ - XMapSubwindows.3 \ - XMapWindow.3 \ - XMappingEvent.3 \ - XMaskEvent.3 \ - XMatchVisualInfo.3 \ - XMaxRequestSize.3 \ - XModifierKeymap.3 \ - XMotionEvent.3 \ - XMoveResizeWindow.3 \ - XMoveWindow.3 \ - XNewModifiermap.3 \ - XNextEvent.3 \ - XNoExposeEvent.3 \ - XNoOp.3 \ - XOMOfOC.3 \ - XOffsetRegion.3 \ - XOpenDevice.3 \ - XOpenDisplay.3 \ - XOpenIM.3 \ - XOpenOM.3 \ - XParseColor.3 \ - XParseGeometry.3 \ - XPeekEvent.3 \ - XPeekIfEvent.3 \ - XPending.3 \ - XPixmapFormatValues.3 \ - XPoint.3 \ - XPointInRegion.3 \ - XPolygonRegion.3 \ - XProcessInternalConnection.3 \ - XPropertyEvent.3 \ - XPutBackEvent.3 \ - XPutImage.3 \ - XPutPixel.3 \ - XQueryBestCursor.3 \ - XQueryBestSize.3 \ - XQueryBestStipple.3 \ - XQueryBestTile.3 \ - XQueryColor.3 \ - XQueryColors.3 \ - XQueryDeviceState.3 \ - XQueryFont.3 \ - XQueryKeymap.3 \ - XQueryPointer.3 \ - XQueryTextExtents.3 \ - XQueryTextExtents16.3 \ - XQueryTree.3 \ - XRaiseWindow.3 \ - XReadBitmapFile.3 \ - XReadBitmapFileData.3 \ - XRebindKeySym.3 \ - XRecolorCursor.3 \ - XReconfigureWMWindow.3 \ - XRectInRegion.3 \ - XRectangle.3 \ - XRefreshKeyboardMapping.3 \ - XRegisterIMInstantiateCallback.3 \ - XRemoveConnectionWatch.3 \ - XRemoveFromSaveSet.3 \ - XRemoveHost.3 \ - XRemoveHosts.3 \ - XReparentEvent.3 \ - XReparentWindow.3 \ - XResetScreenSaver.3 \ - XResizeRequestEvent.3 \ - XResizeWindow.3 \ - XResourceManagerString.3 \ - XRestackWindows.3 \ - XRotateBuffers.3 \ - XRotateWindowProperties.3 \ - XSaveContext.3 \ - XScreenNumberOfScreen.3 \ - XScreenResourceString.3 \ - XSegment.3 \ - XSelectExtensionEvent.3 \ - XSelectInput.3 \ - XSelectionClearEvent.3 \ - XSelectionEvent.3 \ - XSelectionRequestEvent.3 \ - XSendEvent.3 \ - XSendExtensionEvent.3 \ - XSetAccessControl.3 \ - XSetAfterFunction.3 \ - XSetArcMode.3 \ - XSetBackground.3 \ - XSetClassHint.3 \ - XSetClipMask.3 \ - XSetClipOrigin.3 \ - XSetClipRectangles.3 \ - XSetCloseDownMode.3 \ - XSetCommand.3 \ - XSetDashes.3 \ - XSetDeviceButtonMapping.3 \ - XSetDeviceFocus.3 \ - XSetDeviceMode.3 \ - XSetDeviceModifierMapping.3 \ - XSetDeviceValuators.3 \ - XSetErrorHandler.3 \ - XSetFillRule.3 \ - XSetFillStyle.3 \ - XSetFont.3 \ - XSetFontPath.3 \ - XSetForeground.3 \ - XSetFunction.3 \ - XSetGraphicsExposure.3 \ - XSetICFocus.3 \ - XSetICValues.3 \ - XSetIMValues.3 \ - XSetIOErrorHandler.3 \ - XSetIconName.3 \ - XSetIconSizes.3 \ - XSetInputFocus.3 \ - XSetLineAttributes.3 \ - XSetLocaleModifiers.3 \ - XSetModifierMapping.3 \ - XSetOCValues.3 \ - XSetOMValues.3 \ - XSetPlanemask.3 \ - XSetPointerMapping.3 \ - XSetRGBColormaps.3 \ - XSetRegion.3 \ - XSetScreenSaver.3 \ - XSetSelectionOwner.3 \ - XSetState.3 \ - XSetStipple.3 \ - XSetSubwindowMode.3 \ - XSetTSOrigin.3 \ - XSetTextProperty.3 \ - XSetTile.3 \ - XSetTransientForHint.3 \ - XSetWMClientMachine.3 \ - XSetWMColormapWindows.3 \ - XSetWMHints.3 \ - XSetWMIconName.3 \ - XSetWMName.3 \ - XSetWMNormalHints.3 \ - XSetWMProperties.3 \ - XSetWMProtocols.3 \ - XSetWMSizeHints.3 \ - XSetWindowAttributes.3 \ - XSetWindowBackground.3 \ - XSetWindowBackgroundPixmap.3 \ - XSetWindowBorder.3 \ - XSetWindowBorderPixmap.3 \ - XSetWindowBorderWidth.3 \ - XSetWindowColormap.3 \ - XShapeCombineMask.3 \ - XShapeCombineRectangles.3 \ - XShapeCombineRegion.3 \ - XShapeCombineShape.3 \ - XShapeGetRectangles.3 \ - XShapeInputSelected.3 \ - XShapeOffsetShape.3 \ - XShapeQueryExtension.3 \ - XShapeQueryExtents.3 \ - XShapeQueryVersion.3 \ - XShapeSelectInput.3 \ - XShrinkRegion.3 \ - XSizeHints.3 \ - XStandardColormap.3 \ - XStoreBuffer.3 \ - XStoreBytes.3 \ - XStoreColor.3 \ - XStoreColors.3 \ - XStoreName.3 \ - XStoreNamedColor.3 \ - XStringListToTextProperty.3 \ - XStringToKeysym.3 \ - XSubImage.3 \ - XSubtractRegion.3 \ - XSupportsLocale.3 \ - XSync.3 \ - XSynchronize.3 \ - XTextExtents.3 \ - XTextExtents16.3 \ - XTextItem.3 \ - XTextItem16.3 \ - XTextProperty.3 \ - XTextPropertyToStringList.3 \ - XTextWidth.3 \ - XTextWidth16.3 \ - XTimeCoord.3 \ - XTranslateCoordinates.3 \ - XUndefineCursor.3 \ - XUngrabButton.3 \ - XUngrabDevice.3 \ - XUngrabDeviceButton.3 \ - XUngrabDeviceKey.3 \ - XUngrabKey.3 \ - XUngrabKeyboard.3 \ - XUngrabPointer.3 \ - XUngrabServer.3 \ - XUninstallColormap.3 \ - XUnionRectWithRegion.3 \ - XUnionRegion.3 \ - XUniqueContext.3 \ - XUnloadFont.3 \ - XUnlockDisplay.3 \ - XUnmapEvent.3 \ - XUnmapSubwindows.3 \ - XUnmapWindow.3 \ - XUnregisterIMInstantiateCallback.3 \ - XUnsetICFocus.3 \ - XVaCreateNestedList.3 \ - XVisibilityNotifyEvent.3 \ - XVisualIDFromVisual.3 \ - XVisualInfo.3 \ - XWMGeometry.3 \ - XWMHints.3 \ - XWarpPointer.3 \ - XWindowAttributes.3 \ - XWindowChanges.3 \ - XWindowEvent.3 \ - XWithdrawWindow.3 \ - XWriteBitmapFile.3 \ - XXorRegion.3 \ - Xau.3 \ - XauDisposeAuth.3 \ - XauFileName.3 \ - XauGetAuthByAddr.3 \ - XauGetBestAuthByAddr.3 \ - XauLockAuth.3 \ - XauReadAuth.3 \ - XauUnlockAuth.3 \ - XauWriteAuth.3 \ - XcmsAllocColor.3 \ - XcmsAllocNamedColor.3 \ - XcmsCCCOfColormap.3 \ - XcmsCIELab.3 \ - XcmsCIELabQueryMaxC.3 \ - XcmsCIELabQueryMaxL.3 \ - XcmsCIELabQueryMaxLC.3 \ - XcmsCIELabQueryMinL.3 \ - XcmsCIELuv.3 \ - XcmsCIELuvQueryMaxC.3 \ - XcmsCIELuvQueryMaxL.3 \ - XcmsCIELuvQueryMaxLC.3 \ - XcmsCIELuvQueryMinL.3 \ - XcmsCIEXYZ.3 \ - XcmsCIEuvY.3 \ - XcmsCIExyY.3 \ - XcmsColor.3 \ - XcmsConvertColors.3 \ - XcmsCreateCCC.3 \ - XcmsDefaultCCC.3 \ - XcmsFreeCCC.3 \ - XcmsLookupColor.3 \ - XcmsPad.3 \ - XcmsQueryBlack.3 \ - XcmsQueryBlue.3 \ - XcmsQueryColor.3 \ - XcmsQueryColors.3 \ - XcmsQueryGreen.3 \ - XcmsQueryRed.3 \ - XcmsQueryWhite.3 \ - XcmsRGB.3 \ - XcmsRGBi.3 \ - XcmsSetCCCOfColormap.3 \ - XcmsSetWhiteAdjustProc.3 \ - XcmsSetWhitePoint.3 \ - XcmsStoreColor.3 \ - XcmsStoreColors.3 \ - XcmsTekHVC.3 \ - XcmsTekHVCQueryMaxC.3 \ - XcmsTekHVCQueryMaxV.3 \ - XcmsTekHVCQueryMaxVC.3 \ - XcmsTekHVCQueryMaxVSamples.3 \ - XcmsTekHVCQueryMinV.3 \ - XdbeAllocateBackBufferName.3 \ - XdbeBeginIdiom.3 \ - XdbeDeallocateBackBufferName.3 \ - XdbeEndIdiom.3 \ - XdbeFreeVisualInfo.3 \ - XdbeGetBackBufferAttributes.3 \ - XdbeGetVisualInfo.3 \ - XdbeQueryExtension.3 \ - XdbeSwapBuffers.3 \ - XeviGetVisualInfo.3 \ - XeviQueryVersion.3 \ - XmbDrawImageString.3 \ - XmbDrawString.3 \ - XmbDrawText.3 \ - XmbLookupString.3 \ - XmbResetIC.3 \ - XmbSetWMProperties.3 \ - XmbTextEscapement.3 \ - XmbTextExtents.3 \ - XmbTextListToTextProperty.3 \ - XmbTextPerCharExtents.3 \ - XmbTextPropertyToTextList.3 \ - XmbufChangeBufferAttributes.3 \ - XmbufChangeWindowAttributes.3 \ - XmbufCreateBuffers.3 \ - XmbufCreateStereoWindow.3 \ - XmbufDestroyBuffers.3 \ - XmbufDisplayBuffers.3 \ - XmbufGetBufferAttributes.3 \ - XmbufGetScreenInfo.3 \ - XmbufGetVersion.3 \ - XmbufGetWindowAttributes.3 \ - XmbufQueryExtension.3 \ - XrmCombineDatabase.3 \ - XrmCombineFileDatabase.3 \ - XrmDestroyDatabase.3 \ - XrmEnumerateDatabase.3 \ - XrmGetDatabase.3 \ - XrmGetFileDatabase.3 \ - XrmGetResource.3 \ - XrmGetStringDatabase.3 \ - XrmInitialize.3 \ - XrmLocaleOfDatabase.3 \ - XrmMergeDatabases.3 \ - XrmOptionDescRec.3 \ - XrmOptionKind.3 \ - XrmParseCommand.3 \ - XrmPermStringToQuark.3 \ - XrmPutFileDatabase.3 \ - XrmPutLineResource.3 \ - XrmPutResource.3 \ - XrmPutStringResource.3 \ - XrmQGetResource.3 \ - XrmQGetSearchList.3 \ - XrmQGetSearchResource.3 \ - XrmQPutResource.3 \ - XrmQPutStringResource.3 \ - XrmQuarkToString.3 \ - XrmSetDatabase.3 \ - XrmStringToBindingQuarkList.3 \ - XrmStringToQuark.3 \ - XrmStringToQuarkList.3 \ - XrmUniqueQuark.3 \ - XrmValue.3 \ - XtAddActions.3 \ - XtAddCallback.3 \ - XtAddCallbacks.3 \ - XtAddConverter.3 \ - XtAddEventHandler.3 \ - XtAddExposureToRegion.3 \ - XtAddGrab.3 \ - XtAddInput.3 \ - XtAddRawEventHandler.3 \ - XtAddTimeOut.3 \ - XtAddTimeout.3 \ - XtAllocateGC.3 \ - XtAppAddActionHook.3 \ - XtAppAddActions.3 \ - XtAppAddBlockHook.3 \ - XtAppAddConverter.3 \ - XtAppAddInput.3 \ - XtAppAddSignal.3 \ - XtAppAddTimeOut.3 \ - XtAppAddTimeout.3 \ - XtAppAddWorkProc.3 \ - XtAppCreateShell.3 \ - XtAppError.3 \ - XtAppErrorMsg.3 \ - XtAppGetErrorDatabase.3 \ - XtAppGetErrorDatabaseText.3 \ - XtAppGetExitFlag.3 \ - XtAppGetSelectionTimeout.3 \ - XtAppInitialize.3 \ - XtAppLock.3 \ - XtAppMainLoop.3 \ - XtAppNextEvent.3 \ - XtAppPeekEvent.3 \ - XtAppPending.3 \ - XtAppProcessEvent.3 \ - XtAppReleaseCacheRefs.3 \ - XtAppSetErrorHandler.3 \ - XtAppSetErrorMsgHandler.3 \ - XtAppSetExitFlag.3 \ - XtAppSetFallbackResources.3 \ - XtAppSetSelectionTimeout.3 \ - XtAppSetTypeConverter.3 \ - XtAppSetWarningHandler.3 \ - XtAppSetWarningMsgHandler.3 \ - XtAppUnlock.3 \ - XtAppWarning.3 \ - XtAppWarningMsg.3 \ - XtAugmentTranslations.3 \ - XtBuildEventMask.3 \ - XtCallAcceptFocus.3 \ - XtCallActionProc.3 \ - XtCallCallbackList.3 \ - XtCallCallbacks.3 \ - XtCallConverter.3 \ - XtCallbackExclusive.3 \ - XtCallbackNone.3 \ - XtCallbackNonexclusive.3 \ - XtCallbackPopdown.3 \ - XtCalloc.3 \ - XtCancelSelectionRequest.3 \ - XtChangeManagedSet.3 \ - XtCheckSubclass.3 \ - XtClass.3 \ - XtCloseDisplay.3 \ - XtConfigureWidget.3 \ - XtConvert.3 \ - XtConvertAndStore.3 \ - XtConvertCase.3 \ - XtCreateApplicationContext.3 \ - XtCreateApplicationShell.3 \ - XtCreateManagedWidget.3 \ - XtCreatePopupShell.3 \ - XtCreateSelectionRequest.3 \ - XtCreateWidget.3 \ - XtCreateWindow.3 \ - XtDatabase.3 \ - XtDestroyApplicationContext.3 \ - XtDestroyWidget.3 \ - XtDirectConvert.3 \ - XtDisownSelection.3 \ - XtDispatchEvent.3 \ - XtDispatchEventToWidget.3 \ - XtDisplay.3 \ - XtDisplayInitialize.3 \ - XtDisplayOfObject.3 \ - XtDisplayStringConversionWarning.3 \ - XtDisplayToApplicationContext.3 \ - XtError.3 \ - XtErrorMsg.3 \ - XtFindFile.3 \ - XtFree.3 \ - XtGetActionKeysym.3 \ - XtGetActionList.3 \ - XtGetApplicationNameAndClass.3 \ - XtGetApplicationResources.3 \ - XtGetClassExtension.3 \ - XtGetConstraintResourceList.3 \ - XtGetDisplays.3 \ - XtGetErrorDatabase.3 \ - XtGetErrorDatabaseText.3 \ - XtGetGC.3 \ - XtGetKeyboardFocusWidget.3 \ - XtGetKeysymTable.3 \ - XtGetMultiClickTime.3 \ - XtGetResourceList.3 \ - XtGetSelectionParameters.3 \ - XtGetSelectionRequest.3 \ - XtGetSelectionTimeout.3 \ - XtGetSelectionValue.3 \ - XtGetSelectionValueIncremental.3 \ - XtGetSelectionValues.3 \ - XtGetSelectionValuesIncremental.3 \ - XtGetSubresources.3 \ - XtGetSubvalues.3 \ - XtGetValues.3 \ - XtGrabButton.3 \ - XtGrabKey.3 \ - XtGrabKeyboard.3 \ - XtGrabPointer.3 \ - XtHasCallbacks.3 \ - XtHooksOfDisplay.3 \ - XtInitialize.3 \ - XtInitializeWidgetClass.3 \ - XtInsertEventHandler.3 \ - XtInsertEventTypeHandler.3 \ - XtInsertRawEventHandler.3 \ - XtInstallAccelerators.3 \ - XtInstallAllAccelerators.3 \ - XtIsApplicationShell.3 \ - XtIsComposite.3 \ - XtIsConstraint.3 \ - XtIsManaged.3 \ - XtIsObject.3 \ - XtIsOverrideShell.3 \ - XtIsRealized.3 \ - XtIsRectObj.3 \ - XtIsSensitive.3 \ - XtIsShell.3 \ - XtIsSubclass.3 \ - XtIsTopLevelShell.3 \ - XtIsTransientShell.3 \ - XtIsVendorShell.3 \ - XtIsWMShell.3 \ - XtIsWidget.3 \ - XtKeysymToKeycodeList.3 \ - XtLastEventProcessed.3 \ - XtLastTimestampProcessed.3 \ - XtMainLoop.3 \ - XtMakeGeometryRequest.3 \ - XtMakeResizeRequest.3 \ - XtMalloc.3 \ - XtManageChild.3 \ - XtManageChildren.3 \ - XtMapWidget.3 \ - XtMergeArgLists.3 \ - XtMoveWidget.3 \ - XtName.3 \ - XtNameToWidget.3 \ - XtNew.3 \ - XtNewString.3 \ - XtNextEvent.3 \ - XtNoticeSignal.3 \ - XtNumber.3 \ - XtOffset.3 \ - XtOffsetOf.3 \ - XtOpenApplication.3 \ - XtOpenDisplay.3 \ - XtOverrideTranslations.3 \ - XtOwnSelection.3 \ - XtOwnSelectionIncremental.3 \ - XtParent.3 \ - XtParseAcceleratorTable.3 \ - XtParseTranslationTable.3 \ - XtPeekEvent.3 \ - XtPending.3 \ - XtPopdown.3 \ - XtPopup.3 \ - XtPopupSpringLoaded.3 \ - XtProcessEvent.3 \ - XtProcessLock.3 \ - XtProcessUnlock.3 \ - XtQueryGeometry.3 \ - XtRealizeWidget.3 \ - XtRealloc.3 \ - XtRegisterCaseConverter.3 \ - XtRegisterDrawable.3 \ - XtRegisterExtensionSelector.3 \ - XtRegisterGrabAction.3 \ - XtReleaseGC.3 \ - XtReleasePropertyAtom.3 \ - XtRemoveActionHook.3 \ - XtRemoveAllCallbacks.3 \ - XtRemoveBlockHook.3 \ - XtRemoveCallback.3 \ - XtRemoveCallbacks.3 \ - XtRemoveEventHandler.3 \ - XtRemoveEventTypeHandler.3 \ - XtRemoveGrab.3 \ - XtRemoveInput.3 \ - XtRemoveRawEventHandler.3 \ - XtRemoveSignal.3 \ - XtRemoveTimeOut.3 \ - XtRemoveWorkProc.3 \ - XtReservePropertyAtom.3 \ - XtResizeWidget.3 \ - XtResolvePathname.3 \ - XtScreen.3 \ - XtScreenDatabase.3 \ - XtScreenOfObject.3 \ - XtSendSelectionRequest.3 \ - XtSessionGetToken.3 \ - XtSessionReturnToken.3 \ - XtSetArg.3 \ - XtSetErrorHandler.3 \ - XtSetErrorMsgHandler.3 \ - XtSetEventDispatcher.3 \ - XtSetKeyTranslator.3 \ - XtSetKeyboardFocus.3 \ - XtSetLanguageProc.3 \ - XtSetMappedWhenManaged.3 \ - XtSetMultiClickTime.3 \ - XtSetSelectionParameters.3 \ - XtSetSelectionTimeout.3 \ - XtSetSensitive.3 \ - XtSetSubvalues.3 \ - XtSetTypeConverter.3 \ - XtSetValues.3 \ - XtSetWMColormapWindows.3 \ - XtSetWarningHandler.3 \ - XtSetWarningMsgHandler.3 \ - XtStringConversionWarning.3 \ - XtSuperclass.3 \ - XtToolkitInitialize.3 \ - XtToolkitThreadInitialize.3 \ - XtTranslateCoords.3 \ - XtTranslateKeycode.3 \ - XtUngrabButton.3 \ - XtUngrabKey.3 \ - XtUngrabKeyboard.3 \ - XtUngrabPointer.3 \ - XtUninstallTranslations.3 \ - XtUnmanageChild.3 \ - XtUnmanageChildren.3 \ - XtUnmapWidget.3 \ - XtUnrealizeWidget.3 \ - XtUnregisterDrawable.3 \ - XtVaAppCreateShell.3 \ - XtVaAppInitialize.3 \ - XtVaCreateArgsList.3 \ - XtVaCreateManagedWidget.3 \ - XtVaCreatePopupShell.3 \ - XtVaCreateWidget.3 \ - XtVaGetApplicationResources.3 \ - XtVaGetSubresources.3 \ - XtVaGetValues.3 \ - XtVaOpenApplication.3 \ - XtVaSetValues.3 \ - XtWarning.3 \ - XtWarningMsg.3 \ - XtWidgetToApplicationContext.3 \ - XtWindow.3 \ - XtWindowOfObject.3 \ - XtWindowToWidget.3 \ - Xv.3 \ - XvFreeAdaptorInfo.3 \ - XvFreeEncodingInfo.3 \ - XvGetPortAttribute.3 \ - XvGetStill.3 \ - XvGetVideo.3 \ - XvGrabPort.3 \ - XvPortNotify.3 \ - XvPutStill.3 \ - XvPutVideo.3 \ - XvQueryAdaptors.3 \ - XvQueryBestSize.3 \ - XvQueryEncodings.3 \ - XvQueryExtension.3 \ - XvSelectPortNotify.3 \ - XvSelectVideoNotify.3 \ - XvSetPortAttribute.3 \ - XvStopVideo.3 \ - XvUngrabPort.3 \ - XvVideoNotify.3 \ - XwcDrawImageString.3 \ - XwcDrawString.3 \ - XwcDrawText.3 \ - XwcFreeStringList.3 \ - XwcLookupString.3 \ - XwcResetIC.3 \ - XwcTextEscapement.3 \ - XwcTextExtents.3 \ - XwcTextListToTextProperty.3 \ - XwcTextPerCharExtents.3 \ - XwcTextPropertyToTextList.3 \ - glXChooseVisual.3 \ - glXCopyContext.3 \ - glXCreateContext.3 \ - glXCreateGLXPixmap.3 \ - glXDestroyContext.3 \ - glXDestroyGLXPixmap.3 \ - glXFreeContextEXT.3 \ - glXGetClientString.3 \ - glXGetConfig.3 \ - glXGetContextIDEXT.3 \ - glXGetCurrentContext.3 \ - glXGetCurrentDisplay.3 \ - glXGetCurrentDrawable.3 \ - glXImportContextEXT.3 \ - glXIntro.3 \ - glXIsDirect.3 \ - glXMakeCurrent.3 \ - glXQueryContextInfoEXT.3 \ - glXQueryExtension.3 \ - glXQueryExtensionsString.3 \ - glXQueryServerString.3 \ - glXQueryVersion.3 \ - glXSwapBuffers.3 \ - glXUseXFont.3 \ - glXWaitGL.3 \ - glXWaitX.3 -MAN7= X.7 \ - XConsortium.7 \ - XProjectTeam.7 \ - XStandards.7 \ - Xsecurity.7 + +.include <bsd.port.pre.mk> +.include <${FILESDIR}/manpages> do-configure: (cd ${WRKSRC} && \ imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \ - -DTOPDIR=../../.. -DCURDIR=.; \ + -DTOPDIR=../.. -DCURDIR=.; \ ${MAKE} Makefiles ; \ ${MAKE} includes ; \ ${MAKE} depend) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/XFree86-4-manuals/distinfo b/x11/XFree86-4-manuals/distinfo index e9125a5f32c4..b2929fe5f39e 100644 --- a/x11/XFree86-4-manuals/distinfo +++ b/x11/XFree86-4-manuals/distinfo @@ -1 +1 @@ -MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 +MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 diff --git a/x11/XFree86-4-manuals/files/manpages b/x11/XFree86-4-manuals/files/manpages new file mode 100644 index 000000000000..df748387767f --- /dev/null +++ b/x11/XFree86-4-manuals/files/manpages @@ -0,0 +1,1009 @@ +MAN3= AllPlanes.3 \ + BitmapBitOrder.3 \ + BitmapPad.3 \ + BitmapUnit.3 \ + BlackPixel.3 \ + BlackPixelOfScreen.3 \ + CellsOfScreen.3 \ + ClientWhitePointOfCCC.3 \ + ConnectionNumber.3 \ + DBE.3 \ + DefaultColormap.3 \ + DefaultColormapOfScreen.3 \ + DefaultDepth.3 \ + DefaultDepthOfScreen.3 \ + DefaultGC.3 \ + DefaultGCOfScreen.3 \ + DefaultRootWindow.3 \ + DefaultScreen.3 \ + DefaultScreenOfDisplay.3 \ + DefaultVisual.3 \ + DefaultVisualOfScreen.3 \ + DisplayCells.3 \ + DisplayHeight.3 \ + DisplayHeightMM.3 \ + DisplayOfCCC.3 \ + DisplayOfScreen.3 \ + DisplayPlanes.3 \ + DisplayString.3 \ + DisplayWidth.3 \ + DisplayWidthMM.3 \ + DoesBackingStore.3 \ + DoesSaveUnders.3 \ + EventMaskOfScreen.3 \ + GLwCreateMDrawingArea.3 \ + GLwDrawingArea.3 \ + GLwDrawingAreaMakeCurrent.3 \ + GLwDrawingAreaSwapBuffers.3 \ + GLwMDrawingArea.3 \ + HeightMMOfScreen.3 \ + HeightOfScreen.3 \ + ImageByteOrder.3 \ + IsCursorKey.3 \ + IsFunctionKey.3 \ + IsKeypadKey.3 \ + IsMiscFunctionKey.3 \ + IsModiferKey.3 \ + IsPFKey.3 \ + IsPrivateKeypadKey.3 \ + LastKnownRequestProcessed.3 \ + MaxCmapsOfScreen.3 \ + MenuPopdown.3 \ + MenuPopup.3 \ + MinCmapsOfScreen.3 \ + NextRequest.3 \ + PlanesOfScreen.3 \ + ProtocolRevision.3 \ + ProtocolVersion.3 \ + QLength.3 \ + RootWindow.3 \ + RootWindowOfScreen.3 \ + ScreenCount.3 \ + ScreenNumberOfCCC.3 \ + ScreenOfDisplay.3 \ + ScreenWhitePointOfCCC.3 \ + ServerVendor.3 \ + VendorRelease.3 \ + VisualOfCCC.3 \ + WhitePixel.3 \ + WhitePixelOfScreen.3 \ + WidthMMOfScreen.3 \ + WidthOfScreen.3 \ + XActivateScreenSaver.3 \ + XAddConnectionWatch.3 \ + XAddHost.3 \ + XAddHosts.3 \ + XAddPixel.3 \ + XAddToSaveSet.3 \ + XAllocClassHint.3 \ + XAllocColor.3 \ + XAllocColorCells.3 \ + XAllocColorPlanes.3 \ + XAllocIconSize.3 \ + XAllocNamedColor.3 \ + XAllocSizeHints.3 \ + XAllocStandardColormap.3 \ + XAllocWMHints.3 \ + XAllowDeviceEvents.3 \ + XAllowEvents.3 \ + XAnyEvent.3 \ + XArc.3 \ + XAutoRepeatOff.3 \ + XAutoRepeatOn.3 \ + XBaseFontNameListOfFontSet.3 \ + XBell.3 \ + XButtonEvent.3 \ + XChangeActivePointerGrab.3 \ + XChangeDeviceControl.3 \ + XChangeDeviceDontPropagateList.3 \ + XChangeDeviceKeyMapping.3 \ + XChangeFeedbackControl.3 \ + XChangeGC.3 \ + XChangeKeyboardControl.3 \ + XChangeKeyboardDevice.3 \ + XChangeKeyboardMapping.3 \ + XChangePointerControl.3 \ + XChangePointerDevice.3 \ + XChangeProperty.3 \ + XChangeSaveSet.3 \ + XChangeWindowAttributes.3 \ + XChar2b.3 \ + XCharStruct.3 \ + XCheckIfEvent.3 \ + XCheckMaskEvent.3 \ + XCheckTypedEvent.3 \ + XCheckTypedWindowEvent.3 \ + XCheckWindowEvent.3 \ + XCirculateEvent.3 \ + XCirculateRequestEvent.3 \ + XCirculateSubwindows.3 \ + XCirculateSubwindowsDown.3 \ + XCirculateSubwindowsUp.3 \ + XClassHint.3 \ + XClearArea.3 \ + XClearWindow.3 \ + XClientMessageEvent.3 \ + XClipBox.3 \ + XCloseDevice.3 \ + XCloseDisplay.3 \ + XCloseIM.3 \ + XCloseOM.3 \ + XColor.3 \ + XColormapEvent.3 \ + XConfigureEvent.3 \ + XConfigureRequestEvent.3 \ + XConfigureWindow.3 \ + XContextDependentDrawing.3 \ + XContextualDrawing.3 \ + XConvertCase.3 \ + XConvertSelection.3 \ + XCopyArea.3 \ + XCopyColormapAndFree.3 \ + XCopyGC.3 \ + XCopyPlane.3 \ + XCreateBitmapFromData.3 \ + XCreateColormap.3 \ + XCreateFontCursor.3 \ + XCreateFontSet.3 \ + XCreateGC.3 \ + XCreateGlyphCursor.3 \ + XCreateIC.3 \ + XCreateImage.3 \ + XCreateOC.3 \ + XCreatePixmap.3 \ + XCreatePixmapCursor.3 \ + XCreatePixmapFromBitmapData.3 \ + XCreateRegion.3 \ + XCreateSimpleWindow.3 \ + XCreateWindow.3 \ + XCreateWindowEvent.3 \ + XCrossingEvent.3 \ + XDefaultString.3 \ + XDefineCursor.3 \ + XDeleteContext.3 \ + XDeleteModifiermapEntry.3 \ + XDeleteProperty.3 \ + XDestroyIC.3 \ + XDestroyImage.3 \ + XDestroyOC.3 \ + XDestroyRegion.3 \ + XDestroySubwindows.3 \ + XDestroyWindow.3 \ + XDestroyWindowEvent.3 \ + XDeviceBell.3 \ + XDeviceTimeCoord.3 \ + XDirectionalDependentDrawing.3 \ + XDisableAccessControl.3 \ + XDisplayKeycodes.3 \ + XDisplayMotionBufferSize.3 \ + XDisplayName.3 \ + XDisplayOfIM.3 \ + XDisplayOfOM.3 \ + XDrawArc.3 \ + XDrawArcs.3 \ + XDrawImageString.3 \ + XDrawImageString16.3 \ + XDrawLine.3 \ + XDrawLines.3 \ + XDrawPoint.3 \ + XDrawPoints.3 \ + XDrawRectangle.3 \ + XDrawRectangles.3 \ + XDrawSegments.3 \ + XDrawString.3 \ + XDrawString16.3 \ + XDrawText.3 \ + XDrawText16.3 \ + XEmptyRegion.3 \ + XEnableAccessControl.3 \ + XEqualRegion.3 \ + XErrorEvent.3 \ + XEvent.3 \ + XEventsQueued.3 \ + XExposeEvent.3 \ + XExtendedMaxRequestSize.3 \ + XExtentsOfFontSet.3 \ + XFetchBuffer.3 \ + XFetchBytes.3 \ + XFetchName.3 \ + XFillArc.3 \ + XFillArcs.3 \ + XFillPolygon.3 \ + XFillRectangle.3 \ + XFillRectangles.3 \ + XFilterEvent.3 \ + XFindContext.3 \ + XFlush.3 \ + XFocusChangeEvent.3 \ + XFontProp.3 \ + XFontSetExtents.3 \ + XFontStruct.3 \ + XFontsOfFontSet.3 \ + XForceScreenSaver.3 \ + XFree.3 \ + XFreeColormap.3 \ + XFreeColors.3 \ + XFreeCursor.3 \ + XFreeDeviceList.3 \ + XFreeFont.3 \ + XFreeFontInfo.3 \ + XFreeFontNames.3 \ + XFreeFontPath.3 \ + XFreeFontSet.3 \ + XFreeGC.3 \ + XFreeModifierMap.3 \ + XFreePixmap.3 \ + XFreeStringList.3 \ + XGCValues.3 \ + XGContextFromGC.3 \ + XGetAtomName.3 \ + XGetAtomNames.3 \ + XGetClassHint.3 \ + XGetCommand.3 \ + XGetDeviceButtonMapping.3 \ + XGetDeviceControl.3 \ + XGetDeviceDontPropagateList.3 \ + XGetDeviceFocus.3 \ + XGetDeviceKeyMapping.3 \ + XGetDeviceModifierMapping.3 \ + XGetDeviceMotionEvents.3 \ + XGetErrorDatabaseText.3 \ + XGetErrorText.3 \ + XGetExtensionVersion.3 \ + XGetFeedbackControl.3 \ + XGetFontPath.3 \ + XGetFontProperty.3 \ + XGetGCValues.3 \ + XGetGeometry.3 \ + XGetICValues.3 \ + XGetIMValues.3 \ + XGetIconName.3 \ + XGetIconSizes.3 \ + XGetImage.3 \ + XGetInputFocus.3 \ + XGetKeyboardControl.3 \ + XGetKeyboardMapping.3 \ + XGetModifierMapping.3 \ + XGetMotionEvents.3 \ + XGetOCValues.3 \ + XGetOMValues.3 \ + XGetPixel.3 \ + XGetPointerControl.3 \ + XGetPointerMapping.3 \ + XGetRGBColormaps.3 \ + XGetScreenSaver.3 \ + XGetSelectedExtensionEvents.3 \ + XGetSelectionOwner.3 \ + XGetSubImage.3 \ + XGetTextProperty.3 \ + XGetTransientForHint.3 \ + XGetVisualInfo.3 \ + XGetWMClientMachine.3 \ + XGetWMColormapWindows.3 \ + XGetWMHints.3 \ + XGetWMIconName.3 \ + XGetWMName.3 \ + XGetWMNormalHints.3 \ + XGetWMProtocols.3 \ + XGetWMSizeHints.3 \ + XGetWindowAttributes.3 \ + XGetWindowProperty.3 \ + XGrabButton.3 \ + XGrabDevice.3 \ + XGrabDeviceButton.3 \ + XGrabDeviceKey.3 \ + XGrabKey.3 \ + XGrabKeyboard.3 \ + XGrabPointer.3 \ + XGrabServer.3 \ + XGraphicsExposeEvent.3 \ + XGravityEvent.3 \ + XHostAddress.3 \ + XIMOfIC.3 \ + XIconSize.3 \ + XIconifyWindow.3 \ + XIfEvent.3 \ + XInitImage.3 \ + XInitThreads.3 \ + XInsertModifiermapEntry.3 \ + XInstallColormap.3 \ + XInternAtom.3 \ + XInternAtoms.3 \ + XInternalConnectionNumbers.3 \ + XIntersectRegion.3 \ + XKeyEvent.3 \ + XKeyboardControl.3 \ + XKeycodeToKeysym.3 \ + XKeymapEvent.3 \ + XKeysymToKeycode.3 \ + XKeysymToString.3 \ + XKillClient.3 \ + XListDepths.3 \ + XListFonts.3 \ + XListFontsWithInfo.3 \ + XListHosts.3 \ + XListInputDevices.3 \ + XListInstalledColormaps.3 \ + XListPixmapFormats.3 \ + XListProperties.3 \ + XLoadFont.3 \ + XLoadQueryFont.3 \ + XLocaleOfFontSet.3 \ + XLocaleOfIM.3 \ + XLocaleOfOM.3 \ + XLockDisplay.3 \ + XLookupColor.3 \ + XLookupKeysym.3 \ + XLookupString.3 \ + XLowerWindow.3 \ + XMapEvent.3 \ + XMapRaised.3 \ + XMapRequestEvent.3 \ + XMapSubwindows.3 \ + XMapWindow.3 \ + XMappingEvent.3 \ + XMaskEvent.3 \ + XMatchVisualInfo.3 \ + XMaxRequestSize.3 \ + XModifierKeymap.3 \ + XMotionEvent.3 \ + XMoveResizeWindow.3 \ + XMoveWindow.3 \ + XNewModifiermap.3 \ + XNextEvent.3 \ + XNoExposeEvent.3 \ + XNoOp.3 \ + XOMOfOC.3 \ + XOffsetRegion.3 \ + XOpenDevice.3 \ + XOpenDisplay.3 \ + XOpenIM.3 \ + XOpenOM.3 \ + XParseColor.3 \ + XParseGeometry.3 \ + XPeekEvent.3 \ + XPeekIfEvent.3 \ + XPending.3 \ + XPixmapFormatValues.3 \ + XPoint.3 \ + XPointInRegion.3 \ + XPolygonRegion.3 \ + XProcessInternalConnection.3 \ + XPropertyEvent.3 \ + XPutBackEvent.3 \ + XPutImage.3 \ + XPutPixel.3 \ + XQueryBestCursor.3 \ + XQueryBestSize.3 \ + XQueryBestStipple.3 \ + XQueryBestTile.3 \ + XQueryColor.3 \ + XQueryColors.3 \ + XQueryDeviceState.3 \ + XQueryFont.3 \ + XQueryKeymap.3 \ + XQueryPointer.3 \ + XQueryTextExtents.3 \ + XQueryTextExtents16.3 \ + XQueryTree.3 \ + XRaiseWindow.3 \ + XReadBitmapFile.3 \ + XReadBitmapFileData.3 \ + XRebindKeySym.3 \ + XRecolorCursor.3 \ + XReconfigureWMWindow.3 \ + XRectInRegion.3 \ + XRectangle.3 \ + XRefreshKeyboardMapping.3 \ + XRegisterIMInstantiateCallback.3 \ + XRemoveConnectionWatch.3 \ + XRemoveFromSaveSet.3 \ + XRemoveHost.3 \ + XRemoveHosts.3 \ + XReparentEvent.3 \ + XReparentWindow.3 \ + XResetScreenSaver.3 \ + XResizeRequestEvent.3 \ + XResizeWindow.3 \ + XResourceManagerString.3 \ + XRestackWindows.3 \ + XRotateBuffers.3 \ + XRotateWindowProperties.3 \ + XSaveContext.3 \ + XScreenNumberOfScreen.3 \ + XScreenResourceString.3 \ + XSegment.3 \ + XSelectExtensionEvent.3 \ + XSelectInput.3 \ + XSelectionClearEvent.3 \ + XSelectionEvent.3 \ + XSelectionRequestEvent.3 \ + XSendEvent.3 \ + XSendExtensionEvent.3 \ + XSetAccessControl.3 \ + XSetAfterFunction.3 \ + XSetArcMode.3 \ + XSetBackground.3 \ + XSetClassHint.3 \ + XSetClipMask.3 \ + XSetClipOrigin.3 \ + XSetClipRectangles.3 \ + XSetCloseDownMode.3 \ + XSetCommand.3 \ + XSetDashes.3 \ + XSetDeviceButtonMapping.3 \ + XSetDeviceFocus.3 \ + XSetDeviceMode.3 \ + XSetDeviceModifierMapping.3 \ + XSetDeviceValuators.3 \ + XSetErrorHandler.3 \ + XSetFillRule.3 \ + XSetFillStyle.3 \ + XSetFont.3 \ + XSetFontPath.3 \ + XSetForeground.3 \ + XSetFunction.3 \ + XSetGraphicsExposure.3 \ + XSetICFocus.3 \ + XSetICValues.3 \ + XSetIMValues.3 \ + XSetIOErrorHandler.3 \ + XSetIconName.3 \ + XSetIconSizes.3 \ + XSetInputFocus.3 \ + XSetLineAttributes.3 \ + XSetLocaleModifiers.3 \ + XSetModifierMapping.3 \ + XSetOCValues.3 \ + XSetOMValues.3 \ + XSetPlanemask.3 \ + XSetPointerMapping.3 \ + XSetRGBColormaps.3 \ + XSetRegion.3 \ + XSetScreenSaver.3 \ + XSetSelectionOwner.3 \ + XSetState.3 \ + XSetStipple.3 \ + XSetSubwindowMode.3 \ + XSetTSOrigin.3 \ + XSetTextProperty.3 \ + XSetTile.3 \ + XSetTransientForHint.3 \ + XSetWMClientMachine.3 \ + XSetWMColormapWindows.3 \ + XSetWMHints.3 \ + XSetWMIconName.3 \ + XSetWMName.3 \ + XSetWMNormalHints.3 \ + XSetWMProperties.3 \ + XSetWMProtocols.3 \ + XSetWMSizeHints.3 \ + XSetWindowAttributes.3 \ + XSetWindowBackground.3 \ + XSetWindowBackgroundPixmap.3 \ + XSetWindowBorder.3 \ + XSetWindowBorderPixmap.3 \ + XSetWindowBorderWidth.3 \ + XSetWindowColormap.3 \ + XShapeCombineMask.3 \ + XShapeCombineRectangles.3 \ + XShapeCombineRegion.3 \ + XShapeCombineShape.3 \ + XShapeGetRectangles.3 \ + XShapeInputSelected.3 \ + XShapeOffsetShape.3 \ + XShapeQueryExtension.3 \ + XShapeQueryExtents.3 \ + XShapeQueryVersion.3 \ + XShapeSelectInput.3 \ + XShrinkRegion.3 \ + XSizeHints.3 \ + XStandardColormap.3 \ + XStoreBuffer.3 \ + XStoreBytes.3 \ + XStoreColor.3 \ + XStoreColors.3 \ + XStoreName.3 \ + XStoreNamedColor.3 \ + XStringListToTextProperty.3 \ + XStringToKeysym.3 \ + XSubImage.3 \ + XSubtractRegion.3 \ + XSupportsLocale.3 \ + XSync.3 \ + XSynchronize.3 \ + XTextExtents.3 \ + XTextExtents16.3 \ + XTextItem.3 \ + XTextItem16.3 \ + XTextProperty.3 \ + XTextPropertyToStringList.3 \ + XTextWidth.3 \ + XTextWidth16.3 \ + XTimeCoord.3 \ + XTranslateCoordinates.3 \ + XUndefineCursor.3 \ + XUngrabButton.3 \ + XUngrabDevice.3 \ + XUngrabDeviceButton.3 \ + XUngrabDeviceKey.3 \ + XUngrabKey.3 \ + XUngrabKeyboard.3 \ + XUngrabPointer.3 \ + XUngrabServer.3 \ + XUninstallColormap.3 \ + XUnionRectWithRegion.3 \ + XUnionRegion.3 \ + XUniqueContext.3 \ + XUnloadFont.3 \ + XUnlockDisplay.3 \ + XUnmapEvent.3 \ + XUnmapSubwindows.3 \ + XUnmapWindow.3 \ + XUnregisterIMInstantiateCallback.3 \ + XUnsetICFocus.3 \ + XVaCreateNestedList.3 \ + XVisibilityNotifyEvent.3 \ + XVisualIDFromVisual.3 \ + XVisualInfo.3 \ + XWMGeometry.3 \ + XWMHints.3 \ + XWarpPointer.3 \ + XWindowAttributes.3 \ + XWindowChanges.3 \ + XWindowEvent.3 \ + XWithdrawWindow.3 \ + XWriteBitmapFile.3 \ + XXorRegion.3 \ + Xau.3 \ + XauDisposeAuth.3 \ + XauFileName.3 \ + XauGetAuthByAddr.3 \ + XauGetBestAuthByAddr.3 \ + XauLockAuth.3 \ + XauReadAuth.3 \ + XauUnlockAuth.3 \ + XauWriteAuth.3 \ + XcmsAllocColor.3 \ + XcmsAllocNamedColor.3 \ + XcmsCCCOfColormap.3 \ + XcmsCIELab.3 \ + XcmsCIELabQueryMaxC.3 \ + XcmsCIELabQueryMaxL.3 \ + XcmsCIELabQueryMaxLC.3 \ + XcmsCIELabQueryMinL.3 \ + XcmsCIELuv.3 \ + XcmsCIELuvQueryMaxC.3 \ + XcmsCIELuvQueryMaxL.3 \ + XcmsCIELuvQueryMaxLC.3 \ + XcmsCIELuvQueryMinL.3 \ + XcmsCIEXYZ.3 \ + XcmsCIEuvY.3 \ + XcmsCIExyY.3 \ + XcmsColor.3 \ + XcmsConvertColors.3 \ + XcmsCreateCCC.3 \ + XcmsDefaultCCC.3 \ + XcmsFreeCCC.3 \ + XcmsLookupColor.3 \ + XcmsPad.3 \ + XcmsQueryBlack.3 \ + XcmsQueryBlue.3 \ + XcmsQueryColor.3 \ + XcmsQueryColors.3 \ + XcmsQueryGreen.3 \ + XcmsQueryRed.3 \ + XcmsQueryWhite.3 \ + XcmsRGB.3 \ + XcmsRGBi.3 \ + XcmsSetCCCOfColormap.3 \ + XcmsSetWhiteAdjustProc.3 \ + XcmsSetWhitePoint.3 \ + XcmsStoreColor.3 \ + XcmsStoreColors.3 \ + XcmsTekHVC.3 \ + XcmsTekHVCQueryMaxC.3 \ + XcmsTekHVCQueryMaxV.3 \ + XcmsTekHVCQueryMaxVC.3 \ + XcmsTekHVCQueryMaxVSamples.3 \ + XcmsTekHVCQueryMinV.3 \ + XdbeAllocateBackBufferName.3 \ + XdbeBeginIdiom.3 \ + XdbeDeallocateBackBufferName.3 \ + XdbeEndIdiom.3 \ + XdbeFreeVisualInfo.3 \ + XdbeGetBackBufferAttributes.3 \ + XdbeGetVisualInfo.3 \ + XdbeQueryExtension.3 \ + XdbeSwapBuffers.3 \ + XeviGetVisualInfo.3 \ + XeviQueryVersion.3 \ + XmbDrawImageString.3 \ + XmbDrawString.3 \ + XmbDrawText.3 \ + XmbLookupString.3 \ + XmbResetIC.3 \ + XmbSetWMProperties.3 \ + XmbTextEscapement.3 \ + XmbTextExtents.3 \ + XmbTextListToTextProperty.3 \ + XmbTextPerCharExtents.3 \ + XmbTextPropertyToTextList.3 \ + XmbufChangeBufferAttributes.3 \ + XmbufChangeWindowAttributes.3 \ + XmbufCreateBuffers.3 \ + XmbufCreateStereoWindow.3 \ + XmbufDestroyBuffers.3 \ + XmbufDisplayBuffers.3 \ + XmbufGetBufferAttributes.3 \ + XmbufGetScreenInfo.3 \ + XmbufGetVersion.3 \ + XmbufGetWindowAttributes.3 \ + XmbufQueryExtension.3 \ + XrmCombineDatabase.3 \ + XrmCombineFileDatabase.3 \ + XrmDestroyDatabase.3 \ + XrmEnumerateDatabase.3 \ + XrmGetDatabase.3 \ + XrmGetFileDatabase.3 \ + XrmGetResource.3 \ + XrmGetStringDatabase.3 \ + XrmInitialize.3 \ + XrmLocaleOfDatabase.3 \ + XrmMergeDatabases.3 \ + XrmOptionDescRec.3 \ + XrmOptionKind.3 \ + XrmParseCommand.3 \ + XrmPermStringToQuark.3 \ + XrmPutFileDatabase.3 \ + XrmPutLineResource.3 \ + XrmPutResource.3 \ + XrmPutStringResource.3 \ + XrmQGetResource.3 \ + XrmQGetSearchList.3 \ + XrmQGetSearchResource.3 \ + XrmQPutResource.3 \ + XrmQPutStringResource.3 \ + XrmQuarkToString.3 \ + XrmSetDatabase.3 \ + XrmStringToBindingQuarkList.3 \ + XrmStringToQuark.3 \ + XrmStringToQuarkList.3 \ + XrmUniqueQuark.3 \ + XrmValue.3 \ + XtAddActions.3 \ + XtAddCallback.3 \ + XtAddCallbacks.3 \ + XtAddConverter.3 \ + XtAddEventHandler.3 \ + XtAddExposureToRegion.3 \ + XtAddGrab.3 \ + XtAddInput.3 \ + XtAddRawEventHandler.3 \ + XtAddTimeOut.3 \ + XtAddTimeout.3 \ + XtAllocateGC.3 \ + XtAppAddActionHook.3 \ + XtAppAddActions.3 \ + XtAppAddBlockHook.3 \ + XtAppAddConverter.3 \ + XtAppAddInput.3 \ + XtAppAddSignal.3 \ + XtAppAddTimeOut.3 \ + XtAppAddTimeout.3 \ + XtAppAddWorkProc.3 \ + XtAppCreateShell.3 \ + XtAppError.3 \ + XtAppErrorMsg.3 \ + XtAppGetErrorDatabase.3 \ + XtAppGetErrorDatabaseText.3 \ + XtAppGetExitFlag.3 \ + XtAppGetSelectionTimeout.3 \ + XtAppInitialize.3 \ + XtAppLock.3 \ + XtAppMainLoop.3 \ + XtAppNextEvent.3 \ + XtAppPeekEvent.3 \ + XtAppPending.3 \ + XtAppProcessEvent.3 \ + XtAppReleaseCacheRefs.3 \ + XtAppSetErrorHandler.3 \ + XtAppSetErrorMsgHandler.3 \ + XtAppSetExitFlag.3 \ + XtAppSetFallbackResources.3 \ + XtAppSetSelectionTimeout.3 \ + XtAppSetTypeConverter.3 \ + XtAppSetWarningHandler.3 \ + XtAppSetWarningMsgHandler.3 \ + XtAppUnlock.3 \ + XtAppWarning.3 \ + XtAppWarningMsg.3 \ + XtAugmentTranslations.3 \ + XtBuildEventMask.3 \ + XtCallAcceptFocus.3 \ + XtCallActionProc.3 \ + XtCallCallbackList.3 \ + XtCallCallbacks.3 \ + XtCallConverter.3 \ + XtCallbackExclusive.3 \ + XtCallbackNone.3 \ + XtCallbackNonexclusive.3 \ + XtCallbackPopdown.3 \ + XtCalloc.3 \ + XtCancelSelectionRequest.3 \ + XtChangeManagedSet.3 \ + XtCheckSubclass.3 \ + XtClass.3 \ + XtCloseDisplay.3 \ + XtConfigureWidget.3 \ + XtConvert.3 \ + XtConvertAndStore.3 \ + XtConvertCase.3 \ + XtCreateApplicationContext.3 \ + XtCreateApplicationShell.3 \ + XtCreateManagedWidget.3 \ + XtCreatePopupShell.3 \ + XtCreateSelectionRequest.3 \ + XtCreateWidget.3 \ + XtCreateWindow.3 \ + XtDatabase.3 \ + XtDestroyApplicationContext.3 \ + XtDestroyWidget.3 \ + XtDirectConvert.3 \ + XtDisownSelection.3 \ + XtDispatchEvent.3 \ + XtDispatchEventToWidget.3 \ + XtDisplay.3 \ + XtDisplayInitialize.3 \ + XtDisplayOfObject.3 \ + XtDisplayStringConversionWarning.3 \ + XtDisplayToApplicationContext.3 \ + XtError.3 \ + XtErrorMsg.3 \ + XtFindFile.3 \ + XtFree.3 \ + XtGetActionKeysym.3 \ + XtGetActionList.3 \ + XtGetApplicationNameAndClass.3 \ + XtGetApplicationResources.3 \ + XtGetClassExtension.3 \ + XtGetConstraintResourceList.3 \ + XtGetDisplays.3 \ + XtGetErrorDatabase.3 \ + XtGetErrorDatabaseText.3 \ + XtGetGC.3 \ + XtGetKeyboardFocusWidget.3 \ + XtGetKeysymTable.3 \ + XtGetMultiClickTime.3 \ + XtGetResourceList.3 \ + XtGetSelectionParameters.3 \ + XtGetSelectionRequest.3 \ + XtGetSelectionTimeout.3 \ + XtGetSelectionValue.3 \ + XtGetSelectionValueIncremental.3 \ + XtGetSelectionValues.3 \ + XtGetSelectionValuesIncremental.3 \ + XtGetSubresources.3 \ + XtGetSubvalues.3 \ + XtGetValues.3 \ + XtGrabButton.3 \ + XtGrabKey.3 \ + XtGrabKeyboard.3 \ + XtGrabPointer.3 \ + XtHasCallbacks.3 \ + XtHooksOfDisplay.3 \ + XtInitialize.3 \ + XtInitializeWidgetClass.3 \ + XtInsertEventHandler.3 \ + XtInsertEventTypeHandler.3 \ + XtInsertRawEventHandler.3 \ + XtInstallAccelerators.3 \ + XtInstallAllAccelerators.3 \ + XtIsApplicationShell.3 \ + XtIsComposite.3 \ + XtIsConstraint.3 \ + XtIsManaged.3 \ + XtIsObject.3 \ + XtIsOverrideShell.3 \ + XtIsRealized.3 \ + XtIsRectObj.3 \ + XtIsSensitive.3 \ + XtIsShell.3 \ + XtIsSubclass.3 \ + XtIsTopLevelShell.3 \ + XtIsTransientShell.3 \ + XtIsVendorShell.3 \ + XtIsWMShell.3 \ + XtIsWidget.3 \ + XtKeysymToKeycodeList.3 \ + XtLastEventProcessed.3 \ + XtLastTimestampProcessed.3 \ + XtMainLoop.3 \ + XtMakeGeometryRequest.3 \ + XtMakeResizeRequest.3 \ + XtMalloc.3 \ + XtManageChild.3 \ + XtManageChildren.3 \ + XtMapWidget.3 \ + XtMergeArgLists.3 \ + XtMoveWidget.3 \ + XtName.3 \ + XtNameToWidget.3 \ + XtNew.3 \ + XtNewString.3 \ + XtNextEvent.3 \ + XtNoticeSignal.3 \ + XtNumber.3 \ + XtOffset.3 \ + XtOffsetOf.3 \ + XtOpenApplication.3 \ + XtOpenDisplay.3 \ + XtOverrideTranslations.3 \ + XtOwnSelection.3 \ + XtOwnSelectionIncremental.3 \ + XtParent.3 \ + XtParseAcceleratorTable.3 \ + XtParseTranslationTable.3 \ + XtPeekEvent.3 \ + XtPending.3 \ + XtPopdown.3 \ + XtPopup.3 \ + XtPopupSpringLoaded.3 \ + XtProcessEvent.3 \ + XtProcessLock.3 \ + XtProcessUnlock.3 \ + XtQueryGeometry.3 \ + XtRealizeWidget.3 \ + XtRealloc.3 \ + XtRegisterCaseConverter.3 \ + XtRegisterDrawable.3 \ + XtRegisterExtensionSelector.3 \ + XtRegisterGrabAction.3 \ + XtReleaseGC.3 \ + XtReleasePropertyAtom.3 \ + XtRemoveActionHook.3 \ + XtRemoveAllCallbacks.3 \ + XtRemoveBlockHook.3 \ + XtRemoveCallback.3 \ + XtRemoveCallbacks.3 \ + XtRemoveEventHandler.3 \ + XtRemoveEventTypeHandler.3 \ + XtRemoveGrab.3 \ + XtRemoveInput.3 \ + XtRemoveRawEventHandler.3 \ + XtRemoveSignal.3 \ + XtRemoveTimeOut.3 \ + XtRemoveWorkProc.3 \ + XtReservePropertyAtom.3 \ + XtResizeWidget.3 \ + XtResolvePathname.3 \ + XtScreen.3 \ + XtScreenDatabase.3 \ + XtScreenOfObject.3 \ + XtSendSelectionRequest.3 \ + XtSessionGetToken.3 \ + XtSessionReturnToken.3 \ + XtSetArg.3 \ + XtSetErrorHandler.3 \ + XtSetErrorMsgHandler.3 \ + XtSetEventDispatcher.3 \ + XtSetKeyTranslator.3 \ + XtSetKeyboardFocus.3 \ + XtSetLanguageProc.3 \ + XtSetMappedWhenManaged.3 \ + XtSetMultiClickTime.3 \ + XtSetSelectionParameters.3 \ + XtSetSelectionTimeout.3 \ + XtSetSensitive.3 \ + XtSetSubvalues.3 \ + XtSetTypeConverter.3 \ + XtSetValues.3 \ + XtSetWMColormapWindows.3 \ + XtSetWarningHandler.3 \ + XtSetWarningMsgHandler.3 \ + XtStringConversionWarning.3 \ + XtSuperclass.3 \ + XtToolkitInitialize.3 \ + XtToolkitThreadInitialize.3 \ + XtTranslateCoords.3 \ + XtTranslateKeycode.3 \ + XtUngrabButton.3 \ + XtUngrabKey.3 \ + XtUngrabKeyboard.3 \ + XtUngrabPointer.3 \ + XtUninstallTranslations.3 \ + XtUnmanageChild.3 \ + XtUnmanageChildren.3 \ + XtUnmapWidget.3 \ + XtUnrealizeWidget.3 \ + XtUnregisterDrawable.3 \ + XtVaAppCreateShell.3 \ + XtVaAppInitialize.3 \ + XtVaCreateArgsList.3 \ + XtVaCreateManagedWidget.3 \ + XtVaCreatePopupShell.3 \ + XtVaCreateWidget.3 \ + XtVaGetApplicationResources.3 \ + XtVaGetSubresources.3 \ + XtVaGetValues.3 \ + XtVaOpenApplication.3 \ + XtVaSetValues.3 \ + XtWarning.3 \ + XtWarningMsg.3 \ + XtWidgetToApplicationContext.3 \ + XtWindow.3 \ + XtWindowOfObject.3 \ + XtWindowToWidget.3 \ + Xutf8DrawImageString.3 \ + Xutf8DrawString.3 \ + Xutf8DrawText.3 \ + Xutf8LookupString.3 \ + Xutf8ResetIC.3 \ + Xutf8SetWMProperties.3 \ + Xutf8TextEscapement.3 \ + Xutf8TextExtents.3 \ + Xutf8TextListToTextProperty.3 \ + Xutf8TextPerCharExtents.3 \ + Xutf8TextPropertyToTextList.3 \ + Xv.3 \ + XvFreeAdaptorInfo.3 \ + XvFreeEncodingInfo.3 \ + XvGetPortAttribute.3 \ + XvGetStill.3 \ + XvGetVideo.3 \ + XvGrabPort.3 \ + XvPortNotify.3 \ + XvPutStill.3 \ + XvPutVideo.3 \ + XvQueryAdaptors.3 \ + XvQueryBestSize.3 \ + XvQueryEncodings.3 \ + XvQueryExtension.3 \ + XvSelectPortNotify.3 \ + XvSelectVideoNotify.3 \ + XvSetPortAttribute.3 \ + XvStopVideo.3 \ + XvUngrabPort.3 \ + XvVideoNotify.3 \ + XwcDrawImageString.3 \ + XwcDrawString.3 \ + XwcDrawText.3 \ + XwcFreeStringList.3 \ + XwcLookupString.3 \ + XwcResetIC.3 \ + XwcTextEscapement.3 \ + XwcTextExtents.3 \ + XwcTextListToTextProperty.3 \ + XwcTextPerCharExtents.3 \ + XwcTextPropertyToTextList.3 \ + glXChooseVisual.3 \ + glXCopyContext.3 \ + glXCreateContext.3 \ + glXCreateGLXPixmap.3 \ + glXDestroyContext.3 \ + glXDestroyGLXPixmap.3 \ + glXFreeContextEXT.3 \ + glXGetClientString.3 \ + glXGetConfig.3 \ + glXGetContextIDEXT.3 \ + glXGetCurrentContext.3 \ + glXGetCurrentDisplay.3 \ + glXGetCurrentDrawable.3 \ + glXImportContextEXT.3 \ + glXIntro.3 \ + glXIsDirect.3 \ + glXMakeCurrent.3 \ + glXQueryContextInfoEXT.3 \ + glXQueryExtension.3 \ + glXQueryExtensionsString.3 \ + glXQueryServerString.3 \ + glXQueryVersion.3 \ + glXSwapBuffers.3 \ + glXUseXFont.3 \ + glXWaitGL.3 \ + glXWaitX.3 +MAN7= X.7 \ + XConsortium.7 \ + XProjectTeam.7 \ + XStandards.7 \ + Xsecurity.7 diff --git a/x11/XFree86-4-manuals/pkg-descr b/x11/XFree86-4-manuals/pkg-descr index c316e3087810..6e9a78c5a4d3 100644 --- a/x11/XFree86-4-manuals/pkg-descr +++ b/x11/XFree86-4-manuals/pkg-descr @@ -1,8 +1,3 @@ This package contains XFree86 online manual pages. WWW: http://www.xfree86.org/ - -Note: -This is part of the XFree86 distribution, there is a -complete distribution available in the ports collection -as well. |