diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-06-28 11:51:05 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-06-28 11:51:05 +0000 |
commit | 932db7c46c9a269808dfa67ea02746b350c194d8 (patch) | |
tree | 5182ef394eeef9bff78abf27f4a3a05f7fb8ff43 /misc/magicpoint/Makefile | |
parent | sysutils/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
Notes
Notes:
svn path=/head/; revision=321957
Diffstat (limited to 'misc/magicpoint/Makefile')
-rw-r--r-- | misc/magicpoint/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 11f136f680ee..af407bed82cb 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ mng:${PORTSDIR}/graphics/libmng RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm -USE_IMAKE= yes +USES= imake:env USE_XORG= x11 xext xmu xt sm ice xi xtst WANT_GNOME= yes GNU_CONFIGURE= yes @@ -81,6 +81,7 @@ post-patch: ${WRKSRC}/configure post-configure: + (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}) cd ${WRKSRC}/contrib/xmindpath && \ ${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX} |