diff options
| author | Will Andrews <will@FreeBSD.org> | 2002-03-16 23:40:19 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2002-03-16 23:40:19 +0000 |
| commit | 92becb4baf7713b343d948a652f39579b35fcb52 (patch) | |
| tree | e95fd7d2f39f40888e10b2d3afdb76e7196d0055 /x11/XFree86-4-libraries/files/patch-z02 | |
| parent | XFree86 4.2.0 Stage 1: bsd.port.mk (diff) | |
XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades
[1] Upgrade to 4.2.0.
[2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES
by default.
Submitted by: [1] sf, taguchi@tohoku.iij.ad.jp
Approved by: [2] core
Notes
Notes:
svn path=/head/; revision=56229
Diffstat (limited to 'x11/XFree86-4-libraries/files/patch-z02')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-z02 | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-z02 b/x11/XFree86-4-libraries/files/patch-z02 index cbf157626f02..e9c45890eb8d 100644 --- a/x11/XFree86-4-libraries/files/patch-z02 +++ b/x11/XFree86-4-libraries/files/patch-z02 @@ -1,6 +1,6 @@ ---- Imakefile.orig Thu Aug 3 22:25:52 2000 -+++ Imakefile Mon Mar 26 03:32:39 2001 -@@ -18,8 +18,32 @@ +--- Imakefile.orig Thu Mar 22 02:36:43 2001 ++++ Imakefile Mon Jan 21 22:15:51 2002 +@@ -25,8 +25,27 @@ #endif #endif @@ -12,11 +12,6 @@ +#else +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin + SUBDIRS = include config lib $(NLSSUBDIR) \ -+ programs/Xserver/include programs/Xserver/hw/xfree86/parser \ -+ programs/Xserver/hw/xfree86/dummylib \ -+ programs/Xserver/hw/xfree86/loader \ -+ programs/Xserver/hw/xfree86/xf86cfg \ -+ programs/Xserver/hw/xfree86/os-support \ + programs/rgb \ + programs \ + fonts/util @@ -33,7 +28,7 @@ LNINSTALLDIRS = lib #if HasParallelMake -@@ -210,3 +234,98 @@ +@@ -227,3 +246,98 @@ #undef BootstrapCleanSubdirs #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" BOOTSTRAPSUBDIRS = imake makedepend @@ -47,7 +42,7 @@ + programs/Xserver/hw/xfree86/parser +#else +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin -+FreeBSDPortsInstallDir = lib programs programs programs/Xserver/hw/xfree86/xf86cfg fonts/util programs/rgb ++FreeBSDPortsInstallDir = lib programs/rgb programs fonts/util +#else +#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv +FreeBSDPortsInstallDir = programs lib/font $(FreeBSDPortsDRIDir) |