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 /x11/XFree86-4-libraries | |
| parent | 142f65210852bc655ce7e4c7c22b2623ec78ba6a (diff) | |
| download | ports-984a75e189f8032fdc9c22cb74ee524c9c5f229b.tar.gz ports-984a75e189f8032fdc9c22cb74ee524c9c5f229b.zip | |
Notes
Diffstat (limited to 'x11/XFree86-4-libraries')
54 files changed, 758 insertions, 1023 deletions
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 |