Attachment #248232 for bug #276478

Lines 59-65 TEST_WRKSRC?= ${WRKSRC}/tests Link Here

(-)b/Mk/Uses/angr.mk (-1 / +1 lines)
59	ANGR_NOSETESTS?= nosetests-${PYTHON_VER}	59	ANGR_NOSETESTS?= nosetests-${PYTHON_VER}
60		60
61	do-test:	61	do-test:
62	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${ANGR_NOSETESTS})	62	@(cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${ANGR_NOSETESTS})
63	. endif # "${angr_ARGS:Mnose}" != ""	63	. endif # "${angr_ARGS:Mnose}" != ""
64		64
65	.endif	65	.endif




	${RM} -r ${CABAL_HOME}
.  endif
	@${ECHO_MSG} "===> Fetching Hackage index into ${CABAL_HOME}/.cabal"
	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update
.  if ${_hackage_is_default} == yes
	cd ${WRKDIR} && \
		${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} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${HPACK_CMD}
.    endif
.  endif
# Remove Haskell dependencies that come from GH_TUPLE

.  ifdef CABAL_REPOSITORIES
	@${ECHO_MSG} "===> Fetching additional Cabal repositories index into ${CABAL_HOME}/.cabal"
	@cd ${WRKSRC} && \
		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update
.  endif
# Create a cookie for cabal-post-patch
	@${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE}

# This pulls in all source dependencies, resolves them and generates build plan
cabal-configure: check-cabal
	cd ${WRKSRC} && \
		${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} && \
		${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

cabal-pre-configure:
# Generate .cabal file with hpack if requested
.  if ${cabal_ARGS:Mhpack}
	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} hpack
.  endif

.  if !target(do-build)
do-build:
	cd ${WRKSRC} && \
		${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)

Lines 156-163 RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} Link Here

(-)b/Mk/Uses/cargo.mk (-2 / +3 lines)
156	. endif	156	. endif
157		157
158	# Helper to shorten cargo calls.	158	# Helper to shorten cargo calls.
159	_CARGO_RUN= ${SETENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO}	159	_CARGO_RUN= ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO}
160	CARGO_CARGO_RUN= cd ${WRKSRC}; ${SETENV} CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=1 ${_CARGO_RUN}	160	CARGO_CARGO_RUN= cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CARGO_ENV} \
		161	CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=1 ${CARGO}
161		162
162	# User arguments for cargo targets.	163	# User arguments for cargo targets.
163	CARGO_BUILD_ARGS?=	164	CARGO_BUILD_ARGS?=




do-configure:
	@${ECHO_MSG} ${_CMAKE_MSG}
	${MKDIR} ${CONFIGURE_WRKSRC}
	@cd ${CONFIGURE_WRKSRC}; ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
		${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
.    endif

.    if !target(do-test) && ${cmake_ARGS:Mtesting}


do-test:
	@cd ${BUILD_WRKSRC} && \
		${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


Lines 42-48 ELIXIR_APP_ROOT?= ${PREFIX}/lib/elixir/lib/${ELIXIR_APP_NAME} Link Here

(-)b/Mk/Uses/elixir.mk (-1 / +1 lines)
42	ELIXIR_HIDDEN?= "^${ELIXIR_APP_NAME}$$"	42	ELIXIR_HIDDEN?= "^${ELIXIR_APP_NAME}$$"
43	ELIXIR_LOCALE?= en_US.UTF-8	43	ELIXIR_LOCALE?= en_US.UTF-8
44	MIX_CMD?= ${LOCALBASE}/bin/mix	44	MIX_CMD?= ${LOCALBASE}/bin/mix
45	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}	45	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}
46	MIX_REWRITE?=	46	MIX_REWRITE?=
47	MIX_BUILD_DEPS?=	47	MIX_BUILD_DEPS?=
48	MIX_RUN_DEPS?=	48	MIX_RUN_DEPS?=

Lines 97-103 do-build: Link Here

(-)b/Mk/Uses/erlang.mk (-1 / +1 lines)
97	. for target in ${REBAR_TARGETS}	97	. for target in ${REBAR_TARGETS}
98	# Remove rebar.lock every time - it can be created again after each run of rebar3	98	# Remove rebar.lock every time - it can be created again after each run of rebar3
99	@${RM} ${WRKSRC}/rebar.lock	99	@${RM} ${WRKSRC}/rebar.lock
100	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} REBAR_PROFILE=${REBAR_PROFILE} ${ERLANG_COMPILE} ${target}	100	@cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} REBAR_PROFILE=${REBAR_PROFILE} ${ERLANG_COMPILE} ${target}
101	. endfor	101	. endfor
102	. endif # !target(do-build)	102	. endif # !target(do-build)
103		103





_USES_extract+=	590:gem-extract
gem-extract:
	@${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} ; \


.  if !target(do-build)
do-build:
	@(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} ; \


.  if !target(do-install)
do-install:
	(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




	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
		${SETENVI} ${WRK_ENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
.  endif

_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}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
	@(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:

		pkg=$$(${ECHO_CMD} $${t} | \
			${SED} -Ee 's/^([^:]*).*$$/\1/' -e 's/^${PORTNAME}$$/./'); \
		${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
		${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)

	(cd ${GO_WRKSRC}; \
	for t in ${GO_TESTTARGET}; do \
		${ECHO_MSG} "===>  Testing $${t}"; \
		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \
	done)
.  endif


gomod-clean:
.    if exists(${GO_CMD})
	@${ECHO_MSG} "===>  Cleaning Go module cache"
	@${SETENVI} ${WRK_ENV} ${GO_ENV} ${GO_CMD} clean -modcache
.    else
	@${ECHO_MSG} "===>    Skipping since ${GO_CMD} is not installed"
.    endif

	fi

gomod-vendor: gomod-vendor-deps patch
	@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}; ${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

Lines 36-42 XMKMF_ARGS+= -a Link Here

(-)b/Mk/Uses/imake.mk (-1 / +1 lines)
36	. if ! ${imake_ARGS:Menv}	36	. if ! ${imake_ARGS:Menv}
37	. if !target(do-configure)	37	. if !target(do-configure)
38	do-configure:	38	do-configure:
39	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})	39	@(cd ${CONFIGURE_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})
40	. endif	40	. endif
41		41
42	. if ! ${imake_ARGS:Mnoman}	42	. if ! ${imake_ARGS:Mnoman}

Lines 144-150 _INCLUDE_USES_LAZARUS_POST_MK= yes Link Here

(-)b/Mk/Uses/lazarus.mk (-1 / +1 lines)
144	. if !target(do-build)	144	. if !target(do-build)
145	do-build:	145	do-build:
146	. for PROJECT_FILE in ${LAZARUS_PROJECT_FILES}	146	. for PROJECT_FILE in ${LAZARUS_PROJECT_FILES}
147	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} \	147	@(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${LAZBUILD_CMD} \
148	${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE})	148	${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE})
149	. endfor	149	. endfor
150	. endif # !target(do-build)	150	. endif # !target(do-build)

