mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
62d3b1c1fc
for being outdated. Thank you to all the testers and people who submitted patches for this update. Approved by: portmgr
39 lines
1.1 KiB
Cheetah
39 lines
1.1 KiB
Cheetah
--- config/cf/X11.tmpl.orig Tue Feb 25 13:57:52 2003
|
|
+++ config/cf/X11.tmpl Sun Mar 2 21:13:31 2003
|
|
@@ -575,7 +575,7 @@
|
|
#define BuildXft1Library BuildRenderLibrary
|
|
#endif
|
|
#ifndef UseFontconfig
|
|
-#define UseFontconfig BuildXftLibrary
|
|
+#define UseFontconfig (BuildXftLibrary || BuildXft1Library)
|
|
#endif
|
|
#ifndef BuildFontconfigLibrary
|
|
#define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
|
|
@@ -1497,7 +1497,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
|
|
@@ -3028,7 +3035,10 @@
|
|
|
|
#endif /* else BuildFreetype2Library */
|
|
|
|
-#if BuildFreetype2Library || HasFreetype2
|
|
+#if HasFreetype2
|
|
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
|
|
+FREETYPE2DEFINES = -DFREETYPE2
|
|
+#elif BuildFreetype2Library
|
|
FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
|
|
FREETYPE2DEFINES = -DFREETYPE2
|
|
#endif
|