Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Oct 2017 01:54:56 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r451257 - in head: cad/alliance net/fspclient
Message-ID:  <201710050154.v951suP9072751@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Thu Oct  5 01:54:56 2017
New Revision: 451257
URL: https://svnweb.freebsd.org/changeset/ports/451257

Log:
  Register net/fsbclient and cad/alliance conflict.
  
  Reported by:	rodrigo

Modified:
  head/cad/alliance/Makefile   (contents, props changed)
  head/net/fspclient/Makefile   (contents, props changed)

Modified: head/cad/alliance/Makefile
==============================================================================
--- head/cad/alliance/Makefile	Thu Oct  5 01:54:46 2017	(r451256)
+++ head/cad/alliance/Makefile	Thu Oct  5 01:54:56 2017	(r451257)
@@ -19,6 +19,8 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-se
 
 BROKEN_aarch64=		fails to link: collect2: error: ld returned 1 exit status
 
+CONFLICTS_INSTALL=	fspclient-*
+
 WRKSRC=		${WRKDIR}/alliance-5.0
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message

Modified: head/net/fspclient/Makefile
==============================================================================
--- head/net/fspclient/Makefile	Thu Oct  5 01:54:46 2017	(r451256)
+++ head/net/fspclient/Makefile	Thu Oct  5 01:54:56 2017	(r451257)
@@ -9,6 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Ftp-like client for the FSP service
 
+CONFLICTS_INSTALL=	alliance-*
 USES=		tar:bzip2 scons
 MAKE_ARGS=	prefix=${PREFIX}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710050154.v951suP9072751>