diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 23:11:40 +0100 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2021-11-23 23:11:40 +0100 |
| commit | 5933ac0b099d61d98eb531d373cf57a8927bc7af (patch) | |
| tree | fc0ebf2ac7225dec2aa7f2a7b0efbb91919c1030 /mail/postfix-current | |
| parent | lang/guile2: define _WITH_CPU_SET_T to fix build on -CURRENT (diff) | |
*/*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").
Approved by: portmgr (blanket)
Diffstat (limited to 'mail/postfix-current')
| -rw-r--r-- | mail/postfix-current/Makefile | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 609d0a812740..c16c0a61d1e1 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -26,19 +26,19 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS_IPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept FLAVORS= default ldap sasl -default_CONFLICTS_INSTALL= postfix-current-base-ldap-* \ - postfix-current-base-sasl-* \ - postfix-current-ldap-* postfix-current-sasl-* +default_CONFLICTS_INSTALL= postfix-current-base-ldap \ + postfix-current-base-sasl \ + postfix-current-ldap postfix-current-sasl ldap_PKGNAMESUFFIX= -current-ldap -ldap_CONFLICTS_INSTALL= postfix-current-[0-9]* \ - postfix-current-base-[0-9] \ - postfix-current-base-sasl-* \ - postfix-current-sasl-* +ldap_CONFLICTS_INSTALL= postfix-current \ + postfix-current-base \ + postfix-current-base-sasl \ + postfix-current-sasl sasl_PKGNAMESUFFIX= -current-sasl -sasl_CONFLICTS_INSTALL= postfix-current-[0-9]* \ - postfix-current-base-[0-9] \ - postfix-current-base-ldap-* \ - postfix-current-ldap-* +sasl_CONFLICTS_INSTALL= postfix-current \ + postfix-current-base \ + postfix-current-base-ldap \ + postfix-current-ldap COMMENT_ldap= (with OpenLDAP and Cyrus SASL support) COMMENT_sasl= (with Cyrus SASL support) @@ -51,10 +51,10 @@ SHEBANG_FILES= auxiliary/qshape/qshape.pl SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" -CONFLICTS_INSTALL= courier-0.* opensmtpd-[0-9]* opensmtpd-devel-* \ - postfix-[0-9]* postfix-base-* postfix-ldap-sasl-* \ - postfix-sasl-* postfix35-* sendmail-[0-9]* \ - sendmail-devel-* +CONFLICTS_INSTALL= courier-0.* opensmtpd opensmtpd-devel \ + postfix postfix-base postfix-ldap-sasl \ + postfix-sasl postfix35 sendmail \ + sendmail-devel USERS= postfix GROUPS= mail maildrop postfix |