mailutils: apply compiler/linker flags.

[Paolo Vincenzo Olivo <vins%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vins%NetBSD.org@localhost>
Pushed By:	vms
Date:		Sun Dec 11 17:28:08 2022 +0100
Changeset:	94ffaf54689bef78b01152b3341f3a481926163b

Modified Files:
	mailutils/Makefile
	mailutils/options.mk

Log Message:
mailutils: apply compiler/linker flags.

Makefile reworked in its layout to improve readability.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=94ffaf54689bef78b01152b3341f3a481926163b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mailutils/Makefile   | 21 +++++++++++++--------
 mailutils/options.mk |  4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diffs:
diff --git a/mailutils/Makefile b/mailutils/Makefile
index 2d2b6989ed..55bcd5ad5f 100644
--- a/mailutils/Makefile
+++ b/mailutils/Makefile
@@ -15,6 +15,13 @@ CONFLICTS+=	avenger-[0-9]*		# bin/dotlock
 USE_TOOLS+=	gmake yacc
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
+INFO_FILES=	yes
+
+SUBST_CLASSES+=		iconv
+SUBST_STAGE.iconv=	pre-configure
+SUBST_MESSAGE.iconv=	Do not require lib/charset.alias.
+SUBST_FILES.iconv+=	lib/gnu/Makefile.in
+SUBST_SED.iconv=	-e '/need_charset_alias=/s|true|false|'
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -33,18 +40,16 @@ CONFIGURE_ARGS+=	--with-mail-spool=/var/mail
 CONFIGURE_ARGS+=	--enable-virtual-domains
 CONFIGURE_ARGS+=	--enable-mh
 
+.include "options.mk"
+
 PKG_DOCS=	AUTHORS ChangeLog NEWS README* THANKS TODO
 DOCDIR=		share/doc/${PKGBASE}
 
-SUBST_CLASSES+=		iconv
-SUBST_STAGE.iconv=	pre-configure
-SUBST_MESSAGE.iconv=	Do not require lib/charset.alias.
-SUBST_FILES.iconv+=	lib/gnu/Makefile.in
-SUBST_SED.iconv=	-e '/need_charset_alias=/s|true|false|'
-
-.include "options.mk"
+MAKE_FLAGS+=	CC=${CC:Q}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	CPPLAGS=${CPPLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 
-INFO_FILES=		yes
 INSTALLATION_DIRS+=	${DOCDIR}
 
 post-install:
diff --git a/mailutils/options.mk b/mailutils/options.mk
index 866e601622..864a4bff4d 100644
--- a/mailutils/options.mk
+++ b/mailutils/options.mk
@@ -88,7 +88,8 @@ CONFIGURE_ARGS+=    --without-gsasl
 # EmacsLisp
 .if !empty(PKG_OPTIONS:Memacs)
 .include "../../editors/emacs/modules.mk"
-BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD}:${_EMACS_PKGDIR}
+BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD}
+BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_PKGDIR}
 CONFIGURE_ENV+=			ac_cv_prog_EMACS=${EMACS_BIN:Q}
 PKGSRC_MAKE_ENV+=		EMACS=${EMACS:Q}
 CONFIGURE_ARGS+=    		--with-lispdir=${EMACS_LISPPREFIX:Q}
@@ -111,6 +112,7 @@ CONFIGURE_ARGS+=	--without-mysql
 .if !empty(PKG_OPTIONS:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-postgres
+LDFLAGS+=		${BUILDLINK_LDFLAGS.postgresql-lib}
 .else
 CONFIGURE_ARGS+=    	--without-postgres
 .endif