Date: Mon, 1 Jan 2024 18:54:58 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1f12b8b89415 - main - mail/vpopmail: Fix build Message-ID: <202401011854.401IswT6010813@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f12b8b894158bfcd0d3865eaac0cafe67039c01 commit 1f12b8b894158bfcd0d3865eaac0cafe67039c01 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-01-01 14:50:16 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-01-01 18:54:47 +0000 mail/vpopmail: Fix build - While I removed the MYSQL option there was a file in the pkg-plist which caused build failures. [1] - Also refactor @exec/@unexec Reported by: antoine [1] --- mail/vpopmail/pkg-plist | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist index aa96f1eb4a86..c036e4b7a1a1 100644 --- a/mail/vpopmail/pkg-plist +++ b/mail/vpopmail/pkg-plist @@ -29,13 +29,12 @@ vpopmail/bin/vusagec vpopmail/bin/vuserinfo vpopmail/etc/inc_deps vpopmail/etc/lib_deps -@exec if [ ! -f %D/vpopmail/etc/defaultdomain ]; then install -o vpopmail -g vchkpw /dev/null %D/vpopmail/etc/defaultdomain; fi -@unexec if [ -f %D/vpopmail/etc/defaultdomain ] && [ ! -s %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi +@postexec if [ ! -f %D/vpopmail/etc/defaultdomain ]; then install -o vpopmail -g vchkpw /dev/null %D/vpopmail/etc/defaultdomain; fi +@postunexec if [ -f %D/vpopmail/etc/defaultdomain ] && [ ! -s %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi @sample vpopmail/etc/tcp.smtp-dist vpopmail/etc/tcp.smtp @sample vpopmail/etc/vlimits.default-dist vpopmail/etc/vlimits.default %%LDAP%%@sample vpopmail/etc/vpopmail.ldap-dist vpopmail/etc/vpopmail.ldap -%%LDAP%%@exec echo "You need to specify the LDAP connection settings in the %D/vpopmail/etc/vpopmail.ldap file" | /usr/bin/fmt -%%MYSQL%%@sample vpopmail/etc/vpopmail.mysql-dist vpopmail/etc/vpopmail.mysql +%%LDAP%%@preexec echo "You need to specify the LDAP connection settings in the %D/vpopmail/etc/vpopmail.ldap file" | /usr/bin/fmt @sample vpopmail/etc/vusagec.conf-dist vpopmail/etc/vusagec.conf @owner @group @@ -100,7 +99,7 @@ vpopmail/lib/libvpopmail.a @dir(vpopmail,vchkpw,) vpopmail/include @dir(vpopmail,vchkpw,) vpopmail/lib @dir(vpopmail,vchkpw,) vpopmail -%%SPAMASSASSIN%%@exec echo "***********************************************************************" -%%SPAMASSASSIN%%@exec echo "Now you should add the following options to your spamd.sh startup file:" -%%SPAMASSASSIN%%@exec echo "-v -u vpopmail" -%%SPAMASSASSIN%%@exec echo "***********************************************************************" +%%SPAMASSASSIN%%@preexec echo "***********************************************************************" +%%SPAMASSASSIN%%@preexec echo "Now you should add the following options to your spamd.sh startup file:" +%%SPAMASSASSIN%%@preexec echo "-v -u vpopmail" +%%SPAMASSASSIN%%@preexec echo "***********************************************************************"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401011854.401IswT6010813>