Lines 210-216 CONFIGURE_ENV+= NOCONFIGURE=yes Link Here

(-)b/Mk/Uses/mate.mk (-1 / +1 lines)
210	_USES_configure+= 295:mate-pre-configure	210	_USES_configure+= 295:mate-pre-configure
211		211
212	mate-pre-configure:	212	mate-pre-configure:
213	@(cd ${CONFIGURE_WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)	213	@(cd ${CONFIGURE_WRKSRC} ; ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ./autogen.sh)
214	. endif	214	. endif
215		215
216	. if defined(MATE_PRE_PATCH)	216	. if defined(MATE_PRE_PATCH)




		${SCRIPTDIR}/configure; \
	fi
	@cd ${CONFIGURE_WRKSRC} && \
		${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} \
		${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
.      if !${_USE_PERL5:Mmodbuild*}
	@cd ${CONFIGURE_WRKSRC} && \

.  if ${_USE_PERL5:Mmodbuild*}
.    if !target(do-build)
do-build:
	@(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}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS})
.      endif # !target(do-install)
.    endif # ! USES=gmake
.  endif # modbuild

TEST_WRKSRC?=	${BUILD_WRKSRC}
do-test:
.    if ${USE_PERL5:Mmodbuild*}
	@cd ${TEST_WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS}
.    elif ${USE_PERL5:Mconfigure}
	@cd ${TEST_WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET}
.    endif # USE_PERL5:Mmodbuild*
.  endif # do-test
.endif # defined(_POSTMKINCLUDED)





.    if !target(do-build)
do-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} ; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
.    endif  # !target(do-install)

.  endif  # defined(PYQT_DIST)

Lines 60-66 _PYTEST_FILTER_EXPRESSION= ${_PYTEST_ALL_IGNORED_TESTS:C/^(.)/and not \1/:tW:C/^ Link Here

(-)b/Mk/Uses/pytest.mk (-1 / +1 lines)
60		60
61	. if !target(do-test)	61	. if !target(do-test)
62	do-test:	62	do-test:
63	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest \	63	@cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest \
64	-k '${_PYTEST_FILTER_EXPRESSION}' \	64	-k '${_PYTEST_FILTER_EXPRESSION}' \
65	-v -rs -o addopts= \	65	-v -rs -o addopts= \
66	${PYTEST_ARGS}	66	${PYTEST_ARGS}





.    if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE)
do-configure:
	@(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}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS})
.    endif

.    if !target(do-install)
do-install:
	@(cd ${INSTALL_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
.    endif
.  endif # defined(_PYTHON_FEATURE_DISTUTILS)



.    if !target(do-build)
do-build:
	@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} && ${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} \

.  if defined(_PYTHON_FEATURE_NOSE)
.    if !target(do-test)
do-test:
	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} && ${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} && ${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} && ${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} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest2 ${TEST_ARGS:NDESTDIR=*} -v
.    endif
.  endif # defined(_PYTHON_FEATURE_UNITTEST2)


Lines 139-145 _QMAKE_MK_POST_INCLUDED= qmake.mk Link Here

(-)b/Mk/Uses/qmake.mk (-1 / +1 lines)
139	qmake-configure:	139	qmake-configure:
140	@${MKDIR} ${_QMAKE_WRKSRC}	140	@${MKDIR} ${_QMAKE_WRKSRC}
141	@cd ${_QMAKE_WRKSRC} && \	141	@cd ${_QMAKE_WRKSRC} && \
142	${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} \	142	${SETENVI} ${WRK_ENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} \
143	${QMAKE_SOURCE_PATH} \	143	${QMAKE_SOURCE_PATH} \
144	${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS}	144	${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS}
145		145




.        for d in ${RUBY_EXTCONF_SUBDIRS}
	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} in ${d} to configure"
	@cd ${CONFIGURE_WRKSRC}/${d}; \
	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
.        endfor
.      else
	@${ECHO_MSG} "===>  Running ${RUBY_EXTCONF} to configure"
	@cd ${CONFIGURE_WRKSRC}; \
	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
.      endif
.    endif


ruby-setup-configure:
	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to configure"
	@cd ${BUILD_WRKSRC}; \
	${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}; \
	${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}; \
	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR}
.    endif

.    if !${ruby_ARGS:Mbuild} && !${ruby_ARGS:Mrun} && !${ruby_ARGS:Mnone}

Lines 83-88 RM?= /bin/rm -f Link Here

(-)b/Mk/bsd.commands.mk (+1 lines)
83	RMDIR?= /bin/rmdir	83	RMDIR?= /bin/rmdir
84	SED?= /usr/bin/sed	84	SED?= /usr/bin/sed
85	SETENV?= /usr/bin/env	85	SETENV?= /usr/bin/env
		86	SETENVI?= /usr/bin/env -i
86	SH?= /bin/sh	87	SH?= /bin/sh
87	SORT?= /usr/bin/sort	88	SORT?= /usr/bin/sort
88	STRIP_CMD?= /usr/bin/strip	89	STRIP_CMD?= /usr/bin/strip




ALL_TARGET?=
.      if !target(do-build)
do-build:
					@(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}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
						${ANT} ${MAKE_ARGS} ${TEST_TARGET})
.      endif
.    endif


Lines 669-674 FreeBSD_MAINTAINER= portmgr@FreeBSD.org Link Here

(-)b/Mk/bsd.port.mk (-4 / +21 lines)
669	#	669	#
670	# For options see bsd.options.mk	670	# For options see bsd.options.mk
671	#	671	#
		672	# WRK_ENV - Environment used when running the upstream build system.
		673	# Target-specific environment variables can be defined using
		674	# CONFIGURE_ENV, MAKE_ENV, TEST_ENV, and similar variables.
		675	#
672	# For fetch:	676	# For fetch:
673	#	677	#
674	# FETCH_BINARY - Path to ftp/http fetch command if not in $PATH.	678	# FETCH_BINARY - Path to ftp/http fetch command if not in $PATH.
Lines 1609-1614 PKG_NOTES+= flavor Link Here
1609	PKG_NOTE_flavor= ${FLAVOR}	1613	PKG_NOTE_flavor= ${FLAVOR}
1610	. endif	1614	. endif
1611		1615
		1616	WRK_ENV+= HOME=${WRKDIR} \
		1617	PWD="$${PWD}"
		1618	. for e in OSVERSION PATH TERM TMPDIR \
		1619	UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \
		1620	UNAME_p UNAME_r UNAME_s UNAME_U UNAME_v
		1621	. ifdef ${e}
		1622	WRK_ENV+= ${e}=${${e}:Q}
		1623	. endif
		1624	. endfor
		1625
