Framework: partially sync with upstream

Taken from: FreeBSD

MOVED

@@ -17135,3 +17135,4 @@ games/cultivation||2022-04-18|Has expired: Abandonware with last release in 2010
 devel/ros-rosinstall||2022-04-20|Has expired: Upstream has archived the project and is no longer being used in the ROS project
 devel/py-aiorpcX-legacy|devel/py-aiorpcX|2022-04-20|Has expired: Legacy port is no longer required, please use devel/py-aiorpcX instead
 net/kalarmcal|deskutils/kalarm|2022-04-21|Packages were merged
+math/py-gmpy2-devel|math/py-gmpy2|2022-04-22|No more need for the -devel port, py-gmpy2 is at latest

Mk/Uses/7z.mk

@@ -17,29 +17,29 @@ _INCLUDE_USES_7Z_MK=	yes
 7-ZIP_AFTER_ARGS?=	# empty
 7-ZIP_WRKDIR?=		${EXTRACT_WRKDIR}
 
-.if !empty(7z_ARGS:N7-zip:Npartial)
+.  if !empty(7z_ARGS:N7-zip:Npartial)
 IGNORE=			USES=7z has invalid arguments: ${7z_ARGS:N7-zip:Npartial}
-.endif
+.  endif
 
-.if ${7z_ARGS:M7-zip}
+.  if ${7z_ARGS:M7-zip}
 EXTRACT_DEPENDS+=	${7-ZIP_CMD}:archivers/7-zip
-.endif
+.  endif
 
-.if ! ${7z_ARGS:Mpartial}
+.  if ! ${7z_ARGS:Mpartial}
 EXTRACT_SUFX?=		.7z
-.endif
+.  endif
 
-.if ${7z_ARGS:M7-zip} && ! ${7z_ARGS:Mpartial}
+.  if ${7z_ARGS:M7-zip} && ! ${7z_ARGS:Mpartial}
 EXTRACT_CMD?=		${7-ZIP_CMD}
 EXTRACT_BEFORE_ARGS?=	${7-ZIP_BEFORE_ARGS}
 EXTRACT_AFTER_ARGS?=	${7-ZIP_AFTER_ARGS}
-.endif
+.  endif
 
-.if ! ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial} && defined(EXTRACT_ONLY)
+.  if ! ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial} && defined(EXTRACT_ONLY)
 EXTRACT_ONLY+=		${EXTRACT_ONLY_7z}
-.endif
+.  endif
 
