summaryrefslogtreecommitdiff
path: root/devel/imake/files/patch-xmkmf.cpp
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2013-06-28 11:51:05 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2013-06-28 11:51:05 +0000
commit932db7c46c9a269808dfa67ea02746b350c194d8 (patch)
tree5182ef394eeef9bff78abf27f4a3a05f7fb8ff43 /devel/imake/files/patch-xmkmf.cpp
parentsysutils/clone: update to 1.0.2 (diff)
New USES imake to handle the dependency on imake.
This uses accept 'env' as an argument for ports that do use their own or a different do-configure target. Modify xmkmf so it accept IMAKECPPFLAGS as default flags for imake and pass it to the called imake. Modify xorg-cf-files (the FreeBSD.cf configuration file) to allow CppCmd to be overwritten. Pass CppCmd CcCmd and CplusplusCmd via command line to each call of imake via IMAKECPPFLAGS Pass IMAKE_DEFINE with the above arguments to MAKE_ARGS so that imake spawned from Makefile generated by a previous imake also inherit the defined CppCmd CcCmd and CplusplusCmd. Make imake use devel/tradcpp all the time, so that when buidling with clang we do not depend on gcc's cpp. Make imake respect CC and CXX Make imake respect USE_GCC (if set imake will use gcc's cpp). While here: - Remove a couple of indefinite articles from comments - Trim headers - Fix a couple of ports to build with clang or use: USE_GCC=any - Fix a now useless redefinition of the extraction chain - Fix a typo in japanese/Wnn7-lib bundled imake template definitions - Fix some XMKMF execution with no env specified - Use options helper in x11/xautolock to simplify the port
Diffstat (limited to 'devel/imake/files/patch-xmkmf.cpp')
-rw-r--r--devel/imake/files/patch-xmkmf.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/devel/imake/files/patch-xmkmf.cpp b/devel/imake/files/patch-xmkmf.cpp
index 94a238332a9f..75e496452af7 100644
--- a/devel/imake/files/patch-xmkmf.cpp
+++ b/devel/imake/files/patch-xmkmf.cpp
@@ -1,5 +1,14 @@
--- xmkmf.cpp.orig 2012-03-08 06:47:32.000000000 +0100
-+++ xmkmf.cpp 2013-03-17 22:53:14.000000000 +0100
++++ xmkmf.cpp 2013-06-28 11:55:04.174394058 +0200
+@@ -8,7 +8,7 @@
+ topdir=
+ curdir=.
+ do_all=
+-imake_defines=
++imake_defines="${IMAKECPPFLAGS}"
+
+ while [ $# -gt 0 ]
+ do
@@ -64,3 +64,12 @@
imake $imake_defines $args
;;