1612	TEST_ARGS?= ${MAKE_ARGS}	1626	TEST_ARGS?= ${MAKE_ARGS}
1613	TEST_ENV?= ${MAKE_ENV}	1627	TEST_ENV?= ${MAKE_ENV}
1614		1628
Lines 3314-3320 do-configure: Link Here
3314	@${MKDIR} ${CONFIGURE_WRKSRC}	3328	@${MKDIR} ${CONFIGURE_WRKSRC}
3315	@(cd ${CONFIGURE_WRKSRC} && \	3329	@(cd ${CONFIGURE_WRKSRC} && \
3316	${SET_LATE_CONFIGURE_ARGS} \	3330	${SET_LATE_CONFIGURE_ARGS} \
3317	if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \	3331	if ! ${SETENVI} ${WRK_ENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
3318	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \	3332	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
3319	LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \	3333	LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
3320	INSTALL="/usr/bin/install -c" \	3334	INSTALL="/usr/bin/install -c" \
Lines 3331-3337 do-configure: Link Here
3331	. endif	3345	. endif
3332		3346
3333	# Build	3347	# Build
3334	DO_MAKE_BUILD?= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}	3348	DO_MAKE_BUILD?= ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		3349	${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}
3335	. if !target(do-build)	3350	. if !target(do-build)
3336	do-build:	3351	do-build:
3337	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \	3352	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \
Lines 3422-3434 check-install-conflicts: Link Here
3422		3437
3423	. if !target(do-install) && !defined(NO_INSTALL)	3438	. if !target(do-install) && !defined(NO_INSTALL)
3424	do-install:	3439	do-install:
3425	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})	3440	@(cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${FAKEROOT} \
		3441	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
3426	. endif	3442	. endif
3427		3443
3428	# Test	3444	# Test
3429		3445
3430	. if !target(do-test) && defined(TEST_TARGET)	3446	. if !target(do-test) && defined(TEST_TARGET)
3431	DO_MAKE_TEST?= ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}	3447	DO_MAKE_TEST?= ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		3448	${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}
3432	do-test:	3449	do-test:
3433	@(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \	3450	@(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \
3434	if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \	3451	if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \

Removed Link Here

(-)a/games/legesmotus/files/patch-Makefile (-11 lines)
1	--- Makefile.orig 2010-09-06 03:18:02 UTC
2	+++ Makefile
3	@@ -99,7 +99,7 @@ lmserver: server
4
5	$(ALL_PKG):
6	+@mkdir -p $@
7	- +@$(MAKE) -C $@ -f $(BASEDIR)/$@/Makefile BASEDIR="../../.." SUBDIR="$@" $(TARGET)
8	+ +@$(MAKE) -C $@ -f $(BASEDIR)/$@/Makefile BASEDIR=".." SUBDIR="$@" $(TARGET)
9
10	server: common
11




--- common.mk.orig	2010-09-03 19:22:37 UTC
+++ common.mk
@@ -9,7 +9,6 @@ VERSION = 0.4.0
 VERSION = 0.4.0
 
 # These may be overridden by config.mk

 #UNIVERSAL = 1
 #NOBUNDLE = 1
 
@@ -174,12 +173,10 @@ ifeq ($(DEBUG),1)
  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
 
 ifeq ($(DEBUG),1)
  RELEASE = debug

Lines 27-36 PLIST_SUB= _PY_SONAME=${_PY_SONAME} Link Here

(-)b/graphics/py-python-poppler-qt5/Makefile (-2 / +4 lines)
27		27
28	_PY_SONAME= ${PYTHON_EXT_SUFFIX}	28	_PY_SONAME= ${PYTHON_EXT_SUFFIX}
29		29
30	BINARY_ALIAS= qmake=${QMAKE}	30	SIP_ARGS= --qmake ${QMAKE} \
		31	--verbose \
		32	--jobs ${MAKE_JOBS_NUMBER}
31		33
32	do-build:	34	do-build:
33	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS} ; ${SETENV} ${MAKE_ENV} ${MAKE} -C ./build )	35	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} -C ./build )
34		36
35	do-install:	37	do-install:
36	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )	38	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )





PORTNAME=	ocaml
PORTVERSION=	4.08.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

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

			CC="${CC}"
.endif

.if defined(NO_PROFILE)
PLIST_SUB+=	PROF="@comment "
.else
PLIST_SUB+=	PROF=""

		-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 \
	${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}




   model=ppc
 fi; system=elf ;; #(
+  powerpc64le*-*-freebsd*) :
+    arch=power; model=ppc64le; system=freebsd;; #(
+  powerpc*-*-freebsd*) :
+    arch=power; if $arch64; then :
+  model=ppc64
+else
+  model=ppc
+fi; system=freebsd ;; #(
   powerpc-*-netbsd*) :
     arch=power; model=ppc; system=netbsd ;; #(
   powerpc-*-openbsd*) :

   earmv6*-*-netbsd*) :
     arch=arm; model=armv6; system=netbsd ;; #(
   earmv7*-*-netbsd*) :
@@ -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 ;; #(

   x86_64-*-cygwin*) :
     arch=amd64; system=cygwin
  ;; #(
@@ -13714,6 +13734,8 @@ case "$arch,$system" in #(
     profiling=true ;; #(
   amd64,openbsd) :
     profiling=true ;; #(

   amd64,freebsd) :
     profiling=true ;; #(
   amd64,netbsd) :
@@ -13722,11 +13744,17 @@ case "$arch,$system" in #(
   arm,netbsd) :
     profiling=true ;; #(
   amd64,gnu) :
     profiling=true ;; #(
+  arm64,freebsd) :
+    profiling=true ;; #(
+  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 ;; #(

Added Link Here

(-)b/net/libnatpmp/files/patch-Makefile (-1 / +10 lines)
0	-	1	--- Makefile.orig 2022-01-22 19:25:56 UTC
		2	+++ Makefile
		3	@@ -72,7 +72,6 @@ ifneq (, $(findstring x86_64, $(ARCH)))
		4
		5	INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
		6	ifneq (, $(findstring x86_64, $(ARCH)))
		7	-INSTALLDIRLIB = $(INSTALLPREFIX)/lib64
		8	endif
		9
		10	INSTALLDIRBIN = $(INSTALLPREFIX)/bin

Return to bug 276478

