summaryrefslogtreecommitdiff
path: root/x11/XFree86-4-libraries/files/patch-z34
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2002-03-16 23:40:19 +0000
committerWill Andrews <will@FreeBSD.org>2002-03-16 23:40:19 +0000
commit92becb4baf7713b343d948a652f39579b35fcb52 (patch)
treee95fd7d2f39f40888e10b2d3afdb76e7196d0055 /x11/XFree86-4-libraries/files/patch-z34
parentXFree86 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-z34')
-rw-r--r--x11/XFree86-4-libraries/files/patch-z3444
1 files changed, 11 insertions, 33 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-z34 b/x11/XFree86-4-libraries/files/patch-z34
index 7a79e764d544..71bc523266e1 100644
--- a/x11/XFree86-4-libraries/files/patch-z34
+++ b/x11/XFree86-4-libraries/files/patch-z34
@@ -1,33 +1,11 @@
---- lib/font/Imakefile.orig Thu Jan 18 04:43:16 2001
-+++ lib/font/Imakefile Thu Jun 7 04:03:36 2001
-@@ -125,22 +125,30 @@
-
- #if NormalLibFont
- NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
-+# if !defined(LibInstall) || LibInstall
- InstallLibrary($(LIBNAME),$(USRLIBDIR))
-+# endif /* LibInstall */
- #endif /* NormalLibFont */
-
- #if SharedLibFont
- SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.)
-+# if !defined(LibInstall) || LibInstall
- InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
-+# endif /* LibInstall */
- #endif /* SharedLibFont */
-
- #if DebugLibFont
- DebuggedDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
-+# if !defined(LibInstall) || LibInstall
- InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
-+# endif /* LibInstall */
- #endif /* DebugLibFont */
-
- #if ProfileLibFont
- ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
-+# if !defined(LibInstall) || LibInstall
- InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
-+# endif /* LibInstall */
- #endif /* ProfileLibFont */
-
- #if BuildServer && DoLoadableServer
+--- lib/font/Imakefile.orig Tue Aug 28 02:40:58 2001
++++ lib/font/Imakefile Mon Jan 21 02:47:57 2002
+@@ -21,7 +21,7 @@
+ #define LibCreate YES
+ #endif
+
+-#if BuildLibraries
++#if BuildLibraries && !FreeBSDBuildXbin
+ #define LibInstall YES
+ #else
+ #define LibInstall NO