Attachment #248511 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 154-161 RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} Link Here

(-)b/Mk/Uses/cargo.mk (-2 / +3 lines)
154	. endif	154	. endif
155		155
156	# Helper to shorten cargo calls.	156	# Helper to shorten cargo calls.
157	_CARGO_RUN= ${SETENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO}	157	_CARGO_RUN= ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO}
158	CARGO_CARGO_RUN= cd ${WRKSRC}; ${SETENV} CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=1 ${_CARGO_RUN}	158	CARGO_CARGO_RUN= cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CARGO_ENV} \
		159	CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=1 ${CARGO}
159		160
160	# User arguments for cargo targets.	161	# User arguments for cargo targets.
161	CARGO_BUILD_ARGS?=	162	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 3322-3328 do-configure: Link Here
3322	@${MKDIR} ${CONFIGURE_WRKSRC}	3336	@${MKDIR} ${CONFIGURE_WRKSRC}
3323	@(cd ${CONFIGURE_WRKSRC} && \	3337	@(cd ${CONFIGURE_WRKSRC} && \
3324	${SET_LATE_CONFIGURE_ARGS} \	3338	${SET_LATE_CONFIGURE_ARGS} \
3325	if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \	3339	if ! ${SETENVI} ${WRK_ENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
3326	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \	3340	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
3327	LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \	3341	LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
3328	INSTALL="/usr/bin/install -c" \	3342	INSTALL="/usr/bin/install -c" \
Lines 3339-3345 do-configure: Link Here
3339	. endif	3353	. endif
3340		3354
3341	# Build	3355	# Build
3342	DO_MAKE_BUILD?= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}	3356	DO_MAKE_BUILD?= ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		3357	${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}
3343	. if !target(do-build)	3358	. if !target(do-build)
3344	do-build:	3359	do-build:
3345	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \	3360	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \
Lines 3430-3442 check-install-conflicts: Link Here
3430		3445
3431	. if !target(do-install) && !defined(NO_INSTALL)	3446	. if !target(do-install) && !defined(NO_INSTALL)
3432	do-install:	3447	do-install:
3433	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})	3448	@(cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${FAKEROOT} \
		3449	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
3434	. endif	3450	. endif
3435		3451
3436	# Test	3452	# Test
3437		3453
3438	. if !target(do-test) && defined(TEST_TARGET)	3454	. if !target(do-test) && defined(TEST_TARGET)
3439	DO_MAKE_TEST?= ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}	3455	DO_MAKE_TEST?= ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		3456	${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}
3440	do-test:	3457	do-test:
3441	@(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \	3458	@(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \
3442	if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \	3459	if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \




--- DPF/distrho/src/DistrhoPluginInternal.hpp.orig	2021-09-13 17:06:57 UTC
+++ DPF/distrho/src/DistrhoPluginInternal.hpp
@@ -244,10 +244,12 @@ class PluginExporter (public)
           fData((fPlugin != nullptr) ? fPlugin->pData : nullptr),
           fIsActive(false)
     {
+        std::cerr << "PluginExporter: start\n";
         DISTRHO_SAFE_ASSERT_RETURN(fPlugin != nullptr,);
         DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr,);
 
 #if DISTRHO_PLUGIN_NUM_INPUTS+DISTRHO_PLUGIN_NUM_OUTPUTS > 0
+        std::cerr << "PluginExporter: io\n";
         {
             uint32_t j=0;
 # if DISTRHO_PLUGIN_NUM_INPUTS > 0
@@ -261,6 +263,7 @@ class PluginExporter (public)
         }
 #endif // DISTRHO_PLUGIN_NUM_INPUTS+DISTRHO_PLUGIN_NUM_OUTPUTS > 0
 
+        std::cerr << "PluginExporter: params\n";
         for (uint32_t i=0, count=fData->parameterCount; i < count; ++i)
             fPlugin->initParameter(i, fData->parameters[i]);
 
@@ -296,11 +299,13 @@ class PluginExporter (public)
         }
 
 #if DISTRHO_PLUGIN_WANT_PROGRAMS
+        std::cerr << "PluginExporter: progs\n";
         for (uint32_t i=0, count=fData->programCount; i < count; ++i)
             fPlugin->initProgramName(i, fData->programNames[i]);
 #endif
 
 #if DISTRHO_PLUGIN_WANT_STATE
+        std::cerr << "PluginExporter: state\n";
         for (uint32_t i=0, count=fData->stateCount; i < count; ++i)
             fPlugin->initState(i, fData->stateKeys[i], fData->stateDefValues[i]);
 #endif
@@ -308,6 +313,7 @@ class PluginExporter (public)
         fData->callbacksPtr = callbacksPtr;
         fData->writeMidiCallbackFunc = writeMidiCall;
         fData->requestParameterValueChangeCallbackFunc = requestParameterValueChangeCall;
+        std::cerr << "PluginExporter: end\n";
     }
 
     ~PluginExporter()

Added Link Here

(-)b/audio/zynaddsubfx/files/patch-DPF_distrho_src_DistrhoPluginLV2export.cpp (+10 lines)
1	--- DPF/distrho/src/DistrhoPluginLV2export.cpp.orig 2024-02-15 22:37:37 UTC
2	+++ DPF/distrho/src/DistrhoPluginLV2export.cpp
3	@@ -222,6 +222,7 @@ void lv2_generate_ttl(const char* const basename)
4	void lv2_generate_ttl(const char* const basename)
5	{
6	USE_NAMESPACE_DISTRHO
7	+ std::cerr << "lv2_generate_ttl: start\n";
8
9	// Dummy plugin to get data from
10	d_lastBufferSize = 512;

Added Link Here

(-)b/audio/zynaddsubfx/files/patch-src_Plugin_ZynAddSubFX_CMakeLists.txt (+11 lines)
1	--- src/Plugin/ZynAddSubFX/CMakeLists.txt.orig 2022-01-22 01:46:21 UTC
2	+++ src/Plugin/ZynAddSubFX/CMakeLists.txt
3	@@ -202,7 +202,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
4	install(TARGETS ZynAddSubFX_vst LIBRARY DESTINATION ${PluginLibDir}/vst/)
5
6	add_custom_command(TARGET ZynAddSubFX_lv2 POST_BUILD
7	- COMMAND ../../lv2-ttl-generator $<TARGET_FILE:ZynAddSubFX_lv2>
8	+ COMMAND ../../lv2-ttl-generator $<TARGET_FILE:ZynAddSubFX_lv2> >&2
9	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lv2)
10
11	add_dependencies(ZynAddSubFX_lv2 lv2-ttl-generator)




PORTNAME=	iortcw
PORTVERSION=	1.51c
PORTREVISION=	4
PORTEPOCH=	1
CATEGORIES=	games



LDFLAGS_i386=	-Wl,-znotext

PLIST_SUB=	ARCH="${ARCH:S/amd64/x86_64/:S/powerpc/ppc/}" \
		WOLFDIR="${WOLFDIR}"

SUB_FILES=	iowolfded iowolfmp iowolfsp pkg-message
SUB_LIST=	ARCH="${ARCH:S/amd64/x86_64/:S/powerpc/ppc/}" \
		DISTVERSION="${DISTVERSION}" \
		WOLFDIR="${PREFIX}/${WOLFDIR}"





--- MP/Makefile.orig	2019-03-16 18:09:48 UTC
+++ MP/Makefile
@@ -369,7 +369,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 +752,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 +761,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 +786,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 +799,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




--- MP/code/qcommon/q_platform.h.orig	2019-03-16 18:09:48 UTC
+++ MP/code/qcommon/q_platform.h
@@ -221,14 +221,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 #define ID_INLINE inline
 #define PATH_SEP '/'
 
-#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"
 #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"
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN




--- SP/Makefile.orig	2019-03-16 18:09:48 UTC
+++ SP/Makefile
@@ -358,7 +358,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 +741,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 +750,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 +775,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 +788,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




--- SP/code/qcommon/q_platform.h.orig	2019-03-16 18:09:48 UTC
+++ SP/code/qcommon/q_platform.h
@@ -221,14 +221,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 #define ID_INLINE inline
 #define PATH_SEP '/'
 
-#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"
 #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"
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN

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




PORTNAME=	q3cellshading
PORTVERSION=	1.0
PORTREVISION=	5
CATEGORIES=	games
MASTER_SITES=	SF
DISTNAME=	q3cel-${PORTVERSION}-src


USES=		gmake zip

ALL_TARGET=	build_release
MAKE_ENV=	LIBDIR="${LIBDIR}"
MAKE_JOBS_UNSAFE=	yes



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

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}
MAKE_ENV+=	GAMELIBS=YES
.endif


	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \
		${STAGEDIR}${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/}
.endfor
.if ${PORT_OPTIONS:MGAMELIBS}
.for dir in baseq3 missionpack
	@${MKDIR} ${STAGEDIR}${LIBDIR}/${dir}
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so \




--- code/unix/Makefile.orig	2024-02-13 13:27:33 UTC
+++ code/unix/Makefile
@@ -25,7 +25,7 @@ PLATFORM_RELEASE=$(shell uname -r)
 ###

 
 
 
