diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-06-25 14:19:25 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-06-25 14:19:25 +0000 |
| commit | ae44dfc7b83337b56e38040dd10468b989f1ed0a (patch) | |
| tree | 94f1c16e06e688897cb5d9ba59c38054071b58b1 /mail | |
| parent | 56fd9df84fb436ab35f308b89ab44c98e95ce11d (diff) | |
| download | ports-ae44dfc7b83337b56e38040dd10468b989f1ed0a.tar.gz ports-ae44dfc7b83337b56e38040dd10468b989f1ed0a.zip | |
Fix CONFLICTS with netqmail-tls after PKGNAME rename in r359176
Notes
Notes:
svn path=/head/; revision=359244
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qmail-ldap/Makefile | 2 | ||||
| -rw-r--r-- | mail/qmail-mysql/Makefile | 2 | ||||
| -rw-r--r-- | mail/qmail-spamcontrol/Makefile | 2 | ||||
| -rw-r--r-- | mail/qmail/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index 44e59d012a8c..cd34f3d9a52b 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/svscan:${PORTSDIR}/sysutils/daemontools \ ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp CONFLICTS= emboss-[0-9]* digest-[0-9]* *qmail-[0-9]* *qmail-mysql-[0-9]* \ - qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* + qmail-spamcontrol-[0-9]* *qmail-tls-[0-9]* EXTRA_PATCHES+= ${MASTERDIR}/files/patch-Makefile \ ${MASTERDIR}/files/patch-auto_uids-c-dist diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile index d399ab09e056..bd6d2c3842c5 100644 --- a/mail/qmail-mysql/Makefile +++ b/mail/qmail-mysql/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= -mysql COMMENT= Secure, reliable, and fast MTA for UNIX systems with MySQL support -CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* +CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* qmail-spamcontrol-[0-9]* *qmail-tls-[0-9]* MYSQL_PATCH_VERSION= 1.1.15 diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile index 436bac1ffb62..c977a19db55d 100644 --- a/mail/qmail-spamcontrol/Makefile +++ b/mail/qmail-spamcontrol/Makefile @@ -13,7 +13,7 @@ EXTRACT_ONLY= ${QMAIL_DIST} COMMENT= Qmail MTA with SpamControl patches -CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-tls-[0-9]* +CONFLICTS= *qmail-[0-9]* qmail-ldap-[0-9]* *qmail-mysql-[0-9]* *qmail-tls-[0-9]* EXTRA_PATCHES+= ${MASTERDIR}/files/patch-install.c \ ${MASTERDIR}/files/patch-Makefile \ diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index dfb2dddbfb00..cf4d6f65b2cf 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -15,7 +15,7 @@ COMMENT?= Secure, reliable, efficient, simple, and fast MTA DIST_SUBDIR= qmail -CONFLICTS?= qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* qmail-tls-[0-9]* +CONFLICTS?= qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* *qmail-tls-[0-9]* CONFLICTS+= qmail-vida-[0-9]* USES= qmail:vars |