[cygport - the Cygwin packaging tool] branch master, updated. 0.36.6-9-g73b99829

[cygport - the Cygwin packaging tool] branch master, updated. 0.36.6-9-g73b99829

[Jon Turney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=73b99829b48d938df61ee65e97e6d64894e211b3

commit 73b99829b48d938df61ee65e97e6d64894e211b3
Author: Brian Inglis <Brian.Inglis@Shaw.ca>
Date:   Sun Sep 17 15:13:42 2023 +0100

    autotools: Support AC_CONFIG_MACROS_DIRS
    
    Add support for the new (in autoconf 2.69) AC_CONFIG_MACRO_DIRS macro to
    the existing support for the older AC_CONFIG_MACRO_DIR macro.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=47e3c4de1ea40fbc0d64b7e91e9c5baf5fe19eda

commit 47e3c4de1ea40fbc0d64b7e91e9c5baf5fe19eda
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Sep 17 15:05:18 2023 +0100

    Add a deprecation warning for DEPEND
    
    Add a deprecation warning for the obsolete DEPEND variable, suggesting
    BUILD_DEPENDS instead.


Diff:
---
 cygclass/autotools.cygclass | 2 +-
 cygclass/gnome2.cygclass    | 2 +-
 cygclass/mate.cygclass      | 2 +-
 cygclass/xfce4.cygclass     | 2 +-
 lib/check_funcs.cygpart     | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cygclass/autotools.cygclass b/cygclass/autotools.cygclass
index f629f312..55be6709 100644
--- a/cygclass/autotools.cygclass
+++ b/cygclass/autotools.cygclass
@@ -311,7 +311,7 @@ cygautoreconf() {
 			then
 				__parse_aclocal_amflags $(grep '^ACLOCAL_AMFLAGS' Makefile.am | sed 's/=/ = /') | xargs -r mkdir -p
 			fi
-			grep '^[^\#]*AC_CONFIG_MACRO_DIR' ${sub_configure_ac} | sed -e "s!.*AC_CONFIG_MACRO_DIR(\[*\(.*\))!${d}/\1!g" -e 's!\]*!!g' | xargs -r mkdir -p
+			grep '^[^\#]*AC_CONFIG_MACRO_DIRS*' ${sub_configure_ac} | sed -e "s!.*AC_CONFIG_MACRO_DIRS*(\[*\(.*\))!${d}/\1!g" -e 's!\]*!!g' | xargs -r mkdir -p
 
 			if [ ! -f ${d}/aclocal.m4 ] || $(head -n 1 ${d}/aclocal.m4 | grep -q 'generated.* by aclocal')
 			then
diff --git a/cygclass/gnome2.cygclass b/cygclass/gnome2.cygclass
index fc626c37..c2dde040 100644
--- a/cygclass/gnome2.cygclass
+++ b/cygclass/gnome2.cygclass
@@ -181,7 +181,7 @@ gnome2_autoreconf() {
 	fi
 
 	# aclocal requires that its directories exist
-	sed -n -e 's|^AC_CONFIG_MACRO_DIR(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
+	sed -n -e 's|^AC_CONFIG_MACRO_DIRS*(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
 
 	# Automake will exit if these are not present
 	# dodoc won't install these, however, if they are empty
diff --git a/cygclass/mate.cygclass b/cygclass/mate.cygclass
index c3dc7c82..532814ac 100644
--- a/cygclass/mate.cygclass
+++ b/cygclass/mate.cygclass
@@ -202,7 +202,7 @@ mate_autoreconf() {
 	fi
 
 	# aclocal requires that its directories exist
-	sed -n -e 's|^AC_CONFIG_MACRO_DIR(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
+	sed -n -e 's|^AC_CONFIG_MACRO_DIR*(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
 
 	# Automake will exit if these are not present
 	# dodoc won't install these, however, if they are empty
diff --git a/cygclass/xfce4.cygclass b/cygclass/xfce4.cygclass
index 541faedb..5131c9a8 100644
--- a/cygclass/xfce4.cygclass
+++ b/cygclass/xfce4.cygclass
@@ -137,7 +137,7 @@ xfce4_autoreconf() {
 
 	export WANT_AUTOMAKE
 
-	sed -n -e 's|^AC_CONFIG_MACRO_DIR(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
+	sed -n -e 's|^AC_CONFIG_MACRO_DIR*(\[*\([^]]*\)\]*).*|\1|p' ${configure_ac} | xargs -r mkdir -p
 
 	NOCONFIGURE=1 \
 	XDT_PROG_ACLOCAL=aclocal \
diff --git a/lib/check_funcs.cygpart b/lib/check_funcs.cygpart
index 858e42b5..f6b273b3 100644
--- a/lib/check_funcs.cygpart
+++ b/lib/check_funcs.cygpart
@@ -570,6 +570,11 @@ __check_depends() {
 
 	__deparenthesize() { echo "$@" | sed -e 's|[a-zA-Z0-9]*(\([^)]*\))|\1|' ; }
 
+	if [ -v DEPEND ]
+	then
+		warning "DEPEND is deprecated, use BUILD_REQUIRES instead."
+	fi
+
 	for atom in ${BUILD_REQUIRES:-${DEPEND}}
 	do
 		case ${atom} in