From owner-svn-ports-all@freebsd.org Mon Oct 9 18:58:38 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39A8CE3911B; Mon, 9 Oct 2017 18:58:38 +0000 (UTC) (envelope-from pi@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 mx1.freebsd.org (Postfix) with ESMTPS id 06FA976FC0; Mon, 9 Oct 2017 18:58:37 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v99IwbGS026495; Mon, 9 Oct 2017 18:58:37 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v99IwbCf026493; Mon, 9 Oct 2017 18:58:37 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201710091858.v99IwbCf026493@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 9 Oct 2017 18:58:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451630 - in head/net: quagga quagga-esr X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/net: quagga quagga-esr X-SVN-Commit-Revision: 451630 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Oct 2017 18:58:38 -0000 Author: pi Date: Mon Oct 9 18:58:36 2017 New Revision: 451630 URL: https://svnweb.freebsd.org/changeset/ports/451630 Log: net/quagga{-esr}: add conflicts - detected by rodrigo's conflict scanner Modified: head/net/quagga-esr/Makefile head/net/quagga/Makefile Modified: head/net/quagga-esr/Makefile ============================================================================== --- head/net/quagga-esr/Makefile Mon Oct 9 18:25:24 2017 (r451629) +++ head/net/quagga-esr/Makefile Mon Oct 9 18:58:36 2017 (r451630) @@ -14,7 +14,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= gawk:lang/gawk -CONFLICTS= openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]* +CONFLICTS= openbgpd openospfd zebra quagga frr pimd GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga Modified: head/net/quagga/Makefile ============================================================================== --- head/net/quagga/Makefile Mon Oct 9 18:25:24 2017 (r451629) +++ head/net/quagga/Makefile Mon Oct 9 18:58:36 2017 (r451630) @@ -13,7 +13,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= gawk:lang/gawk -CONFLICTS= openbgpd openospfd zebra quagga-re frr +CONFLICTS= openbgpd openospfd zebra quagga-esr frr pimd GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga