svn commit: r509382 - in head/mail: fetchmail fetchmail64

[Matthias Andree]

Author: mandree
Date: Mon Aug 19 22:09:56 2019
New Revision: 509382
URL: https://svnweb.freebsd.org/changeset/ports/509382

Log:
  Resolve conflicts and fix portlint warnings around USES= placement.

Modified:
  head/mail/fetchmail/Makefile
  head/mail/fetchmail64/Makefile

Modified: head/mail/fetchmail/Makefile
==============================================================================
--- head/mail/fetchmail/Makefile	Mon Aug 19 22:01:56 2019	(r509381)
+++ head/mail/fetchmail/Makefile	Mon Aug 19 22:09:56 2019	(r509382)
@@ -20,13 +20,15 @@ LICENSE_COMB=	dual
 .if empty(MASTERDIR)
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
+USES=		cpe gmake tar:xz ssl
+
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
-USES=		cpe gmake tar:xz ssl
-
 USE_RC_SUBR=	fetchmail
 SUB_FILES=	pkg-message
+
+CONFLICTS_INSTALL=	fetchmail-6.4*
 
 GNU_CONFIGURE=	yes
 

Modified: head/mail/fetchmail64/Makefile
==============================================================================
--- head/mail/fetchmail64/Makefile	Mon Aug 19 22:01:56 2019	(r509381)
+++ head/mail/fetchmail64/Makefile	Mon Aug 19 22:09:56 2019	(r509382)
@@ -5,8 +5,10 @@ PORTNAME?=	fetchmail
 DISTVERSION=	6.4.0.rc2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/${PORTNAME}/branch_6.4/
+PKGNAMESUFFIX=	64
 
-MAINTAINER=	mandree at FreeBSD.org # chalpin at cs.wisc.edu has full permissions to this port except overriding MAINTAINER line.
+# chalpin at cs.wisc.edu has full permissions to this port except overriding MAINTAINER line.
+MAINTAINER=	mandree at FreeBSD.org
 COMMENT?=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR - release candidate
 
 LICENSE=	GPLv2 LGPL21
@@ -15,13 +17,15 @@ LICENSE_COMB=	dual
 .if empty(MASTERDIR)
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
+USES=		cpe gmake tar:xz ssl
+
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
-USES=		cpe gmake tar:xz ssl
-
 USE_RC_SUBR=	fetchmail
 SUB_FILES=	pkg-message
+
+CONFLICTS_INSTALL=	fetchmail-6.3*
 
 GNU_CONFIGURE=	yes