aboutsummaryrefslogtreecommitdiff
path: root/japanese/canna-lib
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2013-09-02 13:26:34 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2013-09-02 13:26:34 +0000
commitf86cad0ce3a80127b2912301315fa7dac042002d (patch)
tree724d013a376d218986fefc586ed681b8c219eeb7 /japanese/canna-lib
parent4e55a9215df0dcffaf32acdc58dfda0cb691838c (diff)
downloadports-f86cad0ce3a80127b2912301315fa7dac042002d.tar.gz
ports-f86cad0ce3a80127b2912301315fa7dac042002d.zip
Two imake related changes:
1) Move -a from XMKMF command variable to a new XMKMF_ARGS variable. For ports that don't need -a introduce USES=imake:notall. This way ports no longer have to redefine XMKMF. 2) xmkmf -a runs imake with the flags in IMAKECPPFLAGS as extra arguments to set CPP, CC and CXX. This creates the top Makefile, and then xmkmf runs make Makefiles. This Makefiles target runs imake for each subdirectory but these imake invocations did not have the flags from IMAKECPPFLAGS so the resulting makefiles used the wrong C preprocessor when clang is used (/usr/bin/cpp instead of /usr/local/bin/tradcpp). Instead of letting xmkmf pass IMAKECPPFLAGS from the environment to imake let imake handle IMAKECPPFLAGS itself just like it handles IMAKEINCLUDE. This exposed configure errors in x11-clocks/mouseclock and x11-wm/fvwm. Approved by: portmgr (bapt)
Notes
Notes: svn path=/head/; revision=325992
Diffstat (limited to 'japanese/canna-lib')
-rw-r--r--japanese/canna-lib/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 7dcefd6fd578..59a78f55ac9a 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -13,7 +13,7 @@ DISTNAME= Canna${PORTVERSION:S/.//g}
MAINTAINER= hrs@FreeBSD.org
COMMENT= A Kana-to-Kanji conversion system, library part
-USES= imake
+USES= imake:notall
USE_BZIP2= yes
USE_GCC= any
USE_LDCONFIG= yes
@@ -24,7 +24,6 @@ PLIST_SUB= METAFILE="${METAFILE}" \
ALL_TARGET= canna
INSTALL_TARGET= instsgs
-XMKMF= xmkmf
METAFILE= ${DATADIR_REL}/canna-lib-dic.meta