aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/Uses/cmake.mk5
-rw-r--r--comms/gnuradio/Makefile2
-rw-r--r--databases/sqliteman/Makefile1
-rw-r--r--devel/freeocl/Makefile1
-rw-r--r--devel/qca-qt5/Makefile2
-rw-r--r--devel/qca/Makefile2
-rw-r--r--emulators/tpm-emulator/Makefile2
-rw-r--r--games/opensonic/Makefile2
-rw-r--r--graphics/cegui/Makefile2
-rw-r--r--graphics/luxrender/Makefile2
-rw-r--r--graphics/opencv/Makefile2
-rw-r--r--graphics/openimageio/Makefile1
-rw-r--r--graphics/rawtherapee/Makefile2
-rw-r--r--math/eigen3/Makefile2
-rw-r--r--math/metis/Makefile2
-rw-r--r--math/scalapack/Makefile2
-rw-r--r--sysutils/osquery/Makefile2
-rw-r--r--www/webkit2-gtk3/Makefile6
18 files changed, 17 insertions, 23 deletions
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index 00b0671fbc94..666481cc6623 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -19,8 +19,6 @@
# CMAKE_NINJA - Use ninja instead of make(1)
#
# Variables for ports:
-# CMAKE_ENV - Environment passed to cmake.
-# Default: ${CONFIGURE_ENV}
# CMAKE_ARGS - Arguments passed to cmake
# Default: see below
# CMAKE_BUILD_TYPE - Type of build (cmake predefined build types).
@@ -68,7 +66,6 @@ PLIST_SUB+= CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}"
INSTALL_TARGET?= install/strip
.endif
-CMAKE_ENV?= ${CONFIGURE_ENV}
CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \
-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
@@ -117,7 +114,7 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
do-configure:
@${ECHO_MSG} ${_CMAKE_MSG}
${MKDIR} ${CONFIGURE_WRKSRC}
- @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
+ @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
.endif
.endif #!defined(_INCLUDE_USES_CMAKE_MK)
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 37c1e67ee84b..a54c3fc7e42b 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -35,7 +35,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= cmake:outsource iconv perl5 python:2.7 shebangfix
SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in
-CMAKE_ENV+= LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1"
+CONFIGURE_ENV+= LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1"
CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
CMAKE_ARGS+= -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
-DICONV_LIB:STRING="X${ICONV_LIB}" \
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index 35032fb6c358..307ffffeb217 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -14,7 +14,6 @@ LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
USES= cmake
USE_SQLITE= yes
-CMAKE_ENV+= QMAKESPEC=${QMAKESPEC}
USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql
GNU_CONFIGURE= yes
diff --git a/devel/freeocl/Makefile b/devel/freeocl/Makefile
index 94420852b45e..06f3b17a1450 100644
--- a/devel/freeocl/Makefile
+++ b/devel/freeocl/Makefile
@@ -25,7 +25,6 @@ USES= cmake compiler:c++11-lib
USE_LDCONFIG= yes
CXXFLAGS+= -pthread -std=gnu++0x
-CMAKE_ENV+= FREEOCL_CXX_COMPILER="${CXX}"
CFLAGS_i386= -msse
diff --git a/devel/qca-qt5/Makefile b/devel/qca-qt5/Makefile
index 4c3ae8f47ed2..8bfbec62fe14 100644
--- a/devel/qca-qt5/Makefile
+++ b/devel/qca-qt5/Makefile
@@ -19,7 +19,7 @@ CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT5_BUILD=yes \
-DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
-DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man \
-DQCA_SUFFIX=qt5
-CMAKE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
+CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
USE_LDCONFIG= yes
USE_QT5= buildtools_build core network qmake_build
diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index 0b8314602239..7ecbf294d355 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -18,7 +18,7 @@ CMAKE_ARGS= -DBUILD_PLUGINS=none -DBUILD_TESTS=no -DQT4_BUILD=yes \
-DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
-DQCA_FEATURE_INSTALL_DIR=${QT_MKSPECDIR}/features \
-DQCA_MAN_INSTALL_DIR=${MANPREFIX}/man
-CMAKE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
+CONFIGURE_ENV= QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
USE_LDCONFIG= yes
USE_QT4= corelib moc_build qmake_build rcc_build
diff --git a/emulators/tpm-emulator/Makefile b/emulators/tpm-emulator/Makefile
index e58345e54bd3..f11e90ee9654 100644
--- a/emulators/tpm-emulator/Makefile
+++ b/emulators/tpm-emulator/Makefile
@@ -18,7 +18,7 @@ CONFLICTS= trousers-tddl-[0-9]*
USES= cmake:outsource
USE_RC_SUBR= tpmd
-CMAKE_ENV= PREFIX="${PREFIX}"
+CONFIGURE_ENV= PREFIX="${PREFIX}"
CMAKE_ARGS= -DTPM_INCLUDE_DIRS:STRING="${LOCALBASE}/include" \
-DTPM_LIBRARY_DIRS:STRING="${LOCALBASE}/lib"
USE_LDCONFIG= yes
diff --git a/games/opensonic/Makefile b/games/opensonic/Makefile
index e02f18ed17a2..a2e7b7c62e0a 100644
--- a/games/opensonic/Makefile
+++ b/games/opensonic/Makefile
@@ -24,7 +24,7 @@ DESKTOP_ENTRIES="${PORTNAME}" \
false
USES= cmake
-CMAKE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" \
+CONFIGURE_ENV+= _ALLEGRO_LIBS="`allegro-config --libs`" \
_ALLEGRO_VERSION="`allegro-config --version`"
CFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 6b14e5849f85..e4a5c2f33adf 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
WRKSRC= ${WRKDIR}/${DISTNAME:S/2b/2/}
-CMAKE_ENV+= TOLUA_INC="${LUA_INCDIR}"
+CONFIGURE_ENV+= TOLUA_INC="${LUA_INCDIR}"
CMAKE_ARGS= -DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
-DCEGUI_BUILD_TESTS=OFF
USE_LDCONFIG= yes
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index b8af75b4c864..86752f1f20f2 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -58,7 +58,7 @@ post-patch:
${LUXRAYS_WRKSRC}/cmake/Dependencies.cmake
pre-configure:
- cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} \
+ cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
${CMAKE_ARGS} .
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
${_MAKE_JOBS} ${MAKE_ARGS} -C ${LUXRAYS_WRKSRC}
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index f12498fd389d..acc1e3699580 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -243,7 +243,7 @@ CMAKE_ARGS+= -DBUILD_opencv_java:BOOL=On
. for module in apps python stitching superres videostab
CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off
. endfor
-CMAKE_ENV+= JAVA_HOME="${JAVA_HOME}"
+CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}"
INSTALL_WRKSRC= ${WRKSRC}/modules/java
.else
LIB_DEPENDS+= libopencv_core.so:${PORTSDIR}/graphics/opencv-core
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index c6621a4f7b88..1a464c4fcaf1 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -86,7 +86,6 @@ CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \
USE_GL= glew
USE_QT4= corelib gui opengl qmake_build moc_build rcc_build uic_build
CMAKE_ARGS+= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
-CMAKE_ENV+= QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR}
.else
CMAKE_ARGS+= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
.endif
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 76db7b2d761c..9fb6f1ec5124 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include -fPIC
CXXFLAGS+= -I${LOCALBASE}/include -fPIC
LDFLAGS+= -lpthread -L${LOCALBASE}/lib
-CMAKE_ENV= CFLAGS="${CFLAGS}" \
+CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}"
CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \
-DCREDITSDIR="${DOCSDIR}" \
diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile
index 3188a10571d9..47a8fb01c751 100644
--- a/math/eigen3/Makefile
+++ b/math/eigen3/Makefile
@@ -15,7 +15,7 @@ LICENSE= LGPL21 MPL
LICENSE_COMB= multi
USES= cmake:outsource tar:bzip2
-CMAKE_ENV+= PKG_CONFIG_LIBDIR="${PREFIX}/libdata"
+CONFIGURE_ENV+= PKG_CONFIG_LIBDIR="${PREFIX}/libdata"
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-1306d75b4a21
diff --git a/math/metis/Makefile b/math/metis/Makefile
index 8d7b397a4d84..04034d29d2de 100644
--- a/math/metis/Makefile
+++ b/math/metis/Makefile
@@ -91,7 +91,7 @@ do-configure:
.for o in SHARED STATIC #PROFILE
.if ${PORT_OPTIONS:M${o}}
@${PRINTF} "\n\nConfiguring ${o}:\n\n\n"
- @cd ${WRKSRC_${o}}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} \
+ @cd ${WRKSRC_${o}}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
${CMAKE_ARGS:C|${CFLAGS}|& ${${o}_FLAGS}|g} ${CMAKE_ARGS_${o}} \
-DGKLIB_PATH="${WRKSRC_${o}}/GKlib" ${CMAKE_SOURCE_PATH}
.endif
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 8bb5c3966d69..312d89639ed0 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -112,7 +112,7 @@ post-build:
${RM} -rf ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt
${CP} -p ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
(cd ${WRKSRC} && \
- ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH})
+ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH})
(cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET})
post-install:
diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index 586beb92196f..f2dc32a995af 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs \
libicuuc.so:${PORTSDIR}/devel/icu
USES= cmake:outsource gmake libtool python:build compiler:c++11-lib
-CMAKE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \
+CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \
SKIP_TESTS="yes" CC="${CC}" CXX="${CXX}"
CMAKE_ARGS+= -DFREEBSD=awesome -DCMAKE_SYSTEM_NAME="FreeBSD"
BLDDIR= ${WRKDIR}/.build/${PORTNAME}
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index 3fc7af4294f0..c27616c2b0b0 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -47,10 +47,10 @@ BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake
#../../../lib/libjavascriptcoregtk-4.0.so.18.0.8: undefined reference to `JSC::JSCell::structure() const'
#c++: error: linker command failed with exit code 1 (use -v to see invocation)
#Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/build.make:94: recipe for target 'bin/jsc' failed
-# there is something in CMAKE_ENV that cause this ... but what.
+# there is something in CONFIGURE_ENV that cause this ... but what.
CMAKE_ARGS+= -DPORT=GTK
-CMAKE_ENV+= XDG_CACHE_HOME=${WRKDIR} \
+CONFIGURE_ENV+= XDG_CACHE_HOME=${WRKDIR} \
CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
CC="${CC}" CXX="${CXX}" CPP="${CPP}"
@@ -92,7 +92,7 @@ pre-configure:
do-configure:
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" \
- ${CMAKE_ENV} cmake -DPORT=GTK ${CMAKE_ARGS}
+ ${CONFIGURE_ENV} cmake -DPORT=GTK ${CMAKE_ARGS}
post-install:
${MV} ${STAGEDIR}${PREFIX}/bin/jsc \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 11:07:21 +0000