Date: Sat, 5 Oct 2013 18:35:40 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329494 - in head/mail: cyrus-imapd2 cyrus-imapd22 cyrus-imapd23 cyrus-imapd24 Message-ID: <201310051835.r95IZeEE064430@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Sat Oct 5 18:35:40 2013 New Revision: 329494 URL: http://svnweb.freebsd.org/changeset/ports/329494 Log: avoid package name collisions. Spotted by: bapt Modified: head/mail/cyrus-imapd2/Makefile head/mail/cyrus-imapd22/Makefile head/mail/cyrus-imapd23/Makefile head/mail/cyrus-imapd24/Makefile Modified: head/mail/cyrus-imapd2/Makefile ============================================================================== --- head/mail/cyrus-imapd2/Makefile Sat Oct 5 18:30:05 2013 (r329493) +++ head/mail/cyrus-imapd2/Makefile Sat Oct 5 18:35:40 2013 (r329494) @@ -7,6 +7,7 @@ CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} +PKGNAMESUFFIX= 21 PATCH_SITES= http://www.mahoroba.org/~ume/ipv6/ \ http://home.jp.FreeBSD.org/~ume/ipv6/ @@ -18,9 +19,7 @@ COMMENT= The cyrus mail server, supporti LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^1].* - -LATEST_LINK= ${PORTNAME}2 +CONFLICTS= cyrus-1.* cyrus-imapd-2.[^1].* cyrus-imapd2[^1]-2.[^1].* PERLMAN= ${SITE_PERL_REL:S/site_perl\///} Modified: head/mail/cyrus-imapd22/Makefile ============================================================================== --- head/mail/cyrus-imapd22/Makefile Sat Oct 5 18:30:05 2013 (r329493) +++ head/mail/cyrus-imapd22/Makefile Sat Oct 5 18:35:40 2013 (r329494) @@ -7,15 +7,14 @@ CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} +PKGNAMESUFFIX= 22 MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* - -LATEST_LINK= ${PORTNAME}22 +CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* cyrus-imapd2[^2]-2.[^2].* PERLMAN= ${SITE_PERL_REL:S/site_perl\///} Modified: head/mail/cyrus-imapd23/Makefile ============================================================================== --- head/mail/cyrus-imapd23/Makefile Sat Oct 5 18:30:05 2013 (r329493) +++ head/mail/cyrus-imapd23/Makefile Sat Oct 5 18:35:40 2013 (r329494) @@ -5,6 +5,7 @@ PORTVERSION= 2.3.18 PORTREVISION= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ +PKGNAMESUFFIX= 23 MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols @@ -16,9 +17,7 @@ LIB_DEPENDS= libsasl2.so:${PORTSDIR}/sec libpcre.so:${PORTSDIR}/devel/pcre BUILD_DEPENDS= p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].* - -LATEST_LINK= ${PORTNAME}23 +CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].* PERLMAN= ${SITE_PERL_REL:S/site_perl\///} Modified: head/mail/cyrus-imapd24/Makefile ============================================================================== --- head/mail/cyrus-imapd24/Makefile Sat Oct 5 18:30:05 2013 (r329493) +++ head/mail/cyrus-imapd24/Makefile Sat Oct 5 18:35:40 2013 (r329494) @@ -6,6 +6,7 @@ PORTREVISION= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ http://cyrusimap.org/releases/ +PKGNAMESUFFIX= 24 MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols @@ -16,9 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \ libpcre.so:${PORTSDIR}/devel/pcre -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^4].* - -LATEST_LINK= ${PORTNAME}24 +CONFLICTS= cyrus-1.* cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].* PERLMAN= ${SITE_PERL_REL:S/site_perl\///}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310051835.r95IZeEE064430>