-.if ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial}
+.  if ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial}
 EXTRACT_ONLY?=		${DISTFILES:N*\:*7z*:C/:.*//}
 EXTRACT_ONLY_7z?=	${DISTFILES:M*\:*7z*:C/:.*//}
 
@@ -52,6 +52,6 @@ do-7-zip-extract:
 			exit 1; \
 		fi; \
 	done
-.endif
+.  endif
 
 .endif

Mk/Uses/ada.mk

@@ -15,9 +15,9 @@ EXPIRATION_DATE=2022-06-30
 
 CC=	ada
 
-. if ${ada_ARGS:Mrun}
+.  if ${ada_ARGS:Mrun}
 RUN_DEPENDS+=	${LOCALBASE}/gcc6-aux/bin/ada:lang/gcc6-aux
-. endif
+.  endif
 
 BUILD_DEPENDS+=	${LOCALBASE}/gcc6-aux/bin/ada:lang/gcc6-aux
 MAKE_ENV+=	PATH=${LOCALBASE}/gcc6-aux/bin:${PATH} \

Mk/Uses/alias.mk

@@ -11,18 +11,18 @@
 .if !defined(_INCLUDE_USES_ALIAS_MK)
 _INCLUDE_USES_ALIAS_MK=    yes
 
-.if ${OPSYS} != FreeBSD
+.  if ${OPSYS} != FreeBSD
 
-.if empty(alias_ARGS)
+.    if empty(alias_ARGS)
 CFLAGS+=	-D__FreeBSD__=9
-.else
-.  if ${alias_ARGS} == 9 || ${alias_ARGS} == 10 || ${alias_ARGS} == 11
+.    else
+.      if ${alias_ARGS} == 9 || ${alias_ARGS} == 10 || ${alias_ARGS} == 11
 CFLAGS+=	-D__FreeBSD__=${alias_ARGS}
-.  else
+.      else
 IGNORE=	invalid MAJOR RELEASE argument (${alias_ARGS}) for USES=alias
-.  endif
-.endif
+.      endif
+.    endif
 
-.endif # OPSYS != FreeBSD
+.  endif # OPSYS != FreeBSD
 
 .endif

Mk/Uses/angr.mk

@@ -25,33 +25,33 @@ _INCLUDE_USES_ANGR_MK=	yes
 
 # Arguments validation.
 _valid_ARGS=    binaries nose
-.for _arg in ${angr_ARGS}
-.  if !${_valid_ARGS:M${_arg}}
+.  for _arg in ${angr_ARGS}
+.    if !${_valid_ARGS:M${_arg}}
 IGNORE=	USES=angr: invalid argument: ${_arg}
-.  endif
-.endfor
+.    endif
+.  endfor
 
 # Set the default angr version for all angr-related ports.
 ANGR_VERSION?=		9.0.5405
 ANGR_BINARIES_TAGNAME?=	v${ANGR_VERSION}
 
-.if "${angr_ARGS:Mbinaries}" != ""
+.  if "${angr_ARGS:Mbinaries}" != ""
 USE_GITHUB?=	yes
 GH_TUPLE+=	angr:binaries:${ANGR_BINARIES_TAGNAME}:binaries
 
 # Provide the binaries directory where it is expected by the test scripts.
 pre-test: angr-provide-test-binaries
 angr-provide-test-binaries:
 	@${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries
-.endif # "${angr_ARGS:Mbinaries}" != ""
+.  endif # "${angr_ARGS:Mbinaries}" != ""
 
-.if "${angr_ARGS:Mnose}" != ""
+.  if "${angr_ARGS:Mnose}" != ""
 # Ensure that python.mk variables are available.
-.  if !${USES:Mpython*}
+.    if !${USES:Mpython*}
 python_ARGS=	test
 _USES_POST+=		python:test
 .include "${USESDIR}/python.mk"
-.  endif # !${USES:Mpython*}
+.    endif # !${USES:Mpython*}
 
 TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 TEST_WRKSRC?=	${WRKSRC}/tests
@@ -60,6 +60,6 @@ ANGR_NOSETESTS?=	nosetests-${PYTHON_VER}
 
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${ANGR_NOSETESTS})
-.endif # "${angr_ARGS:Mnose}" != ""
+.  endif # "${angr_ARGS:Mnose}" != ""
 
 .endif

Mk/Uses/ansible.mk

@@ -40,23 +40,23 @@
 _INCLUDE_USES_ANSIBLE_MK=	yes
 
 _valid_ARGS=    env module plugin
-.for _arg in ${ansible_ARGS}
-.  if !${_valid_ARGS:M${_arg}}
+.  for _arg in ${ansible_ARGS}
+.    if !${_valid_ARGS:M${_arg}}
 IGNORE=	USES=ansible: invalid argument: ${_arg}
-.  endif
-.endfor
-.if ${ansible_ARGS:[#]} != 1
+.    endif
+.  endfor
+.  if ${ansible_ARGS:[#]} != 1
 IGNORE=	USES=ansible: too many arguments: ${ansible_ARGS}
-.endif
-.if empty(ansible_ARGS)
+.  endif
+.  if empty(ansible_ARGS)
 IGNORE=	USES=ansible: no arguments specified
-.endif
+.  endif
 
-.if !${USES:Mpython*}
+.  if !${USES:Mpython*}
 python_ARGS=	env
 _USES_POST+=		python:env
 .include "${USESDIR}/python.mk"
-.endif
+.  endif
 
 ANSIBLE_CMD?=		${LOCALBASE}/bin/ansible
 ANSIBLE_DOC_CMD?=	${LOCALBASE}/bin/ansible-doc
@@ -65,16 +65,16 @@ ANSIBLE_RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}ansible>0:sysutils/ansible@${PY_FLA
 ANSIBLE_DATADIR?=		${PREFIX}/share/${PYTHON_PKGNAMEPREFIX}ansible
 ANSIBLE_ETCDIR?=		${PREFIX}/etc/ansible
 ANSIBLE_PLUGINS_PREFIX?=	${ANSIBLE_DATADIR}/plugins
-.if ${ansible_ARGS} == "module"
+.  if ${ansible_ARGS} == "module"
 ANSIBLE_MODULESDIR?=		${ANSIBLE_PLUGINS_PREFIX}/modules
-.elif ${ansible_ARGS} == "plugin"
-.  if empty(ANSIBLE_PLUGIN_TYPE)
+.  elif ${ansible_ARGS} == "plugin"
+.    if empty(ANSIBLE_PLUGIN_TYPE)
 IGNORE=	ANSIBLE_PLUGIN_TYPE must be set
-.  endif
+.    endif
 ANSIBLE_PLUGINSDIR?=		${ANSIBLE_PLUGINS_PREFIX}/${ANSIBLE_PLUGIN_TYPE}
-.endif
+.  endif
 
-.if ${ansible_ARGS} == "module" || ${ansible_ARGS} == "plugin"
+.  if ${ansible_ARGS} == "module" || ${ansible_ARGS} == "plugin"
 RUN_DEPENDS+=	${ANSIBLE_RUN_DEPENDS}
-.endif
+.  endif
 .endif