Lines 192-198 go-post-fetch: Link Here

(-)b/Mk/Uses/go.mk (-8 / +8 lines)
192	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";	192	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
193	@(cd ${DISTDIR}/${DIST_SUBDIR}; \	193	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
194	[ -e go.mod ] \|\| ${RLN} ${GO_MODFILE} go.mod; \	194	[ -e go.mod ] \|\| ${RLN} ${GO_MODFILE} go.mod; \
195	${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)	195	${SETENVI} ${WRK_ENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
196	. endif	196	. endif
197		197
198	_USES_extract+= 800:go-post-extract	198	_USES_extract+= 800:go-post-extract
Lines 201-209 _USES_extract+= 800:go-post-extract Link Here
201	# already in MODCACHE), vendor them so we can patch them if needed.	201	# already in MODCACHE), vendor them so we can patch them if needed.
202	go-post-extract:	202	go-post-extract:
203	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";	203	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
204	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)	204	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
205	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";	205	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
206	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)	206	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)
207	. else	207	. else
208	# Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module.	208	# Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module.
209	go-post-extract:	209	go-post-extract:
Lines 220-226 do-build: Link Here
220	pkg=$$(${ECHO_CMD} $${t} \| \	220	pkg=$$(${ECHO_CMD} $${t} \| \
221	${SED} -Ee 's/^([^:]).$$/\1/' -e 's/^${PORTNAME}$$/./'); \	221	${SED} -Ee 's/^([^:]).$$/\1/' -e 's/^${PORTNAME}$$/./'); \
222	${ECHO_MSG} "===> Building $${out} from $${pkg}"; \	222	${ECHO_MSG} "===> Building $${out} from $${pkg}"; \
223	${SETENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \	223	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOMAXPROCS=${MAKE_JOBS_NUMBER} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
224	-o ${GO_WRKDIR_BIN}/$${out} \	224	-o ${GO_WRKDIR_BIN}/$${out} \
225	$${pkg}; \	225	$${pkg}; \
226	done)	226	done)
Lines 246-252 do-test: Link Here
246	(cd ${GO_WRKSRC}; \	246	(cd ${GO_WRKSRC}; \
247	for t in ${GO_TESTTARGET}; do \	247	for t in ${GO_TESTTARGET}; do \
248	${ECHO_MSG} "===> Testing $${t}"; \	248	${ECHO_MSG} "===> Testing $${t}"; \
249	${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \	249	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} test ${GO_TESTFLAGS} $${t}; \
250	done)	250	done)
251	. endif	251	. endif
252		252
Lines 254-260 do-test: Link Here
254	gomod-clean:	254	gomod-clean:
255	. if exists(${GO_CMD})	255	. if exists(${GO_CMD})
256	@${ECHO_MSG} "===> Cleaning Go module cache"	256	@${ECHO_MSG} "===> Cleaning Go module cache"
257	@${SETENV} ${GO_ENV} ${GO_CMD} clean -modcache	257	@${SETENVI} ${WRK_ENV} ${GO_ENV} ${GO_CMD} clean -modcache
258	. else	258	. else
259	@${ECHO_MSG} "===> Skipping since ${GO_CMD} is not installed"	259	@${ECHO_MSG} "===> Skipping since ${GO_CMD} is not installed"
260	. endif	260	. endif
Lines 279-289 gomod-vendor-deps: Link Here
279	fi	279	fi
280		280
281	gomod-vendor: gomod-vendor-deps patch	281	gomod-vendor: gomod-vendor-deps patch
282	@cd ${WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} mod vendor; \	282	@cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${GO_ENV} ${GO_CMD} mod vendor; \
283	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt	283	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt
284		284
285	gomod-vendor-diff: gomod-vendor-deps patch	285	gomod-vendor-diff: gomod-vendor-deps patch
286	@cd ${WRKSRC}; ${SETENV} ${GO_ENV} ${GO_CMD} mod vendor; \	286	@cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${GO_ENV} ${GO_CMD} mod vendor; \
287	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt \| ${SED} 's\|GH_TUPLE=\| \|; s\| \\$$\|\|' \| ${GREP} -v ' \\' > ${WRKDIR}/GH_TUPLE-new.txt && \	287	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt \| ${SED} 's\|GH_TUPLE=\| \|; s\| \\$$\|\|' \| ${GREP} -v ' \\' > ${WRKDIR}/GH_TUPLE-new.txt && \
288	echo ${GH_TUPLE} \| ${TR} -s " " "\n" \| ${SED} "s\|^\| \|" > ${WRKDIR}/GH_TUPLE-old.txt && \	288	echo ${GH_TUPLE} \| ${TR} -s " " "\n" \| ${SED} "s\|^\| \|" > ${WRKDIR}/GH_TUPLE-old.txt && \
289	${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt \|\| exit 0	289	${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt \|\| exit 0

Lines 228-240 post-patch: Link Here

(-)b/Mk/Uses/pyqt.mk (-2 / +2 lines)
228		228
229	. if !target(do-build)	229	. if !target(do-build)
230	do-build:	230	do-build:
231	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} -C ./build)	231	(cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} -C ./build)
232		232
233	. endif # !target(do-build)	233	. endif # !target(do-build)
234		234
235	. if !target(do-install)	235	. if !target(do-install)
236	do-install:	236	do-install:
237	(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )	237	(cd ${WRKSRC} ; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
238	. endif # !target(do-install)	238	. endif # !target(do-install)
239		239
240	. endif # defined(PYQT_DIST)	240	. endif # defined(PYQT_DIST)

Lines 905-921 MAKE_ENV+= LDSHARED="${LDSHARED}" PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE= Link Here

(-)b/Mk/Uses/python.mk (-10 / +10 lines)
905		905
906	. if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE)	906	. if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE)
907	do-configure:	907	do-configure:
908	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS})	908	@(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS})
909	. endif	909	. endif
910		910
911	. if !target(do-build)	911	. if !target(do-build)
912	do-build:	912	do-build:
913	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS})	913	@(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS})
914	. endif	914	. endif
915		915
916	. if !target(do-install)	916	. if !target(do-install)
917	do-install:	917	do-install:
918	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})	918	@(cd ${INSTALL_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS})
919	. endif	919	. endif
920	. endif # defined(_PYTHON_FEATURE_DISTUTILS)	920	. endif # defined(_PYTHON_FEATURE_DISTUTILS)
921		921
Lines 934-946 do-configure: Link Here
934		934
935	. if !target(do-build)	935	. if !target(do-build)
936	do-build:	936	do-build:
937	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_BUILD_CMD}	937	@cd ${BUILD_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PEP517_BUILD_CMD}
938	. endif	938	. endif
939		939
940	. if !target(do-install)	940	. if !target(do-install)
941	do-install:	941	do-install:
942	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}	942	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
943	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD}	943	@cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD}
944	@${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \	944	@${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \
945	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C\|[-_]+\|_\|g}-${DISTVERSION}*.dist-info/RECORD >> ${_PYTHONPKGLIST}	945	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C\|[-_]+\|_\|g}-${DISTVERSION}*.dist-info/RECORD >> ${_PYTHONPKGLIST}
946	@${REINPLACE_CMD} \	946	@${REINPLACE_CMD} \
Lines 963-997 do-install: Link Here
963	. if defined(_PYTHON_FEATURE_NOSE)	963	. if defined(_PYTHON_FEATURE_NOSE)
964	. if !target(do-test)	964	. if !target(do-test)
965	do-test:	965	do-test:
966	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m nose ${TEST_ARGS:NDESTDIR=*} -v	966	cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m nose ${TEST_ARGS:NDESTDIR=*} -v
967	. endif	967	. endif
968	. endif # defined(_PYTHON_FEATURE_NOSE)	968	. endif # defined(_PYTHON_FEATURE_NOSE)
969		969
970	. if defined(_PYTHON_FEATURE_NOSE2)	970	. if defined(_PYTHON_FEATURE_NOSE2)
971	. if !target(do-test)	971	. if !target(do-test)
972	do-test:	972	do-test:
973	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m nose2 ${TEST_ARGS:NDESTDIR=*} -v	973	cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m nose2 ${TEST_ARGS:NDESTDIR=*} -v
974	. endif	974	. endif
975	. endif # defined(_PYTHON_FEATURE_NOSE2)	975	. endif # defined(_PYTHON_FEATURE_NOSE2)
976		976
977	. if defined(_PYTHON_FEATURE_PYTEST) \|\| defined(_PYTHON_FEATURE_PYTEST4)	977	. if defined(_PYTHON_FEATURE_PYTEST) \|\| defined(_PYTHON_FEATURE_PYTEST4)
978	. if !target(do-test)	978	. if !target(do-test)
979	do-test:	979	do-test:
980	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -k '${_PYTEST_FILTER_EXPRESSION}' -rs -v -o addopts= ${TEST_ARGS:NDESTDIR=*}	980	cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -k '${_PYTEST_FILTER_EXPRESSION}' -rs -v -o addopts= ${TEST_ARGS:NDESTDIR=*}
981	. endif	981	. endif
982	. endif # defined(_PYTHON_FEATURE_PYTEST) \|\| defined(_PYTHON_FEATURE_PYTEST4)	982	. endif # defined(_PYTHON_FEATURE_PYTEST) \|\| defined(_PYTHON_FEATURE_PYTEST4)
983		983
984	. if defined(_PYTHON_FEATURE_UNITTEST)	984	. if defined(_PYTHON_FEATURE_UNITTEST)
985	. if !target(do-test)	985	. if !target(do-test)
986	do-test:	986	do-test:
987	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest ${TEST_ARGS:NDESTDIR=*} -v	987	cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest ${TEST_ARGS:NDESTDIR=*} -v
988	. endif	988	. endif
989	. endif # defined(_PYTHON_FEATURE_UNITTEST)	989	. endif # defined(_PYTHON_FEATURE_UNITTEST)
990		990
991	. if defined(_PYTHON_FEATURE_UNITTEST2)	991	. if defined(_PYTHON_FEATURE_UNITTEST2)
992	. if !target(do-test)	992	. if !target(do-test)
993	do-test:	993	do-test:
994	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest2 ${TEST_ARGS:NDESTDIR=*} -v	994	cd ${TEST_WRKSRC} && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest2 ${TEST_ARGS:NDESTDIR=*} -v
995	. endif	995	. endif
996	. endif # defined(_PYTHON_FEATURE_UNITTEST2)	996	. endif # defined(_PYTHON_FEATURE_UNITTEST2)
997		997

