CVS commit: pkgsrc/mail/postfix

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Sep 26 08:10:45 UTC 2025

Modified Files:
        pkgsrc/mail/postfix: Makefile options.mk

Log Message:
postfix: Unbreak install after MESSAGE file removals.


To generate a diff of this commit:
cvs rdiff -u -r1.352 -r1.353 pkgsrc/mail/postfix/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/mail/postfix/options.mk

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

Modified files:

Index: pkgsrc/mail/postfix/Makefile
diff -u pkgsrc/mail/postfix/Makefile:1.352 pkgsrc/mail/postfix/Makefile:1.353
--- pkgsrc/mail/postfix/Makefile:1.352  Mon May 19 15:56:57 2025
+++ pkgsrc/mail/postfix/Makefile        Fri Sep 26 08:10:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.352 2025/05/19 15:56:57 taca Exp $
+# $NetBSD: Makefile,v 1.353 2025/09/26 08:10:45 jperkin Exp $
 
 .include "../../mail/postfix/Makefile.common"
 
@@ -22,11 +22,8 @@ REPLACE_PERL+=       auxiliary/qshape/qshape.p
 FILES_SUBST+=          EXAMPLEDIR=${EXAMPLEDIR}
 MESSAGE_SUBST+=                EXAMPLEDIR=${EXAMPLEDIR}
 MESSAGE_SUBST+=                DOCDIR=${DOCDIR}
+MESSAGE_SUBST+=                PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
-MESSAGE_SRC+=          ${PKGDIR}/MESSAGE
-.if exists(${PKGDIR}/MESSAGE.${OPSYS})
-MESSAGE_SRC+=          ${PKGDIR}/MESSAGE.${OPSYS}
-.endif
 PLIST_SRC+=            ${PKGDIR}/PLIST
 
 RCD_SCRIPTS=           postfix

Index: pkgsrc/mail/postfix/options.mk
diff -u pkgsrc/mail/postfix/options.mk:1.43 pkgsrc/mail/postfix/options.mk:1.44
--- pkgsrc/mail/postfix/options.mk:1.43 Wed Dec 15 20:54:00 2021
+++ pkgsrc/mail/postfix/options.mk      Fri Sep 26 08:10:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.43 2021/12/15 20:54:00 adam Exp $
+# $NetBSD: options.mk,v 1.44 2025/09/26 08:10:45 jperkin Exp $
 
 # Global and legacy options
 
@@ -43,9 +43,6 @@ AUXLIBS+=     -L${BUILDLINK_PREFIX.cyrus-sas
                ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
                -lsasl2
 PLIST.csasl=   yes
-MESSAGE_SRC+=  ${PKGDIR}/MESSAGE.sasl
-MESSAGE_SUBST+=        PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-MESSAGE_SUBST+=        SASLLIBDIR=${SASLLIBDIR}
 MAKE_DIRS+=    ${SASLLIBDIR}
 CONF_FILES+=   ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
 .else