diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-05-29 01:04:23 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-05-29 01:04:23 +0000 |
| commit | a0c3b7ff78ef132241e5d51de6ef8d11b3f24734 (patch) | |
| tree | 25e796c5a2d6f11a8ae0a4b24522802fa7f256c3 /x11-servers/xorg-server | |
| parent | 12bdd625a9136af4ef3ad2a8555f996774a5b505 (diff) | |
| download | ports-a0c3b7ff78ef132241e5d51de6ef8d11b3f24734.tar.gz ports-a0c3b7ff78ef132241e5d51de6ef8d11b3f24734.zip | |
Notes
Diffstat (limited to 'x11-servers/xorg-server')
| -rw-r--r-- | x11-servers/xorg-server/Makefile.inc | 4 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-Library.tmpl | 21 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-X11.tmpl | 26 |
3 files changed, 50 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index b396e22303bf..6c5af3b29c06 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -28,7 +28,9 @@ _XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS} CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.rules \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl + ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl .if !target(do-configure) do-configure: diff --git a/x11-servers/xorg-server/files/patch-Library.tmpl b/x11-servers/xorg-server/files/patch-Library.tmpl new file mode 100644 index 000000000000..bbebc76c13e0 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Library.tmpl @@ -0,0 +1,21 @@ +--- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 ++++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 +@@ -300,6 +300,10 @@ + */ + + #ifndef MakeStringsDependency ++#if defined(UseInstalled) || defined(UseInstalledPrograms) ++#define MakeStringsDependency @@\ ++MAKESTRS = makestrs ++#else + # define MakeStringsDependency @@\ + MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ + NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ +@@ -308,6 +312,7 @@ + cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ + @@\ + includes:: HostProgramTargetName($(MAKESTRS)) ++#endif + #endif + + #ifndef ToolkitMakeStrings diff --git a/x11-servers/xorg-server/files/patch-X11.tmpl b/x11-servers/xorg-server/files/patch-X11.tmpl new file mode 100644 index 000000000000..a4c2f4348f58 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-X11.tmpl @@ -0,0 +1,26 @@ +--- config/cf/X11.tmpl.orig Fri Apr 2 13:47:10 2004 ++++ config/cf/X11.tmpl Thu May 27 20:52:39 2004 +@@ -576,7 +576,7 @@ + #define BuildXft1Library BuildRenderLibrary + #endif + #ifndef UseFontconfig +-#define UseFontconfig BuildXftLibrary ++#define UseFontconfig (BuildXftLibrary || BuildXft1Library) + #endif + #ifndef BuildFontconfigLibrary + #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) +@@ -1543,7 +1543,14 @@ + #endif + + #ifndef PsWrap ++#if defined(UseInstalled) || defined(UseInstalledPrograms) ++#define PsWrap pswrap ++#define PsWrapDependency /**/ ++#else + #define PsWrap $(PSWRAPSRC)/pswrap ++#define PsWrapDependency HostProgramTargetName($(PSWRAP)) ++#endif ++ PSWRAP = PsWrap + #endif + + #ifndef ResourceConfigurationManagement |