@@ -46,8 +46,8 @@ BASEQ3_DIR=$(BDIR)/baseq3
 
 BASEQ3_DIR=$(BDIR)/baseq3
 

 CDIR=$(MOUNT_DIR)/client
 SDIR=$(MOUNT_DIR)/server
 RDIR=$(MOUNT_DIR)/renderer
@@ -65,7 +65,7 @@ SPLNDIR=$(MOUNT_DIR)/splines
 SPLNDIR=$(MOUNT_DIR)/splines
 
 # extract version info

 RPM_RELEASE=1
 
 # NOTE: used by dcp rcp targets, not referenced
@@ -76,7 +76,10 @@ RPM_RELEASE=1
 #############################################################################
 
 ## Defaults
-DLL_ONLY=false
+ARCH=$(shell uname -m)
+RPMARCH=$(ARCH)
+VENDOR=unknown
+DLL_ONLY=true
 # bk010215 - TODO - add all defaults / kill Ryan
 
 
@@ -199,31 +202,34 @@ GLIBC= #libc is irrelevant
     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
 
   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)))

-RPMARCH=i386
-VENDOR=unknown
-endif #alpha test
+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
 
+BASE_CFLAGS = -fsigned-char $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"'
+ifeq ($(DLL_ONLY),true)
+  BASE_CFLAGS += -DDLL_ONLY
+endif
 
-BASE_CFLAGS =  -pipe
+GL_CFLAGS = -I$(LOCALBASE)/include
+  ifeq ($(ARCH),i386)
+RELEASE_CFLAGS+=-ffast-math -falign-functions=2
+  else
+RELEASE_CFLAGS+=-ffast-math
+  endif
+endif
 
-GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include
-
 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

-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
+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,25 +243,33 @@ THREAD_LDFLAGS=-lpthread
 
 THREAD_LDFLAGS=-lpthread
 # don't need -ldl (FreeBSD)

-	$(B)/missionpack/ui$(ARCH).$(SHLIBEXT)
+ifdef CLIENT
+TARGETS+=$(B)/quake3
 endif
 
+ifdef DEDICATED
+TARGETS+=$(B)/q3ded
+endif

+	$(B)/missionpack/cgame.$(SHLIBEXT) \
+	$(B)/missionpack/qagame.$(SHLIBEXT) \
+	$(B)/missionpack/ui.$(SHLIBEXT)
+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
 
 #############################################################################
@@ -515,20 +529,6 @@ Q3OBJ = \
 	$(B)/client/unix_main.o \
 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 = \
 	$(B)/client/unix_net.o \
 	$(B)/client/unix_shared.o \
-	\
-	$(B)/client/ahoptim.o  \
-	$(B)/client/autohint.o \
-	$(B)/client/ftbase.o   \

-	$(B)/client/sfobjs.o   \
-	$(B)/client/smooth.o   \
-	$(B)/client/truetype.o
 #	\
 #	$(B)/client/q_parse.o \
 #	$(B)/client/math_quaternion.o \
@@ -541,12 +541,14 @@ Q3OBJ = \
@@ -541,10 +530,12 @@ Q3OBJ = \
 #	$(B)/client/q_shared.o \
 
     ifeq ($(ARCH),i386)

+      endif
     endif
 
     ifeq ($(ARCH),ppc)
+    ifeq ($(ARCH),powerpc)
       ifeq ($(DLL_ONLY),false)
-        Q3OBJ += $(B)/client/vm_ppc.o
+        Q3OBJ += $(B)/client/vm_ppc_new.o
       endif
     endif
 
@@ -559,10 +561,24 @@ ifeq ($(PLATFORM),freebsd)
 		$(B)/client/linux_qgl.o \
 		$(B)/client/linux_glimp.o \
 		$(B)/client/linux_snd.o \

 else
 ifeq ($(PLATFORM),irix)
 	Q3POBJ=\
