From owner-svn-ports-head@freebsd.org  Mon Nov  4 23:46:33 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 09D051B4017;
 Mon,  4 Nov 2019 23:46:33 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 476Tw86Vm6z4Vqb;
 Mon,  4 Nov 2019 23:46:32 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3F693F02;
 Mon,  4 Nov 2019 23:46:32 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA4NkWLZ045863;
 Mon, 4 Nov 2019 23:46:32 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA4NkW3Q045862;
 Mon, 4 Nov 2019 23:46:32 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201911042346.xA4NkW3Q045862@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Mon, 4 Nov 2019 23:46:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r516753 - head/lang/ponyc
X-SVN-Group: ports-head
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: head/lang/ponyc
X-SVN-Commit-Revision: 516753
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Nov 2019 23:46:33 -0000

Author: tobik
Date: Mon Nov  4 23:46:32 2019
New Revision: 516753
URL: https://svnweb.freebsd.org/changeset/ports/516753

Log:
  lang/ponyc: Fix CONFLICTS_INSTALL

Modified:
  head/lang/ponyc/Makefile

Modified: head/lang/ponyc/Makefile
==============================================================================
--- head/lang/ponyc/Makefile	Mon Nov  4 23:43:45 2019	(r516752)
+++ head/lang/ponyc/Makefile	Mon Nov  4 23:46:32 2019	(r516753)
@@ -31,7 +31,7 @@ MAKE_ENV=	config=release verbose=true default_pic=true
 		prefix=${PREFIX} arch=${PONYARCH} \
 		LLVM_CONFIG=llvm-config${LLVM_VERSION}
 
-CONFLICTS_INSTALL=	ponyc-static
+CONFLICTS_INSTALL?=	ponyc-static
 
 OPTIONS_DEFINE=			DOCS DTRACE EXAMPLES STATIC
 OPTIONS_EXCLUDE_aarch64=	DTRACE