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 /emulators | |
| 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 'emulators')
| -rw-r--r-- | emulators/spim/Makefile | 11 | ||||
| -rw-r--r-- | emulators/xzx/Makefile | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index d1e2aad796d5..05320a6c4a88 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: spim -# Date created: Mon Oct 28, 1996 -# Whom: David O'Brien (obrien@cs.ucdavis.edu) -# +# Created by: David O'Brien (obrien@cs.ucdavis.edu) # $FreeBSD$ -# PORTNAME= spim PORTVERSION= 8.0 @@ -31,14 +26,14 @@ PLIST_DIRS= %%DATADIR%% .if ${PORT_OPTIONS:MGUI} USE_XORG= x11 xaw -BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake +USES+= imake:env PLIST_FILES+= bin/xspim MAN1+= xspim.1 .endif post-build: .if ${PORT_OPTIONS:MGUI} - @(cd ${WRKSRC}/xspim && ${XMKMF} && \ + @(cd ${WRKSRC}/xspim && ${SETENV} ${MAKE_ENV} ${XMKMF} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}) .endif diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile index f6fa431ee430..f396bef633f5 100644 --- a/emulators/xzx/Makefile +++ b/emulators/xzx/Makefile @@ -11,8 +11,7 @@ DISTNAME= ${PORTNAME}-pro-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= ZX Spectrum (48K/128K/+3) Emulator for X11 -# xmkmf is used in configure script; USE_IMAKE makes the build unhappy -BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake +USES= imake:env USE_MOTIF= yes USE_XORG= x11 ice sm xext xpm xt xxf86vm |