summaryrefslogtreecommitdiff
path: root/x11/XFree86-4-libraries/files/patch-Imake.rules
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2003-03-11 23:38:11 +0000
committerEric Anholt <anholt@FreeBSD.org>2003-03-11 23:38:11 +0000
commit62d3b1c1fc5917881b5ddbd7e85367d9ee8f0523 (patch)
tree138a8c3c6b50724d0f2c54f9e0434141128f7521 /x11/XFree86-4-libraries/files/patch-Imake.rules
parentUpdate MASTER_SITES (diff)
Update XFree86 ports, including linux_dri, to 4.3.0. Set IGNORE= in dri-devel
for being outdated. Thank you to all the testers and people who submitted patches for this update. Approved by: portmgr
Notes
Notes: svn path=/head/; revision=77104
Diffstat (limited to 'x11/XFree86-4-libraries/files/patch-Imake.rules')
-rw-r--r--x11/XFree86-4-libraries/files/patch-Imake.rules48
1 files changed, 48 insertions, 0 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-Imake.rules b/x11/XFree86-4-libraries/files/patch-Imake.rules
new file mode 100644
index 000000000000..edd940aa23bd
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-Imake.rules
@@ -0,0 +1,48 @@
+--- config/cf/Imake.rules.orig Thu Jan 2 14:43:27 2003
++++ config/cf/Imake.rules Thu Jan 2 14:49:12 2003
+@@ -1406,7 +1406,7 @@
+ * this Imakefile is within the source tree.
+ */
+ #ifndef RmanDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define RmanDependency() /**/
+ #else
+ #define RmanDependency() @@\
+@@ -1421,7 +1421,7 @@
+ #endif /* RmanDependency */
+
+ #ifndef RmanCmdDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define RmanCmdDependency /**/
+ #else
+ #define RmanCmdDependency ProgramTargetName($(RMAN))
+@@ -1874,7 +1874,7 @@
+ * this Imakefile is within the source tree.
+ */
+ #ifndef DependDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define DependDependency() /**/
+ #else
+ #define DependDependency() @@\
+@@ -1969,7 +1969,7 @@
+ * within the source tree.
+ */
+ #ifndef ImakeDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define ImakeDependency(target) /**/
+ #else
+ #define ImakeDependency(target) @@\
+@@ -3126,6 +3126,9 @@
+
+ #ifdef UseInstalled
+ #define ImakeSubCmdHelper $(IMAKE_CMD)
++#elif defined(UseInstalledPrograms)
++#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
++ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
+ #else
+ #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)