Lines 396-410 BUILD_DEPENDS+= ${ANT}:devel/apache-ant Link Here

(-)b/Mk/bsd.java.mk (-4 / +4 lines)
396	ALL_TARGET?=	396	ALL_TARGET?=
397	. if !target(do-build)	397	. if !target(do-build)
398	do-build:	398	do-build:
399	@(cd ${BUILD_WRKSRC}; \	399	@(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
400	${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})	400	${ANT} ${MAKE_ARGS} ${ALL_TARGET})
401	. endif	401	. endif
402	. if !target(do-test) && defined(TEST_TARGET)	402	. if !target(do-test) && defined(TEST_TARGET)
403	TEST_DEPENDS+= ${DEPEND_JAVA}	403	TEST_DEPENDS+= ${DEPEND_JAVA}
404	TEST_DEPENDS+= ${ANT}:devel/apache-ant	404	TEST_DEPENDS+= ${ANT}:devel/apache-ant
405	do-test:	405	do-test:
406	@(cd ${TEST_WRKSRC}; \	406	@(cd ${TEST_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
407	${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${TEST_TARGET})	407	${ANT} ${MAKE_ARGS} ${TEST_TARGET})
408	. endif	408	. endif
409	. endif	409	. endif
410		410

Lines 202-215 cabal-extract: check-cabal Link Here

(-)b/Mk/Uses/cabal.mk (-8 / +8 lines)
202	${RM} -r ${CABAL_HOME}	202	${RM} -r ${CABAL_HOME}
203	. endif	203	. endif
204	@${ECHO_MSG} "===> Fetching Hackage index into ${CABAL_HOME}/.cabal"	204	@${ECHO_MSG} "===> Fetching Hackage index into ${CABAL_HOME}/.cabal"
205	${SETENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update	205	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update
206	. if ${_hackage_is_default} == yes	206	. if ${_hackage_is_default} == yes
207	cd ${WRKDIR} && \	207	cd ${WRKDIR} && \
208	${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} get ${HACKAGE_DISTNAME}	208	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} get ${HACKAGE_DISTNAME}
209	. else	209	. else
210	. if ${cabal_ARGS:Mhpack}	210	. if ${cabal_ARGS:Mhpack}
211	@${ECHO_MSG} "===> Running ${HPACK_CMD} to generate .cabal file"	211	@${ECHO_MSG} "===> Running ${HPACK_CMD} to generate .cabal file"
212	cd ${WRKSRC} && ${SETENV} ${CABAL_HOME_ENV} ${HPACK_CMD}	212	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${HPACK_CMD}
213	. endif	213	. endif
214	. endif	214	. endif
215	# Remove Haskell dependencies that come from GH_TUPLE	215	# Remove Haskell dependencies that come from GH_TUPLE
Lines 217-223 cabal-extract: check-cabal Link Here
217	. ifdef CABAL_REPOSITORIES	217	. ifdef CABAL_REPOSITORIES
218	@${ECHO_MSG} "===> Fetching additional Cabal repositories index into ${CABAL_HOME}/.cabal"	218	@${ECHO_MSG} "===> Fetching additional Cabal repositories index into ${CABAL_HOME}/.cabal"
219	@cd ${WRKSRC} && \	219	@cd ${WRKSRC} && \
220	${SETENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update	220	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update
221	. endif	221	. endif
222	# Create a cookie for cabal-post-patch	222	# Create a cookie for cabal-post-patch
223	@${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE}	223	@${TOUCH} ${EXTRACT_COOKIE} ${CABAL_COOKIE}
Lines 227-238 cabal-extract: check-cabal Link Here
227	# This pulls in all source dependencies, resolves them and generates build plan	227	# This pulls in all source dependencies, resolves them and generates build plan
228	cabal-configure: check-cabal	228	cabal-configure: check-cabal
229	cd ${WRKSRC} && \	229	cd ${WRKSRC} && \
230	${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}	230	${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}
231		231
232	# Calls cabal build on the Haskell package located in ${WRKSRC}	232	# Calls cabal build on the Haskell package located in ${WRKSRC}
233	cabal-build: check-cabal	233	cabal-build: check-cabal
234	cd ${WRKSRC} && \	234	cd ${WRKSRC} && \
235	${SETENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${CABAL_LTO_ARGS} ${BUILD_ARGS} ${BUILD_TARGET}	235	${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}
236		236
237	# Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure.	237	# Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure.
238	make-use-cabal: check-cabal2tuple	238	make-use-cabal: check-cabal2tuple
Lines 312-324 cabal-post-patch: Link Here
312	cabal-pre-configure:	312	cabal-pre-configure:
313	# Generate .cabal file with hpack if requested	313	# Generate .cabal file with hpack if requested
314	. if ${cabal_ARGS:Mhpack}	314	. if ${cabal_ARGS:Mhpack}
315	cd ${WRKSRC} && ${SETENV} ${CABAL_HOME_ENV} hpack	315	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} hpack
316	. endif	316	. endif
317		317
318	. if !target(do-build)	318	. if !target(do-build)
319	do-build:	319	do-build:
320	cd ${WRKSRC} && \	320	cd ${WRKSRC} && \
321	${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}	321	${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}
322	. endif	322	. endif
323		323
324	. if !target(do-install)	324	. if !target(do-install)

Lines 153-159 BROKEN= USES=emacs is incompatible with cmake's ninja-generator (try cmake:noni Link Here

(-)b/Mk/Uses/cmake.mk (-4 / +5 lines)
153	do-configure:	153	do-configure:
154	@${ECHO_MSG} ${_CMAKE_MSG}	154	@${ECHO_MSG} ${_CMAKE_MSG}
155	${MKDIR} ${CONFIGURE_WRKSRC}	155	${MKDIR} ${CONFIGURE_WRKSRC}
156	@cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}	156	@cd ${CONFIGURE_WRKSRC}; ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
		157	${CMAKE_ARGS} ${CMAKE_SOURCE_PATH}
157	. endif	158	. endif
158		159
159	. if !target(do-test) && ${cmake_ARGS:Mtesting}	160	. if !target(do-test) && ${cmake_ARGS:Mtesting}
Lines 169-177 CMAKE_TESTING_ARGS+= ${CMAKE_TESTING_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/ Link Here
169		170
170	do-test:	171	do-test:
171	@cd ${BUILD_WRKSRC} && \	172	@cd ${BUILD_WRKSRC} && \
172	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \	173	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \
173	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \	174	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \
174	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}	175	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET}
175	. endif	176	. endif
176	. endif	177	. endif
177		178

Lines 93-100 RUBYGEM_ARGS+= --no-document Link Here

(-)b/Mk/Uses/gem.mk (-4 / +4 lines)
93		93
94	_USES_extract+= 590:gem-extract	94	_USES_extract+= 590:gem-extract
95	gem-extract:	95	gem-extract:
96	@${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES}	96	@${SETENVI} ${WRK_ENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES}
97	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \	97	@(cd ${BUILD_WRKSRC}; if ! ${SETENVI} ${WRK_ENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \
98	if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \	98	if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
99	${ECHO_MSG} "===> Extraction failed unexpectedly."; \	99	${ECHO_MSG} "===> Extraction failed unexpectedly."; \
100	(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") \| ${FMT_80} ; \	100	(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") \| ${FMT_80} ; \
Lines 104-110 gem-extract: Link Here
104		104
105	. if !target(do-build)	105	. if !target(do-build)
106	do-build:	106	do-build:
107	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \	107	@(cd ${BUILD_WRKSRC}; if ! ${SETENVI} ${WRK_ENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \
108	if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \	108	if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
109	${ECHO_MSG} "===> Compilation failed unexpectedly."; \	109	${ECHO_MSG} "===> Compilation failed unexpectedly."; \
110	(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") \| ${FMT_80} ; \	110	(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") \| ${FMT_80} ; \
Lines 115-121 do-build: Link Here
115		115
116	. if !target(do-install)	116	. if !target(do-install)
117	do-install:	117	do-install:
118	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- ${CONFIGURE_ARGS})	118	(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- ${CONFIGURE_ARGS})
119	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/	119	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
120	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +	120	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
121	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete	121	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete

Lines 261-267 do-configure: Link Here

(-)b/Mk/Uses/perl5.mk (-5 / +5 lines)
261	${SCRIPTDIR}/configure; \	261	${SCRIPTDIR}/configure; \
262	fi	262	fi
263	@cd ${CONFIGURE_WRKSRC} && \	263	@cd ${CONFIGURE_WRKSRC} && \
264	${SETENV} ${CONFIGURE_ENV} \	264	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} \
265	${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}	265	${PERL5} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
266	. if !${_USE_PERL5:Mmodbuild*}	266	. if !${_USE_PERL5:Mmodbuild*}
267	@cd ${CONFIGURE_WRKSRC} && \	267	@cd ${CONFIGURE_WRKSRC} && \
Lines 273-285 do-configure: Link Here
273	. if ${_USE_PERL5:Mmodbuild*}	273	. if ${_USE_PERL5:Mmodbuild*}
274	. if !target(do-build)	274	. if !target(do-build)
275	do-build:	275	do-build:
276	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${ALL_TARGET} ${MAKE_ARGS})	276	@(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${ALL_TARGET} ${MAKE_ARGS})
277	. endif # !target(do-build)	277	. endif # !target(do-build)
278		278
279	. if !${USES:Mgmake}	279	. if !${USES:Mgmake}
280	. if !target(do-install)	280	. if !target(do-install)
281	do-install:	281	do-install:
282	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS})	282	@(cd ${BUILD_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS})
283	. endif # !target(do-install)	283	. endif # !target(do-install)
284	. endif # ! USES=gmake	284	. endif # ! USES=gmake
285	. endif # modbuild	285	. endif # modbuild
Lines 325-333 TEST_TARGET?= test Link Here
325	TEST_WRKSRC?= ${BUILD_WRKSRC}	325	TEST_WRKSRC?= ${BUILD_WRKSRC}
326	do-test:	326	do-test:
327	. if ${USE_PERL5:Mmodbuild*}	327	. if ${USE_PERL5:Mmodbuild*}
328	@cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS}	328	@cd ${TEST_WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS}
329	. elif ${USE_PERL5:Mconfigure}	329	. elif ${USE_PERL5:Mconfigure}
330	@cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET}	330	@cd ${TEST_WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET}
331	. endif # USE_PERL5:Mmodbuild*	331	. endif # USE_PERL5:Mmodbuild*
332	. endif # do-test	332	. endif # do-test
333	.endif # defined(_POSTMKINCLUDED)	333	.endif # defined(_POSTMKINCLUDED)

