From owner-svn-ports-head@freebsd.org  Mon Sep  9 09:00:38 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 D02A3F2ADF;
 Mon,  9 Sep 2019 09:00:38 +0000 (UTC) (envelope-from mm@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 46Rhvp58HPz4fRZ;
 Mon,  9 Sep 2019 09:00:38 +0000 (UTC) (envelope-from mm@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 94758B1A9;
 Mon,  9 Sep 2019 09:00:38 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8990cgn072612;
 Mon, 9 Sep 2019 09:00:38 GMT (envelope-from mm@FreeBSD.org)
Received: (from mm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8990cYF072611;
 Mon, 9 Sep 2019 09:00:38 GMT (envelope-from mm@FreeBSD.org)
Message-Id: <201909090900.x8990cYF072611@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org
 using -f
From: Martin Matuska <mm@FreeBSD.org>
Date: Mon, 9 Sep 2019 09:00:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r511609 - head/lang/luajit
X-SVN-Group: ports-head
X-SVN-Commit-Author: mm
X-SVN-Commit-Paths: head/lang/luajit
X-SVN-Commit-Revision: 511609
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, 09 Sep 2019 09:00:38 -0000

Author: mm
Date: Mon Sep  9 09:00:38 2019
New Revision: 511609
URL: https://svnweb.freebsd.org/changeset/ports/511609

Log:
  Add luajit-openresty to CONFLICTS_INSTALL for luajit

Modified:
  head/lang/luajit/Makefile

Modified: head/lang/luajit/Makefile
==============================================================================
--- head/lang/luajit/Makefile	Mon Sep  9 08:57:54 2019	(r511608)
+++ head/lang/luajit/Makefile	Mon Sep  9 09:00:38 2019	(r511609)
@@ -18,6 +18,8 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 IGNORE_aarch64=		fails to compile: lj_arch.h:55:2: No support for this architecture (yet)
 IGNORE_powerpc64=	fails to compile: lj_arch.h:346:2: No support for PowerPC 64 bit mode
 
+CONFLICTS_INSTALL=	luajit-openresty
+
 WRKSRC=		${WRKDIR}/LuaJIT-${DISTVERSION}
 USES=		gmake
 USE_LDCONFIG=	yes