 @@ -1,99 +1,98 @@
-# $NetBSD: Makefile,v 1.338 2022/11/23 16:20:33 adam Exp $
+# $NetBSD: Makefile,v 1.339 2023/01/28 09:28:30 taca Exp $
 PKGREVISION= 1
 .include "../../mail/postfix/Makefile.common"
 COMMENT=	Fast, easy to administer, and secure mail transfer agent
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 CONFLICTS+=	esmtp>=1.2 nullmailer-[0-9]*
 USE_TOOLS+=	perl pkg-config m4
 SPECIAL_PERMS+=	sbin/postdrop ${POSTFIX_USER} ${MAILDROP_GROUP} 2555
 SPECIAL_PERMS+=	sbin/postqueue ${POSTFIX_USER} ${MAILDROP_GROUP} 2555
 REPLACE_PERL+=	auxiliary/qshape/qshape.pl
 # options.mk appends to CCARGS and AUXLIBS the options needed to build
 # Postfix with support for various add-on modules.
+#
 .include "options.mk"
 FILES_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
 MESSAGE_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
 MESSAGE_SUBST+=		DOCDIR=${DOCDIR}
 MESSAGE_SRC+=		${PKGDIR}/MESSAGE
 .if exists(${PKGDIR}/MESSAGE.${OPSYS})
 MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS}
 .endif
 PLIST_SRC+=		${PKGDIR}/PLIST
 RCD_SCRIPTS=		postfix
 OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
 OWN_DIRS_PERMS+=	${POSTFIX_DATA_DIR} ${POSTFIX_USER} ${POSTFIX_GROUP} 0700
 MAKE_DIRS+=		${METADIR}/dynamicmaps.cf.d ${METADIR}/postfix-files.d
 PKG_GROUPS?=		${POSTFIX_GROUP} ${MAILDROP_GROUP}
 PKG_USERS?=		${POSTFIX_USER}:${POSTFIX_GROUP}
 PKG_GECOS.${POSTFIX_USER}=	Postfix User
 PKG_HOME.${POSTFIX_USER}=	${POSTFIX_QUEUE_DIR}
 CONF_FILES=		# empty
 .for i in main.cf master.cf
 CONF_FILES+=		${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
 .endfor
 CONF_FILES_PERMS=	# empty
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
 SUBST_VARS.paths=	PREFIX
 SUBST_STAGE.paths=	pre-configure
 INSTALLATION_DIRS+=	${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR}
 post-extract:
 	${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
 	${RM} -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
 post-build:
 .if !empty(PKG_OPTIONS:Msasl)
 	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
 do-install:
 	${RM} -f ${WRKSRC}/conf/*.orig
 .if !empty(PKG_OPTIONS:Msasl)
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR}
 .endif
 	cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		DYLD_LIBRARY_PATH=${WRKSRC}/lib \
 		${SH} ./postfix-install -non-interactive \
 		${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}"
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
 		${DESTDIR}${EXAMPLEDIR}/mailer.conf
 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
 		${DESTDIR}${PREFIX}/sbin/qshape
 	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .for dir in ${POSTFIX_QUEUE_SUBDIR}
 	${RMDIR} ${DESTDIR}${POSTFIX_QUEUE_DIR}/${dir}
 .endfor
 .if ${OPSYS} == "Darwin"
 	for f in ${DESTDIR}${PREFIX}/lib/postfix/lib*.dylib; do \
 		install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
 	done
 	for f in ${DESTDIR}${PREFIX}/libexec/postfix/* ${DESTDIR}${PREFIX}/sbin/*; do \
 		install_name_tool \
 			-change @rpath/libpostfix-dns.dylib ${PREFIX}/lib/postfix/libpostfix-dns.dylib \
 			-change @rpath/libpostfix-global.dylib ${PREFIX}/lib/postfix/libpostfix-global.dylib \
 			-change @rpath/libpostfix-master.dylib ${PREFIX}/lib/postfix/libpostfix-master.dylib \
 			-change @rpath/libpostfix-tls.dylib ${PREFIX}/lib/postfix/libpostfix-tls.dylib \
 			-change @rpath/libpostfix-util.dylib ${PREFIX}/lib/postfix/libpostfix-util.dylib \
 			$$f; \
 	done
 .endif
 .include "../../mk/bsd.pkg.mk"

 @@ -1,134 +1,134 @@
-# $NetBSD: Makefile.common,v 1.42 2022/10/15 20:34:57 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.43 2023/01/28 09:28:30 taca Exp $
 # used by mail/postfix/Makefile
 # used by mail/postfix/Makefile.module
-DISTNAME=	postfix-3.7.3
+DISTNAME=	postfix-3.7.4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 # The postfix license has only very minor diffs from cpl-1.0.
 LICENSE=	cpl-1.0
 #LICENSE=	postfix-license
 DISTINFO_FILE=	${PKGDIR}/../../mail/postfix/distinfo
 PATCHDIR=	${PKGDIR}/../../mail/postfix/patches
 CHECK_HEADERS_SKIP+=	src/global/mail_params.h
 .include "../../mk/bsd.prefs.mk"
 POSTFIX_USER?=		postfix
 POSTFIX_GROUP?=		postfix
 MAILDROP_GROUP?=	maildrop
 # POSTFIX_QUEUE_DIR is the default queue directory for Postfix.  This is
 # merely a default, and may be changed by setting "queue_directory" in
 # ${PKG_SYSCONFDIR}/main.cf.
+#
 POSTFIX_DATA_DIR?=	${VARBASE}/db/postfix
 POSTFIX_QUEUE_DIR?=	${VARBASE}/spool/postfix
 POSTFIX_QUEUE_SUBDIR=	active bounce corrupt defer deferred flush hold \
 			incoming maildrop pid private public saved trace
 BUILD_DEFS+=		VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR
 # CCARGS is a list of options to pass to the preprocessor/compiler.
 # AUXLIBS is a list of options to pass to the linker.
 CCARGS=		#defined
 AUXLIBS=	${LDFLAGS}
 # Enable Dovecot SASL
 CCARGS+=	-DUSE_SASL_AUTH
 # Enable Berkeley DB map type. BDB_LIBS is defined in mk/bdb.buildlink3.mk.
 CCARGS+=	-DHAS_DB
 AUXLIBS+=	${BDB_LIBS}
 # Disable modules by default
 .for module in cdb ldap lmdb mysql pcre pgsql sqlite
 CCARGS+=	-DNO_${module:tu}
 .endfor
 # Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
 CCARGS+=	-DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
 CCARGS+=	-DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
 CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
 CCARGS+=	-DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\"
 CCARGS+=	-DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
 CCARGS+=	-DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\"
 CCARGS+=	-DDEF_META_DIR=\"${PREFIX}/${METADIR}\"
 CCARGS+=	-DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
 CCARGS+=	-DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
 CCARGS+=	-DDEF_README_DIR=\"${DOCDIR}\"
 CCARGS+=	-DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
 CCARGS+=	-DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
 CCARGS+=	-DDEF_SHLIB_DIR=\"${PREFIX}/${SHLIBDIR}\"
 # Override those same default paths in the installed example main.cf.
 SUBST_CLASSES+=		postfix
 SUBST_STAGE.postfix=	post-configure
 SUBST_FILES.postfix=	conf/main.cf src/global/mail_params.h
 SUBST_SED.postfix=	\
 	-e 's|^\(data_directory\) =.*|\1 = ${POSTFIX_DATA_DIR}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(meta_directory\) =.*|\1 = ${PREFIX}/${METADIR}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(shlib_directory\) =.*|\1 = ${PREFIX}/${SHLIBDIR}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(mail_owner\) =.*|\1 = ${POSTFIX_USER}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(setgid_group\) =.*|\1 = ${MAILDROP_GROUP}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/${PKGMANDIR}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|'
 SUBST_SED.postfix+=	\
 	-e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|'
 SUBST_SED.postfix+=	\
 	-e '/^\#define DEF_MAIL_OWNER[ 	]/s,postfix,${POSTFIX_USER},g'
 SUBST_SED.postfix+=	\
 	-e '/^\#define DEF_SGID_GROUP[ 	]/s,postdrop,${MAILDROP_GROUP},g'
 PKG_SYSCONFSUBDIR=	postfix
 LIBEXECDIR=		${PREFIX}/libexec/postfix
 DOCDIR=			${PREFIX}/share/doc/postfix
 EXAMPLEDIR=		${PREFIX}/share/examples/postfix
 # Not prefixed so that we can use where relative path needed
 # METADIR set for postfix-2.6.x compatibility
 METADIR=		libexec/postfix
 SHLIBDIR=		lib/postfix
 BUILD_TARGET=		# empty
 MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:Q}
 MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
 MAKE_ENV+=		DEBUG= # empty
 .if ${OPSYS} == "SunOS" && !exists(/usr/include/rpcsvc/nis_cache.h)
 CCARGS+=		-DNO_NISPLUS
 .endif
 CFLAGS.SunOS+=		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 LDFLAGS.Darwin+=	-headerpad_max_install_names
 DESTDIR_INSTALLOPTIONS=	-package install_root="${DESTDIR}"
 do-configure:
 	cd ${WRKSRC} &&							\
 	env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles		\
 		'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'			\
 		shared=yes dynamicmaps=yes
 .include "../../mk/bdb.buildlink3.mk"

 @@ -1,217 +1,217 @@
-$NetBSD: patch-ai,v 1.45 2022/07/21 15:08:39 taca Exp $
+$NetBSD: patch-ai,v 1.46 2023/01/28 09:28:30 taca Exp $
 ) Add shlib definitions for NetBSD 5; the build system must be
 hard-coded per OS per version.  Not yet reported upstream.
 ) Make this pkgsrc friendly.
 ) Add support for FreeBSD 13.
 ) Add blocklist(3) support.
---- makedefs.orig	2022-01-23 20:53:41.000000000 +0000
+--- makedefs.orig	2023-01-15 23:29:39.000000000 +0000
 +++ makedefs
 @@ -339,6 +339,15 @@ case "$SYSTEM.$RELEASE" in
  		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
  		: ${PLUGIN_LD="${CC} -shared"}
  		;;
 +  FreeBSD.13*)	SYSTYPE=FREEBSD13
 +		: ${CC=cc}
 +		: ${SHLIB_SUFFIX=.so}
 +		: ${SHLIB_CFLAGS=-fPIC}
 +		: ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'}
 +		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
 +		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
 +		: ${PLUGIN_LD="${CC} -shared"}
 +		;;
   DragonFly.*)	SYSTYPE=DRAGONFLY
  		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
 @@ -376,49 +385,7 @@ case "$SYSTEM.$RELEASE" in
  		;;
    ekkoBSD.1*)	SYSTYPE=EKKOBSD1
  		;;
 -   NetBSD.1*)	SYSTYPE=NETBSD1
 -		;;
 -   NetBSD.2*)	SYSTYPE=NETBSD2
 -		;;
 -   NetBSD.3*)	SYSTYPE=NETBSD3
 -		;;
 -   NetBSD.4*)	SYSTYPE=NETBSD4
 -		;;
 -   NetBSD.5*)	SYSTYPE=NETBSD5
 -		;;
 -   NetBSD.6*)	SYSTYPE=NETBSD6
 -		: ${SHLIB_SUFFIX=.so}
 -		: ${SHLIB_CFLAGS=-fPIC}
 -		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
 -		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
 -		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
 -		: ${PLUGIN_LD="${CC-gcc} -shared"}
 -		;;
 -   NetBSD.7*)	SYSTYPE=NETBSD7
 -		: ${SHLIB_SUFFIX=.so}
 -		: ${SHLIB_CFLAGS=-fPIC}
 -		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
 -		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
 -		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
 -		: ${PLUGIN_LD="${CC-gcc} -shared"}
 -		;;
 -   NetBSD.8*)	SYSTYPE=NETBSD8
 -		: ${SHLIB_SUFFIX=.so}
 -		: ${SHLIB_CFLAGS=-fPIC}
 -		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
 -		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
 -		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
 -		: ${PLUGIN_LD="${CC-gcc} -shared"}
 -		;;
 -   NetBSD.9*)	SYSTYPE=NETBSD9
 -		: ${SHLIB_SUFFIX=.so}
 -		: ${SHLIB_CFLAGS=-fPIC}
 -		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
 -		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
 -		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
 -		: ${PLUGIN_LD="${CC-gcc} -shared"}
 -		;;
 -   NetBSD.10*)	SYSTYPE=NETBSD10
 +   NetBSD*)	SYSTYPE=NETBSD
  		: ${SHLIB_SUFFIX=.so}
  		: ${SHLIB_CFLAGS=-fPIC}
  		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
 @@ -493,13 +460,6 @@ case "$SYSTEM.$RELEASE" in
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
 -		if [ -f /usr/local/lib/libdb.a ]; then
 -		    SYSLIBS="$SYSLIBS -ldb"
 -		    CCARGS="$CCARGS -DHAS_DB"
 -		    if [ -d /usr/local/include/db ]; then
 -			CCARGS="$CCARGS -I/usr/local/include/db"
 -		    fi
 -		fi
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
 @@ -541,33 +501,8 @@ case "$SYSTEM.$RELEASE" in
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
 -		case "$CCARGS" in
 -		 *-DNO_DB*) ;;
 -		 *-DHAS_DB*) ;;
 -		 *) SYSLIBS="-ldb";;
 -		esac
  		;;
      Linux.2*)	SYSTYPE=LINUX2
 -		case "$CCARGS" in
 -		 *-DNO_DB*) ;;
 -		 *-DHAS_DB*) ;;
 -		 *) if [ -f /usr/include/db.h ]
 -		    then
 -			: we are all set
 -		    elif [ -f /usr/include/db/db.h ]
 -		    then
 -			CCARGS="$CCARGS -I/usr/include/db"
 -		    else
 -			# No, we're not going to try db1 db2 db3 etc.
 -			# On a properly installed system, Postfix builds
 -			# by including <db.h> and by linking with -ldb
 -			echo "No <db.h> include file found." 1>&2
 -			echo "Install the appropriate db*-devel package first." 1>&2
 -			exit 1
 -		    fi
 -		    SYSLIBS="-ldb"
 -		    ;;
 -		esac
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -667,24 +602,6 @@ EOF
+@@ -667,24 +602,6 @@ Linux.[3456].*)	SYSTYPE=LINUX$RELEASE_MA
  		;;
       GNU.0*|GNU/kFreeBSD.[567]*)
  		SYSTYPE=GNU0
 -		case "$CCARGS" in
 -		 *-DNO_DB*) ;;
 -		 *) if [ -f /usr/include/db.h ]
 -		    then
 -			: we are all set
 -		    elif [ -f /usr/include/db/db.h ]
 -		    then
 -			CCARGS="$CCARGS -I/usr/include/db"
 -		    else
 -			# On a properly installed system, Postfix builds
 -			# by including <db.h> and by linking with -ldb
 -			echo "No <db.h> include file found." 1>&2
 -			echo "Install the appropriate db*-devel package first." 1>&2
 -			exit 1
 -		    fi
 -		    SYSLIBS="-ldb"
 -		    ;;
 -		esac
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -715,26 +632,14 @@ EOF
+@@ -715,26 +632,14 @@ Linux.[3456].*)	SYSTYPE=LINUX$RELEASE_MA
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP -DNO_SNPRINTF"
 -		if [ -f /usr/lib/libdb.a ]; then
 -		    CCARGS="$CCARGS -DHAS_DB"
 -		    SYSLIBS="$SYSLIBS -ldb"
 -		fi
  		;;
  HP-UX.B.10.*)	SYSTYPE=HPUX10
  		CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
  		    (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
  		CCARGS="$CCARGS -DNO_SNPRINTF"
 -		if [ -f /usr/lib/libdb.a ]; then
 -		    CCARGS="$CCARGS -DHAS_DB"
 -		    SYSLIBS=-ldb
 -		fi
  		;;
  HP-UX.B.11.*)	SYSTYPE=HPUX11
  		SYSLIBS=-lnsl
 -		if [ -f /usr/lib/libdb.a ]; then
 -		    CCARGS="$CCARGS -DHAS_DB"
 -		    SYSLIBS="$SYSLIBS -ldb"
 -		fi
  		;;
  ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
  		RANLIB=echo
-@@ -776,12 +681,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
+@@ -782,12 +687,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
  		esac
  		: ${SHLIB_CFLAGS=-fPIC}
  		: ${SHLIB_SUFFIX=.dylib}
--		: ${SHLIB_LD='cc -shared -Wl,-flat_namespace -Wl,-undefined,dynamic_lookup -Wl,-install_name,@rpath/${LIB}'}
+-		: ${SHLIB_LD="cc -shared -Wl,-flat_namespace ${NOFIXUP}-Wl,-undefined,dynamic_lookup "'-Wl,-install_name,@rpath/${LIB}'}
-+		: ${SHLIB_LD='${CC} -shared -Wl,-flat_namespace -Wl,-undefined,dynamic_lookup -Wl,-install_name,@rpath/${LIB}'}
++		: ${SHLIB_LD='${CC} '"-shared -Wl,-flat_namespace ${NOFIXUP}-Wl,-undefined,dynamic_lookup "'-Wl,-install_name,@rpath/${LIB}'}
  		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
                  # In MacOS/X 10.11.x /bin/sh unsets DYLD_LIBRARY_PATH, so we
                  # have export it into postfix-install indirectly!
  		: ${SHLIB_ENV="DYLD_LIBRARY_PATH=`pwd`/lib SHLIB_ENV_VAR=DYLD_LIBRARY_PATH SHLIB_ENV_VAL=`pwd`/lib"}
--		: ${PLUGIN_LD='cc -shared -Wl,-flat_namespace -Wl,-undefined,dynamic_lookup'}
+-		: ${PLUGIN_LD="cc -shared -Wl,-flat_namespace ${NOFIXUP}-Wl,-undefined,dynamic_lookup"}
-+		: ${PLUGIN_LD='${CC} -shared -Wl,-flat_namespace -Wl,-undefined,dynamic_lookup'}
++		: ${PLUGIN_LD='${CC} '"-shared -Wl,-flat_namespace ${NOFIXUP}-Wl,-undefined,dynamic_lookup"}
  		;;
      dcosx.1*)	SYSTYPE=DCOSX1
  		RANLIB=echo
-@@ -805,6 +710,21 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
+@@ -811,6 +716,21 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
  esac
+ #
 +# Support for blocklist(3) or blacklist(3).
 +#
 +case "$CCARGS" in
 +    *-DUSE_BLOCKLIST*)
 +	if test -f /usr/include/blocklist.h; then
 +	    CCARGS="$CCARGS -DHAVE_BLOCKLIST"
 +	    SYSLIBS="$SYSLIBS -lblocklist"
 +	elif test -f /usr/include/blacklist.h; then
 +	    CCARGS="$CCARGS -DHAVE_BLACKLIST"
 +	    SYSLIBS="$SYSLIBS -lblacklist"
 +	fi
 +	;;
 +esac
++
 +#
  # sigsetjmp()/siglongjmp() can be "better" than setjmp()/longjmp()
  # if used wisely (that is: almost never, just like signals).
  # Unfortunately some implementations have been buggy in the past.

 @@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.203 2022/10/15 20:34:57 triaxx Exp $
+$NetBSD: distinfo,v 1.204 2023/01/28 09:28:30 taca Exp $
-BLAKE2s (postfix-3.7.3.tar.gz) = fc7c1d8c281a88f221ffb51e04fd562508c92fa29e39d6167978ec23f4d96721
+BLAKE2s (postfix-3.7.4.tar.gz) = e89a5cf0be8daf875aa244a30cb8ef54d3bb20873ca212f10767800306e8a4e2
-SHA512 (postfix-3.7.3.tar.gz) = 4ceedd1b7b364f47a3becc041cf29a48aea54e38306fd1227c5a7c25894831fb5c37150d99d781d237175e58da21ac53887c97d99bb6b715c4988777596ee890
+SHA512 (postfix-3.7.4.tar.gz) = 972738291b960c90fe83861d55b1288900416167adb353418956e69bcc709a6daf84fbfde11d573eebba030654d27abc8d55f90661a2b880ccfb3a334064c236
-Size (postfix-3.7.3.tar.gz) = 4825380 bytes
+Size (postfix-3.7.4.tar.gz) = 4833834 bytes
 SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
 SHA1 (patch-ag) = 8ab3cfafa63056f9a7f096da7e55bcccab965180
-SHA1 (patch-ai) = c042f6cf94cbb7301e9e04707dd6eda59ccbbcef
+SHA1 (patch-ai) = 3d143532e1e9a149c6c06e2efadcd34f6f72e82d
 SHA1 (patch-src_smtpd_Makefile.in) = 8133f9cceb0c1c0250d6543cb060c66288571722
 SHA1 (patch-src_smtpd_pfilter.c) = c747d2f3584f694eb7b73b19118b4d8b450cfe7f
 SHA1 (patch-src_smtpd_pfilter.h) = 153b516da89d709d293c6086c2f126791bd945d6
 SHA1 (patch-src_smtpd_smtpd.c) = 03c768fc007156412d11cba6e4d450f73b775d5f

 @@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.32 2022/11/23 16:20:34 adam Exp $
+# $NetBSD: Makefile,v 1.33 2023/01/28 09:28:30 taca Exp $
+#
 COMMENT=		Postfix SMTP server SQLite backend module
 PKGREVISION=		1
 POSTFIX_LIB=		sqlite
 POSTFIX_LIBDIR=		src/global
 POSTFIX_LIB_DICT=	yes
 POSTFIX_LIB_MKMAP=	no
 .include "../../mail/postfix/Makefile.module"
 CCARGS+=		-I${BUILDLINK_PREFIX.sqlite3}/include
 AUXLIBS_MODULE=		-L${BUILDLINK_PREFIX.sqlite3}/lib -lsqlite3		\
 			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.sqlite3}/lib
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"