Lines 311-322 ruby-extconf-configure: Link Here

(-)b/Mk/Uses/ruby.mk (-5 / +5 lines)
311	. for d in ${RUBY_EXTCONF_SUBDIRS}	311	. for d in ${RUBY_EXTCONF_SUBDIRS}
312	@${ECHO_MSG} "===> Running ${RUBY_EXTCONF} in ${d} to configure"	312	@${ECHO_MSG} "===> Running ${RUBY_EXTCONF} in ${d} to configure"
313	@cd ${CONFIGURE_WRKSRC}/${d}; \	313	@cd ${CONFIGURE_WRKSRC}/${d}; \
314	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}	314	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
315	. endfor	315	. endfor
316	. else	316	. else
317	@${ECHO_MSG} "===> Running ${RUBY_EXTCONF} to configure"	317	@${ECHO_MSG} "===> Running ${RUBY_EXTCONF} to configure"
318	@cd ${CONFIGURE_WRKSRC}; \	318	@cd ${CONFIGURE_WRKSRC}; \
319	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}	319	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
320	. endif	320	. endif
321	. endif	321	. endif
322		322
Lines 331-351 do-configure: ruby-setup-configure Link Here
331	ruby-setup-configure:	331	ruby-setup-configure:
332	@${ECHO_MSG} "===> Running ${RUBY_SETUP} to configure"	332	@${ECHO_MSG} "===> Running ${RUBY_SETUP} to configure"
333	@cd ${BUILD_WRKSRC}; \	333	@cd ${BUILD_WRKSRC}; \
334	${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} config ${CONFIGURE_ARGS}	334	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} config ${CONFIGURE_ARGS}
335		335
336	do-build: ruby-setup-build	336	do-build: ruby-setup-build
337		337
338	ruby-setup-build:	338	ruby-setup-build:
339	@${ECHO_MSG} "===> Running ${RUBY_SETUP} to build"	339	@${ECHO_MSG} "===> Running ${RUBY_SETUP} to build"
340	@cd ${BUILD_WRKSRC}; \	340	@cd ${BUILD_WRKSRC}; \
341	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} setup	341	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} setup
342		342
343	do-install: ruby-setup-install	343	do-install: ruby-setup-install
344		344
345	ruby-setup-install:	345	ruby-setup-install:
346	@${ECHO_MSG} "===> Running ${RUBY_SETUP} to install"	346	@${ECHO_MSG} "===> Running ${RUBY_SETUP} to install"
347	@cd ${INSTALL_WRKSRC}; \	347	@cd ${INSTALL_WRKSRC}; \
348	${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR}	348	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP} install --prefix=${STAGEDIR}
349	. endif	349	. endif
350		350
351	. if !${ruby_ARGS:Mbuild} && !${ruby_ARGS:Mrun} && !${ruby_ARGS:Mnone}	351	. if !${ruby_ARGS:Mbuild} && !${ruby_ARGS:Mrun} && !${ruby_ARGS:Mnone}

