git: aa2539679084 - main - framework: cleanup conditional-indentations in Mk/
Date: Sun, 24 Apr 2022 10:07:00 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aa2539679084872cd84112e9df6bfee571570623
commit aa2539679084872cd84112e9df6bfee571570623
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-04-24 10:00:20 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-04-24 10:00:20 +0000
framework: cleanup conditional-indentations in Mk/
Run Tools/scripts/indent_make_if.pl on all of Mk.
These white space changes contribute greatly to the readability of those files.
As we have a version control system, finding out the reasons for the changes
prior to these white space changes is still easily possible
Differential Revision: https://reviews.freebsd.org/D35024
Reviewed by: portmgr (rene, bapt)
---
Mk/Uses/7z.mk | 24 +-
Mk/Uses/ada.mk | 4 +-
Mk/Uses/alias.mk | 16 +-
Mk/Uses/angr.mk | 20 +-
Mk/Uses/ansible.mk | 34 +-
Mk/Uses/apache.mk | 288 ++---
Mk/Uses/autoreconf.mk | 18 +-
Mk/Uses/bdb.mk | 134 +--
Mk/Uses/bison.mk | 18 +-
Mk/Uses/blaslapack.mk | 16 +-
Mk/Uses/cabal.mk | 4 +-
Mk/Uses/cargo.mk | 154 +--
Mk/Uses/charsetfix.mk | 4 +-
Mk/Uses/cmake.mk | 64 +-
Mk/Uses/compiler.mk | 142 +--
Mk/Uses/corosync.mk | 14 +-
Mk/Uses/cran.mk | 26 +-
Mk/Uses/desktop-file-utils.mk | 4 +-
Mk/Uses/desthack.mk | 4 +-
Mk/Uses/display.mk | 8 +-
Mk/Uses/dos2unix.mk | 26 +-
Mk/Uses/drupal.mk | 54 +-
Mk/Uses/elixir.mk | 56 +-
Mk/Uses/emacs.mk | 68 +-
Mk/Uses/erlang.mk | 54 +-
Mk/Uses/fakeroot.mk | 4 +-
Mk/Uses/fam.mk | 38 +-
Mk/Uses/firebird.mk | 22 +-
Mk/Uses/fonts.mk | 24 +-
Mk/Uses/fortran.mk | 18 +-
Mk/Uses/fpc.mk | 56 +-
Mk/Uses/fuse.mk | 12 +-
Mk/Uses/gem.mk | 40 +-
Mk/Uses/gettext-runtime.mk | 16 +-
Mk/Uses/gettext-tools.mk | 12 +-
Mk/Uses/gettext.mk | 4 +-
Mk/Uses/ghostscript.mk | 60 +-
Mk/Uses/gl.mk | 24 +-
Mk/Uses/gmake.mk | 4 +-
Mk/Uses/gnome.mk | 104 +-
Mk/Uses/gnustep.mk | 40 +-
Mk/Uses/go.mk | 82 +-
Mk/Uses/gperf.mk | 16 +-
Mk/Uses/gssapi.mk | 56 +-
Mk/Uses/horde.mk | 28 +-
Mk/Uses/iconv.mk | 18 +-
Mk/Uses/imake.mk | 26 +-
Mk/Uses/jpeg.mk | 16 +-
Mk/Uses/kde.mk | 4 +-
Mk/Uses/kmod.mk | 24 +-
Mk/Uses/kodi.mk | 8 +-
Mk/Uses/lazarus.mk | 60 +-
Mk/Uses/lha.mk | 4 +-
Mk/Uses/libtool.mk | 10 +-
Mk/Uses/linux.mk | 128 +-
Mk/Uses/localbase.mk | 6 +-
Mk/Uses/lua.mk | 122 +-
Mk/Uses/lxqt.mk | 42 +-
Mk/Uses/magick.mk | 8 +-
Mk/Uses/makeinfo.mk | 4 +-
Mk/Uses/makeself.mk | 4 +-
Mk/Uses/mate.mk | 74 +-
Mk/Uses/meson.mk | 10 +-
Mk/Uses/mono.mk | 58 +-
Mk/Uses/motif.mk | 14 +-
Mk/Uses/mpi.mk | 30 +-
Mk/Uses/mysql.mk | 134 +--
Mk/Uses/ncurses.mk | 36 +-
Mk/Uses/ninja.mk | 40 +-
Mk/Uses/nodejs.mk | 42 +-
Mk/Uses/objc.mk | 48 +-
Mk/Uses/openal.mk | 12 +-
Mk/Uses/pathfix.mk | 24 +-
Mk/Uses/perl5.mk | 12 +-
Mk/Uses/pgsql.mk | 26 +-
Mk/Uses/php.mk | 36 +-
Mk/Uses/pkgconfig.mk | 14 +-
Mk/Uses/pyqt.mk | 12 +-
Mk/Uses/python.mk | 284 ++---
Mk/Uses/qmail.mk | 40 +-
Mk/Uses/qt.mk | 4 +-
Mk/Uses/readline.mk | 4 +-
Mk/Uses/samba.mk | 26 +-
Mk/Uses/sdl.mk | 30 +-
Mk/Uses/shared-mime-info.mk | 4 +-
Mk/Uses/shebangfix.mk | 46 +-
Mk/Uses/sqlite.mk | 12 +-
Mk/Uses/ssl.mk | 66 +-
Mk/Uses/tar.mk | 24 +-
Mk/Uses/tcl.mk | 92 +-
Mk/Uses/terminfo.mk | 4 +-
Mk/Uses/trigger.mk | 12 +-
Mk/Uses/uidfix.mk | 8 +-
Mk/Uses/uniquefiles.mk | 42 +-
Mk/Uses/varnish.mk | 10 +-
Mk/Uses/waf.mk | 8 +-
Mk/Uses/webplugin.mk | 50 +-
Mk/Uses/xfce.mk | 36 +-
Mk/Uses/zip.mk | 8 +-
Mk/bsd.ccache.mk | 36 +-
Mk/bsd.default-versions.mk | 76 +-
Mk/bsd.destdir.mk | 38 +-
Mk/bsd.gcc.mk | 62 +-
Mk/bsd.gecko.mk | 190 +--
Mk/bsd.gstreamer.mk | 46 +-
Mk/bsd.java.mk | 172 +--
Mk/bsd.ldap.mk | 56 +-
Mk/bsd.licenses.db.mk | 4 +-
Mk/bsd.licenses.mk | 596 +++++-----
Mk/bsd.ocaml.mk | 72 +-
Mk/bsd.options.mk | 412 +++----
Mk/bsd.port.mk | 2642 ++++++++++++++++++++---------------------
Mk/bsd.port.subdir.mk | 136 +--
Mk/bsd.ruby.mk | 90 +-
Mk/bsd.sanity.mk | 62 +-
Mk/bsd.sites.mk | 252 ++--
Mk/bsd.tex.mk | 54 +-
Mk/bsd.wx.mk | 252 ++--
118 files changed, 4539 insertions(+), 4539 deletions(-)
diff --git a/Mk/Uses/7z.mk b/Mk/Uses/7z.mk
index fb029b3317d7..f2a7d81639e4 100644
--- a/Mk/Uses/7z.mk
+++ b/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
diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
index a0ec072e0205..e695e3c64a2f 100644
--- a/Mk/Uses/ada.mk
+++ b/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} \
diff --git a/Mk/Uses/alias.mk b/Mk/Uses/alias.mk
index 524d1d9f9214..5eee3a957158 100644
--- a/Mk/Uses/alias.mk
+++ b/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
diff --git a/Mk/Uses/angr.mk b/Mk/Uses/angr.mk
index 7d2489854e6c..a1e41b042dae 100644
--- a/Mk/Uses/angr.mk
+++ b/Mk/Uses/angr.mk
@@ -25,17 +25,17 @@ _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
@@ -43,15 +43,15 @@ GH_TUPLE+= angr:binaries:${ANGR_BINARIES_TAGNAME}:binaries
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
diff --git a/Mk/Uses/ansible.mk b/Mk/Uses/ansible.mk
index d46be3f98eed..6e0e2e9ba501 100644
--- a/Mk/Uses/ansible.mk
+++ b/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
diff --git a/Mk/Uses/apache.mk b/Mk/Uses/apache.mk
index 244001c4d5ed..c711648af941 100644
--- a/Mk/Uses/apache.mk
+++ b/Mk/Uses/apache.mk
@@ -85,78 +85,78 @@ _ERROR_MSG= : Error from apache.mk.
# Important Note:
# The "+" sign is only valid as last sign, not between
# two versions or in combination with range!
-.if defined(apache_ARGS) && !empty(apache_ARGS)
+. if defined(apache_ARGS) && !empty(apache_ARGS)
# Preserve original arguments list
_APACHE_ARGS= ${apache_ARGS}
-. if ${_APACHE_ARGS:Mserver} || ${_APACHE_ARGS:Mcommon}
+. if ${_APACHE_ARGS:Mserver} || ${_APACHE_ARGS:Mcommon}
_APACHE_PORT_IS_SERVER= yes
_APACHE_ARGS:= ${_APACHE_ARGS:Nserver}
-. endif
-. if ${_APACHE_ARGS:Mbuild}
+. endif
+. if ${_APACHE_ARGS:Mbuild}
_APACHE_BUILD_DEP= yes
_APACHE_ARGS:= ${_APACHE_ARGS:Nbuild}
-. endif
-. if ${_APACHE_ARGS:Mrun}
+. endif
+. if ${_APACHE_ARGS:Mrun}
_APACHE_RUN_DEP= yes
_APACHE_ARGS:= ${_APACHE_ARGS:Nrun}
-. endif
-. if empty(_APACHE_ARGS)
+. endif
+. if empty(_APACHE_ARGS)
_APACHE_ARGS= ${APACHE_DEFAULT}
-. endif
+. endif
# _APACHE_ARGS must now contain a version(-range)
-. if !empty(_APACHE_ARGS:C/^2\.[0-9]//:S/^-//:C/^2\.[0-9]//:C/\+$//)
+. if !empty(_APACHE_ARGS:C/^2\.[0-9]//:S/^-//:C/^2\.[0-9]//:C/\+$//)
IGNORE= ${_ERROR_MSG} Illegal use of USES= ${USES:Mapache*}
# Catch USES= apache:[min]-[max]+
-. elif ${apache_ARGS:C/[.a-z0-9]//g} == "-+"
+. elif ${apache_ARGS:C/[.a-z0-9]//g} == "-+"
IGNORE= ${_ERROR_MSG} Illegal use of USES= ${USES:Mapache*}
-. endif
-.endif # defined(apache_ARGS)
+. endif
+. endif # defined(apache_ARGS)
# The port does not specify a build, run or server dependency, assume both
# build and run are required.
-.if !defined(_APACHE_BUILD_DEP) && !defined(_APACHE_RUN_DEP) && \
+. if !defined(_APACHE_BUILD_DEP) && !defined(_APACHE_RUN_DEP) && \
!defined(_APACHE_PORT_IS_SERVER)
_APACHE_BUILD_DEP= yes
_APACHE_RUN_DEP= yes
-.endif
+. endif
-.if defined(DEFAULT_APACHE_VER)
+. if defined(DEFAULT_APACHE_VER)
IGNORE+= "DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS+=apache=${DEFAULT_APACHE_VER} instead"
-.endif
+. endif
-.if defined(WITH_MODULES) || defined(WITHOUT_MODULES)
+. if defined(WITH_MODULES) || defined(WITHOUT_MODULES)
IGNORE= ${_ERROR_MSG} WITH(OUT)_MODULES has been removed, use www_${PORTNAME}_(UN)SET
-.endif
+. endif
# ===============================================================
-.if defined(_APACHE_PORT_IS_SERVER)
+. if defined(_APACHE_PORT_IS_SERVER)
# Module selection
-.for category in ${DEFAULT_MODULES_CATEGORIES}
+. for category in ${DEFAULT_MODULES_CATEGORIES}
DEFAULT_MODULES+= ${${category}_MODULES}
-.endfor
+. endfor
-.for category in ${ALL_MODULES_CATEGORIES}
+. for category in ${ALL_MODULES_CATEGORIES}
AVAILABLE_MODULES+= ${${category}_MODULES}
-.endfor
+. endfor
# OPTIONS handling
-.for module in ${AVAILABLE_MODULES}
-. if ${PORT_OPTIONS:M${module}}
+. for module in ${AVAILABLE_MODULES}
+. if ${PORT_OPTIONS:M${module}}
_APACHE_ENABLED_MODS+= ${module}
-. else
+. else
_APACHE_DISABLED_MODS+= ${module}
-. endif
-.endfor
+. endif
+. endfor
-.if !defined(WITH_STATIC_APACHE)
+. if !defined(WITH_STATIC_APACHE)
CONFIGURE_ARGS+= --enable-so
-.else
+. else
CONFIGURE_ARGS+= --disable-so
WITH_ALL_STATIC_MODULES= yes
-.endif
+. endif
-.if ${PORT_OPTIONS:MSUEXEC}
+. if ${PORT_OPTIONS:MSUEXEC}
_APACHE_ENABLED_MODS+= ${SUEXEC_MODULES}
SUEXEC_CONFARGS= with-suexec
@@ -165,11 +165,11 @@ SUEXEC_DOCROOT?= ${PREFIX}/www/data
#SUEXEC_DOCROOT?= ${WWWDIR}
SUEXEC_USERDIR?= public_html
# avoid duplicate search paths
-.if ${LOCALBASE} == ${PREFIX}
+. if ${LOCALBASE} == ${PREFIX}
SUEXEC_SAFEPATH?= ${LOCALBASE}/bin:/usr/bin:/bin
-.else
+. else
SUEXEC_SAFEPATH?= ${PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:/bin
-.endif
+. endif
SUEXEC_LOGFILE?= /var/log/httpd-suexec.log
SUEXEC_UIDMIN?= 1000
SUEXEC_GIDMIN?= 1000
@@ -182,69 +182,69 @@ CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-caller=${SUEXEC_CALLER} \
--${SUEXEC_CONFARGS}-safepath="${SUEXEC_SAFEPATH}" \
--${SUEXEC_CONFARGS}-bin="${PREFIX}/sbin/suexec"
-. if defined(WITH_SUEXEC_UMASK)
+. if defined(WITH_SUEXEC_UMASK)
CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-umask=${SUEXEC_UMASK}
-. endif
+. endif
-. if !${PORT_OPTIONS:MSUEXEC_SYSLOG}
+. if !${PORT_OPTIONS:MSUEXEC_SYSLOG}
CONFIGURE_ARGS+= --${SUEXEC_CONFARGS}-logfile="${SUEXEC_LOGFILE}"
-. endif
+. endif
-.endif
+. endif
-.if !defined(_APACHE_DISABLED_MODS)
+. if !defined(_APACHE_DISABLED_MODS)
APACHE_MODULES= ${_APACHE_ENABLED_MODS}
-.else
-.for module in ${_APACHE_ENABLED_MODS:O:u}
-. if !${_APACHE_DISABLED_MODS:M${module}}
+. else
+. for module in ${_APACHE_ENABLED_MODS:O:u}
+. if !${_APACHE_DISABLED_MODS:M${module}}
APACHE_MODULES+= ${module}
-. endif
-.endfor
-.endif
+. endif
+. endfor
+. endif
-.if defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
+. if defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
WITH_STATIC_MODULES= ${APACHE_MODULES}
-.endif
+. endif
-.for module in ${AVAILABLE_MODULES}
-. if !empty(WITH_STATIC_MODULES:M${module})
+. for module in ${AVAILABLE_MODULES}
+. if !empty(WITH_STATIC_MODULES:M${module})
CONFIGURE_ARGS+= --enable-${module:tl}=static
PLIST_SUB+= MOD_${module}="@comment "
-. elif !empty(APACHE_MODULES:M${module})
+. elif !empty(APACHE_MODULES:M${module})
CONFIGURE_ARGS+= --enable-${module:tl}=shared
PLIST_SUB+= MOD_${module}=""
-. else
+. else
CONFIGURE_ARGS+= --disable-${module:tl}
PLIST_SUB+= MOD_${module}="@comment "
-. endif
-.endfor
+. endif
+. endfor
# pkg-plist workaround STATIC support
-.if ${PORT_OPTIONS:MSUEXEC}
+. if ${PORT_OPTIONS:MSUEXEC}
PLIST_SUB+= SUEXEC=""
-.else
+. else
PLIST_SUB+= SUEXEC="@comment "
-.endif
+. endif
-.if ${PORT_OPTIONS:MLOG_FORENSIC}
+. if ${PORT_OPTIONS:MLOG_FORENSIC}
PLIST_SUB+= FORENSIC=""
-.else
+. else
PLIST_SUB+= FORENSIC="@comment "
-.endif
+. endif
#### End of _APACHE_PORT_IS_SERVER ####
# ===============================================================
-.else
+. else
HTTPD?= ${LOCALBASE}/sbin/httpd
MODULENAME?= ${PORTNAME}
SHORTMODNAME?= ${MODULENAME:S/mod_//}
SRC_FILE?= ${MODULENAME}.c
-.if exists(${HTTPD})
+. if exists(${HTTPD})
_APACHE_VERSION!= ${HTTPD} -v | ${SED} -ne 's/^Server version: Apache\/\([1-9]\.[0-9]*\).*/\1/p'
-.endif
+. endif
# Validate Apache version whether it meets the version restriction.
_APACHE_VERSION_CHECK:= ${_APACHE_ARGS:C/^([1-9]\.[0-9])$/\1-\1/}
@@ -255,56 +255,56 @@ _APACHE_VERSION_MAX:= ${_APACHE_VERSION_MAX_TMP:M[1-9].[0-9]}
# Remove from _WANTED_VERSIONS that which is not wanted
_APACHE_WANTED_VERSIONS= ${_APACHE_SUPPORTED_VERSIONS}
-.for _ver in ${_APACHE_SUPPORTED_VERSIONS:O}
-. if !empty(_APACHE_VERSION_MIN) && ${_ver} < ${_APACHE_VERSION_MIN}
+. for _ver in ${_APACHE_SUPPORTED_VERSIONS:O}
+. if !empty(_APACHE_VERSION_MIN) && ${_ver} < ${_APACHE_VERSION_MIN}
_APACHE_WANTED_VERSIONS:= ${_APACHE_WANTED_VERSIONS:N${_ver}}
-. endif
-. if !empty(_APACHE_VERSION_MAX) && ${_ver} > ${_APACHE_VERSION_MAX}
+. endif
+. if !empty(_APACHE_VERSION_MAX) && ${_ver} > ${_APACHE_VERSION_MAX}
_APACHE_WANTED_VERSIONS:= ${_APACHE_WANTED_VERSIONS:N${_ver}}
-. endif
-.endfor
+. endif
+. endfor
# Check if installed Apache version matches a wanted version
-.if defined(_APACHE_VERSION) && $(_APACHE_WANTED_VERSIONS:M${_APACHE_VERSION})
+. if defined(_APACHE_VERSION) && $(_APACHE_WANTED_VERSIONS:M${_APACHE_VERSION})
_APACHE_WANTED_VERSION= ${_APACHE_VERSION}
-.endif
+. endif
# Select Apache version if not already set
-.for _ver in ${APACHE_DEFAULT} ${_APACHE_SUPPORTED_VERSIONS}
-. if !defined(_APACHE_WANTED_VERSION) && ${_APACHE_WANTED_VERSIONS:M${_ver}}
+. for _ver in ${APACHE_DEFAULT} ${_APACHE_SUPPORTED_VERSIONS}
+. if !defined(_APACHE_WANTED_VERSION) && ${_APACHE_WANTED_VERSIONS:M${_ver}}
_APACHE_WANTED_VERSION= ${_ver}
-. endif
-.endfor
+. endif
+. endfor
APACHE_VERSION:= ${_APACHE_WANTED_VERSION}
-.if defined(_APACHE_VERSION) && ${_APACHE_VERSION} != ${APACHE_VERSION}
+. if defined(_APACHE_VERSION) && ${_APACHE_VERSION} != ${APACHE_VERSION}
BROKEN= ${_ERROR_MSG} Apache ${_APACHE_VERSION} is installed and port requires ${_APACHE_WANTED_VERSION}
-.endif
+. endif
-.if ${APACHE_VERSION} >= 2.5
+. if ${APACHE_VERSION} >= 2.5
APXS?= ${LOCALBASE}/bin/apxs
-.else
+. else
APXS?= ${LOCALBASE}/sbin/apxs
-.endif
+. endif
-.if exists(${APXS})
+. if exists(${APXS})
APXS_PREFIX!= ${APXS} -q prefix 2> /dev/null || echo NULL
-. if ${APXS_PREFIX} == NULL
+. if ${APXS_PREFIX} == NULL
IGNORE= : Your apache does not support DSO modules
-. endif
-. if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX}
+. endif
+. if defined(AP_GENPLIST) && ${APXS_PREFIX} != ${PREFIX}
IGNORE?= PREFIX must be equal to APXS_PREFIX.
-. endif
-.endif
+. endif
+. endif
APACHEMODDIR= libexec/apache${APACHE_VERSION:S/.//}
APACHEINCLUDEDIR= include/apache${APACHE_VERSION:S/.//}
APACHEETCDIR= etc/apache${APACHE_VERSION:S/.//}
-.if ${APACHE_VERSION} == 2.5
+. if ${APACHE_VERSION} == 2.5
_APACHE_PORT?= www/apache${APACHE_VERSION:S/.//}-devel
-.else
+. else
_APACHE_PORT?= www/apache${APACHE_VERSION:S/.//}
-.endif
+. endif
PLIST_SUB+= APACHEMODDIR="${APACHEMODDIR}" \
APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \
@@ -317,44 +317,44 @@ SUB_LIST+= APACHEMODDIR="${APACHEMODDIR}" \
APACHE_PKGNAMEPREFIX= ap${APACHE_VERSION:S/.//}-
-.if defined(AP_FAST_BUILD)
+. if defined(AP_FAST_BUILD)
PKGNAMEPREFIX?= ${APACHE_PKGNAMEPREFIX}
-.endif
+. endif
-.if defined(_APACHE_BUILD_DEP)
+. if defined(_APACHE_BUILD_DEP)
BUILD_DEPENDS+= ${APXS}:${_APACHE_PORT}
-.endif
+. endif
-.if defined(_APACHE_RUN_DEP)
+. if defined(_APACHE_RUN_DEP)
RUN_DEPENDS+= ${APXS}:${_APACHE_PORT}
-.endif
+. endif
PLIST_SUB+= AP_NAME="${SHORTMODNAME}"
PLIST_SUB+= AP_MODULE="${MODULENAME}.so"
-.if defined(AP_GENPLIST)
+. if defined(AP_GENPLIST)
PLIST?= ${WRKDIR}/ap-plist
-.endif
+. endif
-.if defined(AP_INC)
+. if defined(AP_INC)
AP_EXTRAS+= -I ${AP_INC}
-.endif
-.if defined(AP_LIB)
+. endif
+. if defined(AP_LIB)
AP_EXTRAS+= -L ${AP_LIB}
-.endif
+. endif
-.endif # End of _APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MOULE
+. endif # End of _APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MOULE
.endif # End of !_INCLUDE_USES_APACHE_PRE_MK
# ===============================================================
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_APACHE_POST_MK)
_INCLUDE_USES_APACHE_POST_MK= apache.mk
-.if defined(NO_BUILD) && !defined(_APACHE_RUN_DEP)
+. if defined(NO_BUILD) && !defined(_APACHE_RUN_DEP)
BROKEN= If NO_BUILD is used, then apache:run is sufficient. Please fix your Makefile
-.endif
+. endif
-.if defined(_APACHE_PORT_IS_SERVER)
-.if !target(print-closest-mirrors)
+. if defined(_APACHE_PORT_IS_SERVER)
+. if !target(print-closest-mirrors)
print-closest-mirrors:
@${ECHO_MSG} -n "Fetching list of nearest mirror: " >&2
@MIRRORS=`${FETCH_CMD} -T 30 -qo - http://www.apache.org/dyn/closer.cgi/httpd/ 2> /dev/null\
@@ -364,72 +364,72 @@ print-closest-mirrors:
${ECHO_MSG} -n "MASTER_SITE_APACHE_HTTPD?= ";\
${ECHO_MSG} $$MIRRORS; else \
${ECHO_MSG} "No mirrors found!">&2 ; fi
-.endif
+. endif
-.if !target(show-modules)
+. if !target(show-modules)
show-modules:
-.if !empty(APACHE_MODULES)
-.for module in ${AVAILABLE_MODULES}
+. if !empty(APACHE_MODULES)
+. for module in ${AVAILABLE_MODULES}
@${PRINTF} "%-20s : " ${module}
-. if ${APACHE_MODULES:M${module}}
+. if ${APACHE_MODULES:M${module}}
@${ECHO_CMD} -n "enabled "
-. if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
+. if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
@${ECHO_CMD} " (static)"
-. else
+. else
@${ECHO_CMD} "(shared)"
-. endif
-. else
+. endif
+. else
@${ECHO_CMD} disabled
-. endif
-.endfor
-.else
-.for module in ${AVAILABLE_MODULES}
+. endif
+. endfor
+. else
+. for module in ${AVAILABLE_MODULES}
@${PRINTF} "%-20s : disabled\n" ${module}
-.endfor
-.endif
-.endif
+. endfor
+. endif
+. endif
-.else
+. else
-.if defined(AP_MODENABLE)
+. if defined(AP_MODENABLE)
AP_MOD_EN= -a
-.else
+. else
AP_MOD_EN= -A
-.endif
+. endif
PLIST_SUB+= AP_MOD_EN="${AP_MOD_EN}"
-.if defined(AP_FAST_BUILD)
-.if !target(ap-gen-plist)
+. if defined(AP_FAST_BUILD)
+. if !target(ap-gen-plist)
_USES_build+= 490:ap-gen-plist
ap-gen-plist:
-.if defined(AP_GENPLIST)
-. if !exists(${PLIST})
+. if defined(AP_GENPLIST)
+. if !exists(${PLIST})
@${ECHO_MSG} "===> Generating apache plist"
@${ECHO_CMD} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
@${ECHO_CMD} "@postexec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
@${ECHO_CMD} "@postunexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
@${ECHO_CMD} "@postunexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"" >> ${PLIST}
-. endif
-.endif
-.endif
+. endif
+. endif
+. endif
-.if !target(do-build)
+. if !target(do-build)
do-build:
(cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.la ${SRC_FILE})
-.endif
+. endif
-.if !target(do-install)
+. if !target(do-install)
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.la
-. if !defined(DEBUG)
+. if !defined(DEBUG)
@${ECHO_MSG} "===> strip ${APACHEMODDIR}/${MODULENAME}.so"
@[ -e ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so ] && ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
-. else
+. else
@${ECHO_MSG} "===> DEBUG is set, will not strip ${APACHEMODDIR}/${MODULENAME}.so"
-. endif
-.endif
+. endif
+. endif
-.endif # defined(AP_FAST_BUILD)
-.endif # defined(_APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MODULE)
+. endif # defined(AP_FAST_BUILD)
+. endif # defined(_APACHE_PORT_IS_SERVER / _APACHE_PORT_IS_MODULE)
.endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_APACHE_PRE_MK)
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index ac50a82f2af3..8353e5a01818 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -65,27 +65,27 @@ _INCLUDE_USES_AUTORECONF_POST_MK= yes
BUILD_DEPENDS+= autoconf>=2.69:devel/autoconf \
automake>=1.16.1:devel/automake
-.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
+. if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
BUILD_DEPENDS+= libtoolize:devel/libtool
-.endif
+. endif
-.if empty(autoreconf_ARGS)
+. if empty(autoreconf_ARGS)
_USES_configure+= 470:do-autoreconf
do-autoreconf:
-.for f in AUTHORS ChangeLog INSTALL NEWS README
+. for f in AUTHORS ChangeLog INSTALL NEWS README
# Don't modify time stamps if the files already exist
@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
-.endfor
-.if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
+. endfor
+. if defined(_USE_GNOME) && ${_USE_GNOME:Mintltool}
@(cd ${AUTORECONF_WRKSRC} && \
if test -f configure.ac; then configure=configure.ac; \
else configure=configure.in; fi && \
if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
then ${LOCALBASE}/bin/intltoolize -f -c; fi)
-.endif
+. endif
@(cd ${AUTORECONF_WRKSRC} && ${AUTORECONF} -f -i)
-.elif ! ${autoreconf_ARGS:Mbuild}
+. elif ! ${autoreconf_ARGS:Mbuild}
IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
-.endif
+. endif
.endif
diff --git a/Mk/Uses/bdb.mk b/Mk/Uses/bdb.mk
index c80db16b58a2..645b9e9a7b0e 100644
--- a/Mk/Uses/bdb.mk
+++ b/Mk/Uses/bdb.mk
@@ -45,9 +45,9 @@
.if !defined(_INCLUDE_USES_BDB_MK)
_INCLUDE_USES_BDB_MK= yes
-.if !empty(bdb_ARGS)
+. if !empty(bdb_ARGS)
_bdb_ARGS:= ${bdb_ARGS}
-.endif
+. endif
_bdb_ARGS?= yes
# TODO: avoid malformed conditional with invalid _bdb_ARGS/BDB_DEFAULT
@@ -63,9 +63,9 @@ _DB_DEFAULTS= 5
# Since 2020-12-02, this name is not fitting too much but
# retained for now for compatibility. The name of this variable
# is subject to change especially once db6 were removed.
-. if defined(WITH_BDB6_PERMITTED)
+. if defined(WITH_BDB6_PERMITTED)
_DB_DEFAULTS+= 18
-. endif
+. endif
# Dependency lines for different db versions
db5_DEPENDS= libdb-5.3.so:databases/db5
@@ -76,120 +76,120 @@ db18_FIND= ${LOCALBASE}/include/db18/db.h
# Override the global BDB_DEFAULT with the
# port specific <BDB_UNIQUENAME>_WITH_BDB_VER
-.if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
+. if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
BDB_DEFAULT= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}
-.endif
+. endif
# Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not
# ask for a more specific version.
-. if ${_bdb_ARGS} == yes
-. if ${BDB_DEFAULT} != 1
+. if ${_bdb_ARGS} == yes
+. if ${BDB_DEFAULT} != 1
_bdb_ARGS= ${BDB_DEFAULT}
-. else
+. else
_bdb_ARGS:= 5+
+. endif
. endif
-. endif
# Compatiblity hack:
# upgrade older plussed versions to 5+
_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+
-.for i in ${_bdb_ARGS}
-. if ${_BDB_OLDPLUSVERS:M${i}}
+. for i in ${_bdb_ARGS}
+. if ${_BDB_OLDPLUSVERS:M${i}}
_bdb_ARGS:= 5+
-. endif
-.endfor
+. endif
+. endfor
# 1. detect installed versions
_INST_BDB_VER=
-.for bdb in ${_DB_PORTS}
-. if exists(${db${bdb}_FIND})
+. for bdb in ${_DB_PORTS}
+. if exists(${db${bdb}_FIND})
_INST_BDB_VER+=${bdb}
-. endif
-.endfor
+. endif
+. endfor
# 2. parse supported versions:
# 2a. build list from _bdb_ARGS
_SUPP_BDB_VER=
__bdb_ARGS:=${_bdb_ARGS:C,\+$,,}
-.if !empty(_bdb_ARGS:M*+)
-. for bdb in ${_DB_PORTS}
-. if ${__bdb_ARGS} <= ${bdb}
+. if !empty(_bdb_ARGS:M*+)
+. for bdb in ${_DB_PORTS}
+. if ${__bdb_ARGS} <= ${bdb}
_SUPP_BDB_VER+=${bdb:C/\.//}
-. endif
-. endfor
-.else
+. endif
+. endfor
+. else
_SUPP_BDB_VER=${_bdb_ARGS}
-.endif
+. endif
# 2b. expand INVALID_BDB_VER if given with "+":
-.if !empty(INVALID_BDB_VER:M*+)
+. if !empty(INVALID_BDB_VER:M*+)
_INV_BDB:=${INVALID_BDB_VER:C,\+$,,}
_INV_BDB_VER:=
-. for bdb in ${_DB_PORTS}
-. if ${_INV_BDB} <= ${bdb}
*** 16529 LINES SKIPPED ***