@@ -602,12 +618,12 @@ endif #IRIX
 		$(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
 endif #FreeBSD
 endif #IRIX
 

 	$(CC)  -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \
 		$(THREAD_LDFLAGS) $(LDFLAGS) 
 
@@ -758,6 +774,7 @@ $(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC
 $(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)  
 $(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) 

 $(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS) 
 $(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS) 
 
@@ -769,7 +786,7 @@ ifeq ($(DLL_ONLY),false)
 $(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) 
 endif
 
 ifeq ($(ARCH),ppc)
+ifeq ($(ARCH),powerpc)
 ifeq ($(DLL_ONLY),false)
-$(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 +929,26 @@ Q3DOBJ = \
 	$(B)/ded/unix_main.o \
 	$(B)/ded/unix_net.o \
 	$(B)/ded/unix_shared.o \

+  endif
 endif
 
 ifeq ($(ARCH),ppc)
+ifeq ($(ARCH),powerpc)
   ifeq ($(DLL_ONLY),false)
-    Q3DOBJ += $(B)/ded/vm_ppc.o
+    Q3DOBJ += $(B)/ded/vm_ppc_new.o
   endif
 endif
 

 	$(CC)  -o $@ $(Q3DOBJ) $(LDFLAGS)
 
 $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) 
@@ -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) 

 $(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) 
@@ -1003,7 +1025,7 @@ ifeq ($(DLL_ONLY),false)
 $(B)/ded/snapvector.o : $(UDIR)/snapvector.nasm; $(DO_NASM) 
 endif
 
 ifeq ($(ARCH),ppc)
+ifeq ($(ARCH),powerpc)
 ifeq ($(DLL_ONLY),false)
-$(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 +1090,7 @@ Q3CGOBJ = \
 	$(B)/baseq3/cgame/q_math.o \
 	$(B)/baseq3/cgame/q_shared.o
 

 	$(CC)  $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
 
 $(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)         
@@ -1128,7 +1150,7 @@ MPCGOBJ = \
 	$(B)/missionpack/cgame/q_shared.o \
 	$(B)/missionpack/cgame/ui_shared.o
 

 	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
 
 $(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)     -DMISSIONPACK 
@@ -1200,7 +1222,7 @@ Q3GOBJ = \
 	$(B)/baseq3/game/q_math.o \
 	$(B)/baseq3/game/q_shared.o
 

 	$(CC)  $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
 
 $(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC)     
@@ -1278,7 +1300,7 @@ MPGOBJ = \
 	$(B)/missionpack/game/q_math.o \
 	$(B)/missionpack/game/q_shared.o
 

 	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
 
 $(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC)    -DMISSIONPACK 
@@ -1367,7 +1389,7 @@ Q3UIOBJ = \
         $(B)/baseq3/ui/q_math.o \
         $(B)/baseq3/ui/q_shared.o
 

 	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
 
 $(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) 
@@ -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) 

 $(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 +1472,7 @@ MPUIOBJ = \
 #	$(B)/missionpack/ui/q_math.o \
 #	$(B)/missionpack/ui/q_shared.o
 

 	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
 
 $(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
@@ -1613,34 +1635,21 @@ Q3SOBJ = \
 	$(B)/q3static/unix_net.o \
 	$(B)/q3static/unix_shared.o \
 	\

 	$(B)/q3static/linux_snd.o \
 	$(B)/q3static/snd_mixa.o \
 	$(B)/q3static/matha.o
 
 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;
 
 
 

 	$(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

Lines 1-6 Link Here

(-)b/games/tremulous/Makefile (-2 / +2 lines)
1	PORTNAME= tremulous	1	PORTNAME= tremulous
2	PORTVERSION= 1.1.0	2	PORTVERSION= 1.1.0
3	PORTREVISION= 13	3	PORTREVISION= 14
4	CATEGORIES= games	4	CATEGORIES= games
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
6		6
Lines 11-17 WWW= http://www.tremulous.net/ Link Here
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12		12
13	USES= cpe gmake zip	13	USES= cpe gmake zip
14	MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="-lpthread"	14	MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}"
15		15
16	WRKSRC= ${WRKDIR}/${PORTNAME}	16	WRKSRC= ${WRKDIR}/${PORTNAME}
17	BUILD_WRKSRC= ${WRKSRC}/${DISTNAME}-src	17	BUILD_WRKSRC= ${WRKSRC}/${DISTNAME}-src

Lines 1-6 Link Here

(-)b/games/tremulous/files/patch-Makefile (-69 / +55 lines)
1	--- ./tremulous-1.1.0-src/Makefile.orig Tue Mar 21 19:28:25 2006	1	--- tremulous-1.1.0-src/Makefile.orig 2006-03-21 22:28:25 UTC
2	+++ ./tremulous-1.1.0-src/Makefile Wed Jun 7 16:57:12 2006	2	+++ tremulous-1.1.0-src/Makefile
3	@@ -27,11 +27,20 @@	3	@@ -18,7 +18,7 @@ else
		4	# Apple does some things a little differently...
		5	COMPILE_ARCH=$(shell uname -p \| sed -e s/i.86/x86/)
		6	else
		7	- COMPILE_ARCH=$(shell uname -m \| sed -e s/i.86/x86/)
		8	+ COMPILE_ARCH=$(shell uname -m \| sed -e s/amd64/x86_64/ -e s/i.86/x86/ -e s/powerpc/ppc/)
		9	endif
		10
		11	ifeq ($(COMPILE_PLATFORM),mingw32)
		12	@@ -27,11 +27,20 @@ endif
4	endif	13	endif
5	endif	14	endif
6		15
Lines 26-32 Link Here
26		35
27	#############################################################################	36	#############################################################################
28	#	37	#
29	@@ -89,34 +98,10 @@	38	@@ -51,10 +60,6 @@ endif
		39	ifndef ARCH
		40	ARCH=$(COMPILE_ARCH)
		41	endif
		42	-
		43	-ifeq ($(ARCH),powerpc)
		44	- ARCH=ppc
		45	-endif
		46	export ARCH
		47
		48	ifneq ($(PLATFORM),$(COMPILE_PLATFORM))
		49	@@ -89,34 +94,10 @@ export USE_CCACHE
30	endif	50	endif
31	export USE_CCACHE	51	export USE_CCACHE
32		52
Lines 62-68 Link Here
62	CDIR=$(MOUNT_DIR)/client	82	CDIR=$(MOUNT_DIR)/client
63	SDIR=$(MOUNT_DIR)/server	83	SDIR=$(MOUNT_DIR)/server
64	RDIR=$(MOUNT_DIR)/renderer	84	RDIR=$(MOUNT_DIR)/renderer
65	@@ -202,15 +187,13 @@	85	@@ -202,15 +183,13 @@ ifeq ($(PLATFORM),linux)
66		86
67	ifeq ($(ARCH),x86_64)	87	ifeq ($(ARCH),x86_64)
68	OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \	88	OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
Lines 80-86 Link Here
80	HAVE_VM_COMPILED=true	100	HAVE_VM_COMPILED=true
81	else	101	else
82	ifeq ($(ARCH),ppc)	102	ifeq ($(ARCH),ppc)
83	@@ -293,7 +276,7 @@	103	@@ -293,7 +272,7 @@ ifeq ($(PLATFORM),darwin)
84	GL_CFLAGS =	104	GL_CFLAGS =
85	endif	105	endif
86		106
Lines 89-95 Link Here
89		109
90	ifeq ($(ARCH),ppc)	110	ifeq ($(ARCH),ppc)
91	BASE_CFLAGS += -faltivec	111	BASE_CFLAGS += -faltivec
92	@@ -375,8 +358,8 @@	112	@@ -375,8 +354,8 @@ ifeq ($(PLATFORM),mingw32)
93	GL_CFLAGS =	113	GL_CFLAGS =
94	MINGW_CFLAGS = -DDONT_TYPEDEF_INT32	114	MINGW_CFLAGS = -DDONT_TYPEDEF_INT32
95		115
Lines 100-106 Link Here
100		120
101	DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0	121	DEBUG_CFLAGS=$(BASE_CFLAGS) -g -O0
102		122
103	@@ -412,18 +395,12 @@	123	@@ -412,18 +391,12 @@ ifeq ($(PLATFORM),freebsd)
104		124
105	ifeq ($(PLATFORM),freebsd)	125	ifeq ($(PLATFORM),freebsd)
106		126
Lines 109-128 Link Here
109	- else #default to x86	129	- else #default to x86
110	- ARCH=x86	130	- ARCH=x86
111	- endif #alpha test	131	- endif #alpha test
112	-
113	-
114	- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
115	+ BASE_CFLAGS = -I$(LOCALBASE)/include -DARCH='\"$(ARCH)\"' -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes	132	+ BASE_CFLAGS = -I$(LOCALBASE)/include -DARCH='\"$(ARCH)\"' -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
116		133
117	- GL_CFLAGS = -I/usr/X11R6/include
118	+ GL_CFLAGS = -I$(LOCALBASE)/include	134	+ GL_CFLAGS = -I$(LOCALBASE)/include
119		135
		136	- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
		137	-
		138	- GL_CFLAGS = -I/usr/X11R6/include
		139	-
120	DEBUG_CFLAGS=$(BASE_CFLAGS) -g	140	DEBUG_CFLAGS=$(BASE_CFLAGS) -g
121	+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe	141	+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe
122		142
123	ifeq ($(USE_OPENAL),1)	143	ifeq ($(USE_OPENAL),1)
124	BASE_CFLAGS += -DUSE_OPENAL=1	144	BASE_CFLAGS += -DUSE_OPENAL=1
125	@@ -436,46 +413,61 @@	145	@@ -436,46 +409,61 @@ ifeq ($(PLATFORM),freebsd)
126	BASE_CFLAGS += -DUSE_CODEC_VORBIS=1	146	BASE_CFLAGS += -DUSE_CODEC_VORBIS=1
127	endif	147	endif
128		148
Lines 156-167 Link Here
156	+	176	+
157	+ ifeq ($(USE_SDL_VIDEO),1)	177	+ ifeq ($(USE_SDL_VIDEO),1)
158	+ BASE_CFLAGS += -DUSE_SDL_VIDEO=1	178	+ BASE_CFLAGS += -DUSE_SDL_VIDEO=1
159	+ endif	179	endif
160	+	180
161	+ ifeq ($(USE_OPTIMIZED_CFLAGS),1)	181	+ ifeq ($(USE_OPTIMIZED_CFLAGS),1)
162	+ RELEASE_CFLAGS+=-O3 -ffast-math -funroll-loops -fomit-frame-pointer \	182	+ RELEASE_CFLAGS+=-O3 -ffast-math -funroll-loops -fomit-frame-pointer \
163	+ -fexpensive-optimizations	183	+ -fexpensive-optimizations
164	+ ifeq ($(ARCH),i386)	184	+ ifeq ($(ARCH),x86)
165	+ RELEASE_CFLAGS+=-falign-functions=2 -fstrength-reduce	185	+ RELEASE_CFLAGS+=-falign-functions=2 -fstrength-reduce
166	+ endif	186	+ endif
167	+ endif	187	+ endif
Lines 169-182 Link Here
169	+ HAVE_VM_COMPILED?=false	189	+ HAVE_VM_COMPILED?=false
170	+ ifneq ($(HAVE_VM_COMPILED),true)	190	+ ifneq ($(HAVE_VM_COMPILED),true)
171	+ BASE_CFLAGS += -DNO_VM_COMPILED	191	+ BASE_CFLAGS += -DNO_VM_COMPILED
172	endif	192	+ endif
173		193	+
174	SHLIBEXT=so	194	SHLIBEXT=so
175	SHLIBCFLAGS=-fPIC	195	SHLIBCFLAGS=-fPIC
176	SHLIBLDFLAGS=-shared $(LDFLAGS)	196	SHLIBLDFLAGS=-shared $(LDFLAGS)
177		197
178	- THREAD_LDFLAGS=-lpthread	198	THREAD_LDFLAGS=-lpthread
179	+ THREAD_LDFLAGS=$(PTHREAD_LIBS)
180	# don't need -ldl (FreeBSD)	199	# don't need -ldl (FreeBSD)
181	- LDFLAGS=-lm	200	- LDFLAGS=-lm
182	+ LDFLAGS+=-lm	201	+ LDFLAGS+=-lm
Lines 193-204 Link Here
193	+ ifeq ($(USE_SDL_VIDEO),1)	212	+ ifeq ($(USE_SDL_VIDEO),1)
194	+ CLIENT_LDFLAGS += $(shell $(SDL_CONFIG) --libs)	213	+ CLIENT_LDFLAGS += $(shell $(SDL_CONFIG) --libs)
195	+ endif	214	+ endif
196	+ endif
197	+
198	+ ifneq ($(USE_SDL_VIDEO),1)
199	+ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
200	endif	215	endif
201		216
		217	+ ifneq ($(USE_SDL_VIDEO),1)
		218	+ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
		219	+ endif
		220	+
202	ifeq ($(USE_OPENAL),1)	221	ifeq ($(USE_OPENAL),1)
203	+ CLIENT_LDFLAGS += $(THREAD_LDFLAGS)	222	+ CLIENT_LDFLAGS += $(THREAD_LDFLAGS)
204	ifneq ($(USE_OPENAL_DLOPEN),1)	223	ifneq ($(USE_OPENAL_DLOPEN),1)
Lines 207-213 Link Here
207	endif	226	endif
208	endif	227	endif
209		228
210	@@ -574,16 +566,15 @@	229	@@ -574,16 +562,15 @@ ifeq ($(PLATFORM),SunOS)
211	OPTIMIZE = -O3 -ffast-math -funroll-loops	230	OPTIMIZE = -O3 -ffast-math -funroll-loops
212		231
213	ifeq ($(ARCH),sparc)	232	ifeq ($(ARCH),sparc)
Lines 227-233 Link Here
227	endif	246	endif
228	endif	247	endif
229		248
230	@@ -637,21 +628,22 @@	249	@@ -637,21 +624,22 @@ ifneq ($(BUILD_SERVER),0)
231	TARGETS =	250	TARGETS =
232		251
233	ifneq ($(BUILD_SERVER),0)	252	ifneq ($(BUILD_SERVER),0)
Lines 241-252 Link Here
241	- TARGETS += $(B)/tremulous.$(ARCH)$(BINEXT)	260	- TARGETS += $(B)/tremulous.$(ARCH)$(BINEXT)
242	- endif	261	- endif
243	+ TARGETS += $(B)/tremulous$(BINEXT)	262	+ TARGETS += $(B)/tremulous$(BINEXT)
244	+endif
245	+
246	+ifneq ($(BUILD_CLIENT_SMP),0)
247	+ TARGETS += $(B)/tremulous-smp$(BINEXT)
248	endif	263	endif
249		264
		265	+ifneq ($(BUILD_CLIENT_SMP),0)
		266	+ TARGETS += $(B)/tremulous-smp$(BINEXT)
		267	+endif
		268	+
250	ifneq ($(BUILD_GAME_SO),0)	269	ifneq ($(BUILD_GAME_SO),0)
251	TARGETS += \	270	TARGETS += \
252	- $(B)/base/cgame$(ARCH).$(SHLIBEXT) \	271	- $(B)/base/cgame$(ARCH).$(SHLIBEXT) \
Lines 258-264 Link Here
258	endif	277	endif
259		278
260	ifneq ($(BUILD_GAME_QVM),0)	279	ifneq ($(BUILD_GAME_QVM),0)
261	@@ -709,14 +701,14 @@	280	@@ -709,14 +697,14 @@ build_release: B=$(BR)
262	endif	281	endif
263		282
264	build_release: B=$(BR)	283	build_release: B=$(BR)
Lines 275-299 Link Here
275		294
276	targets: $(TARGETS)	295	targets: $(TARGETS)
277		296
278	@@ -901,7 +893,7 @@	297	@@ -962,10 +950,10 @@ endif
279	$(B)/client/tr_surface.o \
280	$(B)/client/tr_world.o \
281
282	-ifeq ($(ARCH),x86)
283	+ifeq ($(ARCH),i386)
284	Q3OBJ += $(B)/client/vm_x86.o
285	Q3OBJ += \
286	$(B)/client/snd_mixa.o \
287	@@ -910,7 +902,7 @@
288	$(B)/client/snapvectora.o
289	endif
290
291	-ifeq ($(ARCH),x86_64)
292	+ifeq ($(ARCH),amd64)
293	Q3OBJ += $(B)/client/vm_x86_64.o
294	endif
295
296	@@ -962,10 +954,10 @@
297	$(B)/client/sdl_glimp_smp.o	298	$(B)/client/sdl_glimp_smp.o
298	endif	299	endif
299		300
Lines 306-327 Link Here
306	$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \	307	$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
307	$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)	308	$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
308		309
309	@@ -1238,12 +1230,12 @@	310	@@ -1253,7 +1241,7 @@ endif
310	$(B)/ded/null_input.o \
311	$(B)/ded/null_snddma.o
312
313	-ifeq ($(ARCH),x86)
314	+ifeq ($(ARCH),i386)
315	Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftola.o \
316	$(B)/ded/snapvectora.o $(B)/ded/matha.o
317	endif
318
319	-ifeq ($(ARCH),x86_64)
320	+ifeq ($(ARCH),amd64)
321	Q3DOBJ += $(B)/ded/vm_x86_64.o
322	endif
323
324	@@ -1253,7 +1245,7 @@
325	endif	311	endif
326	endif	312	endif
327		313
Lines 330-336 Link Here
330	$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)	316	$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
331		317
332	$(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC)	318	$(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC)
333	@@ -1374,7 +1366,7 @@	319	@@ -1374,7 +1362,7 @@ CGVMOBJ = $(CGOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.as
334	CGOBJ = $(CGOBJ_) $(B)/base/cgame/cg_syscalls.o	320	CGOBJ = $(CGOBJ_) $(B)/base/cgame/cg_syscalls.o
335	CGVMOBJ = $(CGOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm	321	CGVMOBJ = $(CGOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm
336		322
Lines 339-345 Link Here
339	$(CC) $(SHLIBLDFLAGS) -o $@ $(CGOBJ)	325	$(CC) $(SHLIBLDFLAGS) -o $@ $(CGOBJ)
340		326
341	$(B)/base/vm/cgame.qvm: $(CGVMOBJ) $(CGDIR)/cg_syscalls.asm	327	$(B)/base/vm/cgame.qvm: $(CGVMOBJ) $(CGDIR)/cg_syscalls.asm
342	@@ -1418,7 +1410,7 @@	328	@@ -1418,7 +1406,7 @@ GVMOBJ = $(GOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm
343	GOBJ = $(GOBJ_) $(B)/base/game/g_syscalls.o	329	GOBJ = $(GOBJ_) $(B)/base/game/g_syscalls.o
344	GVMOBJ = $(GOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm	330	GVMOBJ = $(GOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm
345		331
Lines 348-354 Link Here
348	$(CC) $(SHLIBLDFLAGS) -o $@ $(GOBJ)	334	$(CC) $(SHLIBLDFLAGS) -o $@ $(GOBJ)
349		335
350	$(B)/base/vm/game.qvm: $(GVMOBJ) $(GDIR)/g_syscalls.asm	336	$(B)/base/vm/game.qvm: $(GVMOBJ) $(GDIR)/g_syscalls.asm
351	@@ -1444,7 +1436,7 @@	337	@@ -1444,7 +1432,7 @@ UIVMOBJ = $(UIOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.as
352	UIOBJ = $(UIOBJ_) $(B)/base/ui/ui_syscalls.o	338	UIOBJ = $(UIOBJ_) $(B)/base/ui/ui_syscalls.o
353	UIVMOBJ = $(UIOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm	339	UIVMOBJ = $(UIOBJ_:%.o=%.asm) $(B)/base/game/bg_lib.asm
354		340





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 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 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 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 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 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 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 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

Added Link Here

(-)b/audio/zynaddsubfx/files/patch-DPF_distrho_src_DistrhoPluginInternal.hpp (+45 lines)
1	--- DPF/distrho/src/DistrhoPluginInternal.hpp.orig 2021-09-13 17:06:57 UTC
2	+++ DPF/distrho/src/DistrhoPluginInternal.hpp
3	@@ -244,10 +244,12 @@ class PluginExporter (public)
4	fData((fPlugin != nullptr) ? fPlugin->pData : nullptr),
5	fIsActive(false)
6	{
7	+ std::cerr << "PluginExporter: start\n";
8	DISTRHO_SAFE_ASSERT_RETURN(fPlugin != nullptr,);
9	DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr,);
10
11	#if DISTRHO_PLUGIN_NUM_INPUTS+DISTRHO_PLUGIN_NUM_OUTPUTS > 0
12	+ std::cerr << "PluginExporter: io\n";
13	{
14	uint32_t j=0;
15	# if DISTRHO_PLUGIN_NUM_INPUTS > 0
16	@@ -261,6 +263,7 @@ class PluginExporter (public)
17	}
18	#endif // DISTRHO_PLUGIN_NUM_INPUTS+DISTRHO_PLUGIN_NUM_OUTPUTS > 0
19
20	+ std::cerr << "PluginExporter: params\n";
21	for (uint32_t i=0, count=fData->parameterCount; i < count; ++i)
22	fPlugin->initParameter(i, fData->parameters[i]);
23
24	@@ -296,11 +299,13 @@ class PluginExporter (public)
25	}
26
27	#if DISTRHO_PLUGIN_WANT_PROGRAMS
28	+ std::cerr << "PluginExporter: progs\n";
29	for (uint32_t i=0, count=fData->programCount; i < count; ++i)
30	fPlugin->initProgramName(i, fData->programNames[i]);
31	#endif
32
33	#if DISTRHO_PLUGIN_WANT_STATE
34	+ std::cerr << "PluginExporter: state\n";
35	for (uint32_t i=0, count=fData->stateCount; i < count; ++i)
36	fPlugin->initState(i, fData->stateKeys[i], fData->stateDefValues[i]);
37	#endif
38	@@ -308,6 +313,7 @@ class PluginExporter (public)
39	fData->callbacksPtr = callbacksPtr;
40	fData->writeMidiCallbackFunc = writeMidiCall;
41	fData->requestParameterValueChangeCallbackFunc = requestParameterValueChangeCall;
42	+ std::cerr << "PluginExporter: end\n";
43	}
44
45	~PluginExporter()

Lines 1-6 Link Here

(-)b/games/iortcw/Makefile (-3 / +3 lines)
1	PORTNAME= iortcw	1	PORTNAME= iortcw
2	PORTVERSION= 1.51c	2	PORTVERSION= 1.51c
3	PORTREVISION= 3	3	PORTREVISION= 4
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= games	5	CATEGORIES= games
6		6
Lines 30-40 MAKE_ARGS= BINDIR="${STAGEDIR}${PREFIX}/bin" \ Link Here
30		30
31	LDFLAGS_i386= -Wl,-znotext	31	LDFLAGS_i386= -Wl,-znotext
32		32
33	PLIST_SUB= ARCH="${ARCH}" \	33	PLIST_SUB= ARCH="${ARCH:S/amd64/x86_64/:S/powerpc/ppc/}" \
34	WOLFDIR="${WOLFDIR}"	34	WOLFDIR="${WOLFDIR}"
35		35
36	SUB_FILES= iowolfded iowolfmp iowolfsp pkg-message	36	SUB_FILES= iowolfded iowolfmp iowolfsp pkg-message
37	SUB_LIST= ARCH="${ARCH}" \	37	SUB_LIST= ARCH="${ARCH:S/amd64/x86_64/:S/powerpc/ppc/}" \
38	DISTVERSION="${DISTVERSION}" \	38	DISTVERSION="${DISTVERSION}" \
39	WOLFDIR="${PREFIX}/${WOLFDIR}"	39	WOLFDIR="${PREFIX}/${WOLFDIR}"
40		40

Added Link Here

(-)b/games/iortcw/files/patch-MP_Makefile (+58 lines)
1	--- MP/Makefile.orig 2019-03-16 18:09:48 UTC
2	+++ MP/Makefile
3	@@ -369,7 +369,7 @@ CLIENT_EXTRA_FILES=
4	EXTRA_FILES=
5	CLIENT_EXTRA_FILES=
6
7	-ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
8	+ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu" "freebsd" "netbsd" "openbsd"))
9	TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\"
10	endif
11
12	@@ -752,7 +752,7 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
13	ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd" "netbsd"))
14
15	BASE_CFLAGS = -Wall -fno-strict-aliasing \
16	- -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
17	+ -pipe -DUSE_ICON -DARCH_STRING=\\\"$(FILE_ARCH)\\\" -DMAP_ANONYMOUS=MAP_ANON
18	CLIENT_CFLAGS += $(SDL_CFLAGS)
19
20	OPTIMIZEVM = -O3
21	@@ -761,7 +761,6 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
22	ifeq ($(ARCH),x86_64)
23	OPTIMIZEVM = -O3
24	OPTIMIZE = $(OPTIMIZEVM) -ffast-math
25	- FILE_ARCH = amd64
26	endif
27	ifeq ($(ARCH),x86)
28	OPTIMIZEVM = -O3 -march=i586
29	@@ -787,13 +786,8 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
30	OPTIMIZE = $(OPTIMIZEVM)
31	endif
32
33	- ifeq ($(USE_CURL),1)
34	- CLIENT_CFLAGS += $(CURL_CFLAGS)
35	- USE_CURL_DLOPEN=0
36	- endif
37	-
38	SHLIBEXT=so
39	- SHLIBCFLAGS=-fPIC
40	+ SHLIBCFLAGS=-fPIC -fvisibility=hidden
41	SHLIBLDFLAGS=-shared $(LDFLAGS)
42
43	THREAD_LIBS=-lpthread
44	@@ -805,12 +799,14 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
45	RENDERER_LIBS = $(SDL_LIBS)
46
47	ifeq ($(USE_OPENAL),1)
48	+ CLIENT_CFLAGS += $(OPENAL_CFLAGS)
49	ifneq ($(USE_OPENAL_DLOPEN),1)
50	CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
51	endif
52	endif
53
54	ifeq ($(USE_CURL),1)
55	+ CLIENT_CFLAGS += $(CURL_CFLAGS)
56	ifneq ($(USE_CURL_DLOPEN),1)
57	CLIENT_LIBS += $(CURL_LIBS)
58	endif

Lines 1-32 Link Here

(-)b/games/iortcw/files/patch-MP_code_qcommon_q__platform.h (-26 / +16 lines)
1	--- MP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC	1	--- MP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC
2	+++ MP/code/qcommon/q_platform.h	2	+++ MP/code/qcommon/q_platform.h
3	@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,	3	@@ -221,14 +221,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
		4	#define ID_INLINE inline
		5	#define PATH_SEP '/'
4		6
5	#else	7	-#ifdef __i386__
6		8	-#define ARCH_STRING "i386"
7	-#if (defined _M_IX86 \|\| defined __i386__) && !defined(C_ONLY)	9	-#elif defined __amd64__
8	-#define id386 1	10	+#if !defined(ARCH_STRING)
9	-#else	11	+# error ARCH_STRING should be defined by the Makefile
10	#define id386 0	12	+#endif
11	-#endif	13	+
12		14	+#if defined __x86_64__
13	#if (defined(powerc) \|\| defined(powerpc) \|\| defined(ppc) \|\| \	15	#undef idx64
14	defined(__ppc) \|\| defined(__ppc__)) && !defined(C_ONLY)	16	#define idx64 1
15	@@ -224,11 +220,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,	17	-#define ARCH_STRING "amd64"
16	#ifdef __i386__	18	-#elif defined __axp__
17	#define ARCH_STRING "i386"	19	-#define ARCH_STRING "alpha"
18	#elif defined __amd64__
19	-#undef idx64
20	-#define idx64 1
21	#define ARCH_STRING "amd64"
22	#elif defined __axp__
23	#define ARCH_STRING "alpha"
24	+#elif defined __powerpc64__
25	+#define ARCH_STRING "powerpc64"
26	+#elif defined __powerpc__
27	+#define ARCH_STRING "powerpc"
28	+#elif defined __riscv
29	+#define ARCH_STRING "riscv64"
30	#endif	20	#endif
31		21
32	#if BYTE_ORDER == BIG_ENDIAN	22	#if BYTE_ORDER == BIG_ENDIAN

Added Link Here

(-)b/games/iortcw/files/patch-SP_Makefile (+58 lines)
1	--- SP/Makefile.orig 2019-03-16 18:09:48 UTC
2	+++ SP/Makefile
3	@@ -358,7 +358,7 @@ CLIENT_EXTRA_FILES=
4	EXTRA_FILES=
5	CLIENT_EXTRA_FILES=
6
7	-ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
8	+ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu" "freebsd" "netbsd" "openbsd"))
9	TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\"
10	endif
11
12	@@ -741,7 +741,7 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
13	ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd" "netbsd"))
14
15	BASE_CFLAGS = -Wall -fno-strict-aliasing \
16	- -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
17	+ -pipe -DUSE_ICON -DARCH_STRING=\\\"$(FILE_ARCH)\\\" -DMAP_ANONYMOUS=MAP_ANON
18	CLIENT_CFLAGS += $(SDL_CFLAGS)
19
20	OPTIMIZEVM = -O3
21	@@ -750,7 +750,6 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
22	ifeq ($(ARCH),x86_64)
23	OPTIMIZEVM = -O3
24	OPTIMIZE = $(OPTIMIZEVM) -ffast-math
25	- FILE_ARCH = amd64
26	endif
27	ifeq ($(ARCH),x86)
28	OPTIMIZEVM = -O3 -march=i586
29	@@ -776,13 +775,8 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
30	OPTIMIZE = $(OPTIMIZEVM)
31	endif
32
33	- ifeq ($(USE_CURL),1)
34	- CLIENT_CFLAGS += $(CURL_CFLAGS)
35	- USE_CURL_DLOPEN=0
36	- endif
37	-
38	SHLIBEXT=so
39	- SHLIBCFLAGS=-fPIC
40	+ SHLIBCFLAGS=-fPIC -fvisibility=hidden
41	SHLIBLDFLAGS=-shared $(LDFLAGS)
42
43	THREAD_LIBS=-lpthread
44	@@ -794,12 +788,14 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
45	RENDERER_LIBS = $(SDL_LIBS)
46
47	ifeq ($(USE_OPENAL),1)
48	+ CLIENT_CFLAGS += $(OPENAL_CFLAGS)
49	ifneq ($(USE_OPENAL_DLOPEN),1)
50	CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
51	endif
52	endif
53
54	ifeq ($(USE_CURL),1)
55	+ CLIENT_CFLAGS += $(CURL_CFLAGS)
56	ifneq ($(USE_CURL_DLOPEN),1)
57	CLIENT_LIBS += $(CURL_LIBS)
58	endif

Lines 1-32 Link Here

(-)b/games/iortcw/files/patch-SP_code_qcommon_q__platform.h (-26 / +16 lines)
1	--- SP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC	1	--- SP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48 UTC
2	+++ SP/code/qcommon/q_platform.h	2	+++ SP/code/qcommon/q_platform.h
3	@@ -35,11 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,	3	@@ -221,14 +221,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
		4	#define ID_INLINE inline
		5	#define PATH_SEP '/'
4		6
5	#else	7	-#ifdef __i386__
6		8	-#define ARCH_STRING "i386"
7	-#if (defined _M_IX86 \|\| defined __i386__) && !defined(C_ONLY)	9	-#elif defined __amd64__
8	-#define id386 1	10	+#if !defined(ARCH_STRING)
9	-#else	11	+# error ARCH_STRING should be defined by the Makefile
10	#define id386 0	12	+#endif
11	-#endif	13	+
12		14	+#if defined __x86_64__
13	#if (defined(powerc) \|\| defined(powerpc) \|\| defined(ppc) \|\| \	15	#undef idx64
14	defined(__ppc) \|\| defined(__ppc__)) && !defined(C_ONLY)	16	#define idx64 1
15	@@ -224,11 +220,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,	17	-#define ARCH_STRING "amd64"
16	#ifdef __i386__	18	-#elif defined __axp__
17	#define ARCH_STRING "i386"	19	-#define ARCH_STRING "alpha"
18	#elif defined __amd64__
19	-#undef idx64
20	-#define idx64 1
21	#define ARCH_STRING "amd64"
22	#elif defined __axp__
23	#define ARCH_STRING "alpha"
24	+#elif defined __powerpc64__
25	+#define ARCH_STRING "powerpc64"
26	+#elif defined __powerpc__
27	+#define ARCH_STRING "powerpc"
28	+#elif defined __riscv
29	+#define ARCH_STRING "riscv64"
30	#endif	20	#endif
31		21
32	#if BYTE_ORDER == BIG_ENDIAN	22	#if BYTE_ORDER == BIG_ENDIAN

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 1-6 Link Here

(-)b/games/q3cellshading/Makefile (-15 / +4 lines)
1	PORTNAME= q3cellshading	1	PORTNAME= q3cellshading
2	PORTVERSION= 1.0	2	PORTVERSION= 1.0
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= games	4	CATEGORIES= games
5	MASTER_SITES= SF	5	MASTER_SITES= SF
6	DISTNAME= q3cel-${PORTVERSION}-src	6	DISTNAME= q3cel-${PORTVERSION}-src
Lines 14-19 ONLY_FOR_ARCHS_REASON= does not run properly; try games/ioquake3 with option Link Here
14		14
15	USES= gmake zip	15	USES= gmake zip
16		16
		17	ALL_TARGET= build_release
17	MAKE_ENV= LIBDIR="${LIBDIR}"	18	MAKE_ENV= LIBDIR="${LIBDIR}"
18	MAKE_JOBS_UNSAFE= yes	19	MAKE_JOBS_UNSAFE= yes
19		20
Lines 22-29 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Link Here
22		23
23	PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}"	24	PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}"
24		25
25	VM_ARCHS= i386 powerpc
26
27	OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS	26	OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS
28	OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT	27	OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT
29	OPTIONS_MULTI= FLAVOR	28	OPTIONS_MULTI= FLAVOR
Lines 51-73 LIBDIR= ${PREFIX}/lib/${PORTNAME} Link Here
51	BUILD_DEPENDS+= nasm:devel/nasm	50	BUILD_DEPENDS+= nasm:devel/nasm
52	.endif	51	.endif
53		52
54	.for arch in ${ARCH}
55	. if ${VM_ARCHS:M${arch}} != ""
56	HAVE_VM_COMPILED= yes
57	. endif
58	.endfor
59
60	.if !defined(HAVE_VM_COMPILED)
61	MAKE_ENV+= DLL_ONLY=true
62	.endif
63
64	.if ${PORT_OPTIONS:MCLIENT} \|\| ${PORT_OPTIONS:MSMP_CLIENT}	53	.if ${PORT_OPTIONS:MCLIENT} \|\| ${PORT_OPTIONS:MSMP_CLIENT}
65	USES+= gl xorg	54	USES+= gl xorg
66	USE_GL= glu	55	USE_GL= glu
67	USE_XORG= xxf86dga xxf86vm	56	USE_XORG= xxf86dga xxf86vm
68	.endif	57	.endif
69		58
70	.if ${PORT_OPTIONS:MGAMELIBS} \|\| !defined(HAVE_VM_COMPILED)	59	.if ${PORT_OPTIONS:MGAMELIBS}
71	MAKE_ENV+= GAMELIBS=YES	60	MAKE_ENV+= GAMELIBS=YES
72	.endif	61	.endif
73		62
Lines 77-83 do-install: Link Here
77	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \	66	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \
78	${STAGEDIR}${PREFIX}/bin/${bin:C/(quake3\|q3)/\1cel/}	67	${STAGEDIR}${PREFIX}/bin/${bin:C/(quake3\|q3)/\1cel/}
79	.endfor	68	.endfor
80	.if ${PORT_OPTIONS:MGAMELIBS} \|\| !defined(HAVE_VM_COMPILED)	69	.if ${PORT_OPTIONS:MGAMELIBS}
81	.for dir in baseq3 missionpack	70	.for dir in baseq3 missionpack
82	@${MKDIR} ${STAGEDIR}${LIBDIR}/${dir}	71	@${MKDIR} ${STAGEDIR}${LIBDIR}/${dir}
83	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so \	72	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so \

Lines 1-4 Link Here

(-)b/games/q3cellshading/files/patch-code-unix-Makefile (-165 / +103 lines)
1	--- code/unix/Makefile.orig 2006-07-18 09:52:58 UTC	1	--- code/unix/Makefile.orig 2024-02-13 13:27:33 UTC
2	+++ code/unix/Makefile	2	+++ code/unix/Makefile
3	@@ -25,7 +25,7 @@ PLATFORM_RELEASE=$(shell uname -r)	3	@@ -25,7 +25,7 @@ PLATFORM_RELEASE=$(shell uname -r)
4	###	4	###
Lines 18-24 Link Here
18		18
19		19
20		20
21	@@ -46,8 +46,8 @@ BUILD_NAME=quake3.x86	21	@@ -46,8 +46,8 @@ BASEQ3_DIR=$(BDIR)/baseq3
22		22
23	BASEQ3_DIR=$(BDIR)/baseq3	23	BASEQ3_DIR=$(BDIR)/baseq3
24		24
Lines 29-35 Link Here
29	CDIR=$(MOUNT_DIR)/client	29	CDIR=$(MOUNT_DIR)/client
30	SDIR=$(MOUNT_DIR)/server	30	SDIR=$(MOUNT_DIR)/server
31	RDIR=$(MOUNT_DIR)/renderer	31	RDIR=$(MOUNT_DIR)/renderer
32	@@ -65,7 +65,7 @@ JPDIR=$(MOUNT_DIR)/jpeg-6	32	@@ -65,7 +65,7 @@ SPLNDIR=$(MOUNT_DIR)/splines
33	SPLNDIR=$(MOUNT_DIR)/splines	33	SPLNDIR=$(MOUNT_DIR)/splines
34		34
35	# extract version info	35	# extract version info
Lines 38-87 Link Here
38	RPM_RELEASE=1	38	RPM_RELEASE=1
39		39
40	# NOTE: used by dcp rcp targets, not referenced	40	# NOTE: used by dcp rcp targets, not referenced
41	@@ -76,7 +76,7 @@ RPM_RELEASE=1	41	@@ -76,7 +76,10 @@ RPM_RELEASE=1
42	#############################################################################	42	#############################################################################
43		43
44	## Defaults	44	## Defaults
45	-DLL_ONLY=false	45	-DLL_ONLY=false
46	+DLL_ONLY?=false	46	+ARCH=$(shell uname -m)
		47	+RPMARCH=$(ARCH)
		48	+VENDOR=unknown
		49	+DLL_ONLY=true
47	# bk010215 - TODO - add all defaults / kill Ryan	50	# bk010215 - TODO - add all defaults / kill Ryan
48		51
49		52
50	@@ -136,7 +136,7 @@ ifeq ($(PLATFORM),linux)	53	@@ -199,31 +202,34 @@ GLIBC= #libc is irrelevant
51	ifeq ($(ARCH),ppc)
52	NEWPGCC=/loki/global/ppc/bin/gcc
53	CC=$(NEWPGCC)
54	- 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
55	+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -ffast-math -falign-functions=2
56	else
57	#NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205
58	#NEWPGCC=/loki/global/x86/bin/gcc
59	@@ -146,7 +146,7 @@ ifeq ($(PLATFORM),linux)
60	# TTimo: legacy RELEASE_CFLAGS
61	# NOTE: the -fomit-frame-pointer option leads to an unstable binary on my test box if it was built on the main box
62	# but building on the Mdk 7.2 baseline seems to work
63	- 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
64	+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -ffast-math -falign-functions=2
65	# TTimo: use this for building on P3 gcc 2.95.3 libc2.2 for all targets (experimental! -fomit-fram-pointer removed)
66	# 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
67	endif
68	@@ -162,7 +162,7 @@ ifeq ($(PLATFORM),linux)
69	RANLIB=ranlib
70
71	THREAD_LDFLAGS=-lpthread
72	- LDFLAGS=-ldl -lm
73	+ LDFLAGS=-lm
74	GLLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
75		54
76	ifeq ($(ARCH),axp)
77	@@ -197,33 +197,28 @@ else # ifeq Linux
78
79	ifeq ($(PLATFORM),freebsd)
80
81	+ifeq ($(ARCH),powerpc)
82	+ARCH=ppc
83	+endif
84	+
85	GLIBC= #libc is irrelevant	55	GLIBC= #libc is irrelevant
86		56
87	-ifneq (,$(findstring alpha,$(shell uname -m)))	57	-ifneq (,$(findstring alpha,$(shell uname -m)))
Lines 93-116 Link Here
93	-RPMARCH=i386	63	-RPMARCH=i386
94	-VENDOR=unknown	64	-VENDOR=unknown
95	-endif #alpha test	65	-endif #alpha test
96	+BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"'	66	+ifeq ($(ARCH),alpha)
97	+GL_CFLAGS = -I$(LOCALBASE)/include	67	+ ARCH=axp
		68	+ RPMARCH=alpha
		69	+ VENDOR=dec
		70	+else ifeq ($(ARCH),powerpc)
		71	+ ARCH=ppc
		72	+ RPMARCH=ppc
		73	+ DLL_ONLY=false
		74	+else ifeq ($(ARCH),i386)
		75	+ DLL_ONLY=false
		76	+endif
98		77
99	+DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror	78	+BASE_CFLAGS = -fsigned-char $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"'
100	+RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG	79	+ifeq ($(DLL_ONLY),true)
		80	+ BASE_CFLAGS += -DDLL_ONLY
		81	+endif
101		82
102	-BASE_CFLAGS = -pipe	83	-BASE_CFLAGS = -pipe
103	+ifdef OPTIMIZED_CFLAGS	84	+GL_CFLAGS = -I$(LOCALBASE)/include
104	+ ifeq ($(ARCH),i386)
105	+RELEASE_CFLAGS+=-ffast-math -falign-functions=2
106	+ else
107	+RELEASE_CFLAGS+=-ffast-math
108	+ endif
109	+endif
110		85
111	-GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include	86	-GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include
112	-	87	-
113	-DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror	88	DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror
114	-ifeq ($(ARCH),axp)	89	-ifeq ($(ARCH),axp)
115	-CC=pgcc	90	-CC=pgcc
116	-RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations	91	-RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
Lines 120-131 Link Here
120	-NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc	95	-NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc
121	-CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi )	96	-CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi )
122	-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	97	-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
123	+ifeq ($(DLL_ONLY),true)	98	+RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG
124	+BASE_CFLAGS += -DDLL_ONLY	99	+
		100	+ifdef OPTIMIZED_CFLAGS
		101	+ ifeq ($(ARCH),i386)
		102	+RELEASE_CFLAGS+=-ffast-math -falign-functions=2
		103	+ else
		104	+RELEASE_CFLAGS+=-ffast-math
		105	+ endif
125	endif	106	endif
126		107
127	LIBEXT=a	108	LIBEXT=a
128	@@ -237,23 +232,31 @@ RANLIB=ranlib	109	@@ -237,25 +243,33 @@ THREAD_LDFLAGS=-lpthread
129		110
130	THREAD_LDFLAGS=-lpthread	111	THREAD_LDFLAGS=-lpthread
131	# don't need -ldl (FreeBSD)	112	# don't need -ldl (FreeBSD)
Lines 150-157 Link Here
150	- $(B)/missionpack/ui$(ARCH).$(SHLIBEXT)	131	- $(B)/missionpack/ui$(ARCH).$(SHLIBEXT)
151	+ifdef CLIENT	132	+ifdef CLIENT
152	+TARGETS+=$(B)/quake3	133	+TARGETS+=$(B)/quake3
153	+endif	134	endif
154	+	135
155	+ifdef DEDICATED	136	+ifdef DEDICATED
156	+TARGETS+=$(B)/q3ded	137	+TARGETS+=$(B)/q3ded
157	+endif	138	+endif
Lines 168-210 Link Here
168	+ $(B)/missionpack/cgame.$(SHLIBEXT) \	149	+ $(B)/missionpack/cgame.$(SHLIBEXT) \
169	+ $(B)/missionpack/qagame.$(SHLIBEXT) \	150	+ $(B)/missionpack/qagame.$(SHLIBEXT) \
170	+ $(B)/missionpack/ui.$(SHLIBEXT)	151	+ $(B)/missionpack/ui.$(SHLIBEXT)
171	endif	152	+endif
172		153	+
173	else # ifeq freebsd	154	else # ifeq freebsd
174	@@ -283,7 +286,7 @@ SHLIBLDFLAGS=-shared
175	ARFLAGS=ar rv
176	RANLIB=ranlib
177
178	-LDFLAGS=-ldl -lm
179	+LDFLAGS=-lm
180	GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm
181
182	TARGETS=$(B)/sgiquake3 \
183	@@ -310,9 +313,9 @@ ARFLAGS=ar rv
184	RANLIB=ranlib
185		155
186	ifeq ($(PLATFORM),freebsd)	156	#############################################################################
187	-LDFLAGS=-lm	157	@@ -515,20 +529,6 @@ Q3OBJ = \
188	+LDFLAGS+=-lm	158	$(B)/client/unix_main.o \
189	else
190	-LDFLAGS=-ldl -lm
191	+LDFLAGS=-lm
192	endif # ifeq freebsd
193
194	TARGETS=\
195	@@ -348,7 +351,7 @@ build_release:
196	$(MAKE) targets B=$(BR) CFLAGS="$(RELEASE_CFLAGS)"
197
198	#Build both debug and release builds
199	-all:build_debug build_release
200	+all:build_release
201
202	targets:makedirs $(TARGETS)
203
204	@@ -516,20 +519,6 @@ Q3OBJ = \
205	$(B)/client/unix_net.o \	159	$(B)/client/unix_net.o \
206	$(B)/client/unix_shared.o \	160	$(B)/client/unix_shared.o \
207	\	161	- \
208	- $(B)/client/ahoptim.o \	162	- $(B)/client/ahoptim.o \
209	- $(B)/client/autohint.o \	163	- $(B)/client/autohint.o \
210	- $(B)/client/ftbase.o \	164	- $(B)/client/ftbase.o \
Lines 218-228 Link Here
218	- $(B)/client/sfobjs.o \	172	- $(B)/client/sfobjs.o \
219	- $(B)/client/smooth.o \	173	- $(B)/client/smooth.o \
220	- $(B)/client/truetype.o	174	- $(B)/client/truetype.o
221	-# \	175	# \
222	# $(B)/client/q_parse.o \	176	# $(B)/client/q_parse.o \
223	# $(B)/client/math_quaternion.o \	177	# $(B)/client/math_quaternion.o \
224	# $(B)/client/util_str.o \	178	@@ -541,12 +541,14 @@ Q3OBJ = \
225	@@ -541,10 +530,12 @@ Q3OBJ = \
226	# $(B)/client/q_shared.o \	179	# $(B)/client/q_shared.o \
227		180
228	ifeq ($(ARCH),i386)	181	ifeq ($(ARCH),i386)
Lines 232-243 Link Here
232	+ endif	185	+ endif
233	endif	186	endif
234		187
235	- ifeq ($(ARCH),ppc)	188	ifeq ($(ARCH),ppc)
236	+ ifeq ($(ARCH),powerpc)
237	ifeq ($(DLL_ONLY),false)	189	ifeq ($(DLL_ONLY),false)
238	Q3OBJ += $(B)/client/vm_ppc.o	190	- Q3OBJ += $(B)/client/vm_ppc.o
		191	+ Q3OBJ += $(B)/client/vm_ppc_new.o
239	endif	192	endif
240	@@ -559,10 +550,24 @@ ifeq ($(PLATFORM),freebsd)	193	endif
		194
		195	@@ -559,10 +561,24 @@ ifeq ($(PLATFORM),freebsd)
241	$(B)/client/linux_qgl.o \	196	$(B)/client/linux_qgl.o \
242	$(B)/client/linux_glimp.o \	197	$(B)/client/linux_glimp.o \
243	$(B)/client/linux_snd.o \	198	$(B)/client/linux_snd.o \
Lines 265-287 Link Here
265	else	220	else
266	ifeq ($(PLATFORM),irix)	221	ifeq ($(PLATFORM),irix)
267	Q3POBJ=\	222	Q3POBJ=\
268	@@ -578,7 +583,6 @@ else	223	@@ -602,12 +618,12 @@ endif #IRIX
269	$(B)/client/linux_common.o \
270	$(B)/client/linux_qgl.o \
271	$(B)/client/linux_glimp.o \
272	- $(B)/client/linux_joystick.o \
273	$(B)/client/linux_snd.o \
274	$(B)/client/snd_mixa.o \
275	$(B)/client/matha.o \
276	@@ -587,7 +591,6 @@ else
277	$(B)/client/linux_common.o \
278	$(B)/client/linux_qgl.o \
279	$(B)/client/linux_glimp_smp.o \
280	- $(B)/client/linux_joystick.o \
281	$(B)/client/linux_snd.o \
282	$(B)/client/snd_mixa.o \
283	$(B)/client/matha.o
284	@@ -602,12 +605,12 @@ endif #Linux
285	endif #FreeBSD	224	endif #FreeBSD
286	endif #IRIX	225	endif #IRIX
287		226
Lines 296-306 Link Here
296	$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \	235	$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \
297	$(THREAD_LDFLAGS) $(LDFLAGS)	236	$(THREAD_LDFLAGS) $(LDFLAGS)
298		237
299	@@ -754,10 +757,10 @@ $(B)/client/irix_input.o : $(UDIR)/irix_input.c; $(DO_	238	@@ -758,6 +774,7 @@ $(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC
300	$(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC)
301	$(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS)
302	$(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC) $(GL_CFLAGS)
303	-$(B)/client/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC)
304	$(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) $(GL_CFLAGS)	239	$(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) $(GL_CFLAGS)
305	$(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC)	240	$(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC)
306	$(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC)	241	$(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC)
Lines 308-323 Link Here
308	$(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS)	243	$(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS)
309	$(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS)	244	$(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS)
310		245
311	@@ -767,7 +770,7 @@ $(B)/client/snapvector.o : $(UDIR)/snapvector.nasm; $(	246	@@ -769,7 +786,7 @@ ifeq ($(DLL_ONLY),false)
312	$(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC)
313	endif
314		247
315	-ifeq ($(ARCH),ppc)	248	ifeq ($(ARCH),ppc)
316	+ifeq ($(ARCH),powerpc)
317	ifeq ($(DLL_ONLY),false)	249	ifeq ($(DLL_ONLY),false)
318	$(B)/client/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC)	250	-$(B)/client/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC)
		251	+$(B)/client/vm_ppc_new.o : $(CMDIR)/vm_ppc_new.c; $(DO_CC)
		252	endif
319	endif	253	endif
320	@@ -912,22 +915,26 @@ Q3DOBJ = \	254
		255	@@ -912,22 +929,26 @@ Q3DOBJ = \
321	$(B)/ded/unix_main.o \	256	$(B)/ded/unix_main.o \
322	$(B)/ded/unix_net.o \	257	$(B)/ded/unix_net.o \
323	$(B)/ded/unix_shared.o \	258	$(B)/ded/unix_shared.o \
Lines 335-344 Link Here
335	+ endif	270	+ endif
336	endif	271	endif
337		272
338	-ifeq ($(ARCH),ppc)	273	ifeq ($(ARCH),ppc)
339	+ifeq ($(ARCH),powerpc)
340	ifeq ($(DLL_ONLY),false)	274	ifeq ($(DLL_ONLY),false)
341	Q3DOBJ += $(B)/ded/vm_ppc.o	275	- Q3DOBJ += $(B)/ded/vm_ppc.o
		276	+ Q3DOBJ += $(B)/ded/vm_ppc_new.o
342	endif	277	endif
343	endif	278	endif
344		279
Lines 347-353 Link Here
347	$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)	282	$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
348		283
349	$(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC)	284	$(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC)
350	@@ -988,6 +995,7 @@ $(B)/ded/linux_common.o : $(UDIR)/linux_common.c; $(DO	285	@@ -988,6 +1009,7 @@ $(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_D
351	$(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC)	286	$(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC)
352	$(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC)	287	$(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC)
353	$(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC)	288	$(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC)
Lines 355-370 Link Here
355	$(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC)	290	$(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC)
356	$(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC)	291	$(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC)
357	$(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC)	292	$(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC)
358	@@ -1001,7 +1009,7 @@ $(B)/ded/ftol.o : $(UDIR)/ftol.nasm; $(DO_NASM)	293	@@ -1003,7 +1025,7 @@ ifeq ($(DLL_ONLY),false)
359	$(B)/ded/snapvector.o : $(UDIR)/snapvector.nasm; $(DO_NASM)
360	endif
361		294
362	-ifeq ($(ARCH),ppc)	295	ifeq ($(ARCH),ppc)
363	+ifeq ($(ARCH),powerpc)
364	ifeq ($(DLL_ONLY),false)	296	ifeq ($(DLL_ONLY),false)
365	$(B)/ded/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_DED_CC)	297	-$(B)/ded/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_DED_CC)
		298	+$(B)/ded/vm_ppc_new.o : $(CMDIR)/vm_ppc_new.c; $(DO_DED_CC)
		299	endif
366	endif	300	endif
367	@@ -1068,7 +1076,7 @@ Q3CGOBJ = \	301
		302	@@ -1068,7 +1090,7 @@ Q3CGOBJ = \
368	$(B)/baseq3/cgame/q_math.o \	303	$(B)/baseq3/cgame/q_math.o \
369	$(B)/baseq3/cgame/q_shared.o	304	$(B)/baseq3/cgame/q_shared.o
370		305
Lines 373-379 Link Here
373	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)	308	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
374		309
375	$(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)	310	$(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)
376	@@ -1128,7 +1136,7 @@ MPCGOBJ = \	311	@@ -1128,7 +1150,7 @@ MPCGOBJ = \
377	$(B)/missionpack/cgame/q_shared.o \	312	$(B)/missionpack/cgame/q_shared.o \
378	$(B)/missionpack/cgame/ui_shared.o	313	$(B)/missionpack/cgame/ui_shared.o
379		314
Lines 382-388 Link Here
382	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)	317	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
383		318
384	$(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -DMISSIONPACK	319	$(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -DMISSIONPACK
385	@@ -1200,7 +1208,7 @@ Q3GOBJ = \	320	@@ -1200,7 +1222,7 @@ Q3GOBJ = \
386	$(B)/baseq3/game/q_math.o \	321	$(B)/baseq3/game/q_math.o \
387	$(B)/baseq3/game/q_shared.o	322	$(B)/baseq3/game/q_shared.o
388		323
Lines 391-397 Link Here
391	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)	326	$(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
392		327
393	$(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC)	328	$(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC)
394	@@ -1278,7 +1286,7 @@ MPGOBJ = \	329	@@ -1278,7 +1300,7 @@ MPGOBJ = \
395	$(B)/missionpack/game/q_math.o \	330	$(B)/missionpack/game/q_math.o \
396	$(B)/missionpack/game/q_shared.o	331	$(B)/missionpack/game/q_shared.o
397		332
Lines 400-406 Link Here
400	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)	335	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
401		336
402	$(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -DMISSIONPACK	337	$(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -DMISSIONPACK
403	@@ -1367,7 +1375,7 @@ Q3UIOBJ = \	338	@@ -1367,7 +1389,7 @@ Q3UIOBJ = \
404	$(B)/baseq3/ui/q_math.o \	339	$(B)/baseq3/ui/q_math.o \
405	$(B)/baseq3/ui/q_shared.o	340	$(B)/baseq3/ui/q_shared.o
406		341
Lines 409-415 Link Here
409	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)	344	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
410		345
411	$(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)	346	$(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)
412	@@ -1410,7 +1418,7 @@ $(B)/baseq3/ui/ui_spskill.o : $(Q3UIDIR)/ui_spskill.c;	347	@@ -1410,7 +1432,7 @@ $(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamord
413	$(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC)	348	$(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC)
414	$(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC)	349	$(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC)
415	$(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC)	350	$(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC)
Lines 418-424 Link Here
418	$(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC)	353	$(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC)
419		354
420	# bk001205 - these wre the only SHLIB compiles in 1.17	355	# bk001205 - these wre the only SHLIB compiles in 1.17
421	@@ -1450,7 +1458,7 @@ MPUIOBJ = \	356	@@ -1450,7 +1472,7 @@ MPUIOBJ = \
422	# $(B)/missionpack/ui/q_math.o \	357	# $(B)/missionpack/ui/q_math.o \
423	# $(B)/missionpack/ui/q_shared.o	358	# $(B)/missionpack/ui/q_shared.o
424		359
Lines 427-433 Link Here
427	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)	362	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
428		363
429	$(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) -DMISSIONPACK	364	$(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) -DMISSIONPACK
430	@@ -1613,23 +1621,8 @@ Q3SOBJ = \	365	@@ -1613,34 +1635,21 @@ Q3SOBJ = \
431	$(B)/q3static/unix_net.o \	366	$(B)/q3static/unix_net.o \
432	$(B)/q3static/unix_shared.o \	367	$(B)/q3static/unix_shared.o \
433	\	368	\
Lines 451-465 Link Here
451	$(B)/q3static/linux_snd.o \	386	$(B)/q3static/linux_snd.o \
452	$(B)/q3static/snd_mixa.o \	387	$(B)/q3static/snd_mixa.o \
453	$(B)/q3static/matha.o	388	$(B)/q3static/matha.o
454	@@ -1779,7 +1772,6 @@ $(B)/q3static/unix_main.o : $(UDIR)/unix_main.c; $(DO_	389
455	$(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC	390	ifeq ($(ARCH),i386)
456	$(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC	391	- Q3SOBJ += $(B)/q3static/vm_x86.o
457	$(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC	392	+ ifeq ($(DLL_ONLY),false)
458	-$(B)/q3static/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) -DQ3_STATIC	393	+ Q3SOBJ += $(B)/q3static/vm_x86.o
459	$(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC	394	+ endif
460	$(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC	395	endif
461	$(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC	396
462	@@ -2020,7 +2012,7 @@ $(B)/q3static/bg_slidemove.o : $(GDIR)/bg_slidemove.c;	397	ifeq ($(ARCH),ppc)
		398	ifeq ($(DLL_ONLY),false)
		399	- Q3SOBJ += $(B)/q3static/vm_ppc.o
		400	+ Q3SOBJ += $(B)/q3static/vm_ppc_new.o
		401	endif
		402	endif
		403
		404	@@ -1795,7 +1804,7 @@ ifeq ($(DLL_ONLY),false)
		405
		406	ifeq ($(ARCH),ppc)
		407	ifeq ($(DLL_ONLY),false)
		408	-$(B)/q3static/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC) -DQ3_STATIC
		409	+$(B)/q3static/vm_ppc_new.o : $(CMDIR)/vm_ppc_new.c; $(DO_CC) -DQ3_STATIC
		410	endif
		411	endif
		412
		413	@@ -2020,7 +2029,7 @@ $(B)/q3static/bg_slidemove.o : $(GDIR)/bg_slidemove.c;
463		414
464		415
465		416
Lines 468-483 Link Here
468	$(CC) $(CFLAGS) -o $@ $(Q3SOBJ) $(GLLDFLAGS) $(LDFLAGS)	419	$(CC) $(CFLAGS) -o $@ $(Q3SOBJ) $(GLLDFLAGS) $(LDFLAGS)
469		420
470		421
471	@@ -2059,9 +2051,9 @@ rpm: $(BUILD_NAME).spec
472
473	copyfiles:
474	-mkdirhier $(COPYDIR)
475	- cp $(BR)/linuxquake3 $(COPYDIR)/quake3.x86
476	- strip $(COPYDIR)/quake3.x86
477	- chmod 755 $(COPYDIR)/quake3.x86
478	+ cp $(BR)/linuxquake3 $(COPYDIR)/quake3
479	+ strip $(COPYDIR)/quake3
480	+ chmod 755 $(COPYDIR)/quake3
481	cp $(BR)/linuxq3ded $(COPYDIR)/q3ded
482	strip $(COPYDIR)/q3ded
483	chmod 755 $(COPYDIR)/q3ded

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 ;; #(