Lines 1-6 Link Here

(-)b/games/legesmotus/files/patch-common.mk (-16 / +2 lines)
1	--- common.mk.orig 2010-09-03 19:22:37 UTC	1	--- common.mk.orig 2010-09-03 19:22:37 UTC
2	+++ common.mk	2	+++ common.mk
3	@@ -9,7 +9,6 @@ FRAMEWORKS = /Library/Frameworks	3	@@ -9,7 +9,6 @@ VERSION = 0.4.0
4	VERSION = 0.4.0	4	VERSION = 0.4.0
5		5
6	# These may be overridden by config.mk	6	# These may be overridden by config.mk
Lines 8-28 Link Here
8	#UNIVERSAL = 1	8	#UNIVERSAL = 1
9	#NOBUNDLE = 1	9	#NOBUNDLE = 1
10		10
11	@@ -84,13 +83,6 @@ ifeq ($(ARCHS),)	11	@@ -174,12 +173,10 @@ ifeq ($(DEBUG),1)
12	endif
13	endif
14
15	-# Only Mac OS X can use fat binaries
16	-ifneq ($(filter $(ARCH),$(ARCHS)),$(ARCH))
17	- ifneq ($(MACHINE)-$(ARCH),Darwin-universal)
18	- $(error Disallowed architecture for this platform: $(ARCH))
19	- endif
20	-endif
21	-
22	ifeq ($(MACHINE)$(NOBUNDLE),Darwin)
23	export MACOSX_DEPLOYMENT_TARGET=10.4
24	FLAGS_SDL = -I$(FRAMEWORKS)/SDL.framework/Headers
25	@@ -174,12 +166,10 @@ CXXFLAGS += -Wnon-virtual-dtor
26		12
27	ifeq ($(DEBUG),1)	13	ifeq ($(DEBUG),1)
28	RELEASE = debug	14	RELEASE = debug

Lines 2-8 Link Here

