diff options
35 files changed, 487 insertions, 418 deletions
@@ -10,7 +10,22 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. -20230111: +20240229: +AUTHOR: tijl@FreeBSD.org + + A new command SETENVI that clears the environment and a new variable + WRK_ENV that contains a basic environment to use with SETENVI have + been added. + Ports that run (parts of) the upstream build system directly using + commands like "${SETENV} ${MAKE_ENV} ${MAKE_CMD} ..." should change + that to "${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ...". This way + the build system runs with a clean environment without interference + from the user environment or ports framework environment. Ports can + add extra environment variables to WRK_ENV similar to CONFIGURE_ENV, + MAKE_ENV, TEST_ENV, and so on, but WRK_ENV is used in all targets + while the latter are target-specific. + +20240111: AUTHOR: bapt@FreeBSD.org MAN[1-8LN]PREFIX variable has been removed from the framework, use PREFIX diff --git a/Mk/Uses/angr.mk b/Mk/Uses/angr.mk index a1e41b042dae..6a5ae2a433ea 100644 --- a/Mk/Uses/angr.mk +++ b/Mk/Uses/angr.mk @@ -59,7 +59,7 @@ TEST_WRKSRC?= ${WRKSRC}/tests ANGR_NOSETESTS?= nosetests-${PYTHON_VER} do-test: - @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${ANGR_NOSETESTS}) + @(cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${ANGR_NOSETESTS}) . endif # "${angr_ARGS:Mnose}" != "" .endif diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index e91e4522e8f7..2ee0596e0a6e 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -202,14 +202,14 @@ cabal-extract: check-cabal ${RM} -r ${CABAL_HOME} . endif @${ECHO_MSG} "===> Fetching Hackage index into ${CABAL_HOME}/.cabal" - ${SETENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update . if ${_hackage_is_default} == yes cd ${WRKDIR} && \ - ${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} get ${HACKAGE_DISTNAME} + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} get ${HACKAGE_DISTNAME} . else . if ${cabal_ARGS:Mhpack} @${ECHO_MSG} "===> Running ${HPACK_CMD} to generate .cabal file" - cd ${WRKSRC} && ${SETENV} ${CABAL_HOME_ENV} ${HPACK_CMD} + cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${HPACK_CMD} . endif . endif # Remove Haskell dependencies that come from GH_TUPLE @@ -217,7 +217,7 @@ cabal-extract: check-cabal . ifdef CABAL_REPOSITORIES @${ECHO_MSG} "===> Fetching additional Cabal repositories index into ${CABAL_HOME}/.cabal" @cd ${WRKSRC} && \ - ${SETENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update . endif # Create a cookie for cabal-post-patch @${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE} @@ -227,12 +227,12 @@ cabal-extract: check-cabal # This pulls in all source dependencies, resolves them and generates build plan cabal-configure: check-cabal cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --dry-run --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --dry-run --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} # Calls cabal build on the Haskell package located in ${WRKSRC} cabal-build: check-cabal cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} # Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure. make-use-cabal: check-cabal2tuple @@ -312,13 +312,13 @@ cabal-post-patch: cabal-pre-configure: # Generate .cabal file with hpack if requested . if ${cabal_ARGS:Mhpack} - cd ${WRKSRC} && ${SETENV} ${CABAL_HOME_ENV} hpack + cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} hpack . endif . if !target(do-build) do-build: cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --offline --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} --flags "${CABAL_FLAGS}" ${BUILD_ARGS} ${BUILD_TARGET} . endif . if !target(do-install) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index ea012141d66b..ca0a4fef23bd 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -154,8 +154,9 @@ RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} . endif # Helper to shorten cargo calls. -_CARGO_RUN= ${SETENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO} -CARGO_CARGO_RUN= cd ${WRKSRC}; ${SETENV} CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=1 ${_CARGO_RUN} +_CARGO_RUN= ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO} +CARGO_CARGO_RUN= cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CARGO_ENV} \ + CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=1 ${CARGO} # User arguments for cargo targets. CARGO_BUILD_ARGS?= diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index d8a13e8f7e7a..8229fa9cbb55 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -153,7 +153,8 @@ BROKEN= USES=emacs is incompatible with cmake's ninja-generator (try cmake:noni do-configure: @${ECHO_MSG} ${_CMAKE_MSG} ${MKDIR} ${CONFIGURE_WRKSRC} - @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} + @cd ${CONFIGURE_WRKSRC}; ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ + ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} . endif . if !target(do-test) && ${cmake_ARGS:Mtesting} @@ -169,9 +170,9 @@ CMAKE_TESTING_ARGS+= ${CMAKE_TESTING_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/ do-test: @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} + ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} . endif . endif diff --git a/Mk/Uses/elixir.mk b/Mk/Uses/elixir.mk index fbfe407907d6..89d29aa9c46d 100644 --- a/Mk/Uses/elixir.mk +++ b/Mk/Uses/elixir.mk @@ -42,7 +42,7 @@ ELIXIR_APP_ROOT?= ${PREFIX}/lib/elixir/lib/${ELIXIR_APP_NAME} ELIXIR_HIDDEN?= "^${ELIXIR_APP_NAME}$$" ELIXIR_LOCALE?= en_US.UTF-8 MIX_CMD?= ${LOCALBASE}/bin/mix -MIX_COMPILE?= ${SETENV} ${MIX_ENV} LANG=${ELIXIR_LOCALE} LC_ALL=${ELIXIR_LOCALE} MIX_ENV=${MIX_ENV_NAME} ELIXIR_HIDDEN=${ELIXIR_HIDDEN} ${MIX_CMD} ${MIX_TARGET} +MIX_COMPILE?= ${SETENVI} ${WRK_ENV} ${MIX_ENV} LANG=${ELIXIR_LOCALE} LC_ALL=${ELIXIR_LOCALE} MIX_ENV=${MIX_ENV_NAME} ELIXIR_HIDDEN=${ELIXIR_HIDDEN} ${MIX_CMD} ${MIX_TARGET} MIX_REWRITE?= MIX_BUILD_DEPS?= MIX_RUN_DEPS?= diff --git a/Mk/Uses/erlang.mk b/Mk/Uses/erlang.mk index 62e9e6e34f29..acdd6c031cdd 100644 --- a/Mk/Uses/erlang.mk +++ b/Mk/Uses/erlang.mk @@ -97,7 +97,7 @@ do-build: . for target in ${REBAR_TARGETS} # Remove rebar.lock every time - it can be created again after each run of rebar3 @${RM} ${WRKSRC}/rebar.lock - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} REBAR_PROFILE=${REBAR_PROFILE} ${ERLANG_COMPILE} ${target} + @cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} REBAR_PROFILE=${REBAR_PROFILE} ${ERLANG_COMPILE} ${target} . endfor . endif # !target(do-build) diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk index 8c4539a274ca..e085c45fcab0 100644 --- a/Mk/Uses/gem.mk +++ b/Mk/Uses/gem.mk @@ -93,8 +93,8 @@ RUBYGEM_ARGS+= --no-document _USES_extract+= 590:gem-extract gem-extract: - @${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \ + @${SETENVI} ${WRK_ENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} + @(cd ${BUILD_WRKSRC}; if ! ${SETENVI} ${WRK_ENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Extraction failed unexpectedly."; \ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \ @@ -104,7 +104,7 @@ gem-extract: . if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \ + @(cd ${BUILD_WRKSRC}; if ! ${SETENVI} ${WRK_ENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \ @@ -115,7 +115,7 @@ do-build: . if !target(do-install) do-install: - (cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- ${CONFIGURE_ARGS}) + (cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- ${CONFIGURE_ARGS}) ${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/ ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} + ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index 95af91448885..32884f3f3607 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -192,7 +192,7 @@ go-post-fetch: @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies"; @(cd ${DISTDIR}/${DIST_SUBDIR}; \ [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ - ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) + ${SETENVI} ${WRK_ENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) . endif _USES_extract+= 800:go-post-extract @@ -201,9 +201,9 @@ _USES_extract+= 800:go-post-extract # already in MODCACHE), vendor them so we can patch them if needed. go-post-extract: @${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies"; - @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e) + @(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e) @${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies"; - @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e) + @(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e) . else # Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module. go-post-extract: @@ -220,7 +220,7 @@ do-build: pkg=$$(${ECHO_CMD} $${t} | \ ${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \ ${ECHO_MSG} "===> Building $${out} from $${pkg}"; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \ -o ${GO_WRKDIR_BIN}/$${out} \ $${pkg}; \ done) @@ -246,7 +246,7 @@ do-test: (cd ${GO_WRKSRC}; \ for t in ${GO_TESTTARGET}; do \ ${ECHO_MSG} "===> Testing $${t}"; \ - ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \ done) . endif @@ -254,7 +254,7 @@ do-test: gomod-clean: . if exists(${GO_CMD}) @${ECHO_MSG} "===> Cleaning Go module cache" - @${SETENV} ${GO_ENV} ${GO_CMD} clean -modcache + @${SETENVI} ${WRK_ENV} ${GO_ENV} ${GO_CMD} clean -modcache . else @${ECHO_MSG} "===> Skipping since ${GO_CMD} is not installed" . endif @@ -279,11 +279,11 @@ gomod-vendor-deps: fi gomod-vendor: gomod-vendor-deps patch - @cd ${WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} mod vendor; \ + @cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${GO_ENV} ${GO_CMD} mod vendor; \ [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt gomod-vendor-diff: gomod-vendor-deps patch - @cd ${WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} mod vendor; \ + @cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${GO_ENV} ${GO_CMD} mod vendor; \ [ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${SED} 's|GH_TUPLE=| |; s| \\$$||' | ${GREP} -v ' \\' > ${WRKDIR}/GH_TUPLE-new.txt && \ echo ${GH_TUPLE} | ${TR} -s " " "\n" | ${SED} "s|^| |" > ${WRKDIR}/GH_TUPLE-old.txt && \ ${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt || exit 0 diff --git a/Mk/Uses/imake.mk b/Mk/Uses/imake.mk index 06981bc9f819..6848907e8934 100644 --- a/Mk/Uses/imake.mk +++ b/Mk/Uses/imake.mk @@ -36,7 +36,7 @@ XMKMF_ARGS+= -a . if ! ${imake_ARGS:Menv} . if !target(do-configure) do-configure: - @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS}) + @(cd ${CONFIGURE_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS}) . endif . if ! ${imake_ARGS:Mnoman} diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk index 6088ea029b23..ef5569ab8eb9 100644 --- a/Mk/Uses/lazarus.mk +++ b/Mk/Uses/lazarus.mk @@ -144,7 +144,7 @@ _INCLUDE_USES_LAZARUS_POST_MK= yes . if !target(do-build) do-build: . for PROJECT_FILE in ${LAZARUS_PROJECT_FILES} - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} \ + @(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${LAZBUILD_CMD} \ ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}) . endfor . endif # !target(do-build) diff --git a/Mk/Uses/mate.mk b/Mk/Uses/mate.mk index 34ccb7d831c3..dc4272bb90a0 100644 --- a/Mk/Uses/mate.mk +++ b/Mk/Uses/mate.mk @@ -210,7 +210,7 @@ CONFIGURE_ENV+= NOCONFIGURE=yes _USES_configure+= 295:mate-pre-configure mate-pre-configure: - @(cd ${CONFIGURE_WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./autogen.sh) + @(cd ${CONFIGURE_WRKSRC} ; ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ./autogen.sh) . endif . if defined(MATE_PRE_PATCH) diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index 8c266cdfafee..e7c5fd5b5068 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -261,7 +261,7 @@ do-configure: ${SCRIPTDIR}/configure; \ fi @cd ${CONFIGURE_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} \ + ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} \ ${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} . if !${_USE_PERL5:Mmodbuild*} @cd ${CONFIGURE_WRKSRC} && \ @@ -273,13 +273,13 @@ do-configure: . if ${_USE_PERL5:Mmodbuild*} . if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${ALL_TARGET} ${MAKE_ARGS}) + @(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${ALL_TARGET} ${MAKE_ARGS}) . endif # !target(do-build) . if !${USES:Mgmake} . if !target(do-install) do-install: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS}) + @(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS}) . endif # !target(do-install) . endif # ! USES=gmake . endif # modbuild @@ -325,9 +325,9 @@ TEST_TARGET?= test TEST_WRKSRC?= ${BUILD_WRKSRC} do-test: . if ${USE_PERL5:Mmodbuild*} - @cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS} + @cd ${TEST_WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS} . elif ${USE_PERL5:Mconfigure} - @cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET} + @cd ${TEST_WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET} . endif # USE_PERL5:Mmodbuild* . endif # do-test .endif # defined(_POSTMKINCLUDED) diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index 18196b6768a1..b197f1ffcfb5 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -228,13 +228,13 @@ post-patch: . if !target(do-build) do-build: - (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} -C ./build) + (cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} -C ./build) . endif # !target(do-build) . if !target(do-install) do-install: - (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} ) + (cd ${WRKSRC} ; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} ) . endif # !target(do-install) . endif # defined(PYQT_DIST) diff --git a/Mk/Uses/pytest.mk b/Mk/Uses/pytest.mk index 62e435270cbd..4d0a0039672f 100644 --- a/Mk/Uses/pytest.mk +++ b/Mk/Uses/pytest.mk @@ -60,7 +60,7 @@ _PYTEST_FILTER_EXPRESSION= ${_PYTEST_ALL_IGNORED_TESTS:C/^(.)/and not \1/:tW:C/^ . if !target(do-test) do-test: - @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest \ + @cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest \ -k '${_PYTEST_FILTER_EXPRESSION}' \ -v -rs -o addopts= \ ${PYTEST_ARGS} diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 5ef639cf7907..dad34dac322e 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -905,17 +905,17 @@ MAKE_ENV+= LDSHARED="${LDSHARED}" PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE= . if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE) do-configure: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS}) + @(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS}) . endif . if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) + @(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) . endif . if !target(do-install) do-install: - @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) + @(cd ${INSTALL_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) . endif . endif # defined(_PYTHON_FEATURE_DISTUTILS) @@ -934,13 +934,13 @@ do-configure: . if !target(do-build) do-build: - @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_BUILD_CMD} + @cd ${BUILD_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PEP517_BUILD_CMD} . endif . if !target(do-install) do-install: @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD} + @cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD} @${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}*.dist-info/RECORD >> ${_PYTHONPKGLIST} @${REINPLACE_CMD} \ @@ -963,35 +963,35 @@ do-install: . if defined(_PYTHON_FEATURE_NOSE) . if !target(do-test) do-test: - cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m nose ${TEST_ARGS:NDESTDIR=*} -v + cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m nose ${TEST_ARGS:NDESTDIR=*} -v . endif . endif # defined(_PYTHON_FEATURE_NOSE) . if defined(_PYTHON_FEATURE_NOSE2) . if !target(do-test) do-test: - cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m nose2 ${TEST_ARGS:NDESTDIR=*} -v + cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m nose2 ${TEST_ARGS:NDESTDIR=*} -v . endif . endif # defined(_PYTHON_FEATURE_NOSE2) . if defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4) . if !target(do-test) do-test: - cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -k '${_PYTEST_FILTER_EXPRESSION}' -rs -v -o addopts= ${TEST_ARGS:NDESTDIR=*} + cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -k '${_PYTEST_FILTER_EXPRESSION}' -rs -v -o addopts= ${TEST_ARGS:NDESTDIR=*} . endif . endif # defined(_PYTHON_FEATURE_PYTEST) || defined(_PYTHON_FEATURE_PYTEST4) . if defined(_PYTHON_FEATURE_UNITTEST) . if !target(do-test) do-test: - cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest ${TEST_ARGS:NDESTDIR=*} -v + cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest ${TEST_ARGS:NDESTDIR=*} -v . endif . endif # defined(_PYTHON_FEATURE_UNITTEST) . if defined(_PYTHON_FEATURE_UNITTEST2) . if !target(do-test) do-test: - cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest2 ${TEST_ARGS:NDESTDIR=*} -v + cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest2 ${TEST_ARGS:NDESTDIR=*} -v . endif . endif # defined(_PYTHON_FEATURE_UNITTEST2) diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk index e6fc0758026a..926d98002b53 100644 --- a/Mk/Uses/qmake.mk +++ b/Mk/Uses/qmake.mk @@ -139,7 +139,7 @@ _QMAKE_MK_POST_INCLUDED= qmake.mk qmake-configure: @${MKDIR} ${_QMAKE_WRKSRC} @cd ${_QMAKE_WRKSRC} && \ - ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} \ + ${SETENVI} ${WRK_ENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} \ ${QMAKE_SOURCE_PATH} \ ${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS} diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index c4631b64d2a9..8900de1ef1d9 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -311,12 +311,12 @@ ruby-extconf-configure: . for d in ${RUBY_EXTCONF_SUBDIRS} @${ECHO_MSG} "===> Running ${RUBY_EXTCONF} in ${d} to configure" @cd ${CONFIGURE_WRKSRC}/${d}; \ - ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS} + ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS} . endfor . else @${ECHO_MSG} "===> Running ${RUBY_EXTCONF} to configure" @cd ${CONFIGURE_WRKSRC}; \ - ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS} + ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS} . endif . endif @@ -331,21 +331,21 @@ do-configure: ruby-setup-configure ruby-setup-configure: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to configure" @cd ${BUILD_WRKSRC}; \ - ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} config ${CONFIGURE_ARGS} + ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} config ${CONFIGURE_ARGS} do-build: ruby-setup-build ruby-setup-build: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to build" @cd ${BUILD_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} setup + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} setup do-install: ruby-setup-install ruby-setup-install: @${ECHO_MSG} "===> Running ${RUBY_SETUP} to install" @cd ${INSTALL_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR} + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR} . endif . if !${ruby_ARGS:Mbuild} && !${ruby_ARGS:Mrun} && !${ruby_ARGS:Mnone} diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 069b5e4c6030..8ab99a18e22b 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -83,6 +83,7 @@ RM?= /bin/rm -f RMDIR?= /bin/rmdir SED?= /usr/bin/sed SETENV?= /usr/bin/env +SETENVI?= /usr/bin/env -i SH?= /bin/sh SORT?= /usr/bin/sort STRIP_CMD?= /usr/bin/strip diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 162e2836e236..91ea9516c846 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -396,15 +396,15 @@ BUILD_DEPENDS+= ${ANT}:devel/apache-ant ALL_TARGET?= . if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET}) + @(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ${ANT} ${MAKE_ARGS} ${ALL_TARGET}) . endif . if !target(do-test) && defined(TEST_TARGET) TEST_DEPENDS+= ${DEPEND_JAVA} TEST_DEPENDS+= ${ANT}:devel/apache-ant do-test: - @(cd ${TEST_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${TEST_TARGET}) + @(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ${ANT} ${MAKE_ARGS} ${TEST_TARGET}) . endif . endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1ec1e6c52c66..0671ec0d817d 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -669,6 +669,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # # For options see bsd.options.mk # +# WRK_ENV - Environment used when running the upstream build system. +# Target-specific environment variables can be defined using +# CONFIGURE_ENV, MAKE_ENV, TEST_ENV, and similar variables. +# # For fetch: # # FETCH_BINARY - Path to ftp/http fetch command if not in $PATH. @@ -1630,6 +1634,16 @@ PKG_NOTES+= flavor PKG_NOTE_flavor= ${FLAVOR} . endif +WRK_ENV+= HOME=${WRKDIR} \ + PWD="$${PWD}" +. for e in OSVERSION PATH TERM TMPDIR \ + UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \ + UNAME_p UNAME_r UNAME_s UNAME_U UNAME_v +. ifdef ${e} +WRK_ENV+= ${e}=${${e}:Q} +. endif +. endfor + TEST_ARGS?= ${MAKE_ARGS} TEST_ENV?= ${MAKE_ENV} @@ -3335,7 +3349,7 @@ do-configure: @${MKDIR} ${CONFIGURE_WRKSRC} @(cd ${CONFIGURE_WRKSRC} && \ ${SET_LATE_CONFIGURE_ARGS} \ - if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + if ! ${SETENVI} ${WRK_ENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ INSTALL="/usr/bin/install -c" \ @@ -3352,7 +3366,8 @@ do-configure: . endif # Build -DO_MAKE_BUILD?= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} +DO_MAKE_BUILD?= ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ + ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} . if !target(do-build) do-build: @(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \ @@ -3443,13 +3458,15 @@ check-install-conflicts: . if !target(do-install) && !defined(NO_INSTALL) do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @(cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${FAKEROOT} \ + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) . endif # Test . if !target(do-test) && defined(TEST_TARGET) -DO_MAKE_TEST?= ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*} +DO_MAKE_TEST?= ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ + ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*} do-test: @(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \ if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \ diff --git a/games/iortcw/Makefile b/games/iortcw/Makefile index 910beccfd637..9c20425cd256 100644 --- a/games/iortcw/Makefile +++ b/games/iortcw/Makefile @@ -1,6 +1,6 @@ PORTNAME= iortcw PORTVERSION= 1.51c -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= games @@ -30,11 +30,11 @@ MAKE_ARGS= BINDIR="${STAGEDIR}${PREFIX}/bin" \ LDFLAGS_i386= -Wl,-znotext -PLIST_SUB= ARCH="${ARCH}" \ +PLIST_SUB= ARCH="${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc/ppc/}" \ WOLFDIR="${WOLFDIR}" SUB_FILES= iowolfded iowolfmp iowolfsp pkg-message -SUB_LIST= ARCH="${ARCH}" \ +SUB_LIST= ARCH="${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc/ppc/}" \ DISTVERSION="${DISTVERSION}" \ WOLFDIR="${PREFIX}/${WOLFDIR}" diff --git a/games/iortcw/files/patch-MP_Makefile b/games/iortcw/files/patch-MP_Makefile new file mode 100644 index 000000000000..be11bab35ea7 --- /dev/null +++ b/games/iortcw/files/patch-MP_Makefile @@ -0,0 +1,73 @@ +--- MP/Makefile.orig 2019-03-16 18:09:48 UTC ++++ MP/Makefile +@@ -101,14 +101,6 @@ export ARCH + endif + export ARCH + +-# For historical compatibility reasons on non-windows +-# platform output files use i386 instead of x86 +-ifeq ($(ARCH),x86) +- ifndef MINGW +- FILE_ARCH=i386 +- endif +-endif +- + ifndef FILE_ARCH + FILE_ARCH=$(ARCH) + endif +@@ -369,7 +361,7 @@ CLIENT_EXTRA_FILES= + EXTRA_FILES= + CLIENT_EXTRA_FILES= + +-ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) ++ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu" "freebsd" "netbsd" "openbsd")) + TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\" + endif + +@@ -752,7 +744,7 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd + ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd" "netbsd")) + + BASE_CFLAGS = -Wall -fno-strict-aliasing \ +- -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON ++ -pipe -DUSE_ICON -DARCH_STRING=\\\"$(FILE_ARCH)\\\" -DMAP_ANONYMOUS=MAP_ANON + CLIENT_CFLAGS += $(SDL_CFLAGS) + + OPTIMIZEVM = -O3 +@@ -761,7 +753,6 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd + ifeq ($(ARCH),x86_64) + OPTIMIZEVM = -O3 + OPTIMIZE = $(OPTIMIZEVM) -ffast-math +- FILE_ARCH = amd64 + endif + ifeq ($(ARCH),x86) + OPTIMIZEVM = -O3 -march=i586 +@@ -787,13 +778,8 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd + OPTIMIZE = $(OPTIMIZEVM) + endif + +- ifeq ($(USE_CURL),1) +- CLIENT_CFLAGS += $(CURL_CFLAGS) +- USE_CURL_DLOPEN=0 +- endif +- + SHLIBEXT=so +- SHLIBCFLAGS=-fPIC ++ SHLIBCFLAGS=-fPIC -fvisibility=hidden + SHLIBLDFLAGS=-shared $(LDFLAGS) + + THREAD_LIBS=-lpthread +@@ -805,12 +791,14 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd + RENDERER_LIBS = $(SDL_LIBS) + + ifeq ($(USE_OPENAL),1) ++ CLIENT_CFLAGS += $(OPENAL_CFLAGS) + ifneq ($(USE_OPENAL_DLOPEN),1) + CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS) + endif + endif + + ifeq ($(USE_CURL),1) ++ CLIENT_CFLAGS += $(CURL_CFLAGS) + ifneq ($(USE_CURL_DLOPEN),1) + CLIENT_LIBS += $(CURL_LIBS) + endif diff --git a/games/iortcw/files/patch-MP_code_qcommon_q__platform.h b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h index 770e384a9750..1e6322c627c0 100644 --- a/games/iortcw/files/patch-MP_code_qcommon_q__platform.h +++ b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h @@ -1,32 +1,22 @@ --- MP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC +++ MP/code/qcommon/q_platform.h -@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +@@ -221,14 +221,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + #define ID_INLINE inline + #define PATH_SEP '/' - #else - --#if (defined _M_IX86 || defined __i386__) && !defined(C_ONLY) --#define id386 1 --#else - #define id386 0 --#endif - - #if (defined(powerc) || defined(powerpc) || defined(ppc) || \ - defined(__ppc) || defined(__ppc__)) && !defined(C_ONLY) -@@ -224,11 +220,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - #ifdef __i386__ - #define ARCH_STRING "i386" - #elif defined __amd64__ --#undef idx64 --#define idx64 1 - #define ARCH_STRING "amd64" - #elif defined __axp__ - #define ARCH_STRING "alpha" -+#elif defined __powerpc64__ -+#define ARCH_STRING "powerpc64" -+#elif defined __powerpc__ -+#define ARCH_STRING "powerpc" -+#elif defined __riscv -+#define ARCH_STRING "riscv64" +-#ifdef __i386__ +-#define ARCH_STRING "i386" +-#elif defined __amd64__ ++#if !defined(ARCH_STRING) ++# error ARCH_STRING should be defined by the Makefile ++#endif ++ ++#if defined __x86_64__ + #undef idx64 + #define idx64 1 +-#define ARCH_STRING "amd64" +-#elif defined __axp__ +-#define ARCH_STRING "alpha" #endif #if BYTE_ORDER == BIG_ENDIAN diff --git a/games/iortcw/files/patch-SP_Makefile b/games/iortcw/files/patch-SP_Makefile new file mode 100644 index 000000000000..294a9b7c76d6 --- /dev/null +++ b/games/iortcw/files/patch-SP_Makefile @@ -0,0 +1,73 @@ +--- SP/Makefile.orig 2019-03-16 18:09:48 UTC ++++ SP/Makefile +@@ -98,14 +98,6 @@ export ARCH + endif + export ARCH + +-# For historical compatibility reasons on non-windows +-# platform output files use i386 instead of x86 +-ifeq ($(ARCH),x86) +- ifndef MINGW +- FILE_ARCH=i386 +- endif +-endif +- + ifndef FILE_ARCH + FILE_ARCH=$(ARCH) + endif +@@ -358,7 +350,7 @@ CLIENT_EXTRA_FILES= + EXTRA_FILES= + CLIENT_EXTRA_FILES= + +-ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) ++ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu" "freebsd" "netbsd" "openbsd")) + TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\" + endif + +@@ -741,7 +733,7 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd + ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd" "netbsd")) + + BASE_CFLAGS = -Wall -fno-strict-aliasing \ +- -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON ++ -pipe -DUSE_ICON -DARCH_STRING=\\\"$(FILE_ARCH)\\\" -DMAP_ANONYMOUS=MAP_ANON + CLIENT_CFLAGS += $(SDL_CFLAGS) + + OPTIMIZEVM = -O3 +@@ -750,7 +742,6 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd + ifeq ($(ARCH),x86_64) + OPTIMIZEVM = -O3 + OPTIMIZE = $(OPTIMIZEVM) -ffast-math +- FILE_ARCH = amd64 + endif + ifeq ($(ARCH),x86) + OPTIMIZEVM = -O3 -march=i586 +@@ -776,13 +767,8 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd + OPTIMIZE = $(OPTIMIZEVM) + endif + +- ifeq ($(USE_CURL),1) +- CLIENT_CFLAGS += $(CURL_CFLAGS) +- USE_CURL_DLOPEN=0 +- endif +- + SHLIBEXT=so +- SHLIBCFLAGS=-fPIC ++ SHLIBCFLAGS=-fPIC -fvisibility=hidden + SHLIBLDFLAGS=-shared $(LDFLAGS) + + THREAD_LIBS=-lpthread +@@ -794,12 +780,14 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd + RENDERER_LIBS = $(SDL_LIBS) + + ifeq ($(USE_OPENAL),1) ++ CLIENT_CFLAGS += $(OPENAL_CFLAGS) + ifneq ($(USE_OPENAL_DLOPEN),1) + CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS) + endif + endif + + ifeq ($(USE_CURL),1) ++ CLIENT_CFLAGS += $(CURL_CFLAGS) + ifneq ($(USE_CURL_DLOPEN),1) + CLIENT_LIBS += $(CURL_LIBS) + endif diff --git a/games/iortcw/files/patch-SP_code_qcommon_q__platform.h b/games/iortcw/files/patch-SP_code_qcommon_q__platform.h index 84d7ad28d17e..5c657c98badd 100644 --- a/games/iortcw/files/patch-SP_code_qcommon_q__platform.h +++ b/games/iortcw/files/patch-SP_code_qcommon_q__platform.h @@ -1,32 +1,22 @@ --- SP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC +++ SP/code/qcommon/q_platform.h -@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +@@ -221,14 +221,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + #define ID_INLINE inline + #define PATH_SEP '/' - #else - --#if (defined _M_IX86 || defined __i386__) && !defined(C_ONLY) --#define id386 1 --#else - #define id386 0 --#endif - - #if (defined(powerc) || defined(powerpc) || defined(ppc) || \ - defined(__ppc) || defined(__ppc__)) && !defined(C_ONLY) -@@ -224,11 +220,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - #ifdef __i386__ - #define ARCH_STRING "i386" - #elif defined __amd64__ --#undef idx64 --#define idx64 1 - #define ARCH_STRING "amd64" - #elif defined __axp__ - #define ARCH_STRING "alpha" -+#elif defined __powerpc64__ -+#define ARCH_STRING "powerpc64" -+#elif defined __powerpc__ -+#define ARCH_STRING "powerpc" -+#elif defined __riscv -+#define ARCH_STRING "riscv64" +-#ifdef __i386__ +-#define ARCH_STRING "i386" +-#elif defined __amd64__ ++#if !defined(ARCH_STRING) ++# error ARCH_STRING should be defined by the Makefile ++#endif ++ ++#if defined __x86_64__ + #undef idx64 + #define idx64 1 +-#define ARCH_STRING "amd64" +-#elif defined __axp__ +-#define ARCH_STRING "alpha" #endif #if BYTE_ORDER == BIG_ENDIAN diff --git a/games/legesmotus/files/patch-Makefile b/games/legesmotus/files/patch-Makefile deleted file mode 100644 index 58d01cbdab8c..000000000000 --- a/games/legesmotus/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2010-09-06 03:18:02 UTC -+++ Makefile -@@ -99,7 +99,7 @@ lmserver: server - - $(ALL_PKG): - +@mkdir -p $@ -- +@$(MAKE) -C $@ -f $(BASEDIR)/$@/Makefile BASEDIR="../../.." SUBDIR="$@" $(TARGET) -+ +@$(MAKE) -C $@ -f $(BASEDIR)/$@/Makefile BASEDIR=".." SUBDIR="$@" $(TARGET) - - server: common - diff --git a/games/legesmotus/files/patch-common.mk b/games/legesmotus/files/patch-common.mk index e92d58d1463d..0aa014d450e2 100644 --- a/games/legesmotus/files/patch-common.mk +++ b/games/legesmotus/files/patch-common.mk @@ -1,6 +1,6 @@ --- common.mk.orig 2010-09-03 19:22:37 UTC +++ common.mk -@@ -9,7 +9,6 @@ FRAMEWORKS = /Library/Frameworks +@@ -9,7 +9,6 @@ VERSION = 0.4.0 VERSION = 0.4.0 # These may be overridden by config.mk @@ -8,21 +8,7 @@ #UNIVERSAL = 1 #NOBUNDLE = 1 -@@ -84,13 +83,6 @@ ifeq ($(ARCHS),) - endif - endif - --# Only Mac OS X can use fat binaries --ifneq ($(filter $(ARCH),$(ARCHS)),$(ARCH)) -- ifneq ($(MACHINE)-$(ARCH),Darwin-universal) -- $(error Disallowed architecture for this platform: $(ARCH)) -- endif --endif -- - ifeq ($(MACHINE)$(NOBUNDLE),Darwin) - export MACOSX_DEPLOYMENT_TARGET=10.4 - FLAGS_SDL = -I$(FRAMEWORKS)/SDL.framework/Headers -@@ -174,12 +166,10 @@ CXXFLAGS += -Wnon-virtual-dtor +@@ -174,12 +173,10 @@ ifeq ($(DEBUG),1) ifeq ($(DEBUG),1) RELEASE = debug diff --git a/games/q3cellshading/Makefile b/games/q3cellshading/Makefile index 80fb57dccc76..ae9135d40e8a 100644 --- a/games/q3cellshading/Makefile +++ b/games/q3cellshading/Makefile @@ -1,6 +1,6 @@ PORTNAME= q3cellshading PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF DISTNAME= q3cel-${PORTVERSION}-src @@ -14,6 +14,7 @@ ONLY_FOR_ARCHS_REASON= does not run properly; try games/ioquake3 with option USES= gmake zip +ALL_TARGET= build_release MAKE_ENV= LIBDIR="${LIBDIR}" MAKE_JOBS_UNSAFE= yes @@ -22,8 +23,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" -VM_ARCHS= i386 powerpc - OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT OPTIONS_MULTI= FLAVOR @@ -51,23 +50,13 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} BUILD_DEPENDS+= nasm:devel/nasm .endif -.for arch in ${ARCH} -. if ${VM_ARCHS:M${arch}} != "" -HAVE_VM_COMPILED= yes -. endif -.endfor - -.if !defined(HAVE_VM_COMPILED) -MAKE_ENV+= DLL_ONLY=true -.endif - .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT} USES+= gl xorg USE_GL= glu USE_XORG= xxf86dga xxf86vm .endif -.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) +.if ${PORT_OPTIONS:MGAMELIBS} MAKE_ENV+= GAMELIBS=YES .endif @@ -77,7 +66,7 @@ do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \ ${STAGEDIR}${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/} .endfor -.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) +.if ${PORT_OPTIONS:MGAMELIBS} .for dir in baseq3 missionpack @${MKDIR} ${STAGEDIR}${LIBDIR}/${dir} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so \ diff --git a/games/q3cellshading/files/patch-code-unix-Makefile b/games/q3cellshading/files/patch-code-unix-Makefile index 0c197e23fe36..271885889547 100644 --- a/games/q3cellshading/files/patch-code-unix-Makefile +++ b/games/q3cellshading/files/patch-code-unix-Makefile @@ -1,4 +1,4 @@ ---- code/unix/Makefile.orig 2006-07-18 09:52:58 UTC +--- code/unix/Makefile.orig 2024-02-13 13:27:33 UTC +++ code/unix/Makefile @@ -25,7 +25,7 @@ PLATFORM_RELEASE=$(shell uname -r) ### @@ -18,7 +18,7 @@ -@@ -46,8 +46,8 @@ BUILD_NAME=quake3.x86 +@@ -46,8 +46,8 @@ BASEQ3_DIR=$(BDIR)/baseq3 BASEQ3_DIR=$(BDIR)/baseq3 @@ -29,7 +29,7 @@ CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer -@@ -65,7 +65,7 @@ JPDIR=$(MOUNT_DIR)/jpeg-6 +@@ -65,7 +65,7 @@ SPLNDIR=$(MOUNT_DIR)/splines SPLNDIR=$(MOUNT_DIR)/splines # extract version info @@ -38,50 +38,20 @@ RPM_RELEASE=1 # NOTE: used by dcp rcp targets, not referenced -@@ -76,7 +76,7 @@ RPM_RELEASE=1 +@@ -76,7 +76,10 @@ RPM_RELEASE=1 ############################################################################# ## Defaults -DLL_ONLY=false -+DLL_ONLY?=false ++ARCH=$(shell uname -m) ++RPMARCH=$(ARCH) ++VENDOR=unknown ++DLL_ONLY=true # bk010215 - TODO - add all defaults / kill Ryan -@@ -136,7 +136,7 @@ ifeq ($(PLATFORM),linux) - ifeq ($(ARCH),ppc) - NEWPGCC=/loki/global/ppc/bin/gcc - CC=$(NEWPGCC) -- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce -+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -ffast-math -falign-functions=2 - else - #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205 - #NEWPGCC=/loki/global/x86/bin/gcc -@@ -146,7 +146,7 @@ ifeq ($(PLATFORM),linux) - # TTimo: legacy RELEASE_CFLAGS - # NOTE: the -fomit-frame-pointer option leads to an unstable binary on my test box if it was built on the main box - # but building on the Mdk 7.2 baseline seems to work -- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce -+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -ffast-math -falign-functions=2 - # TTimo: use this for building on P3 gcc 2.95.3 libc2.2 for all targets (experimental! -fomit-fram-pointer removed) - # RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce - endif -@@ -162,7 +162,7 @@ ifeq ($(PLATFORM),linux) - RANLIB=ranlib - - THREAD_LDFLAGS=-lpthread -- LDFLAGS=-ldl -lm -+ LDFLAGS=-lm - GLLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm +@@ -199,31 +202,34 @@ GLIBC= #libc is irrelevant - ifeq ($(ARCH),axp) -@@ -197,33 +197,28 @@ else # ifeq Linux - - ifeq ($(PLATFORM),freebsd) - -+ifeq ($(ARCH),powerpc) -+ARCH=ppc -+endif -+ GLIBC= #libc is irrelevant -ifneq (,$(findstring alpha,$(shell uname -m))) @@ -93,24 +63,29 @@ -RPMARCH=i386 -VENDOR=unknown -endif #alpha test -+BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -+GL_CFLAGS = -I$(LOCALBASE)/include ++ifeq ($(ARCH),alpha) ++ ARCH=axp ++ RPMARCH=alpha ++ VENDOR=dec ++else ifeq ($(ARCH),powerpc) ++ ARCH=ppc ++ RPMARCH=ppc ++ DLL_ONLY=false ++else ifeq ($(ARCH),i386) ++ DLL_ONLY=false ++endif -+DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror -+RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG ++BASE_CFLAGS = -fsigned-char $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' ++ifeq ($(DLL_ONLY),true) ++ BASE_CFLAGS += -DDLL_ONLY ++endif -BASE_CFLAGS = -pipe -+ifdef OPTIMIZED_CFLAGS -+ ifeq ($(ARCH),i386) -+RELEASE_CFLAGS+=-ffast-math -falign-functions=2 -+ else -+RELEASE_CFLAGS+=-ffast-math -+ endif -+endif ++GL_CFLAGS = -I$(LOCALBASE)/include -GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include - --DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror + DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror -ifeq ($(ARCH),axp) -CC=pgcc -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations @@ -120,12 +95,18 @@ -NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc -CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi ) -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce -+ifeq ($(DLL_ONLY),true) -+BASE_CFLAGS += -DDLL_ONLY ++RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG ++ ++ifdef OPTIMIZED_CFLAGS ++ ifeq ($(ARCH),i386) ++RELEASE_CFLAGS+=-ffast-math -falign-functions=2 ++ else ++RELEASE_CFLAGS+=-ffast-math ++ endif endif LIBEXT=a -@@ -237,23 +232,31 @@ RANLIB=ranlib +@@ -237,25 +243,33 @@ THREAD_LDFLAGS=-lpthread THREAD_LDFLAGS=-lpthread # don't need -ldl (FreeBSD) @@ -150,8 +131,8 @@ - $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) +ifdef CLIENT +TARGETS+=$(B)/quake3 -+endif -+ + endif + +ifdef DEDICATED +TARGETS+=$(B)/q3ded +endif @@ -168,43 +149,16 @@ + $(B)/missionpack/cgame.$(SHLIBEXT) \ + $(B)/missionpack/qagame.$(SHLIBEXT) \ + $(B)/missionpack/ui.$(SHLIBEXT) - endif - ++endif ++ else # ifeq freebsd -@@ -283,7 +286,7 @@ SHLIBLDFLAGS=-shared - ARFLAGS=ar rv - RANLIB=ranlib - --LDFLAGS=-ldl -lm -+LDFLAGS=-lm - GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm - - TARGETS=$(B)/sgiquake3 \ -@@ -310,9 +313,9 @@ ARFLAGS=ar rv - RANLIB=ranlib - ifeq ($(PLATFORM),freebsd) --LDFLAGS=-lm -+LDFLAGS+=-lm - else --LDFLAGS=-ldl -lm -+LDFLAGS=-lm - endif # ifeq freebsd - - TARGETS=\ -@@ -348,7 +351,7 @@ build_release: - $(MAKE) targets B=$(BR) CFLAGS="$(RELEASE_CFLAGS)" - - #Build both debug and release builds --all:build_debug build_release -+all:build_release - - targets:makedirs $(TARGETS) - -@@ -516,20 +519,6 @@ Q3OBJ = \ + ############################################################################# +@@ -515,20 +529,6 @@ Q3OBJ = \ + $(B)/client/unix_main.o \ $(B)/client/unix_net.o \ $(B)/client/unix_shared.o \ - \ +- \ - $(B)/client/ahoptim.o \ - $(B)/client/autohint.o \ - $(B)/client/ftbase.o \ @@ -218,11 +172,10 @@ - $(B)/client/sfobjs.o \ - $(B)/client/smooth.o \ - $(B)/client/truetype.o --# \ + # \ # $(B)/client/q_parse.o \ # $(B)/client/math_quaternion.o \ - # $(B)/client/util_str.o \ -@@ -541,10 +530,12 @@ Q3OBJ = \ +@@ -541,12 +541,14 @@ Q3OBJ = \ # $(B)/client/q_shared.o \ ifeq ($(ARCH),i386) @@ -232,12 +185,14 @@ + endif endif -- ifeq ($(ARCH),ppc) -+ ifeq ($(ARCH),powerpc) + ifeq ($(ARCH),ppc) ifeq ($(DLL_ONLY),false) - Q3OBJ += $(B)/client/vm_ppc.o +- Q3OBJ += $(B)/client/vm_ppc.o ++ Q3OBJ += $(B)/client/vm_ppc_new.o endif -@@ -559,10 +550,24 @@ ifeq ($(PLATFORM),freebsd) + endif + +@@ -559,10 +561,24 @@ ifeq ($(PLATFORM),freebsd) $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp.o \ $(B)/client/linux_snd.o \ @@ -265,23 +220,7 @@ else ifeq ($(PLATFORM),irix) Q3POBJ=\ -@@ -578,7 +583,6 @@ else - $(B)/client/linux_common.o \ - $(B)/client/linux_qgl.o \ - $(B)/client/linux_glimp.o \ -- $(B)/client/linux_joystick.o \ - $(B)/client/linux_snd.o \ - $(B)/client/snd_mixa.o \ - $(B)/client/matha.o \ -@@ -587,7 +591,6 @@ else - $(B)/client/linux_common.o \ - $(B)/client/linux_qgl.o \ - $(B)/client/linux_glimp_smp.o \ -- $(B)/client/linux_joystick.o \ - $(B)/client/linux_snd.o \ - $(B)/client/snd_mixa.o \ - $(B)/client/matha.o -@@ -602,12 +605,12 @@ endif #Linux +@@ -602,12 +618,12 @@ endif #IRIX endif #FreeBSD endif #IRIX @@ -296,11 +235,7 @@ $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) -@@ -754,10 +757,10 @@ $(B)/client/irix_input.o : $(UDIR)/irix_input.c; $(DO_ - $(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC) - $(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS) - $(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC) $(GL_CFLAGS) --$(B)/client/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) +@@ -758,6 +774,7 @@ $(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC $(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) $(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) @@ -308,16 +243,16 @@ $(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS) $(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS) -@@ -767,7 +770,7 @@ $(B)/client/snapvector.o : $(UDIR)/snapvector.nasm; $( - $(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) - endif +@@ -769,7 +786,7 @@ ifeq ($(DLL_ONLY),false) --ifeq ($(ARCH),ppc) -+ifeq ($(ARCH),powerpc) + ifeq ($(ARCH),ppc) ifeq ($(DLL_ONLY),false) - $(B)/client/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC) +-$(B)/client/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC) ++$(B)/client/vm_ppc_new.o : $(CMDIR)/vm_ppc_new.c; $(DO_CC) + endif endif -@@ -912,22 +915,26 @@ Q3DOBJ = \ + +@@ -912,22 +929,26 @@ Q3DOBJ = \ $(B)/ded/unix_main.o \ $(B)/ded/unix_net.o \ $(B)/ded/unix_shared.o \ @@ -335,10 +270,10 @@ + endif endif --ifeq ($(ARCH),ppc) -+ifeq ($(ARCH),powerpc) + ifeq ($(ARCH),ppc) ifeq ($(DLL_ONLY),false) - Q3DOBJ += $(B)/ded/vm_ppc.o +- Q3DOBJ += $(B)/ded/vm_ppc.o ++ Q3DOBJ += $(B)/ded/vm_ppc_new.o endif endif @@ -347,7 +282,7 @@ $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) -@@ -988,6 +995,7 @@ $(B)/ded/linux_common.o : $(UDIR)/linux_common.c; $(DO +@@ -988,6 +1009,7 @@ $(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_D $(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC) $(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC) $(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC) @@ -355,16 +290,16 @@ $(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC) $(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC) $(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC) -@@ -1001,7 +1009,7 @@ $(B)/ded/ftol.o : $(UDIR)/ftol.nasm; $(DO_NASM) - $(B)/ded/snapvector.o : $(UDIR)/snapvector.nasm; $(DO_NASM) - endif +@@ -1003,7 +1025,7 @@ ifeq ($(DLL_ONLY),false) --ifeq ($(ARCH),ppc) -+ifeq ($(ARCH),powerpc) + ifeq ($(ARCH),ppc) ifeq ($(DLL_ONLY),false) - $(B)/ded/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_DED_CC) +-$(B)/ded/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_DED_CC) ++$(B)/ded/vm_ppc_new.o : $(CMDIR)/vm_ppc_new.c; $(DO_DED_CC) + endif endif -@@ -1068,7 +1076,7 @@ Q3CGOBJ = \ + +@@ -1068,7 +1090,7 @@ Q3CGOBJ = \ $(B)/baseq3/cgame/q_math.o \ $(B)/baseq3/cgame/q_shared.o @@ -373,7 +308,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -@@ -1128,7 +1136,7 @@ MPCGOBJ = \ +@@ -1128,7 +1150,7 @@ MPCGOBJ = \ $(B)/missionpack/cgame/q_shared.o \ $(B)/missionpack/cgame/ui_shared.o @@ -382,7 +317,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) $(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -DMISSIONPACK -@@ -1200,7 +1208,7 @@ Q3GOBJ = \ +@@ -1200,7 +1222,7 @@ Q3GOBJ = \ $(B)/baseq3/game/q_math.o \ $(B)/baseq3/game/q_shared.o @@ -391,7 +326,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -@@ -1278,7 +1286,7 @@ MPGOBJ = \ +@@ -1278,7 +1300,7 @@ MPGOBJ = \ $(B)/missionpack/game/q_math.o \ $(B)/missionpack/game/q_shared.o @@ -400,7 +335,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) $(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -DMISSIONPACK -@@ -1367,7 +1375,7 @@ Q3UIOBJ = \ +@@ -1367,7 +1389,7 @@ Q3UIOBJ = \ $(B)/baseq3/ui/q_math.o \ $(B)/baseq3/ui/q_shared.o @@ -409,7 +344,7 @@ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -@@ -1410,7 +1418,7 @@ $(B)/baseq3/ui/ui_spskill.o : $(Q3UIDIR)/ui_spskill.c; +@@ -1410,7 +1432,7 @@ $(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamord $(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC) @@ -418,7 +353,7 @@ $(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC) # bk001205 - these wre the only SHLIB compiles in 1.17 -@@ -1450,7 +1458,7 @@ MPUIOBJ = \ +@@ -1450,7 +1472,7 @@ MPUIOBJ = \ # $(B)/missionpack/ui/q_math.o \ # $(B)/missionpack/ui/q_shared.o @@ -427,7 +362,7 @@ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ) $(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) -DMISSIONPACK -@@ -1613,23 +1621,8 @@ Q3SOBJ = \ +@@ -1613,34 +1635,21 @@ Q3SOBJ = \ $(B)/q3static/unix_net.o \ $(B)/q3static/unix_shared.o \ \ @@ -451,15 +386,31 @@ $(B)/q3static/linux_snd.o \ $(B)/q3static/snd_mixa.o \ $(B)/q3static/matha.o -@@ -1779,7 +1772,6 @@ $(B)/q3static/unix_main.o : $(UDIR)/unix_main.c; $(DO_ - $(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC - $(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC - $(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC --$(B)/q3static/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) -DQ3_STATIC - $(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC - $(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC - $(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC -@@ -2020,7 +2012,7 @@ $(B)/q3static/bg_slidemove.o : $(GDIR)/bg_slidemove.c; + + ifeq ($(ARCH),i386) +- Q3SOBJ += $(B)/q3static/vm_x86.o ++ ifeq ($(DLL_ONLY),false) ++ Q3SOBJ += $(B)/q3static/vm_x86.o ++ endif + endif + + ifeq ($(ARCH),ppc) + ifeq ($(DLL_ONLY),false) +- Q3SOBJ += $(B)/q3static/vm_ppc.o ++ Q3SOBJ += $(B)/q3static/vm_ppc_new.o + endif + endif + +@@ -1795,7 +1804,7 @@ ifeq ($(DLL_ONLY),false) + + ifeq ($(ARCH),ppc) + ifeq ($(DLL_ONLY),false) +-$(B)/q3static/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC) -DQ3_STATIC ++$(B)/q3static/vm_ppc_new.o : $(CMDIR)/vm_ppc_new.c; $(DO_CC) -DQ3_STATIC + endif + endif + +@@ -2020,7 +2029,7 @@ $(B)/q3static/bg_slidemove.o : $(GDIR)/bg_slidemove.c; @@ -468,16 +419,3 @@ $(CC) $(CFLAGS) -o $@ $(Q3SOBJ) $(GLLDFLAGS) $(LDFLAGS) -@@ -2059,9 +2051,9 @@ rpm: $(BUILD_NAME).spec - - copyfiles: - -mkdirhier $(COPYDIR) -- cp $(BR)/linuxquake3 $(COPYDIR)/quake3.x86 -- strip $(COPYDIR)/quake3.x86 -- chmod 755 $(COPYDIR)/quake3.x86 -+ cp $(BR)/linuxquake3 $(COPYDIR)/quake3 -+ strip $(COPYDIR)/quake3 -+ chmod 755 $(COPYDIR)/quake3 - cp $(BR)/linuxq3ded $(COPYDIR)/q3ded - strip $(COPYDIR)/q3ded - chmod 755 $(COPYDIR)/q3ded diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile index 81d32209df19..e1e3af31fff0 100644 --- a/games/tremulous/Makefile +++ b/games/tremulous/Makefile @@ -1,6 +1,6 @@ PORTNAME= tremulous PORTVERSION= 1.1.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} @@ -11,7 +11,7 @@ WWW= http://www.tremulous.net/ LICENSE= GPLv2 USES= cpe gmake zip -MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="-lpthread" +MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/${DISTNAME}-src diff --git a/games/tremulous/files/patch-Makefile b/games/tremulous/files/patch-Makefile index cfc579c8de14..2a84db09d8d2 100644 --- a/games/tremulous/files/patch-Makefile +++ b/games/tremulous/files/patch-Makefile @@ -1,6 +1,15 @@ ---- ./tremulous-1.1.0-src/Makefile.orig Tue Mar 21 19:28:25 2006 -+++ ./tremulous-1.1.0-src/Makefile Wed Jun 7 16:57:12 2006 -@@ -27,11 +27,20 @@ +--- tremulous-1.1.0-src/Makefile.orig 2006-03-21 22:28:25 UTC ++++ tremulous-1.1.0-src/Makefile +@@ -18,7 +18,7 @@ else + # Apple does some things a little differently... + COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/) + else +- COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/x86/) ++ COMPILE_ARCH=$(shell uname -m | sed -e s/amd64/x86_64/ -e s/i.86/x86/ -e s/powerpc/ppc/) + endif + + ifeq ($(COMPILE_PLATFORM),mingw32) +@@ -27,11 +27,20 @@ endif endif endif @@ -26,7 +35,18 @@ ############################################################################# # -@@ -89,34 +98,10 @@ +@@ -51,10 +60,6 @@ endif + ifndef ARCH + ARCH=$(COMPILE_ARCH) + endif +- +-ifeq ($(ARCH),powerpc) +- ARCH=ppc +-endif + export ARCH + + ifneq ($(PLATFORM),$(COMPILE_PLATFORM)) +@@ -89,34 +94,10 @@ export USE_CCACHE endif export USE_CCACHE @@ -62,7 +82,7 @@ CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer -@@ -202,15 +187,13 @@ +@@ -202,15 +183,13 @@ ifeq ($(PLATFORM),linux) ifeq ($(ARCH),x86_64) OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \ @@ -80,7 +100,7 @@ HAVE_VM_COMPILED=true else ifeq ($(ARCH),ppc) -@@ -293,7 +276,7 @@ +@@ -293,7 +272,7 @@ ifeq ($(PLATFORM),darwin) GL_CFLAGS = endif @@ -89,7 +109,7 @@ ifeq ($(ARCH),ppc) BASE_CFLAGS += -faltivec -@@ -375,8 +358,8 @@ +@@ -375,8 +354,8 @@ ifeq ($(PLATFORM),mingw32) GL_CFLAGS = MINGW_CFLAGS = -DDONT_TYPEDEF_INT32 @@ -100,7 +120,7 @@ DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0 -@@ -412,18 +395,12 @@ +@@ -412,18 +391,12 @@ ifeq ($(PLATFORM),freebsd) ifeq ($(PLATFORM),freebsd) @@ -109,20 +129,20 @@ - else #default to x86 - ARCH=x86 - endif #alpha test -- -- -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes + BASE_CFLAGS = -I$(LOCALBASE)/include -DARCH='\"$(ARCH)\"' -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -- GL_CFLAGS = -I/usr/X11R6/include + GL_CFLAGS = -I$(LOCALBASE)/include +- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes +- +- GL_CFLAGS = -I/usr/X11R6/include +- DEBUG_CFLAGS=$(BASE_CFLAGS) -g + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe ifeq ($(USE_OPENAL),1) BASE_CFLAGS += -DUSE_OPENAL=1 -@@ -436,46 +413,61 @@ +@@ -436,46 +409,61 @@ ifeq ($(PLATFORM),freebsd) BASE_CFLAGS += -DUSE_CODEC_VORBIS=1 endif @@ -156,12 +176,12 @@ + + ifeq ($(USE_SDL_VIDEO),1) + BASE_CFLAGS += -DUSE_SDL_VIDEO=1 -+ endif -+ + endif + + ifeq ($(USE_OPTIMIZED_CFLAGS),1) + RELEASE_CFLAGS+=-O3 -ffast-math -funroll-loops -fomit-frame-pointer \ + -fexpensive-optimizations -+ ifeq ($(ARCH),i386) ++ ifeq ($(ARCH),x86) + RELEASE_CFLAGS+=-falign-functions=2 -fstrength-reduce + endif + endif @@ -169,14 +189,13 @@ + HAVE_VM_COMPILED?=false + ifneq ($(HAVE_VM_COMPILED),true) + BASE_CFLAGS += -DNO_VM_COMPILED - endif - ++ endif ++ SHLIBEXT=so SHLIBCFLAGS=-fPIC SHLIBLDFLAGS=-shared $(LDFLAGS) -- THREAD_LDFLAGS=-lpthread -+ THREAD_LDFLAGS=$(PTHREAD_LIBS) + THREAD_LDFLAGS=-lpthread # don't need -ldl (FreeBSD) - LDFLAGS=-lm + LDFLAGS+=-lm @@ -193,12 +212,12 @@ + ifeq ($(USE_SDL_VIDEO),1) + CLIENT_LDFLAGS += $(shell $(SDL_CONFIG) --libs) + endif -+ endif -+ -+ ifneq ($(USE_SDL_VIDEO),1) -+ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm endif ++ ifneq ($(USE_SDL_VIDEO),1) ++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm ++ endif ++ ifeq ($(USE_OPENAL),1) + CLIENT_LDFLAGS += $(THREAD_LDFLAGS) ifneq ($(USE_OPENAL_DLOPEN),1) @@ -207,7 +226,7 @@ endif endif -@@ -574,16 +566,15 @@ +@@ -574,16 +562,15 @@ ifeq ($(PLATFORM),SunOS) OPTIMIZE = -O3 -ffast-math -funroll-loops ifeq ($(ARCH),sparc) @@ -227,7 +246,7 @@ endif endif -@@ -637,21 +628,22 @@ +@@ -637,21 +624,22 @@ ifneq ($(BUILD_SERVER),0) TARGETS = ifneq ($(BUILD_SERVER),0) @@ -241,12 +260,12 @@ - TARGETS += $(B)/tremulous.$(ARCH)$(BINEXT) - endif + TARGETS += $(B)/tremulous$(BINEXT) -+endif -+ -+ifneq ($(BUILD_CLIENT_SMP),0) -+ TARGETS += $(B)/tremulous-smp$(BINEXT) endif ++ifneq ($(BUILD_CLIENT_SMP),0) ++ TARGETS += $(B)/tremulous-smp$(BINEXT) ++endif ++ ifneq ($(BUILD_GAME_SO),0) TARGETS += \ - $(B)/base/cgame$(ARCH).$(SHLIBEXT) \ @@ -258,7 +277,7 @@ endif ifneq ($(BUILD_GAME_QVM),0) -@@ -709,14 +701,14 @@ +@@ -709,14 +697,14 @@ build_release: B=$(BR) endif build_release: B=$(BR) @@ -275,25 +294,7 @@ targets: $(TARGETS) -@@ -901,7 +893,7 @@ - $(B)/client/tr_surface.o \ - $(B)/client/tr_world.o \ - --ifeq ($(ARCH),x86) -+ifeq ($(ARCH),i386) - Q3OBJ += $(B)/client/vm_x86.o - Q3OBJ += \ - $(B)/client/snd_mixa.o \ -@@ -910,7 +902,7 @@ - $(B)/client/snapvectora.o - endif - --ifeq ($(ARCH),x86_64) -+ifeq ($(ARCH),amd64) - Q3OBJ += $(B)/client/vm_x86_64.o - endif - -@@ -962,10 +954,10 @@ +@@ -962,10 +950,10 @@ endif $(B)/client/sdl_glimp_smp.o endif @@ -306,22 +307,7 @@ $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) -@@ -1238,12 +1230,12 @@ - $(B)/ded/null_input.o \ - $(B)/ded/null_snddma.o - --ifeq ($(ARCH),x86) -+ifeq ($(ARCH),i386) - Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o \ - $(B)/ded/snapvectora.o $(B)/ded/matha.o - endif - --ifeq ($(ARCH),x86_64) -+ifeq ($(ARCH),amd64) - Q3DOBJ += $(B)/ded/vm_x86_64.o - endif - -@@ -1253,7 +1245,7 @@ +@@ -1253,7 +1241,7 @@ endif endif endif @@ -330,7 +316,7 @@ $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) -@@ -1374,7 +1366,7 @@ +@@ -1374,7 +1362,7 @@ CGVMOBJ = $(CGOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.as CGOBJ = $(CGOBJ_) $(B)/base/cgame/cg_syscalls.o CGVMOBJ = $(CGOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm @@ -339,7 +325,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(CGOBJ) $(B)/base/vm/cgame.qvm: $(CGVMOBJ) $(CGDIR)/cg_syscalls.asm -@@ -1418,7 +1410,7 @@ +@@ -1418,7 +1406,7 @@ GVMOBJ = $(GOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm GOBJ = $(GOBJ_) $(B)/base/game/g_syscalls.o GVMOBJ = $(GOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm @@ -348,7 +334,7 @@ $(CC) $(SHLIBLDFLAGS) -o $@ $(GOBJ) $(B)/base/vm/game.qvm: $(GVMOBJ) $(GDIR)/g_syscalls.asm -@@ -1444,7 +1436,7 @@ +@@ -1444,7 +1432,7 @@ UIVMOBJ = $(UIOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.as UIOBJ = $(UIOBJ_) $(B)/base/ui/ui_syscalls.o UIVMOBJ = $(UIOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index e4ba7d887ebf..9ced7c1cccbc 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -2,7 +2,7 @@ PORTNAME= ocaml PORTVERSION= 4.08.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \ http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs @@ -49,7 +49,6 @@ CONFIGURE_ARGS= --prefix="${PREFIX}" CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ ASPP="${CC} -c" \ PARTIALLD="${LD} -r" -MAKE_ENV= SYSTEM_ARCH="${ARCH:C/aarch64/arm64/:C/powerpc.*/power/}" OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES OPTIONS_DEFAULT=X11 THREADS @@ -91,7 +90,7 @@ CONFIGURE_ENV+= AS="${AS} ${ASFLAGS}" \ CC="${CC}" .endif -.if defined(NO_PROFILE) || ${ARCH:Mpowerpc} || ${ARCH:Mamd64} +.if defined(NO_PROFILE) PLIST_SUB+= PROF="@comment " .else PLIST_SUB+= PROF="" @@ -103,17 +102,12 @@ post-patch: -e '\|RANLIB|s|ranlib|${RANLIB}|' \ -e '\|^ldflags=|s|""|"${LDFLAGS}"|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \ - ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \ - ${WRKSRC}/runtime/Makefile \ - ${WRKSRC}/ocamltest/Makefile \ - ${WRKSRC}/otherlibs/systhreads/Makefile check-test: do-install @cd ${WRKSRC}/testsuite; ${RM} _log; for d in tests/* ; do \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one DIR=$${d} \ - 2>&1 | tee -a _log || ${TRUE} ; done ; \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one \ + DIR=$${d} 2>&1 | tee -a _log || ${TRUE} ; done ; \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report post-install: .if ${PORT_OPTIONS:MDOCS} diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index 2cf280415341..c3e62de2bf07 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -50,13 +50,13 @@ model=ppc fi; system=elf ;; #( + powerpc64le*-*-freebsd*) : -+ arch=power; model=ppc64le; system=bsd_elf;; #( ++ arch=power; model=ppc64le; system=freebsd;; #( + powerpc*-*-freebsd*) : + arch=power; if $arch64; then : + model=ppc64 +else + model=ppc -+fi; system=bsd_elf ;; #( ++fi; system=freebsd ;; #( powerpc-*-netbsd*) : arch=power; model=ppc; system=netbsd ;; #( powerpc-*-openbsd*) : @@ -69,7 +69,16 @@ earmv6*-*-netbsd*) : arch=arm; model=armv6; system=netbsd ;; #( earmv7*-*-netbsd*) : -@@ -13544,6 +13560,8 @@ fi; system=elf ;; #( +@@ -13534,6 +13550,8 @@ fi; system=elf ;; #( + arch=amd64; system=dragonfly ;; #( + x86_64-*-freebsd*) : + arch=amd64; system=freebsd ;; #( ++ amd64-*-freebsd*) : ++ arch=amd64; system=freebsd ;; #( + x86_64-*-netbsd*) : + arch=amd64; system=netbsd ;; #( + x86_64-*-openbsd*) : +@@ -13544,6 +13562,8 @@ fi; system=elf ;; #( arch=amd64; system=mingw64 ;; #( aarch64-*-linux*) : arch=arm64; system=linux ;; #( @@ -78,7 +87,7 @@ x86_64-*-cygwin*) : arch=amd64; system=cygwin ;; #( -@@ -13714,6 +13732,8 @@ case "$arch,$system" in #( +@@ -13714,6 +13734,8 @@ case "$arch,$system" in #( profiling=true ;; #( amd64,openbsd) : profiling=true ;; #( @@ -87,14 +96,21 @@ amd64,freebsd) : profiling=true ;; #( amd64,netbsd) : -@@ -13721,6 +13741,10 @@ case "$arch,$system" in #( - arm,netbsd) : +@@ -13722,11 +13744,17 @@ case "$arch,$system" in #( profiling=true ;; #( amd64,gnu) : + profiling=true ;; #( ++ arm64,freebsd) : + profiling=true ;; #( -+ arm64,freebsd*) : ++ arm,freebsd) : + profiling=true ;; #( -+ arm,freebsd*) : - profiling=true ;; #( arm,linux*) : profiling=true ;; #( + power,elf) : + profiling=true ;; #( + power,bsd*) : ++ profiling=true ;; #( ++ power,freebsd) : + profiling=true ;; #( + power,netbsd) : + profiling=true ;; #( diff --git a/net/libnatpmp/files/patch-Makefile b/net/libnatpmp/files/patch-Makefile new file mode 100644 index 000000000000..1a8ca9ecb3ef --- /dev/null +++ b/net/libnatpmp/files/patch-Makefile @@ -0,0 +1,10 @@ +--- Makefile.orig 2022-01-22 19:25:56 UTC ++++ Makefile +@@ -72,7 +72,6 @@ ifneq (, $(findstring x86_64, $(ARCH))) + + INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) + ifneq (, $(findstring x86_64, $(ARCH))) +-INSTALLDIRLIB = $(INSTALLPREFIX)/lib64 + endif + + INSTALLDIRBIN = $(INSTALLPREFIX)/bin |