svn commit: r359244 - in head/mail: qmail qmail-ldap qmail-mysql qmail-spamcontrol
Bryan Drewery
bdrewery at FreeBSD.org
Wed Jun 25 14:19:26 UTC 2014
Author: bdrewery
Date: Wed Jun 25 14:19:25 2014
New Revision: 359244
URL: http://svnweb.freebsd.org/changeset/ports/359244
QAT: https://qat.redports.org/buildarchive/r359244/
Log:
Fix CONFLICTS with netqmail-tls after PKGNAME rename in r359176
Modified:
head/mail/qmail-ldap/Makefile
head/mail/qmail-mysql/Makefile
head/mail/qmail-spamcontrol/Makefile
head/mail/qmail/Makefile
Modified: head/mail/qmail-ldap/Makefile
==============================================================================
--- head/mail/qmail-ldap/Makefile Wed Jun 25 14:00:36 2014 (r359243)
+++ head/mail/qmail-ldap/Makefile Wed Jun 25 14:19:25 2014 (r359244)
@@ -13,7 +13,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/svscan:${P
${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
Modified: head/mail/qmail-mysql/Makefile
==============================================================================
--- head/mail/qmail-mysql/Makefile Wed Jun 25 14:00:36 2014 (r359243)
+++ head/mail/qmail-mysql/Makefile Wed Jun 25 14:19:25 2014 (r359244)
@@ -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
Modified: head/mail/qmail-spamcontrol/Makefile
==============================================================================
--- head/mail/qmail-spamcontrol/Makefile Wed Jun 25 14:00:36 2014 (r359243)
+++ head/mail/qmail-spamcontrol/Makefile Wed Jun 25 14:19:25 2014 (r359244)
@@ -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 \
Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile Wed Jun 25 14:00:36 2014 (r359243)
+++ head/mail/qmail/Makefile Wed Jun 25 14:19:25 2014 (r359244)
@@ -15,7 +15,7 @@ COMMENT?= Secure, reliable, efficient, s
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
More information about the svn-ports-all
mailing list