(-)b/lang/ocaml/Makefile (-11 / +5 lines)
2		2
3	PORTNAME= ocaml	3	PORTNAME= ocaml
4	PORTVERSION= 4.08.1	4	PORTVERSION= 4.08.1
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= lang	6	CATEGORIES= lang
7	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \	7	MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
8	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs	8	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs
Lines 49-55 CONFIGURE_ARGS= --prefix="${PREFIX}" Link Here
49	CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \	49	CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \
50	ASPP="${CC} -c" \	50	ASPP="${CC} -c" \
51	PARTIALLD="${LD} -r"	51	PARTIALLD="${LD} -r"
52	MAKE_ENV= SYSTEM_ARCH="${ARCH:C/aarch64/arm64/:C/powerpc.*/power/}"
53		52
54	OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES	53	OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES
55	OPTIONS_DEFAULT=X11 THREADS	54	OPTIONS_DEFAULT=X11 THREADS
Lines 91-97 CONFIGURE_ENV+= AS="${AS} ${ASFLAGS}" \ Link Here
91	CC="${CC}"	90	CC="${CC}"
92	.endif	91	.endif
93		92
94	.if defined(NO_PROFILE) \|\| ${ARCH:Mpowerpc} \|\| ${ARCH:Mamd64}	93	.if defined(NO_PROFILE)
95	PLIST_SUB+= PROF="@comment "	94	PLIST_SUB+= PROF="@comment "
96	.else	95	.else
97	PLIST_SUB+= PROF=""	96	PLIST_SUB+= PROF=""
Lines 103-119 post-patch: Link Here
103	-e '\\|RANLIB\|s\|ranlib\|${RANLIB}\|' \	102	-e '\\|RANLIB\|s\|ranlib\|${RANLIB}\|' \
104	-e '\\|^ldflags=\|s\|""\|"${LDFLAGS}"\|' \	103	-e '\\|^ldflags=\|s\|""\|"${LDFLAGS}"\|' \
105	${WRKSRC}/configure	104	${WRKSRC}/configure
106	@${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \
107	${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \
108	${WRKSRC}/runtime/Makefile \
109	${WRKSRC}/ocamltest/Makefile \
110	${WRKSRC}/otherlibs/systhreads/Makefile
111		105
112	check-test: do-install	106	check-test: do-install
113	@cd ${WRKSRC}/testsuite; ${RM} _log; for d in tests/* ; do \	107	@cd ${WRKSRC}/testsuite; ${RM} _log; for d in tests/* ; do \
114	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one DIR=$${d} \	108	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one \
115	2>&1 \| tee -a _log \|\| ${TRUE} ; done ; \	109	DIR=$${d} 2>&1 \| tee -a _log \|\| ${TRUE} ; done ; \
116	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report	110	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report
117		111
118	post-install:	112	post-install:
119	.if ${PORT_OPTIONS:MDOCS}	113	.if ${PORT_OPTIONS:MDOCS}

Lines 50-62 Link Here

(-)b/lang/ocaml/files/patch-configure (-9 / +25 lines)
50	model=ppc	50	model=ppc
51	fi; system=elf ;; #(	51	fi; system=elf ;; #(
52	+ powerpc64le--freebsd*) :	52	+ powerpc64le--freebsd*) :
53	+ arch=power; model=ppc64le; system=bsd_elf;; #(	53	+ arch=power; model=ppc64le; system=freebsd;; #(
54	+ powerpc--freebsd*) :	54	+ powerpc--freebsd*) :
55	+ arch=power; if $arch64; then :	55	+ arch=power; if $arch64; then :
56	+ model=ppc64	56	+ model=ppc64
57	+else	57	+else
58	+ model=ppc	58	+ model=ppc
59	+fi; system=bsd_elf ;; #(	59	+fi; system=freebsd ;; #(
60	powerpc--netbsd) :	60	powerpc--netbsd) :
61	arch=power; model=ppc; system=netbsd ;; #(	61	arch=power; model=ppc; system=netbsd ;; #(
62	powerpc--openbsd) :	62	powerpc--openbsd) :
Lines 69-75 Link Here
69	earmv6--netbsd*) :	69	earmv6--netbsd*) :
70	arch=arm; model=armv6; system=netbsd ;; #(	70	arch=arm; model=armv6; system=netbsd ;; #(
71	earmv7--netbsd*) :	71	earmv7--netbsd*) :
72	@@ -13544,6 +13560,8 @@ fi; system=elf ;; #(	72	@@ -13534,6 +13550,8 @@ fi; system=elf ;; #(
		73	arch=amd64; system=dragonfly ;; #(
		74	x86_64--freebsd) :
		75	arch=amd64; system=freebsd ;; #(
		76	+ amd64--freebsd) :
		77	+ arch=amd64; system=freebsd ;; #(
		78	x86_64--netbsd) :
		79	arch=amd64; system=netbsd ;; #(
		80	x86_64--openbsd) :
		81	@@ -13544,6 +13562,8 @@ fi; system=elf ;; #(
73	arch=amd64; system=mingw64 ;; #(	82	arch=amd64; system=mingw64 ;; #(
74	aarch64--linux) :	83	aarch64--linux) :
75	arch=arm64; system=linux ;; #(	84	arch=arm64; system=linux ;; #(
Lines 78-84 Link Here
78	x86_64--cygwin) :	87	x86_64--cygwin) :
79	arch=amd64; system=cygwin	88	arch=amd64; system=cygwin
80	;; #(	89	;; #(
81	@@ -13714,6 +13732,8 @@ case "$arch,$system" in #(	90	@@ -13714,6 +13734,8 @@ case "$arch,$system" in #(
82	profiling=true ;; #(	91	profiling=true ;; #(
83	amd64,openbsd) :	92	amd64,openbsd) :
84	profiling=true ;; #(	93	profiling=true ;; #(
Lines 87-100 Link Here
87	amd64,freebsd) :	96	amd64,freebsd) :
88	profiling=true ;; #(	97	profiling=true ;; #(
89	amd64,netbsd) :	98	amd64,netbsd) :
90	@@ -13721,6 +13741,10 @@ case "$arch,$system" in #(	99	@@ -13722,11 +13744,17 @@ case "$arch,$system" in #(
91	arm,netbsd) :
92	profiling=true ;; #(	100	profiling=true ;; #(
93	amd64,gnu) :	101	amd64,gnu) :
		102	profiling=true ;; #(
		103	+ arm64,freebsd) :
94	+ profiling=true ;; #(	104	+ profiling=true ;; #(
95	+ arm64,freebsd*) :	105	+ arm,freebsd) :
96	+ profiling=true ;; #(	106	+ profiling=true ;; #(
97	+ arm,freebsd*) :
98	profiling=true ;; #(
99	arm,linux*) :	107	arm,linux*) :
100	profiling=true ;; #(	108	profiling=true ;; #(
		109	power,elf) :
		110	profiling=true ;; #(
		111	power,bsd*) :
		112	+ profiling=true ;; #(
		113	+ power,freebsd) :
		114	profiling=true ;; #(
		115	power,netbsd) :
		116	profiling=true ;; #(